diff --git a/.editorconfig b/.editorconfig
index 2ab3cbeae7..a41ddcad7f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false
 
-# Ktlint rule, for more information see https://pinterest.github.io/ktlint/1.1.1/faq/#how-do-i-enable-or-disable-a-rule
+# Ktlint rule, for more information see https://pinterest.github.io/ktlint/latest/faq/#how-do-i-enable-or-disable-a-rule
 ktlint_standard_wrapping = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
 ktlint_standard_trailing-comma-on-declaration-site = disabled
@@ -26,7 +26,16 @@ ktlint_standard_annotation = disabled
 ktlint_standard_parameter-list-wrapping = disabled
 ktlint_standard_indent = disabled
 ktlint_standard_blank-line-before-declaration = disabled
-ktlint_function_naming_ignore_when_annotated_with=Composable
+ktlint_function_naming_ignore_when_annotated_with = Composable
+# Added when upgrading to 1.7.1
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_chain-method-continuation = disabled
+ktlint_standard_class-signature = disabled
+# Added when upgrading to 1.8.0
+ktlint_standard_when-entry-bracing = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
+ktlint_standard_mixed-condition-operators = disabled
+ktlint_standard_no-unused-imports = enabled
 
 [*.java]
 ij_java_align_consecutive_assignments = false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb14c3cee6..aa62b83e36 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-{0}-{1}', matrix.variant, github.sha) || format('build-{0}-{1}', matrix.variant, github.ref)  }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -46,6 +46,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
           ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
+          ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}
           ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
           ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
           ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
@@ -53,7 +54,7 @@ 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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-debug
           path: |
@@ -61,7 +62,7 @@ jobs:
             app/build/outputs/apk/fdroid/debug/*-universal-debug.apk
       - name: Upload x86_64 APK for Maestro
         if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-apk-maestro
           path: |
@@ -69,7 +70,7 @@ jobs:
           retention-days: 5
           overwrite: true
           if-no-files-found: error
-      - uses: rnkdsh/action-upload-diawi@26292a7b424bdc9f4ab4ccea6202fc513f571370 # v1.5.11
+      - uses: rnkdsh/action-upload-diawi@4e1421305be7cfc510d05f47850262eeaf345108 # v1.5.12
         id: diawi
         # Do not fail the whole build if Diawi upload fails
         continue-on-error: true
diff --git a/.github/workflows/build_enterprise.yml b/.github/workflows/build_enterprise.yml
index 0d9b5949cc..1d416ffe42 100644
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -27,7 +27,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-enterprise-{0}-{1}', matrix.variant, github.sha) || format('build-enterprise-{0}-{1}', matrix.variant, github.ref)  }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -54,6 +54,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
           ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
+          ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}
           ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
           ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
           ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
@@ -61,7 +62,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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-enterprise-debug
           path: |
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 0868b0729f..f7c8fccc62 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -9,7 +9,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@v5
+      - uses: actions/checkout@v6
       - name: Add SSH private keys for submodule repositories
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         with:
@@ -20,7 +20,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
+        uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:
diff --git a/.github/workflows/generate_github_pages.yml b/.github/workflows/generate_github_pages.yml
index 0d03d1a928..008ac299c7 100644
--- a/.github/workflows/generate_github_pages.yml
+++ b/.github/workflows/generate_github_pages.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.14
       - name: Run World screenshots generation script
         run: |
           ./tools/test/generateWorldScreenshots.py
diff --git a/.github/workflows/gradle-wrapper-update.yml b/.github/workflows/gradle-wrapper-update.yml
index f826bb8205..3b0fac5309 100644
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -11,7 +11,7 @@ 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@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-java@v5
         name: Use JDK 21
         if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
diff --git a/.github/workflows/maestro-local.yml b/.github/workflows/maestro-local.yml
index 7481bec0ba..4fd42534b7 100644
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -23,7 +23,7 @@ jobs:
       group: ${{ format('maestro-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -44,7 +44,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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-apk-maestro
           path: |
@@ -62,14 +62,14 @@ jobs:
       group: ${{ format('maestro-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         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
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.ref }}
       - name: Download APK artifact from previous job
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: elementx-apk-maestro
       - name: Enable KVM group perms
@@ -102,7 +102,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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: test-results
           path: |
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b494d9fe8c..0ea049b2f0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -30,6 +30,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
           ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
+          ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}
           ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
           ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
           ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
diff --git a/.github/workflows/nightlyReports.yml b/.github/workflows/nightlyReports.yml
index 537565743e..b7119c7036 100644
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: ✅ Upload kover report
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: kover-results
           path: |
@@ -60,7 +60,7 @@ jobs:
     name: Dependency analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -74,7 +74,7 @@ jobs:
         run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
       - name: Upload dependency analysis
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dependency-analysis
           path: build/reports/dependency-check-report.html
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 773bc02d93..2084c7648a 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -17,7 +17,7 @@ jobs:
     name: Search for forbidden patterns
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Add SSH private keys for submodule repositories
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
@@ -33,11 +33,11 @@ jobs:
     name: Search for invalid screenshot files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.14
       - name: Search for invalid screenshot files
         run: ./tools/test/checkInvalidScreenshots.py
 
@@ -45,7 +45,7 @@ jobs:
     name: Search for invalid dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -58,7 +58,7 @@ jobs:
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.14
       - name: Search for invalid dependencies
         run: ./tools/dependencies/checkDependencies.py
 
@@ -71,7 +71,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@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -97,12 +97,45 @@ jobs:
         run: ./gradlew :tests:konsist:testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES --no-daemon
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: konsist-report
           path: |
             **/build/reports/**/*.*
 
+  compose:
+    name: Compose tests
+    runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
+    concurrency:
+      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@v6
+        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 }}
+      - name: Add SSH private keys for submodule repositories
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
+        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
+        with:
+          ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
+      - name: Clone submodules
+        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@v5
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '21'
+      - name: Configure gradle
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
+      - name: Run compose tests
+        run: ./tools/compose/check_stability.sh
+
   lint:
     name: Android lint check
     runs-on: ubuntu-latest
@@ -111,7 +144,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@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -141,7 +174,7 @@ jobs:
         run: ./gradlew :app:lintGplayDebug :app:lintFdroidDebug lintDebug $CI_GRADLE_ARG_PROPERTIES --continue
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: linting-report
           path: |
@@ -155,7 +188,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@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -181,7 +214,7 @@ jobs:
         run: ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES --no-daemon
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: detekt-report
           path: |
@@ -195,7 +228,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@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -221,7 +254,7 @@ jobs:
         run: ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ktlint-report
           path: |
@@ -235,7 +268,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-knit-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-knit-develop-{0}', github.sha) || format('check-knit-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -266,7 +299,7 @@ jobs:
     name: Check shell scripts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Run shellcheck
         uses: ludeeus/action-shellcheck@2.0.0
         with:
@@ -278,13 +311,13 @@ 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@v5
+      - uses: actions/checkout@v6
         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 }}
       - name: Download reports from previous jobs
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
       - name: Prepare Danger
         if: always()
         run: |
@@ -293,7 +326,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
+        uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2cce85bd5a..439b97ba8c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       group: ${{ format('build-release-main-gplay-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -32,13 +32,14 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
           ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
+          ELEMENT_SDK_SENTRY_DSN: ${{ secrets.ELEMENT_SDK_SENTRY_DSN }}
           ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
           ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
           ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
           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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-app-gplay-bundle-unsigned
           path: |
@@ -52,7 +53,7 @@ jobs:
       group: ${{ format('build-release-main-enterprise-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Add SSH private keys for submodule repositories
         uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
@@ -74,7 +75,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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-enterprise-app-gplay-bundle-unsigned
           path: |
@@ -87,7 +88,7 @@ jobs:
       group: ${{ format('build-release-main-fdroid-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -102,7 +103,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@v4
+        uses: actions/upload-artifact@v6
         with:
           name: elementx-app-fdroid-apks-unsigned
           path: |
diff --git a/.github/workflows/scripts/maestro/local-recording.sh b/.github/workflows/scripts/maestro/local-recording.sh
index 6534d2feca..adc83f4876 100755
--- a/.github/workflows/scripts/maestro/local-recording.sh
+++ b/.github/workflows/scripts/maestro/local-recording.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 #
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only
+# SPDX-License-Identifier: AGPL-3.0-only.
 # Please see LICENSE in the repository root for full details.
 #
 
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 b94958dba4..a9f789a4f5 100755
--- a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
+++ b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 #
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only
+# SPDX-License-Identifier: AGPL-3.0-only.
 # Please see LICENSE in the repository root for full details.
 #
 
diff --git a/.github/workflows/scripts/recordScreenshots.sh b/.github/workflows/scripts/recordScreenshots.sh
index 19469e69e3..d29353a2c2 100755
--- a/.github/workflows/scripts/recordScreenshots.sh
+++ b/.github/workflows/scripts/recordScreenshots.sh
@@ -1,8 +1,9 @@
 #!/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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 set -e
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index acfe6ba87f..c289102116 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -22,7 +22,7 @@ jobs:
       group: ${{ format('sonar-{0}', github.ref) }}
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml
index 7740af4064..2086eab3aa 100644
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -11,7 +11,7 @@ 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@v5
+      - uses: actions/checkout@v6
       - name: Use JDK 21
         uses: actions/setup-java@v5
         with:
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.14
       - name: Setup Localazy
         run: |
           curl -sS https://dist.localazy.com/debian/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/localazy.gpg
@@ -36,7 +36,7 @@ jobs:
           ./tools/localazy/importSupportedLocalesFromLocalazy.py
           ./tools/test/generateAllScreenshots.py
       - name: Create Pull Request for Strings
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
         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 84b0cb521c..2f5f22a2d5 100644
--- a/.github/workflows/sync-sas-strings.yml
+++ b/.github/workflows/sync-sas-strings.yml
@@ -12,18 +12,18 @@ 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@v5
+      - uses: actions/checkout@v6
       - name: Set up Python 3.12
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.14
       - name: Install Prerequisite dependencies
         run: |
           pip install requests
       - 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@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 22c302cbb3..aa11a433f4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: 🚫 Upload kover failed coverage reports
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: kover-error-report
           path: |
@@ -73,7 +73,7 @@ jobs:
 
       - name: 🚫 Upload test results on error
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: tests-and-screenshot-tests-results
           path: |
@@ -83,7 +83,7 @@ jobs:
 
       # https://github.com/codecov/codecov-action
       - name: ☂️ Upload coverage reports to codecov
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.gitignore b/.gitignore
index e1b1c5c8ab..77acaadb20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+# 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.
+
 # Built application files
 *.apk
 *.ap_
@@ -50,6 +55,7 @@ captures/
 .idea/deviceManager.xml
 .idea/gradle.xml
 .idea/jarRepositories.xml
+.idea/markdown.xml
 .idea/misc.xml
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
diff --git a/.idea/copyright/Element_Enterprise.xml b/.idea/copyright/Element_Enterprise.xml
index e8c3019732..b556049368 100644
--- a/.idea/copyright/Element_Enterprise.xml
+++ b/.idea/copyright/Element_Enterprise.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="© &amp;#36;today.year New Vector Limited, Element Software SARL, Element Software Inc.,&#10;and Element Software GmbH (the &quot;Element Group&quot;) only make this file available&#10;under a proprietary license model.&#10;&#10;Without a proprietary license with us, you cannot use this file. The terms of&#10;the proprietary license agreement between you and any member of the Element Group&#10;shall always apply to your use of this file. Unauthorised use, copying, distribution,&#10;or modification of this file, via any medium, is strictly prohibited.&#10;&#10;For details about the licensing terms, you must either visit our website or contact&#10;a member of our sales team." />
+    <option name="notice" value="© &amp;#36;today.year Element Creations Ltd.&#10;&#10;Element Creations Ltd, Element Software SARL, Element Software Inc.,&#10;and Element Software GmbH (the &quot;Element Group&quot;) only make this file available&#10;under a proprietary license model.&#10;&#10;Without a proprietary license with us, you cannot use this file. The terms of&#10;the proprietary license agreement between you and any member of the Element Group&#10;shall always apply to your use of this file. Unauthorised use, copying, distribution,&#10;or modification of this file, via any medium, is strictly prohibited.&#10;&#10;For details about the licensing terms, you must either visit our website or contact&#10;a member of our sales team." />
     <option name="myName" value="Element Enterprise" />
   </copyright>
 </component>
\ No newline at end of file
diff --git a/.idea/copyright/Element_FOSS.xml b/.idea/copyright/Element_FOSS.xml
index 930b4d9f5b..bfc80c44e1 100644
--- a/.idea/copyright/Element_FOSS.xml
+++ b/.idea/copyright/Element_FOSS.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright &amp;#36;today.year New Vector Ltd.&#10;&#10;SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial&#10;Please see LICENSE files in the repository root for full details." />
+    <option name="notice" value="Copyright (c) &amp;#36;today.year Element Creations Ltd.&#10;&#10;SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.&#10;Please see LICENSE files in the repository root for full details." />
     <option name="myName" value="Element FOSS" />
   </copyright>
 </component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 3efb2d8dd4..dbbf81b44b 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.2.20" />
+    <option name="version" value="2.3.0" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/CHANGES.md b/CHANGES.md
index cbc1db0032..47ea7ec332 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,290 @@
+Changes in Element X v25.12.0
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.12.0 -->
+
+## What's Changed
+### ✨ Features
+* Room list: enable latest event sorter. by @bmarty in https://github.com/element-hq/element-x-android/pull/5825
+* Add room list indicators about last message by @bmarty in https://github.com/element-hq/element-x-android/pull/5824
+### 🙌 Improvements
+* Change : improve room and space member list by @ganfra in https://github.com/element-hq/element-x-android/pull/5806
+* Change : security and privacy rework by @ganfra in https://github.com/element-hq/element-x-android/pull/5816
+### 🐛 Bugfixes
+* Ensure confirmation dialog is displayed when an admin add other admin to a room by @bmarty in https://github.com/element-hq/element-x-android/pull/5786
+* Edit user profile cancel confirmation by @bmarty in https://github.com/element-hq/element-x-android/pull/5788
+* Fix editing owner by @bmarty in https://github.com/element-hq/element-x-android/pull/5807
+* Uris should take precedence in plain text intents by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5785
+* Fix long voice recording by @bmarty in https://github.com/element-hq/element-x-android/pull/5821
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5792
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5830
+### 🧱 Build
+* Use regex to check forbidden terms by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5784
+* Update Gradle Wrapper from 8.14.3 to 9.2.1 by @ElementBot in https://github.com/element-hq/element-x-android/pull/5751
+### Dependency upgrades
+* fix(deps): update dependency androidx.sqlite:sqlite-ktx to v2.6.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5769
+* fix(deps): update datastore to v1.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5789
+* chore(deps): update peter-evans/create-pull-request action to v7.0.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5793
+* fix(deps): update dependency io.nlopez.compose.rules:detekt to v0.4.28 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5795
+* fix(deps): update metro to v0.7.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5771
+* chore(deps): update plugin sonarqube to v7.1.0.6387 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5783
+* fix(deps): update dependency io.github.sergio-sastre.composablepreviewscanner:android to v0.7.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5799
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.11.24 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5796
+* fix(deps): update dependency io.sentry:sentry-android to v8.27.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5803
+* fix(deps): update dependency io.element.android:emojibase-bindings to v1.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5801
+* fix(deps): update roborazzi to v1.52.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5804
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v12.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5814
+* chore(deps): update actions/checkout action to v6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5805
+* fix(deps): update dependency com.google.testparameterinjector:test-parameter-injector to v1.20 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5800
+* fix(deps): update android.gradle.plugin to v8.13.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5260
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.11.26 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5818
+* fix(deps): update dependencyanalysis to v3.5.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5819
+* fix(deps): update dependency com.posthog:posthog-android to v3.27.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5834
+* fix(deps): update dependency io.element.android:element-call-embedded to v0.16.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5839
+* Upgrade the Rust SDK to `v25.12.2` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5838
+### Others
+* misc : use newLatestEvent api from sdk by @ganfra in https://github.com/element-hq/element-x-android/pull/5809
+* Inject RoomMemberListDataSource in the presenter constructor. by @bmarty in https://github.com/element-hq/element-x-android/pull/5822
+* Add more performance checks by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5767
+* Load `JoinedRoom` in home screen, pass it to the room flow by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5817
+* Revert "fix(deps): update dependency com.posthog:posthog-android to v3.27.0" by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5836
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.11.3...v25.12.0
+
+Changes in Element X v25.11.3
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.11.3 -->
+
+## What's Changed
+### 🙌 Improvements
+* Improve rendering notification for multi account by @bmarty in https://github.com/element-hq/element-x-android/pull/5645
+* Change : roles and permissions by @ganfra in https://github.com/element-hq/element-x-android/pull/5685
+* Improve account provider selection during the login flow by @bmarty in https://github.com/element-hq/element-x-android/pull/5692
+* Let notifications use avatar fallback. by @bmarty in https://github.com/element-hq/element-x-android/pull/5721
+* Changes : member list improvements by @ganfra in https://github.com/element-hq/element-x-android/pull/5728
+### 🐛 Bugfixes
+* Do not use the bestDescription but the caption for images, when available by @bmarty in https://github.com/element-hq/element-x-android/pull/5684
+* Add the user certificate if any when creating Matrix Client. by @bmarty in https://github.com/element-hq/element-x-android/pull/5686
+* Ensure the form data are not lost when opening the log viewer. by @bmarty in https://github.com/element-hq/element-x-android/pull/5695
+* Fix password flow when using a login link by @bmarty in https://github.com/element-hq/element-x-android/pull/5693
+* Fix layout issue in text composer by @bmarty in https://github.com/element-hq/element-x-android/pull/5710
+* Fix navigation stack overflow when sharing media by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5724
+* Notification robustness by @bmarty in https://github.com/element-hq/element-x-android/pull/5726
+* Send read receipts using the current timeline, not the live timeline by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5731
+* Render Owner in the horizontal list when editing Admins. by @bmarty in https://github.com/element-hq/element-x-android/pull/5736
+* Stop overriding the homeserver when restoring a `Client` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5753
+* Revert "Stop overriding the homeserver when restoring a `Client`" by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5754
+* Try fixing forced dark mode issues on MIUI on Android 10 by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5708
+* Fix crash at startup by @bmarty in https://github.com/element-hq/element-x-android/pull/5761
+* Fix null pointer exception on room notification settings.  by @bmarty in https://github.com/element-hq/element-x-android/pull/5758
+* Fix crash when viewing Pinned events by @bmarty in https://github.com/element-hq/element-x-android/pull/5764
+* Fix crash when pressing back from the showkase Activity by @bmarty in https://github.com/element-hq/element-x-android/pull/5772
+* Fix navigation issue once incoming share is handled by @bmarty in https://github.com/element-hq/element-x-android/pull/5773
+* Fix crash in work manager by @bmarty in https://github.com/element-hq/element-x-android/pull/5768
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5704
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5747
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5782
+### 🧱 Build
+* Module cleanup by @bmarty in https://github.com/element-hq/element-x-android/pull/5722
+* Add `NIGHTLY` env for Sentry by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5779
+### 🚧 In development 🚧
+* Space : prepare Space Settings screen by @ganfra in https://github.com/element-hq/element-x-android/pull/5668
+### Dependency upgrades
+* fix(deps): update dependency androidx.core:core-splashscreen to v1.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5687
+* fix(deps): update dependency com.posthog:posthog-android to v3.26.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5696
+* fix(deps): update metro to v0.7.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5697
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.11.11 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5716
+* Update plugin ktlint to v14 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5713
+* Update plugin dependencycheck to v12.1.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5717
+* Update dependency org.maplibre.gl:android-sdk to v12.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5714
+* Update dependency io.sentry:sentry-android to v8.26.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5720
+* Update sqldelight to v2.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5730
+* fix(deps): update dependency com.squareup.okhttp3:okhttp-bom to v5.3.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5746
+* fix(deps): update dependency com.google.firebase:firebase-bom to v34.6.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5737
+* fix(deps): update metro to v0.7.6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5752
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v12.1.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5743
+* Update dependency com.squareup.okhttp3:okhttp-bom to v5.3.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5757
+* fix(deps): update dependency com.pinterest.ktlint:ktlint-cli to v1.8.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5738
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.11.19 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5762
+* fix(deps): update dependencyanalysis to v3.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5776
+### Others
+* Extract save change dialog by @bmarty in https://github.com/element-hq/element-x-android/pull/5679
+* Use the dedicated subdomain for the bug report URL by default by @benbz in https://github.com/element-hq/element-x-android/pull/5689
+* Convert `ComposerAlertMolecule` to use alert levels. by @kaylendog in https://github.com/element-hq/element-x-android/pull/5691
+* Improve composer alert molecule by @bmarty in https://github.com/element-hq/element-x-android/pull/5701
+* Code consistency around view event handling by @bmarty in https://github.com/element-hq/element-x-android/pull/5698
+* Update copyright holders by @bmarty in https://github.com/element-hq/element-x-android/pull/5706
+* Fix rendering notifications after receiving redundant push by @SpiritCroc in https://github.com/element-hq/element-x-android/pull/5711
+* Fix push gateway with some push provider (Sunup/autopush) by @p1gp1g in https://github.com/element-hq/element-x-android/pull/5741
+* Use new notification sound in release. by @bmarty in https://github.com/element-hq/element-x-android/pull/5748
+* Fix issue on brand color override by @bmarty in https://github.com/element-hq/element-x-android/pull/5626
+* Add media retention policy by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5749
+* Enable logging OkHttp traffic based on the current log level by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5750
+* Remove unused `slidingSyncProxy` from DB. by @bmarty in https://github.com/element-hq/element-x-android/pull/5755
+* Add some performance metrics for Sentry by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5760
+
+## New Contributors
+* @benbz made their first contribution in https://github.com/element-hq/element-x-android/pull/5689
+* @kaylendog made their first contribution in https://github.com/element-hq/element-x-android/pull/5691
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.11.2...v25.11.3
+
+Changes in Element X v25.11.2
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.11.2 -->
+
+## What's Changed
+### ✨ Features
+* Enable access to security and privacy by @bmarty in https://github.com/element-hq/element-x-android/pull/5566
+* Add ability to forward a media from the media viewer and the gallery by @bmarty in https://github.com/element-hq/element-x-android/pull/5622
+* Split notifications for messages in threads by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5595
+### 🙌 Improvements
+* Enable `SyncNotificationsWithWorkManager` in nightly and debug builds by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5573
+* Confirm exit without saving change in room details edit screen by @bmarty in https://github.com/element-hq/element-x-android/pull/5618
+* Space : add view members entry by @ganfra in https://github.com/element-hq/element-x-android/pull/5619
+* Update notification sound by @bmarty in https://github.com/element-hq/element-x-android/pull/5667
+* Use the new notification sound only on debug and nightly build by @bmarty in https://github.com/element-hq/element-x-android/pull/5673
+* Make sure we know the session verification state before showing the options to verify the session by @bmarty in https://github.com/element-hq/element-x-android/pull/5677
+### 🐛 Bugfixes
+* Improve how brand color is applied. by @bmarty in https://github.com/element-hq/element-x-android/pull/5584
+* Improve wellknown retrieval API by @bmarty in https://github.com/element-hq/element-x-android/pull/5587
+* Clearing the room list search clears the search term too by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5603
+* Delete pin code only when the last session is deleted by @bmarty in https://github.com/element-hq/element-x-android/pull/5600
+* Fix issues with WorkManager on Android 12 and below by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5606
+* Fix marking a room as read re-instantiates its timeline by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5628
+* Display only valid emojis in recent emoji list by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5612
+* Fix navigation issue. by @bmarty in https://github.com/element-hq/element-x-android/pull/5666
+* Fix forward events from media viewer from pinned media timeline by @bmarty in https://github.com/element-hq/element-x-android/pull/5669
+* Try fixing 'Timeline Event object has already been destroyed' by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5675
+* Use the SDK Client to check whether a homeserver is compatible by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5664
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5610
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5662
+### 🧱 Build
+* Remove `@Inject`, not necessary anymore when class is annotated with `@ContributesBinding` by @bmarty in https://github.com/element-hq/element-x-android/pull/5589
+* Upgrade ktlint to 1.7.1 and ensure Renovate will upgrade the version by @bmarty in https://github.com/element-hq/element-x-android/pull/5638
+* Improve architecture around Nodes by @bmarty in https://github.com/element-hq/element-x-android/pull/5641
+* Move dependencies block out of the android block. by @bmarty in https://github.com/element-hq/element-x-android/pull/5674
+* Always use the handleEvent(s) function the same way. by @bmarty in https://github.com/element-hq/element-x-android/pull/5672
+### Dependency upgrades
+* fix(deps): update metro to v0.7.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5576
+* fix(deps): update dependencyanalysis to v3.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5577
+* fix(deps): update dependency io.sentry:sentry-android to v8.24.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5586
+* fix(deps): update dependency androidx.work:work-runtime-ktx to v2.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5590
+* fix(deps): update dependency com.posthog:posthog-android to v3.25.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5594
+* fix(deps): update dependency com.google.crypto.tink:tink-android to v1.19.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5572
+* Update plugin sonarqube to v7.0.1.6134 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5605
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.28 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5620
+* fix(deps): update dependencyanalysis to v3.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5602
+* fix(deps): update dependency com.github.matrix-org:matrix-analytics-events to v0.29.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5621
+* fix(deps): update dependencyanalysis to v3.4.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5624
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.29 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5625
+* fix(deps): update dependency io.sentry:sentry-android to v8.25.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5629
+* fix(deps): update dependencyanalysis to v3.4.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5642
+* fix(deps): update dependency com.squareup.okhttp3:okhttp-bom to v5.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5644
+* chore(deps): update danger/danger-js action to v13.0.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5652
+* fix(deps): update dependency com.google.firebase:firebase-bom to v34.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5643
+* fix(deps): update firebaseappdistribution to v5.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5640
+* fix(deps): update metro to v0.7.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5663
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.31 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5657
+* Update GitHub Artifact Actions (major) by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5609
+* Update dependency io.element.android:element-call-embedded to v0.16.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5598
+* Update roborazzi to v1.51.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5676
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.11.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5681
+* fix(deps): update metro to v0.7.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5683
+### Others
+* Improve code around Element .well-known configuration by @bmarty in https://github.com/element-hq/element-x-android/pull/5565
+* misc: display offline banner for all LoggedIn screens by @ganfra in https://github.com/element-hq/element-x-android/pull/5574
+* Remove icon preview duplicate by @bmarty in https://github.com/element-hq/element-x-android/pull/5588
+* Remove application navigation state usage in the push module by @bmarty in https://github.com/element-hq/element-x-android/pull/5596
+* Design : update Home TopBar and RoomList Filters by @ganfra in https://github.com/element-hq/element-x-android/pull/5599
+* Add missing tests on the analytic modules by @bmarty in https://github.com/element-hq/element-x-android/pull/5604
+* design(space): let SpaceRoomItemView divider be full width by @ganfra in https://github.com/element-hq/element-x-android/pull/5597
+* Update notification style by @bmarty in https://github.com/element-hq/element-x-android/pull/5607
+* Improve how data is handled for the WorkManager. by @bmarty in https://github.com/element-hq/element-x-android/pull/5592
+* Revert "Make sure declining a call stops observing the ringing call state" by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5615
+* Misc : space flow inject room by @ganfra in https://github.com/element-hq/element-x-android/pull/5614
+* Enable `SyncNotificationsWithWorkManager` by default in release mode apps too by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5646
+* Revert "Update notification sound" by @bmarty in https://github.com/element-hq/element-x-android/pull/5671
+* Introduce new query to count accounts by @bmarty in https://github.com/element-hq/element-x-android/pull/5678
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.11.0...v25.11.2
+
+Changes in Element X v25.11.0
+=============================
+
+Hotfix release.
+
+Includes https://github.com/element-hq/element-x-android/pull/5615, which fixes an issue that prevented Element Call notifications from being displayed sometimes.
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.10.1...v25.11.0
+
+Changes in Element X v25.10.1
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v25.10.1 -->
+
+## What's Changed
+### ✨ Features
+* Sync notifications using WorkManager by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5545
+### 🙌 Improvements
+* Sort feature flags by @bmarty in https://github.com/element-hq/element-x-android/pull/5557
+### 🐛 Bugfixes
+* Makes sure images are loaded when cancelling multiaccount flow  by @ganfra in https://github.com/element-hq/element-x-android/pull/5502
+* Fix 'test push loop back' notification check by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5541
+* Display 'join anyway' button on room preview when the state can't be loaded by @ShadowRZ in https://github.com/element-hq/element-x-android/pull/5514
+* Fix media viewer not being dismissed with reduced motion enabled by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5555
+* Keep the cursor position in room list search when going back by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5570
+* Make sure declining a call stops observing the ringing call state by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5563
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5515
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5562
+### 🧱 Build
+* Do some cleanup on our immutable annotation usage by @bmarty in https://github.com/element-hq/element-x-android/pull/5503
+* `interface TestParameterValuesProvider` is deprecated. by @bmarty in https://github.com/element-hq/element-x-android/pull/5568
+### Dependency upgrades
+* fix(deps): update metro to v0.6.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5480
+* fix(deps): update dependency org.unifiedpush.android:connector to v3.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5443
+* fix(deps): update wysiwyg to v2.40.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5400
+* fix(deps): update dependency io.github.sergio-sastre.composablepreviewscanner:android to v0.7.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5510
+* fix(deps): update camera to v1.5.1 - autoclosed by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5509
+* chore(deps): update plugin dependencycheck to v12.1.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5518
+* chore(deps): update plugin licensee to v1.14.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5477
+* chore(deps): update dependency python to 3.14 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5475
+* fix(deps): update metro to v0.6.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5520
+* fix(deps): update dependency org.unifiedpush.android:connector to v3.1.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5519
+* chore(deps): update plugin gms_google_services to v4.4.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5507
+* fix(deps): update dependency com.google.firebase:firebase-bom to v34.4.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5522
+* fix(deps): update dependency com.squareup.okhttp3:okhttp-bom to v5.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5524
+* fix(deps): update dependency net.zetetic:sqlcipher-android to v4.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5525
+* fix(deps): update dependencyanalysis to v3.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5523
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.10.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5527
+* chore(deps): update plugin dependencycheck to v12.1.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5531
+* chore(deps): update rnkdsh/action-upload-diawi action to v1.5.12 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5533
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v12.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5548
+* fix(deps): update metro to v0.7.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5554
+* fix(deps): update dependency com.posthog:posthog-android to v3.24.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5564
+* chore(deps): update plugin sonarqube to v7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5535
+### Others
+* Import Compound tokens - fixed icons by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5506
+* Replace Uri by String in States that are used in Composable function. by @bmarty in https://github.com/element-hq/element-x-android/pull/5508
+* Let room filters follow the design. by @bmarty in https://github.com/element-hq/element-x-android/pull/5526
+* Allow uploading notification push rules in bug reports by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5538
+* Add number of accounts info in the rageshake data. by @bmarty in https://github.com/element-hq/element-x-android/pull/5532
+* design(space): match figma for Space views by @ganfra in https://github.com/element-hq/element-x-android/pull/5540
+* Extract console message logger and mutualize instance of Json by @bmarty in https://github.com/element-hq/element-x-android/pull/5552
+* Improve colors customization by @bmarty in https://github.com/element-hq/element-x-android/pull/5542
+* Fix test warning by @bmarty in https://github.com/element-hq/element-x-android/pull/5558
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.10.0...v25.10.1
+
 Changes in Element X v25.10.0
 =============================
 
diff --git a/README.md b/README.md
index 95e8b219f5..5406b158c9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-x-android&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-x-android)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=element-x-android&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=element-x-android)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=element-x-android&metric=bugs)](https://sonarcloud.io/summary/new_code?id=element-x-android)
-[![codecov](https://codecov.io/github/element-hq/element-x-android/branch/develop/graph/badge.svg?token=ecwvia7amV)](https://codecov.io/github/vector-im/element-x-android)
+[![codecov](https://codecov.io/github/element-hq/element-x-android/branch/develop/graph/badge.svg?token=ecwvia7amV)](https://codecov.io/github/element-hq/element-x-android)
 [![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)
 [![Localazy](https://img.shields.io/endpoint?url=https%3A%2F%2Fconnect.localazy.com%2Fstatus%2Felement%2Fdata%3Fcontent%3Dall%26title%3Dlocalazy%26logo%3Dtrue)](https://localazy.com/p/element)
 
@@ -102,9 +102,10 @@ If after your research you still have a question, ask at [#element-x-android:mat
 
 ## Copyright and License
 
-Copyright (c) 2022 - 2025 New Vector Ltd
+Copyright (c) 2025 Element Creations Ltd.
+Copyright (c) 2022 - 2025 New Vector Ltd.
 
-This software is dual licensed by New Vector Ltd (Element). It can be used either:
+This software is dual licensed by Element Creations Ltd (Element). It can be used either:
 
 (1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
 
diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts
index 00d0735292..33e3cbeff2 100644
--- a/annotations/build.gradle.kts
+++ b/annotations/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt b/annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt
index 06c5749736..632bdc3e81 100644
--- a/annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt
+++ b/annotations/src/main/kotlin/io/element/android/annotations/ContributesNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9be152e9e7..322ad47911 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -128,12 +129,12 @@ android {
             )
             signingConfig = signingConfigs.getByName("debug")
 
-            postprocessing {
-                isRemoveUnusedCode = true
-                isObfuscate = false
-                isOptimizeCode = true
-                isRemoveUnusedResources = true
-                proguardFiles("proguard-rules.pro")
+            optimization {
+                enable = true
+                keepRules {
+                    files.add(File(projectDir, "proguard-rules.pro"))
+                    files.add(getDefaultProguardFile("proguard-android-optimize.txt"))
+                }
             }
         }
 
@@ -151,10 +152,6 @@ android {
             matchingFallbacks += listOf("release")
             signingConfig = signingConfigs.getByName("nightly")
 
-            postprocessing {
-                initWith(release.postprocessing)
-            }
-
             firebaseAppDistribution {
                 artifactType = "APK"
                 // We upload the universal APK to fix this error:
@@ -197,6 +194,16 @@ android {
             buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid")
         }
     }
+
+    packaging {
+        resources.pickFirsts += setOf(
+            "META-INF/versions/9/OSGI-INF/MANIFEST.MF",
+        )
+
+        jniLibs {
+            useLegacyPackaging = project.findProperty("useLegacyPackaging")?.toString()?.toBoolean()
+        }
+    }
 }
 
 androidComponents {
@@ -318,6 +325,7 @@ licensee {
     allowUrl("https://jsoup.org/license")
     allowUrl("https://asm.ow2.io/license.html")
     allowUrl("https://www.gnu.org/licenses/agpl-3.0.txt")
+    allowUrl("https://github.com/mhssn95/compose-color-picker/blob/main/LICENSE")
     ignoreDependencies("com.github.matrix-org", "matrix-analytics-events")
     // Ignore dependency that are not third-party licenses to us.
     ignoreDependencies(groupId = "io.element.android")
@@ -333,7 +341,7 @@ fun Project.configureLicensesTasks(reportingExtension: ReportingExtension) {
                     it.toString()
                 }
             }
-            val artifactsFile = reportingExtension.file("licensee/android$capitalizedVariantName/artifacts.json")
+            val artifactsFile = reportingExtension.baseDirectory.file("licensee/android$capitalizedVariantName/artifacts.json")
 
             val copyArtifactsTask =
                 project.tasks.register<AssetCopyTask>("copy${capitalizedVariantName}LicenseeReportToAssets") {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c55b1bf1c2..9207e06edc 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -41,8 +41,6 @@
     static int windowAttachCount(android.view.View);
 }
 
--keep class io.element.android.x.di.** { *; }
-
 
 # Keep LogSessionId class and related classes (https://github.com/androidx/media/issues/2535)
 -keep class android.media.metrics.LogSessionId { *; }
@@ -51,3 +49,27 @@
 # Keep Media3 classes that use reflection (https://github.com/androidx/media/issues/2535)
 -keep class androidx.media3.** { *; }
 -dontwarn android.media.metrics.**
+
+# New rules after AGP 8.13.1 upgrade
+-dontwarn androidx.window.extensions.WindowExtensions
+-dontwarn androidx.window.extensions.WindowExtensionsProvider
+-dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
+-dontwarn androidx.window.extensions.layout.DisplayFeature
+-dontwarn androidx.window.extensions.layout.FoldingFeature
+-dontwarn androidx.window.extensions.layout.WindowLayoutComponent
+-dontwarn androidx.window.extensions.layout.WindowLayoutInfo
+-dontwarn androidx.window.sidecar.SidecarDeviceState
+-dontwarn androidx.window.sidecar.SidecarDisplayFeature
+-dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
+-dontwarn androidx.window.sidecar.SidecarInterface
+-dontwarn androidx.window.sidecar.SidecarProvider
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
+
+# Also needed after AGP 8.13.1 upgrade, it seems like proguard is now more aggressive on removing unused code
+-keep class org.matrix.rustcomponents.sdk.** { *;}
+-keep class uniffi.** { *;}
+-keep class io.element.android.x.di.** { *; }
+-keepclasseswithmembernames,allowoptimization,allowshrinking class io.element.android.** { *; }
+
+# Keep Metro classes
+-keep class dev.zacsweers.metro.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26e8c7dc23..628c428790 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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"
@@ -34,10 +35,17 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            android:exported="false">
+            android:exported="false"
+            tools:node="merge">
             <meta-data
                 android:name='androidx.lifecycle.ProcessLifecycleInitializer'
                 android:value='androidx.startup' />
+
+            <!-- Remove to use Application workManagerConfiguration -->
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
         </provider>
 
         <!--
@@ -175,7 +183,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_providers" />
         </provider>
-
     </application>
 
 </manifest>
diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
index a075929552..e29ff82d55 100644
--- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
+++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,17 +10,23 @@ package io.element.android.x
 
 import android.app.Application
 import androidx.startup.AppInitializer
+import androidx.work.Configuration
 import dev.zacsweers.metro.createGraphFactory
-import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
 import io.element.android.libraries.di.DependencyInjectionGraphOwner
+import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
 import io.element.android.x.di.AppGraph
 import io.element.android.x.info.logApplicationInfo
+import io.element.android.x.initializer.CacheCleanerInitializer
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.PlatformInitializer
 
-class ElementXApplication : Application(), DependencyInjectionGraphOwner {
+class ElementXApplication : Application(), DependencyInjectionGraphOwner, Configuration.Provider {
     override val graph: AppGraph = createGraphFactory<AppGraph.Factory>().create(this)
 
+    override val workManagerConfiguration: Configuration = Configuration.Builder()
+        .setWorkerFactory(MetroWorkerFactory(graph.workerProviders))
+        .build()
+
     override fun onCreate() {
         super.onCreate()
         AppInitializer.getInstance(this).apply {
@@ -27,6 +34,7 @@ class ElementXApplication : Application(), DependencyInjectionGraphOwner {
             initializeComponent(PlatformInitializer::class.java)
             initializeComponent(CacheCleanerInitializer::class.java)
         }
+
         logApplicationInfo(this)
     }
 }
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 f80db878a7..162a55c3a7 100644
--- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,9 @@ 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.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -25,6 +29,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeActivity
 import com.bumble.appyx.core.plugin.NodeReadyObserver
+import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.lockscreen.api.LockScreenEntryPoint
 import io.element.android.features.lockscreen.api.LockScreenLockState
@@ -61,9 +66,13 @@ class MainActivity : NodeActivity() {
     @Composable
     private fun MainContent(appBindings: AppBindings) {
         val migrationState = appBindings.migrationEntryPoint().present()
+        val colors by remember {
+            appBindings.enterpriseService().semanticColorsFlow(sessionId = null)
+        }.collectAsState(SemanticColorsLightDark.default)
         ElementThemeApp(
             appPreferencesStore = appBindings.preferencesStore(),
-            enterpriseService = appBindings.enterpriseService(),
+            compoundLight = colors.light,
+            compoundDark = colors.dark,
             buildMeta = appBindings.buildMeta()
         ) {
             CompositionLocalProvider(
diff --git a/app/src/main/kotlin/io/element/android/x/MainNode.kt b/app/src/main/kotlin/io/element/android/x/MainNode.kt
index 52668ff3a4..2004db8c3c 100644
--- a/app/src/main/kotlin/io/element/android/x/MainNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
index 5c74510e49..6768d0d8db 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.features.rageshake.api.reporter.BugReporter
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.di.identifiers.SentrySdkDsn
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.matrix.api.platform.InitPlatformService
 import io.element.android.libraries.matrix.api.tracing.TracingService
@@ -47,4 +49,6 @@ interface AppBindings {
     fun featureFlagService(): FeatureFlagService
 
     fun buildMeta(): BuildMeta
+
+    fun sentrySdkDsn(): SentrySdkDsn?
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt b/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt
index 195265a99c..7b5ba11f4c 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt
@@ -1,23 +1,32 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package io.element.android.x.di
 
 import android.content.Context
+import androidx.work.ListenableWorker
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.DependencyGraph
+import dev.zacsweers.metro.Multibinds
 import dev.zacsweers.metro.Provides
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
+import kotlin.reflect.KClass
 
 @DependencyGraph(AppScope::class)
 interface AppGraph : NodeFactoriesBindings {
     val sessionGraphFactory: SessionGraph.Factory
 
+    @Multibinds
+    val workerProviders:
+        Map<KClass<out ListenableWorker>, MetroWorkerFactory.WorkerInstanceFactory<*>>
+
     @DependencyGraph.Factory
     interface Factory {
         fun create(
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 d98a05321d..87d0ece7a1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,8 +19,6 @@ import dev.zacsweers.metro.Provides
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ApplicationConfig
 import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider
-import io.element.android.features.messages.impl.timeline.components.customreaction.EmojibaseProvider
 import io.element.android.libraries.androidutils.system.getVersionCodeFromManifest
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.meta.BuildMeta
@@ -29,6 +28,8 @@ 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
diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt
index 9ae8c54eb7..bc5c853c66 100644
--- a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt
@@ -1,20 +1,19 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package io.element.android.x.di
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appnav.di.RoomGraphFactory
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultRoomGraphFactory(
     private val sessionGraph: SessionGraph,
 ) : RoomGraphFactory {
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 632e4dd32d..9631713bb6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.x.di
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appnav.di.SessionGraphFactory
 import io.element.android.libraries.matrix.api.MatrixClient
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSessionGraphFactory(
     private val appGraph: AppGraph
 ) : SessionGraphFactory {
diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt b/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
index e48dd52daf..6588335507 100644
--- a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,13 +10,14 @@ package io.element.android.x.di
 
 import dev.zacsweers.metro.GraphExtension
 import dev.zacsweers.metro.Provides
+import io.element.android.appnav.di.TimelineBindings
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @GraphExtension(RoomScope::class)
-interface RoomGraph : NodeFactoriesBindings {
+interface RoomGraph : NodeFactoriesBindings, TimelineBindings {
     @GraphExtension.Factory
     interface Factory {
         fun create(
diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt b/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt
index 3782b00a58..e53d0eb56d 100644
--- a/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/app/src/main/kotlin/io/element/android/x/info/Logs.kt b/app/src/main/kotlin/io/element/android/x/info/Logs.kt
index cca271e199..2b66fef55e 100644
--- a/app/src/main/kotlin/io/element/android/x/info/Logs.kt
+++ b/app/src/main/kotlin/io/element/android/x/info/Logs.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt
similarity index 71%
rename from features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerInitializer.kt
rename to app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt
index 4ac5e0b814..3e187bcafa 100644
--- a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerInitializer.kt
+++ b/app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt
@@ -1,14 +1,16 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.cachecleaner.api
+package io.element.android.x.initializer
 
 import android.content.Context
 import androidx.startup.Initializer
+import io.element.android.features.cachecleaner.impl.CacheCleanerBindings
 import io.element.android.libraries.architecture.bindings
 
 class CacheCleanerInitializer : Initializer<Unit> {
diff --git a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
index d2fbb1b78f..3caff8af09 100644
--- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
+++ b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt
index 40016922ae..2a844b1331 100644
--- a/app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt
+++ b/app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,6 +38,7 @@ class PlatformInitializer : Initializer<Unit> {
             logLevel = logLevel,
             extraTargets = listOf(ELEMENT_X_TARGET),
             traceLogPacks = runBlocking { preferencesStore.getTracingLogPacksFlow().first() },
+            sdkSentryDsn = appBindings.sentrySdkDsn()?.value?.takeIf { it.isNotBlank() },
         )
         bugReporter.setCurrentTracingLogLevel(logLevel.name)
         platformService.init(tracingConfiguration)
diff --git a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
index 746f570447..0453fdf160 100644
--- a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,13 @@ package io.element.android.x.intent
 
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.deeplink.api.DeepLinkCreator
 import io.element.android.libraries.di.annotations.ApplicationContext
+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.core.ThreadId
@@ -22,7 +24,6 @@ import io.element.android.libraries.push.impl.intent.IntentProvider
 import io.element.android.x.MainActivity
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultIntentProvider(
     @ApplicationContext private val context: Context,
     private val deepLinkCreator: DeepLinkCreator,
@@ -31,10 +32,13 @@ class DefaultIntentProvider(
         sessionId: SessionId,
         roomId: RoomId?,
         threadId: ThreadId?,
+        eventId: EventId?,
+        extras: Bundle?,
     ): Intent {
         return Intent(context, MainActivity::class.java).apply {
             action = Intent.ACTION_VIEW
-            data = deepLinkCreator.create(sessionId, roomId, threadId).toUri()
+            data = deepLinkCreator.create(sessionId, roomId, threadId, eventId).toUri()
+            extras?.let(::putExtras)
         }
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt b/app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt
index d225b8ea34..1e9af37c58 100644
--- a/app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt
+++ b/app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
index 20ac5c2476..ad4f9a47b2 100644
--- a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,13 +10,11 @@ package io.element.android.x.oidc
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
 import io.element.android.services.toolbox.api.strings.StringProvider
 import io.element.android.x.R
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOidcRedirectUrlProvider(
     private val stringProvider: StringProvider,
 ) : OidcRedirectUrlProvider {
diff --git a/app/src/main/res/drawable/transparent.xml b/app/src/main/res/drawable/transparent.xml
index f5f4d3a7bf..248ccbce22 100644
--- a/app/src/main/res/drawable/transparent.xml
+++ b/app/src/main/res/drawable/transparent.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
index b55c556736..8cbf8eaf6a 100644
--- a/app/src/main/res/resources.properties
+++ b/app/src/main/res/resources.properties
@@ -1,6 +1,7 @@
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 unqualifiedResLocale=en
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index c4014b842c..af159a0b11 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f61fb33868..d666caddea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 76fb597109..4190fd84f2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.ElementX.Splash" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/splashscreen_bg_light</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/transparent</item>
         <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
     </style>
-    <style name="Theme.ElementX" parent="Theme.Material3.Light.NoActionBar" />
+    <style name="Theme.ElementX" parent="Theme.Material3.Light.NoActionBar">
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml
index 745752ed0b..c466692855 100644
--- a/app/src/main/res/xml/automotive_app_desc.xml
+++ b/app/src/main/res/xml/automotive_app_desc.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2025 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <automotiveApp>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index 3602e38d2d..06db4ae4cb 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <!--
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index d11b4203fe..77b05d37ff 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <!--
@@ -23,4 +24,4 @@
         <exclude domain="sharedpref" path="."/>
         <exclude domain="external" path="."/>
     </device-transfer>
-</data-extraction-rules>
\ No newline at end of file
+</data-extraction-rules>
diff --git a/app/src/main/res/xml/file_providers.xml b/app/src/main/res/xml/file_providers.xml
index fb63c95440..ac74590cba 100644
--- a/app/src/main/res/xml/file_providers.xml
+++ b/app/src/main/res/xml/file_providers.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <paths>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index 72a7d32cc0..a171646bad 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -9,13 +9,13 @@
     <locale android:name="el"/>
     <locale android:name="en"/>
     <locale android:name="en_US"/>
-    <locale android:name="eo"/>
     <locale android:name="es"/>
     <locale android:name="et"/>
     <locale android:name="eu"/>
     <locale android:name="fa"/>
     <locale android:name="fi"/>
     <locale android:name="fr"/>
+    <locale android:name="hr"/>
     <locale android:name="hu"/>
     <locale android:name="in"/>
     <locale android:name="it"/>
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 9d6d9d4320..4598a74e51 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,9 +14,11 @@ import android.content.Context
 import android.content.Intent
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.deeplink.api.DeepLinkCreator
+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.core.ThreadId
+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_THREAD_ID
@@ -31,14 +34,15 @@ import org.robolectric.RuntimeEnvironment
 class DefaultIntentProviderTest {
     @Test
     fun `test getViewRoomIntent with data`() {
-        val deepLinkCreator = lambdaRecorder<SessionId, RoomId?, ThreadId?, String> { _, _, _ -> "deepLinkCreatorResult" }
+        val deepLinkCreator = lambdaRecorder<SessionId, RoomId?, ThreadId?, EventId?, String> { _, _, _, _ -> "deepLinkCreatorResult" }
         val sut = createDefaultIntentProvider(
-            deepLinkCreator = { sessionId, roomId, threadId -> deepLinkCreator.invoke(sessionId, roomId, threadId) },
+            deepLinkCreator = { sessionId, roomId, threadId, eventId -> deepLinkCreator.invoke(sessionId, roomId, threadId, eventId) },
         )
         val result = sut.getViewRoomIntent(
             sessionId = A_SESSION_ID,
             roomId = A_ROOM_ID,
             threadId = A_THREAD_ID,
+            eventId = AN_EVENT_ID,
         )
         result.commonAssertions()
         assertThat(result.data.toString()).isEqualTo("deepLinkCreatorResult")
@@ -46,11 +50,12 @@ class DefaultIntentProviderTest {
             value(A_SESSION_ID),
             value(A_ROOM_ID),
             value(A_THREAD_ID),
+            value(AN_EVENT_ID),
         )
     }
 
     private fun createDefaultIntentProvider(
-        deepLinkCreator: DeepLinkCreator = DeepLinkCreator { _, _, _ -> "" },
+        deepLinkCreator: DeepLinkCreator = DeepLinkCreator { _, _, _, _ -> "" },
     ): DefaultIntentProvider {
         return DefaultIntentProvider(
             context = RuntimeEnvironment.getApplication() as Context,
diff --git a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt b/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
index 5a0df57bda..18567355d2 100644
--- a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
+++ b/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/build.gradle.kts b/appconfig/build.gradle.kts
index 15b8bd51ba..45496acb77 100644
--- a/appconfig/build.gradle.kts
+++ b/appconfig/build.gradle.kts
@@ -2,9 +2,10 @@ import config.BuildTimeConfig
 import extension.buildConfigFieldStr
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -32,7 +33,7 @@ android {
             value = if (isEnterpriseBuild) {
                 BuildTimeConfig.BUG_REPORT_URL ?: ""
             } else {
-                "https://riot.im/bugreports/submit"
+                "https://rageshakes.element.io/api/submit"
             },
         )
         buildConfigFieldStr(
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt
index 346fce4725..e32e482842 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt
index eeeb52f095..e1ae6896bb 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/AuthenticationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/AuthenticationConfig.kt
index 5061290948..7432a6904f 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/AuthenticationConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/AuthenticationConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/ElementCallConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/ElementCallConfig.kt
index ca9a6391f2..ea4c2640fe 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/ElementCallConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/ElementCallConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/LearnMoreConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/LearnMoreConfig.kt
index 9dee73fc94..855586892a 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/LearnMoreConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/LearnMoreConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,4 +13,5 @@ object LearnMoreConfig {
     const val DEVICE_VERIFICATION_URL: String = "https://element.io/help#encryption-device-verification"
     const val SECURE_BACKUP_URL: String = "https://element.io/help#encryption5"
     const val IDENTITY_CHANGE_URL: String = "https://element.io/help#encryption18"
+    const val HISTORY_VISIBLE_URL: String = "https://element.io/en/help#e2ee-history-sharing"
 }
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt
index c3dbe2bea5..f2ef0bc42f 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt
index a8f424bd08..76b96bf398 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/MessageComposerConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/MessageComposerConfig.kt
index 68e5a8b6ad..f3893f0f61 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/MessageComposerConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/MessageComposerConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt
index 41acf5d266..cac2f8a8ed 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import android.graphics.Color
 import androidx.annotation.ColorInt
+import androidx.core.graphics.toColorInt
 
 object NotificationConfig {
     /**
@@ -27,5 +28,5 @@ object NotificationConfig {
     const val SHOW_QUICK_REPLY_ACTION = true
 
     @ColorInt
-    val NOTIFICATION_ACCENT_COLOR: Int = Color.parseColor("#FF0DBD8B")
+    val NOTIFICATION_ACCENT_COLOR: Int = "#FF0DBD8B".toColorInt()
 }
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/OnBoardingConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/OnBoardingConfig.kt
index b7a057dcee..c59f5d19fe 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/OnBoardingConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/OnBoardingConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt
index 506b17f7a8..d36fb742b0 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/RageshakeConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/RageshakeConfig.kt
index 1dd482cc40..1f6609ecc3 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/RageshakeConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/RageshakeConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt
index dd2a22a5ab..7369f1393c 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7e38ec8092..d4fe7d1fc5 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,19 +17,19 @@ object TimelineConfig {
      * Event types that will be filtered out from the timeline (i.e. not displayed).
      */
     val excludedEvents = listOf(
-        StateEventType.CALL_MEMBER,
-        StateEventType.ROOM_ALIASES,
-        StateEventType.ROOM_CANONICAL_ALIAS,
-        StateEventType.ROOM_GUEST_ACCESS,
-        StateEventType.ROOM_HISTORY_VISIBILITY,
-        StateEventType.ROOM_JOIN_RULES,
-        StateEventType.ROOM_POWER_LEVELS,
-        StateEventType.ROOM_SERVER_ACL,
-        StateEventType.ROOM_TOMBSTONE,
-        StateEventType.SPACE_CHILD,
-        StateEventType.SPACE_PARENT,
-        StateEventType.POLICY_RULE_ROOM,
-        StateEventType.POLICY_RULE_SERVER,
-        StateEventType.POLICY_RULE_USER,
+        StateEventType.CallMember,
+        StateEventType.RoomAliases,
+        StateEventType.RoomCanonicalAlias,
+        StateEventType.RoomGuestAccess,
+        StateEventType.RoomHistoryVisibility,
+        StateEventType.RoomJoinRules,
+        StateEventType.RoomPowerLevels,
+        StateEventType.RoomServerAcl,
+        StateEventType.RoomTombstone,
+        StateEventType.SpaceChild,
+        StateEventType.SpaceParent,
+        StateEventType.PolicyRuleRoom,
+        StateEventType.PolicyRuleServer,
+        StateEventType.PolicyRuleUser,
     )
 }
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/VoiceMessageConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/VoiceMessageConfig.kt
index ca2b99e633..b77b2dc113 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/VoiceMessageConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/VoiceMessageConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appicon/element/build.gradle.kts b/appicon/element/build.gradle.kts
index fd5a2d74ca..23c21d4863 100644
--- a/appicon/element/build.gradle.kts
+++ b/appicon/element/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt b/appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
index c25675bffc..bffcdaecb3 100644
--- a/appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
+++ b/appicon/element/src/main/kotlin/io/element/android/appicon/element/IconPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 777a587a50..9de193bab3 100644
--- a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 777a587a50..9de193bab3 100644
--- a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/appicon/enterprise/build.gradle.kts b/appicon/enterprise/build.gradle.kts
index 462397b5b2..bc5cdea0b8 100644
--- a/appicon/enterprise/build.gradle.kts
+++ b/appicon/enterprise/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt b/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt
index b3f96785f4..70e0201218 100644
--- a/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt
+++ b/appicon/enterprise/src/main/kotlin/io/element/android/appicon/enterprise/IconPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml
index 4806e4bffd..38ef234b87 100644
--- a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2024 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml
index 11c51fdf6a..0fd0f91c19 100644
--- a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2024 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/appnav/build.gradle.kts b/appnav/build.gradle.kts
index 063e26b9da..84d614b3d9 100644
--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -38,6 +39,7 @@ dependencies {
     implementation(projects.libraries.pushproviders.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.uiCommon)
     implementation(projects.libraries.uiStrings)
     implementation(projects.features.login.api)
@@ -46,6 +48,7 @@ dependencies {
 
     implementation(projects.features.announcement.api)
     implementation(projects.features.ftue.api)
+    implementation(projects.features.linknewdevice.api)
     implementation(projects.features.share.api)
 
     implementation(projects.services.apperror.impl)
@@ -59,8 +62,10 @@ dependencies {
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.libraries.pushproviders.test)
+    testImplementation(projects.features.forward.test)
     testImplementation(projects.features.networkmonitor.test)
     testImplementation(projects.features.rageshake.test)
+    testImplementation(projects.services.appnavstate.impl)
     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/BackstackExt.kt b/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
index 2f1e4e75ea..1185016c0b 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
index 9ae5aa38fe..0dbcb0f3f1 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,13 +22,13 @@ import com.bumble.appyx.core.navigation.model.permanent.PermanentNavModel
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 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.appnav.di.SessionGraphFactory
 import io.element.android.libraries.architecture.NodeInputs
+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.DependencyInjectionGraphOwner
@@ -56,10 +57,12 @@ class LoggedInAppScopeFlowNode(
     plugins = plugins
 ), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
-        fun onOpenBugReport()
-        fun onAddAccount()
+        fun navigateToBugReport()
+        fun navigateToAddAccount()
     }
 
+    private val callback: Callback = callback()
+
     @Parcelize
     object NavTarget : Parcelable
 
@@ -81,12 +84,12 @@ class LoggedInAppScopeFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         val callback = object : LoggedInFlowNode.Callback {
-            override fun onOpenBugReport() {
-                plugins<Callback>().forEach { it.onOpenBugReport() }
+            override fun navigateToBugReport() {
+                callback.navigateToBugReport()
             }
 
-            override fun onAddAccount() {
-                plugins<Callback>().forEach { it.onAddAccount() }
+            override fun navigateToAddAccount() {
+                callback.navigateToAddAccount()
             }
         }
         return createNode<LoggedInFlowNode>(buildContext, listOf(callback))
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
index c557d6e1c2..cee2296d43 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b0fc707d07..92c3cfe3dd 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 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.composable.PermanentChild
@@ -23,7 +25,6 @@ import com.bumble.appyx.core.navigation.NavKey
 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.BackStack.State.ACTIVE
 import com.bumble.appyx.navmodel.backstack.BackStack.State.CREATED
@@ -38,7 +39,6 @@ import com.bumble.appyx.navmodel.backstack.operation.replace
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
-import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.loggedin.LoggedInNode
 import io.element.android.appnav.loggedin.MediaPreviewConfigMigration
@@ -46,26 +46,33 @@ import io.element.android.appnav.loggedin.SendQueues
 import io.element.android.appnav.room.RoomFlowNode
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
+import io.element.android.compound.colors.SemanticColorsLightDark
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.ftue.api.FtueEntryPoint
 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.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
+import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorContainer
 import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.share.api.ShareEntryPoint
-import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.features.startchat.api.StartChatEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.architecture.waitForChildAttached
 import io.element.android.libraries.architecture.waitForNavTargetAttached
+import io.element.android.libraries.core.meta.BuildMeta
+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
@@ -77,10 +84,16 @@ 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.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.verification.SessionVerificationServiceListener
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
 import io.element.android.libraries.ui.common.nodes.emptyNode
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
@@ -97,6 +110,7 @@ import java.util.UUID
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
+import im.vector.app.features.analytics.plan.JoinedRoom as JoinedRoomAnalyticsEvent
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -110,6 +124,7 @@ class LoggedInFlowNode(
     private val secureBackupEntryPoint: SecureBackupEntryPoint,
     private val userProfileEntryPoint: UserProfileEntryPoint,
     private val ftueEntryPoint: FtueEntryPoint,
+    private val linkNewDeviceEntryPoint: LinkNewDeviceEntryPoint,
     @SessionCoroutineScope
     private val sessionCoroutineScope: CoroutineScope,
     private val ftueService: FtueService,
@@ -122,7 +137,13 @@ class LoggedInFlowNode(
     private val sessionEnterpriseService: SessionEnterpriseService,
     private val networkMonitor: NetworkMonitor,
     private val notificationConversationService: NotificationConversationService,
+    private val syncService: SyncService,
+    private val enterpriseService: EnterpriseService,
+    private val appPreferencesStore: AppPreferencesStore,
+    private val buildMeta: BuildMeta,
     snackbarDispatcher: SnackbarDispatcher,
+    private val analyticsService: AnalyticsService,
+    private val analyticsRoomListStateWatcher: AnalyticsRoomListStateWatcher,
 ) : BaseFlowNode<LoggedInFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Placeholder,
@@ -136,10 +157,11 @@ class LoggedInFlowNode(
     plugins = plugins
 ) {
     interface Callback : Plugin {
-        fun onOpenBugReport()
-        fun onAddAccount()
+        fun navigateToBugReport()
+        fun navigateToAddAccount()
     }
 
+    private val callback: Callback = callback()
     private val loggedInFlowProcessor = LoggedInEventProcessor(
         snackbarDispatcher = snackbarDispatcher,
         roomMembershipObserver = matrixClient.roomMembershipObserver,
@@ -185,6 +207,7 @@ class LoggedInFlowNode(
         }
         lifecycle.subscribe(
             onCreate = {
+                analyticsRoomListStateWatcher.start()
                 appNavigationStateService.onNavigateToSession(id, matrixClient.sessionId)
                 // TODO We do not support Space yet, so directly navigate to main space
                 appNavigationStateService.onNavigateToSpace(id, MAIN_SPACE)
@@ -198,6 +221,8 @@ class LoggedInFlowNode(
                     matrixClient.getMaxFileUploadSize()
                 }
 
+                analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.FirstRoomsDisplayed)
+
                 ftueService.state
                     .onEach { ftueState ->
                         when (ftueState) {
@@ -219,6 +244,7 @@ class LoggedInFlowNode(
                 appNavigationStateService.onLeavingSession(id)
                 loggedInFlowProcessor.stopObserving()
                 matrixClient.sessionVerificationService.setListener(null)
+                analyticsRoomListStateWatcher.stop()
             }
         )
         setupSendingQueue()
@@ -242,9 +268,9 @@ class LoggedInFlowNode(
         data class Room(
             val roomIdOrAlias: RoomIdOrAlias,
             val serverNames: List<String> = emptyList(),
-            val trigger: JoinedRoom.Trigger? = null,
+            val trigger: JoinedRoomAnalyticsEvent.Trigger? = null,
             val roomDescription: RoomDescription? = null,
-            val initialElement: RoomNavigationTarget = RoomNavigationTarget.Messages(),
+            val initialElement: RoomNavigationTarget = RoomNavigationTarget.Root(),
             val targetId: UUID = UUID.randomUUID(),
         ) : NavTarget
 
@@ -270,7 +296,10 @@ class LoggedInFlowNode(
         data object Ftue : NavTarget
 
         @Parcelize
-        data object RoomDirectorySearch : NavTarget
+        data object LinkNewDevice : NavTarget
+
+        @Parcelize
+        data object RoomDirectory : NavTarget
 
         @Parcelize
         data class IncomingShare(val intent: Intent) : NavTarget
@@ -292,50 +321,52 @@ class LoggedInFlowNode(
             }
             NavTarget.Home -> {
                 val callback = object : HomeEntryPoint.Callback {
-                    override fun onRoomClick(roomId: RoomId) {
-                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
+                    override fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?) {
+                        backstack.push(
+                            NavTarget.Room(
+                                roomIdOrAlias = roomId.toRoomIdOrAlias(),
+                                initialElement = RoomNavigationTarget.Root(joinedRoom = joinedRoom)
+                            )
+                        )
                     }
 
-                    override fun onSettingsClick() {
+                    override fun navigateToSettings() {
                         backstack.push(NavTarget.Settings())
                     }
 
-                    override fun onStartChatClick() {
+                    override fun navigateToCreateRoom() {
                         backstack.push(NavTarget.CreateRoom)
                     }
 
-                    override fun onSetUpRecoveryClick() {
+                    override fun navigateToSetUpRecovery() {
                         backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.Root))
                     }
 
-                    override fun onSessionConfirmRecoveryKeyClick() {
+                    override fun navigateToEnterRecoveryKey() {
                         backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))
                     }
 
-                    override fun onRoomSettingsClick(roomId: RoomId) {
+                    override fun navigateToRoomSettings(roomId: RoomId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Details))
                     }
 
-                    override fun onReportBugClick() {
-                        plugins<Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                     }
                 }
-                homeEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
+                homeEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
             is NavTarget.Room -> {
                 val joinedRoomCallback = object : JoinedRoomLoadedFlowNode.Callback {
-                    override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
+                    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))
                     }
 
-                    override fun onForwardedToSingleRoom(roomId: RoomId) {
-                        sessionCoroutineScope.launch { attachRoom(roomId.toRoomIdOrAlias(), clearBackstack = false) }
-                    }
-
-                    override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                    override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
                         when (data) {
                             is PermalinkData.UserLink -> {
                                 // Should not happen (handled by MessagesNode)
@@ -345,8 +376,8 @@ class LoggedInFlowNode(
                                 val target = NavTarget.Room(
                                     roomIdOrAlias = data.roomIdOrAlias,
                                     serverNames = data.viaParameters,
-                                    trigger = JoinedRoom.Trigger.Timeline,
-                                    initialElement = RoomNavigationTarget.Messages(data.eventId),
+                                    trigger = JoinedRoomAnalyticsEvent.Trigger.Timeline,
+                                    initialElement = RoomNavigationTarget.Root(data.eventId),
                                 )
                                 if (pushToBackstack) {
                                     backstack.push(target)
@@ -361,15 +392,10 @@ class LoggedInFlowNode(
                         }
                     }
 
-                    override fun onOpenGlobalNotificationSettings() {
+                    override fun navigateToGlobalNotificationSettings() {
                         backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.NotificationSettings))
                     }
                 }
-                val spaceCallback = object : SpaceEntryPoint.Callback {
-                    override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
-                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames = viaParameters))
-                    }
-                }
                 val inputs = RoomFlowNode.Inputs(
                     roomIdOrAlias = navTarget.roomIdOrAlias,
                     roomDescription = Optional.ofNullable(navTarget.roomDescription),
@@ -377,114 +403,138 @@ class LoggedInFlowNode(
                     trigger = Optional.ofNullable(navTarget.trigger),
                     initialElement = navTarget.initialElement
                 )
-                createNode<RoomFlowNode>(buildContext, plugins = listOf(inputs, joinedRoomCallback, spaceCallback))
+                createNode<RoomFlowNode>(buildContext, plugins = listOf(inputs, joinedRoomCallback))
             }
             is NavTarget.UserProfile -> {
                 val callback = object : UserProfileEntryPoint.Callback {
-                    override fun onOpenRoom(roomId: RoomId) {
+                    override fun navigateToRoom(roomId: RoomId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                     }
                 }
-                userProfileEntryPoint.nodeBuilder(this, buildContext)
-                    .params(UserProfileEntryPoint.Params(userId = navTarget.userId))
-                    .callback(callback)
-                    .build()
+                userProfileEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = UserProfileEntryPoint.Params(userId = navTarget.userId),
+                    callback = callback,
+                )
             }
             is NavTarget.Settings -> {
                 val callback = object : PreferencesEntryPoint.Callback {
-                    override fun onAddAccount() {
-                        plugins<Callback>().forEach { it.onAddAccount() }
+                    override fun navigateToAddAccount() {
+                        callback.navigateToAddAccount()
                     }
 
-                    override fun onOpenBugReport() {
-                        plugins<Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToLinkNewDevice() {
+                        backstack.push(NavTarget.LinkNewDevice)
                     }
 
-                    override fun onSecureBackupClick() {
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
+                    }
+
+                    override fun navigateToSecureBackup() {
                         backstack.push(NavTarget.SecureBackup())
                     }
 
-                    override fun onOpenRoomNotificationSettings(roomId: RoomId) {
+                    override fun navigateToRoomNotificationSettings(roomId: RoomId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.NotificationSettings))
                     }
 
-                    override fun navigateTo(roomId: RoomId, eventId: EventId) {
-                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Messages(eventId)))
+                    override fun navigateToEvent(roomId: RoomId, eventId: EventId) {
+                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Root(eventId)))
                     }
                 }
                 val inputs = PreferencesEntryPoint.Params(navTarget.initialElement)
-                preferencesEntryPoint.nodeBuilder(this, buildContext)
-                    .params(inputs)
-                    .callback(callback)
-                    .build()
+                preferencesEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = inputs,
+                    callback = callback,
+                )
             }
             NavTarget.CreateRoom -> {
                 val callback = object : StartChatEntryPoint.Callback {
-                    override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
+                    override fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
                         backstack.replace(NavTarget.Room(roomIdOrAlias = roomIdOrAlias, serverNames = serverNames))
                     }
 
-                    override fun onOpenRoomDirectory() {
-                        backstack.push(NavTarget.RoomDirectorySearch)
+                    override fun navigateToRoomDirectory() {
+                        backstack.push(NavTarget.RoomDirectory)
                     }
                 }
 
-                startChatEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
+                startChatEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
             is NavTarget.SecureBackup -> {
-                secureBackupEntryPoint.nodeBuilder(this, buildContext)
-                    .params(SecureBackupEntryPoint.Params(initialElement = navTarget.initialElement))
-                    .callback(object : SecureBackupEntryPoint.Callback {
+                secureBackupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SecureBackupEntryPoint.Params(initialElement = navTarget.initialElement),
+                    callback = object : SecureBackupEntryPoint.Callback {
                         override fun onDone() {
                             backstack.pop()
                         }
-                    })
-                    .build()
+                    },
+                )
             }
             NavTarget.Ftue -> {
                 ftueEntryPoint.createNode(this, buildContext)
             }
-            NavTarget.RoomDirectorySearch -> {
-                roomDirectoryEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(object : RoomDirectoryEntryPoint.Callback {
-                        override fun onResultClick(roomDescription: RoomDescription) {
+            NavTarget.LinkNewDevice -> {
+                val callback = object : LinkNewDeviceEntryPoint.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                linkNewDeviceEntryPoint.createNode(this, buildContext, callback)
+            }
+            NavTarget.RoomDirectory -> {
+                roomDirectoryEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = object : RoomDirectoryEntryPoint.Callback {
+                        override fun navigateToRoom(roomDescription: RoomDescription) {
                             backstack.push(
                                 NavTarget.Room(
                                     roomIdOrAlias = roomDescription.roomId.toRoomIdOrAlias(),
                                     roomDescription = roomDescription,
-                                    trigger = JoinedRoom.Trigger.RoomDirectory,
+                                    trigger = JoinedRoomAnalyticsEvent.Trigger.RoomDirectory,
                                 )
                             )
                         }
-                    })
-                    .build()
+                    },
+                )
             }
             is NavTarget.IncomingShare -> {
-                shareEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(object : ShareEntryPoint.Callback {
+                shareEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = ShareEntryPoint.Params(intent = navTarget.intent),
+                    callback = object : ShareEntryPoint.Callback {
                         override fun onDone(roomIds: List<RoomId>) {
-                            navigateUp()
-                            if (roomIds.size == 1) {
-                                val targetRoomId = roomIds.first()
-                                backstack.push(NavTarget.Room(targetRoomId.toRoomIdOrAlias()))
+                            backstack.pop()
+                            roomIds.singleOrNull()?.let { roomId ->
+                                backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                             }
                         }
-                    })
-                    .params(ShareEntryPoint.Params(intent = navTarget.intent))
-                    .build()
+                    },
+                )
             }
             is NavTarget.IncomingVerificationRequest -> {
-                incomingVerificationEntryPoint.nodeBuilder(this, buildContext)
-                    .params(IncomingVerificationEntryPoint.Params(navTarget.data))
-                    .callback(object : IncomingVerificationEntryPoint.Callback {
+                incomingVerificationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = IncomingVerificationEntryPoint.Params(navTarget.data),
+                    callback = object : IncomingVerificationEntryPoint.Callback {
                         override fun onDone() {
                             backstack.pop()
                         }
-                    })
-                    .build()
+                    },
+                )
             }
         }
     }
@@ -492,10 +542,10 @@ class LoggedInFlowNode(
     suspend fun attachRoom(
         roomIdOrAlias: RoomIdOrAlias,
         serverNames: List<String> = emptyList(),
-        trigger: JoinedRoom.Trigger? = null,
+        trigger: JoinedRoomAnalyticsEvent.Trigger? = null,
         eventId: EventId? = null,
         clearBackstack: Boolean,
-    ) {
+    ): RoomFlowNode {
         waitForNavTargetAttached { navTarget ->
             navTarget is NavTarget.Home
         }
@@ -504,12 +554,19 @@ class LoggedInFlowNode(
                 roomIdOrAlias = roomIdOrAlias,
                 serverNames = serverNames,
                 trigger = trigger,
-                initialElement = RoomNavigationTarget.Messages(
-                    focusedEventId = eventId
-                )
+                initialElement = RoomNavigationTarget.Root(eventId = eventId)
             )
             backstack.accept(AttachRoomOperation(roomNavTarget, clearBackstack))
         }
+
+        // If we don't do this check, we might be returning while a previous node with the same type is still displayed
+        // This means we may attach some new nodes to that one, which will be quickly replaced by the one instantiated above
+        return waitForChildAttached<RoomFlowNode, NavTarget> {
+            it is NavTarget.Room &&
+                it.roomIdOrAlias == roomIdOrAlias &&
+                it.initialElement is RoomNavigationTarget.Root &&
+                it.initialElement.eventId == eventId
+        }
     }
 
     suspend fun attachUser(userId: UserId) {
@@ -538,11 +595,27 @@ class LoggedInFlowNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        Box(modifier = modifier) {
-            val ftueState by ftueService.state.collectAsState()
-            BackstackView()
-            if (ftueState is FtueState.Complete) {
-                PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LoggedInPermanent)
+        val colors by remember {
+            enterpriseService.semanticColorsFlow(sessionId = matrixClient.sessionId)
+        }.collectAsState(SemanticColorsLightDark.default)
+        ElementThemeApp(
+            appPreferencesStore = appPreferencesStore,
+            compoundLight = colors.light,
+            compoundDark = colors.dark,
+            buildMeta = buildMeta,
+        ) {
+            val isOnline by syncService.isOnline.collectAsState()
+            ConnectivityIndicatorContainer(
+                isOnline = isOnline,
+                modifier = modifier,
+            ) { contentModifier ->
+                Box(modifier = contentModifier) {
+                    val ftueState by ftueService.state.collectAsState()
+                    BackstackView()
+                    if (ftueState is FtueState.Complete) {
+                        PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LoggedInPermanent)
+                    }
+                }
             }
         }
     }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
index 08bdbadde6..080f3c1d77 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,6 @@ 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
@@ -29,10 +29,12 @@ import io.element.android.features.login.api.LoginParams
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 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.designsystem.utils.ForceOrientationInMobileDevices
 import io.element.android.libraries.designsystem.utils.ScreenOrientation
-import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactory
+import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(AppScope::class)
@@ -41,7 +43,8 @@ class NotLoggedInFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val loginEntryPoint: LoginEntryPoint,
-    private val notLoggedInImageLoaderFactory: NotLoggedInImageLoaderFactory,
+    private val imageLoaderHolder: ImageLoaderHolder,
+    private val analyticsColdStartWatcher: AnalyticsColdStartWatcher,
 ) : BaseFlowNode<NotLoggedInFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Root,
@@ -55,16 +58,19 @@ class NotLoggedInFlowNode(
     ) : NodeInputs
 
     interface Callback : Plugin {
-        fun onOpenBugReport()
+        fun navigateToBugReport()
+        fun onDone()
     }
 
+    private val callback: Callback = callback()
     private val inputs = inputs<Params>()
 
     override fun onBuilt() {
         super.onBuilt()
+        analyticsColdStartWatcher.whenLoggingIn()
         lifecycle.subscribe(
             onResume = {
-                SingletonImageLoader.setUnsafe(notLoggedInImageLoaderFactory.newImageLoader())
+                SingletonImageLoader.setUnsafe(imageLoaderHolder.get())
             },
         )
     }
@@ -78,20 +84,23 @@ class NotLoggedInFlowNode(
         return when (navTarget) {
             NavTarget.Root -> {
                 val callback = object : LoginEntryPoint.Callback {
-                    override fun onReportProblem() {
-                        plugins<Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
+                    }
+
+                    override fun onDone() {
+                        callback.onDone()
                     }
                 }
-                loginEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .params(
-                        LoginEntryPoint.Params(
-                            accountProvider = inputs.loginParams?.accountProvider,
-                            loginHint = inputs.loginParams?.loginHint,
-                        )
-                    )
-                    .callback(callback)
-                    .build()
+                loginEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = LoginEntryPoint.Params(
+                        accountProvider = inputs.loginParams?.accountProvider,
+                        loginHint = inputs.loginParams?.loginHint,
+                    ),
+                    callback = callback,
+                )
             }
         }
     }
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 19290c5f8b..4687946367 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,6 +32,7 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.di.MatrixSessionCache
 import io.element.android.appnav.intent.IntentResolver
 import io.element.android.appnav.intent.ResolvedIntent
+import io.element.android.appnav.room.RoomFlowNode
 import io.element.android.appnav.root.RootNavStateFlowFactory
 import io.element.android.appnav.root.RootPresenter
 import io.element.android.appnav.root.RootView
@@ -38,7 +40,6 @@ import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.login.api.LoginParams
 import io.element.android.features.login.api.accesscontrol.AccountProviderAccessControl
 import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
-import io.element.android.features.rageshake.api.reporter.BugReporter
 import io.element.android.features.signedout.api.SignedOutEntryPoint
 import io.element.android.libraries.accountselect.api.AccountSelectEntryPoint
 import io.element.android.libraries.architecture.BackstackView
@@ -50,7 +51,10 @@ import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.deeplink.api.DeeplinkData
 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.SessionId
+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
@@ -58,6 +62,10 @@ import io.element.android.libraries.oidc.api.OidcActionFlow
 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
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+import io.element.android.services.appnavstate.api.ROOM_OPENED_FROM_NOTIFICATION
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -80,9 +88,10 @@ class RootFlowNode(
     private val accountSelectEntryPoint: AccountSelectEntryPoint,
     private val intentResolver: IntentResolver,
     private val oidcActionFlow: OidcActionFlow,
-    private val bugReporter: BugReporter,
     private val featureFlagService: FeatureFlagService,
     private val announcementService: AnnouncementService,
+    private val analyticsService: AnalyticsService,
+    private val analyticsColdStartWatcher: AnalyticsColdStartWatcher,
 ) : BaseFlowNode<RootFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.SplashScreen,
@@ -92,6 +101,7 @@ class RootFlowNode(
     plugins = plugins
 ) {
     override fun onBuilt() {
+        analyticsColdStartWatcher.start()
         matrixSessionCache.restoreWithSavedState(buildContext.savedStateMap)
         super.onBuilt()
         observeNavState()
@@ -130,7 +140,6 @@ class RootFlowNode(
 
     private fun switchToNotLoggedInFlow(params: LoginParams?) {
         matrixSessionCache.removeAll()
-        bugReporter.setLogDirectorySubfolder(null)
         backstack.safeRoot(NavTarget.NotLoggedInFlow(params))
     }
 
@@ -226,11 +235,11 @@ class RootFlowNode(
                     }
                 val inputs = LoggedInAppScopeFlowNode.Inputs(matrixClient)
                 val callback = object : LoggedInAppScopeFlowNode.Callback {
-                    override fun onOpenBugReport() {
+                    override fun navigateToBugReport() {
                         backstack.push(NavTarget.BugReport)
                     }
 
-                    override fun onAddAccount() {
+                    override fun navigateToAddAccount() {
                         backstack.push(NavTarget.NotLoggedInFlow(null))
                     }
                 }
@@ -238,9 +247,13 @@ class RootFlowNode(
             }
             is NavTarget.NotLoggedInFlow -> {
                 val callback = object : NotLoggedInFlowNode.Callback {
-                    override fun onOpenBugReport() {
+                    override fun navigateToBugReport() {
                         backstack.push(NavTarget.BugReport)
                     }
+
+                    override fun onDone() {
+                        backstack.pop()
+                    }
                 }
                 val params = NotLoggedInFlowNode.Params(
                     loginParams = navTarget.params,
@@ -248,11 +261,13 @@ class RootFlowNode(
                 createNode<NotLoggedInFlowNode>(buildContext, plugins = listOf(params, callback))
             }
             is NavTarget.SignedOutFlow -> {
-                signedOutEntryPoint.nodeBuilder(this, buildContext).params(
-                    SignedOutEntryPoint.Params(
-                        sessionId = navTarget.sessionId
-                    )
-                ).build()
+                signedOutEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SignedOutEntryPoint.Params(
+                        sessionId = navTarget.sessionId,
+                    ),
+                )
             }
             NavTarget.SplashScreen -> emptyNode(buildContext)
             NavTarget.BugReport -> {
@@ -261,11 +276,15 @@ class RootFlowNode(
                         backstack.pop()
                     }
                 }
-                bugReportEntryPoint.nodeBuilder(this, buildContext).callback(callback).build()
+                bugReportEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
             is NavTarget.AccountSelect -> {
                 val callback: AccountSelectEntryPoint.Callback = object : AccountSelectEntryPoint.Callback {
-                    override fun onSelectAccount(sessionId: SessionId) {
+                    override fun onAccountSelected(sessionId: SessionId) {
                         lifecycleScope.launch {
                             if (sessionId == navTarget.currentSessionId) {
                                 // Ensure that the account selection Node is removed from the backstack
@@ -286,7 +305,11 @@ class RootFlowNode(
                         backstack.pop()
                     }
                 }
-                accountSelectEntryPoint.nodeBuilder(this, buildContext).callback(callback).build()
+                accountSelectEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
         }
     }
@@ -294,7 +317,13 @@ class RootFlowNode(
     suspend fun handleIntent(intent: Intent) {
         val resolvedIntent = intentResolver.resolve(intent) ?: return
         when (resolvedIntent) {
-            is ResolvedIntent.Navigation -> navigateTo(resolvedIntent.deeplinkData)
+            is ResolvedIntent.Navigation -> {
+                val openingRoomFromNotification = intent.getBooleanExtra(ROOM_OPENED_FROM_NOTIFICATION, false)
+                if (openingRoomFromNotification && resolvedIntent.deeplinkData is DeeplinkData.Room) {
+                    analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.NotificationTapOpensTimeline)
+                }
+                navigateTo(resolvedIntent.deeplinkData)
+            }
             is ResolvedIntent.Login -> onLoginLink(resolvedIntent.params)
             is ResolvedIntent.Oidc -> onOidcAction(resolvedIntent.oidcAction)
             is ResolvedIntent.Permalink -> navigateTo(resolvedIntent.permalinkData)
@@ -338,7 +367,7 @@ class RootFlowNode(
         } else {
             // wait for the current session to be restored
             val loggedInFlowNode = attachSession(latestSessionId)
-            if (sessionStore.getAllSessions().size > 1) {
+            if (sessionStore.numberOfSessions() > 1) {
                 // Several accounts, let the user choose which one to use
                 backstack.push(
                     NavTarget.AccountSelect(
@@ -368,7 +397,7 @@ class RootFlowNode(
                 is PermalinkData.FallbackLink -> Unit
                 is PermalinkData.RoomEmailInviteLink -> Unit
                 else -> {
-                    if (sessionStore.getAllSessions().size > 1) {
+                    if (sessionStore.numberOfSessions() > 1) {
                         // Several accounts, let the user choose which one to use
                         backstack.push(
                             NavTarget.AccountSelect(
@@ -391,13 +420,19 @@ class RootFlowNode(
             is PermalinkData.FallbackLink -> Unit
             is PermalinkData.RoomEmailInviteLink -> Unit
             is PermalinkData.RoomLink -> {
+                // If there is a thread id, focus on it in the main timeline
+                val focusedEventId = if (permalinkData.threadId != null) {
+                    permalinkData.threadId?.asEventId()
+                } else {
+                    permalinkData.eventId
+                }
                 attachRoom(
                     roomIdOrAlias = permalinkData.roomIdOrAlias,
                     trigger = JoinedRoom.Trigger.MobilePermalink,
                     serverNames = permalinkData.viaParameters,
-                    eventId = permalinkData.eventId,
+                    eventId = focusedEventId,
                     clearBackstack = true
-                )
+                ).maybeAttachThread(permalinkData.threadId, permalinkData.eventId)
             }
             is PermalinkData.UserLink -> {
                 attachUser(permalinkData.userId)
@@ -405,12 +440,24 @@ class RootFlowNode(
         }
     }
 
+    private suspend fun RoomFlowNode.maybeAttachThread(threadId: ThreadId?, focusedEventId: EventId?) {
+        if (threadId != null) {
+            attachThread(threadId, focusedEventId)
+        }
+    }
+
     private suspend fun navigateTo(deeplinkData: DeeplinkData) {
         Timber.d("Navigating to $deeplinkData")
-        attachSession(deeplinkData.sessionId).apply {
+        attachSession(deeplinkData.sessionId).let { loggedInFlowNode ->
             when (deeplinkData) {
                 is DeeplinkData.Root -> Unit // The room list will always be shown, observing FtueState
-                is DeeplinkData.Room -> attachRoom(deeplinkData.roomId.toRoomIdOrAlias(), clearBackstack = true)
+                is DeeplinkData.Room -> {
+                    loggedInFlowNode.attachRoom(
+                        roomIdOrAlias = deeplinkData.roomId.toRoomIdOrAlias(),
+                        eventId = if (deeplinkData.threadId != null) deeplinkData.threadId?.asEventId() else deeplinkData.eventId,
+                        clearBackstack = true,
+                    ).maybeAttachThread(deeplinkData.threadId, deeplinkData.eventId)
+                }
             }
         }
     }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt
index ce80ac7207..c6a031921f 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,14 @@ import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.core.state.SavedStateMap
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.androidutils.hash.hash
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analyticsproviders.api.AnalyticsUserData
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -33,10 +36,10 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHold
  */
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class MatrixSessionCache(
     private val authenticationService: MatrixAuthenticationService,
     private val syncOrchestratorFactory: SyncOrchestrator.Factory,
+    private val analyticsService: AnalyticsService,
 ) : MatrixClientProvider {
     private val sessionIdsToMatrixSession = ConcurrentHashMap<SessionId, InMemoryMatrixSession>()
     private val restoreMutex = Mutex()
@@ -101,6 +104,11 @@ class MatrixSessionCache(
         Timber.d("Restore matrix session: $sessionId")
         return authenticationService.restoreSession(sessionId)
             .onSuccess { matrixClient ->
+                // Add the current homeserver (hashed) to the extra info
+                // This may not play well with multiple sessions, but it should work for now
+                analyticsService.addIndexableData(AnalyticsUserData.HOMESERVER, matrixClient.userIdServerName().hash())
+
+                // Add the new client to the in-memory cache
                 onNewMatrixClient(matrixClient)
             }
             .onFailure {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/RoomGraphFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/RoomGraphFactory.kt
index ae0a3a81f2..2d5244cb5a 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/RoomGraphFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/RoomGraphFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt
index 788a1633df..bc3960409e 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/SessionGraphFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2561fd3ac7..9b1bbd1b81 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,9 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScope
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.sync.SyncState
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.recordTransaction
+import io.element.android.services.analyticsproviders.api.AnalyticsUserData
 import io.element.android.services.appnavstate.api.AppForegroundStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
@@ -38,6 +42,7 @@ class SyncOrchestrator(
     private val appForegroundStateService: AppForegroundStateService,
     private val networkMonitor: NetworkMonitor,
     dispatchers: CoroutineDispatchers,
+    private val analyticsService: AnalyticsService,
 ) {
     @AssistedFactory
     interface Factory {
@@ -68,10 +73,13 @@ class SyncOrchestrator(
             // Perform an initial sync if the sync service is not running, to check whether the homeserver is accessible
             // Otherwise, if the device is offline the sync service will never start and the SyncState will be Idle, not Offline
             Timber.tag(tag).d("performing initial sync attempt")
-            syncService.startSync()
+            analyticsService.recordTransaction("First sync", "syncService.startSync()") { transaction ->
+                syncService.startSync()
 
-            // Wait until the sync service is not idle, either it will be running or in error/offline state
-            syncService.syncState.first { it != SyncState.Idle }
+                // Wait until the sync service is not idle, either it will be running or in error/offline state
+                val firstState = syncService.syncState.first { it != SyncState.Idle }
+                transaction.putIndexableData(AnalyticsUserData.FIRST_SYNC_STATE, firstState.name)
+            }
 
             observeStates()
         }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/TimelineBindings.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/TimelineBindings.kt
new file mode 100644
index 0000000000..cb78760a0f
--- /dev/null
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/TimelineBindings.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.appnav.di
+
+import io.element.android.features.messages.api.pinned.PinnedEventsTimelineProvider
+import io.element.android.libraries.matrix.api.timeline.TimelineProvider
+
+interface TimelineBindings {
+    val timelineProvider: TimelineProvider
+    val pinnedEventsTimelineProvider: PinnedEventsTimelineProvider
+}
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 187b8f84b6..3e26130c78 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateExt.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateExt.kt
index 565dbdd5ad..714645dcdc 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateExt.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d7020c50a5..d2a9c9298e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
index edc2be05db..c49ca4221d 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,10 +13,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -32,18 +33,14 @@ class LoggedInNode(
         fun navigateToNotificationTroubleshoot()
     }
 
-    private fun navigateToNotificationTroubleshoot() {
-        plugins<Callback>().forEach {
-            it.navigateToNotificationTroubleshoot()
-        }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val loggedInState = loggedInPresenter.present()
         LoggedInView(
             state = loggedInState,
-            navigateToNotificationTroubleshoot = ::navigateToNotificationTroubleshoot,
+            navigateToNotificationTroubleshoot = callback::navigateToNotificationTroubleshoot,
             modifier = modifier
         )
     }
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 1f8be2f673..184766e323 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -35,7 +36,7 @@ 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.push.api.PushService
-import io.element.android.libraries.pushproviders.api.RegistrationFailure
+import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.combine
@@ -70,7 +71,17 @@ class LoggedInPresenter(
                     when (sessionVerifiedStatus) {
                         SessionVerifiedStatus.Unknown -> Unit
                         SessionVerifiedStatus.Verified -> {
-                            ensurePusherIsRegistered(pusherRegistrationState)
+                            Timber.tag(pusherTag.value).d("Ensure pusher is registered")
+                            pushService.ensurePusherIsRegistered(matrixClient).fold(
+                                onSuccess = {
+                                    Timber.tag(pusherTag.value).d("Pusher registered")
+                                    pusherRegistrationState.value = AsyncData.Success(Unit)
+                                },
+                                onFailure = {
+                                    Timber.tag(pusherTag.value).e(it, "Failed to register pusher")
+                                    pusherRegistrationState.value = AsyncData.Failure(it)
+                                },
+                            )
                         }
                         SessionVerifiedStatus.NotVerified -> {
                             pusherRegistrationState.value = AsyncData.Failure(PusherRegistrationFailure.AccountNotVerified())
@@ -122,7 +133,7 @@ class LoggedInPresenter(
             ignoreRegistrationError = ignoreRegistrationError,
             forceNativeSlidingSyncMigration = forceNativeSlidingSyncMigration,
             appName = buildMeta.applicationName,
-            eventSink = ::handleEvent
+            eventSink = ::handleEvent,
         )
     }
 
@@ -132,59 +143,6 @@ class LoggedInPresenter(
         currentSlidingSyncVersion == SlidingSyncVersion.Proxy
     }
 
-    private suspend fun ensurePusherIsRegistered(pusherRegistrationState: MutableState<AsyncData<Unit>>) {
-        Timber.tag(pusherTag.value).d("Ensure pusher is registered")
-        val currentPushProvider = pushService.getCurrentPushProvider()
-        val result = if (currentPushProvider == null) {
-            Timber.tag(pusherTag.value).d("Register with the first available push provider with at least one distributor")
-            val pushProvider = pushService.getAvailablePushProviders()
-                .firstOrNull { it.getDistributors().isNotEmpty() }
-            // Else fallback to the first available push provider (the list should never be empty)
-                ?: pushService.getAvailablePushProviders().firstOrNull()
-                ?: return Unit
-                    .also { Timber.tag(pusherTag.value).w("No push providers available") }
-                    .also { pusherRegistrationState.value = AsyncData.Failure(PusherRegistrationFailure.NoProvidersAvailable()) }
-            val distributor = pushProvider.getDistributors().firstOrNull()
-                ?: return Unit
-                    .also { Timber.tag(pusherTag.value).w("No distributors available") }
-                    .also {
-                        // In this case, consider the push provider is chosen.
-                        pushService.selectPushProvider(matrixClient.sessionId, pushProvider)
-                    }
-                    .also { pusherRegistrationState.value = AsyncData.Failure(PusherRegistrationFailure.NoDistributorsAvailable()) }
-            pushService.registerWith(matrixClient, pushProvider, distributor)
-        } else {
-            val currentPushDistributor = currentPushProvider.getCurrentDistributor(matrixClient.sessionId)
-            if (currentPushDistributor == null) {
-                Timber.tag(pusherTag.value).d("Register with the first available distributor")
-                val distributor = currentPushProvider.getDistributors().firstOrNull()
-                    ?: return Unit
-                        .also { Timber.tag(pusherTag.value).w("No distributors available") }
-                        .also { pusherRegistrationState.value = AsyncData.Failure(PusherRegistrationFailure.NoDistributorsAvailable()) }
-                pushService.registerWith(matrixClient, currentPushProvider, distributor)
-            } else {
-                Timber.tag(pusherTag.value).d("Re-register with the current distributor")
-                pushService.registerWith(matrixClient, currentPushProvider, currentPushDistributor)
-            }
-        }
-        result.fold(
-            onSuccess = {
-                Timber.tag(pusherTag.value).d("Pusher registered")
-                pusherRegistrationState.value = AsyncData.Success(Unit)
-            },
-            onFailure = {
-                Timber.tag(pusherTag.value).e(it, "Failed to register pusher")
-                if (it is RegistrationFailure) {
-                    pusherRegistrationState.value = AsyncData.Failure(
-                        PusherRegistrationFailure.RegistrationFailure(it.clientException, it.isRegisteringAgain)
-                    )
-                } else {
-                    pusherRegistrationState.value = AsyncData.Failure(it)
-                }
-            }
-        )
-    }
-
     private fun reportCryptoStatusToAnalytics(verificationState: SessionVerifiedStatus, recoveryState: RecoveryState) {
         // Update first the user property, to store the current status for that posthog user
         val userVerificationState = verificationState.toAnalyticsUserPropertyValue()
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 8f039ffa2b..b066f9f867 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2ba0c8de81..b2f5407519 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,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.push.api.PusherRegistrationFailure
 
 open class LoggedInStateProvider : PreviewParameterProvider<LoggedInState> {
     override val values: Sequence<LoggedInState>
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 d6a12ea27b..62d8de8c29 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,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.push.api.PusherRegistrationFailure
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
index 7916d48171..6b5803aa14 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
index bb485fd646..3f01f8337e 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt
index e8890a5da8..7c5f196a4c 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SyncStateView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
index 9a84049497..1bf3516900 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,8 +10,6 @@ package io.element.android.appnav.room
 
 import android.os.Parcelable
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
 import com.bumble.appyx.core.modality.BuildContext
@@ -20,10 +19,10 @@ import com.bumble.appyx.core.node.node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.active
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
-import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.room.joined.JoinedRoomFlowNode
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
@@ -32,36 +31,42 @@ import io.element.android.features.joinroom.api.JoinRoomEntryPoint
 import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint
 import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint.Params
 import io.element.android.features.roomdirectory.api.RoomDescription
-import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.withPreviousValue
 import io.element.android.libraries.di.SessionScope
 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.RoomAlias
 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.ThreadId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 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.sync.SyncService
 import io.element.android.libraries.matrix.ui.room.LoadingRoomState
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadJoinedRoomFlow
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationTapOpensTimeline
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
+import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.launch
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 import java.util.Optional
 import kotlin.jvm.optionals.getOrNull
+import im.vector.app.features.analytics.plan.JoinedRoom as JoinedRoomAnalyticsEvent
+import io.element.android.libraries.matrix.api.room.JoinedRoom as JoinedRoomInstance
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -71,12 +76,18 @@ class RoomFlowNode(
     private val client: MatrixClient,
     private val joinRoomEntryPoint: JoinRoomEntryPoint,
     private val roomAliasResolverEntryPoint: RoomAliasResolverEntryPoint,
-    private val syncService: SyncService,
     private val membershipObserver: RoomMembershipObserver,
-    private val spaceEntryPoint: SpaceEntryPoint,
+    private val analyticsService: AnalyticsService,
 ) : BaseFlowNode<RoomFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = NavTarget.Loading,
+        initialElement = run {
+            val joinedRoom = (plugins.filterIsInstance<Inputs>().first().initialElement as? RoomNavigationTarget.Root)?.joinedRoom
+            if (joinedRoom != null) {
+                NavTarget.JoinedRoom(joinedRoom)
+            } else {
+                NavTarget.Loading
+            }
+        },
         savedStateMap = buildContext.savedStateMap,
     ),
     buildContext = buildContext,
@@ -86,7 +97,7 @@ class RoomFlowNode(
         val roomIdOrAlias: RoomIdOrAlias,
         val roomDescription: Optional<RoomDescription>,
         val serverNames: List<String>,
-        val trigger: Optional<JoinedRoom.Trigger>,
+        val trigger: Optional<JoinedRoomAnalyticsEvent.Trigger>,
         val initialElement: RoomNavigationTarget,
     ) : NodeInputs
 
@@ -103,18 +114,23 @@ class RoomFlowNode(
         data class JoinRoom(
             val roomId: RoomId,
             val serverNames: List<String>,
-            val trigger: im.vector.app.features.analytics.plan.JoinedRoom.Trigger,
+            val trigger: JoinedRoomAnalyticsEvent.Trigger,
         ) : NavTarget
 
         @Parcelize
-        data class JoinedRoom(val roomId: RoomId) : NavTarget
-
-        @Parcelize
-        data class JoinedSpace(val spaceId: RoomId) : NavTarget
+        data class JoinedRoom(
+            val roomId: RoomId,
+            @IgnoredOnParcel val joinedRoom: JoinedRoomInstance? = null,
+        ) : NavTarget {
+            constructor(joinedRoom: JoinedRoomInstance) : this(joinedRoom.roomId, joinedRoom)
+        }
     }
 
     override fun onBuilt() {
         super.onBuilt()
+        val parentTransaction = analyticsService.getLongRunningTransaction(NotificationTapOpensTimeline)
+        val openRoomTransaction = analyticsService.startLongRunningTransaction(OpenRoom, parentTransaction)
+        analyticsService.startLongRunningTransaction(LoadJoinedRoomFlow, openRoomTransaction)
         resolveRoomId()
     }
 
@@ -132,8 +148,9 @@ class RoomFlowNode(
     }
 
     private fun subscribeToRoomInfoFlow(roomId: RoomId, serverNames: List<String>) {
-        val roomInfoFlow = client.getRoomInfoFlow(roomId)
-        val isSpaceFlow = roomInfoFlow.map { it.getOrNull()?.isSpace.orFalse() }.distinctUntilChanged()
+        val joinedRoom = (inputs.initialElement as? RoomNavigationTarget.Root)?.joinedRoom
+        val roomInfoFlow = joinedRoom?.roomInfoFlow?.map { Optional.of(it) }
+            ?: client.getRoomInfoFlow(roomId)
 
         // This observes the local membership changes for the room
         val membershipUpdateFlow = membershipObserver.updates
@@ -146,14 +163,15 @@ class RoomFlowNode(
             .map { it.getOrNull()?.currentUserMembership }
             .distinctUntilChanged()
             .withPreviousValue()
-        combine(currentMembershipFlow, isSpaceFlow) { (previousMembership, membership), isSpace ->
+        currentMembershipFlow.onEach { (previousMembership, membership) ->
             Timber.d("Room membership: $membership")
             if (membership == CurrentUserMembership.JOINED) {
-                if (isSpace) {
-                    backstack.newRoot(NavTarget.JoinedSpace(spaceId = roomId))
-                } else {
-                    backstack.newRoot(NavTarget.JoinedRoom(roomId))
+                val currentNavTarget = backstack.active?.key?.navTarget
+                if (currentNavTarget is NavTarget.JoinedRoom && currentNavTarget.roomId == roomId) {
+                    Timber.d("Already in JoinedRoom $roomId, do nothing")
+                    return@onEach
                 }
+                backstack.newRoot(NavTarget.JoinedRoom(roomId))
             } else {
                 val leavingFromCurrentDevice =
                     membership == CurrentUserMembership.LEFT &&
@@ -167,7 +185,7 @@ class RoomFlowNode(
                         NavTarget.JoinRoom(
                             roomId = roomId,
                             serverNames = serverNames,
-                            trigger = inputs.trigger.getOrNull() ?: JoinedRoom.Trigger.Invite,
+                            trigger = inputs.trigger.getOrNull() ?: JoinedRoomAnalyticsEvent.Trigger.Invite,
                         )
                     )
                 }
@@ -188,10 +206,12 @@ class RoomFlowNode(
                     }
                 }
                 val params = Params(navTarget.roomAlias)
-                roomAliasResolverEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .params(params)
-                    .build()
+                roomAliasResolverEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
             }
             is NavTarget.JoinRoom -> {
                 val inputs = JoinRoomEntryPoint.Inputs(
@@ -201,31 +221,32 @@ class RoomFlowNode(
                     serverNames = navTarget.serverNames,
                     trigger = navTarget.trigger,
                 )
-                joinRoomEntryPoint.createNode(this, buildContext, inputs)
+                joinRoomEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inputs = inputs,
+                )
             }
             is NavTarget.JoinedRoom -> {
                 val roomFlowNodeCallback = plugins<JoinedRoomLoadedFlowNode.Callback>()
                 val inputs = JoinedRoomFlowNode.Inputs(
                     roomId = navTarget.roomId,
-                    initialElement = inputs.initialElement
+                    initialElement = inputs.initialElement,
+                    joinedRoom = navTarget.joinedRoom,
                 )
                 createNode<JoinedRoomFlowNode>(buildContext, plugins = listOf(inputs) + roomFlowNodeCallback)
             }
-            is NavTarget.JoinedSpace -> {
-                val spaceCallback = plugins<SpaceEntryPoint.Callback>().single()
-                spaceEntryPoint.nodeBuilder(this, buildContext)
-                    .inputs(SpaceEntryPoint.Inputs(roomId = navTarget.spaceId))
-                    .callback(spaceCallback)
-                    .build()
-            }
         }
     }
 
+    suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?) {
+        waitForChildAttached<JoinedRoomFlowNode>()
+            .attachThread(threadId, focusedEventId)
+    }
+
     private fun loadingNode(buildContext: BuildContext) = node(buildContext) { modifier ->
-        val isOnline by syncService.isOnline.collectAsState()
         LoadingRoomNodeView(
             state = LoadingRoomState.Loading,
-            hasNetworkConnection = isOnline,
             onBackClick = { navigateUp() },
             modifier = modifier,
         )
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
index ab1589898b..aac916ab9d 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,16 @@ package io.element.android.appnav.room
 
 import android.os.Parcelable
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 sealed interface RoomNavigationTarget : Parcelable {
     @Parcelize
-    data class Messages(val focusedEventId: EventId? = null) : RoomNavigationTarget
+    data class Root(
+        val eventId: EventId? = null,
+        @IgnoredOnParcel val joinedRoom: JoinedRoom? = null,
+    ) : RoomNavigationTarget
 
     @Parcelize
     data object Details : RoomNavigationTarget
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
index cbda7a8bfb..504bdfec58 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,8 +35,10 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
+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.sync.SyncService
+import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.ui.room.LoadingRoomState
 import io.element.android.libraries.matrix.ui.room.LoadingRoomStateFlowFactory
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -50,7 +53,6 @@ class JoinedRoomFlowNode(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     loadingRoomStateFlowFactory: LoadingRoomStateFlowFactory,
-    private val syncService: SyncService,
 ) :
     BaseFlowNode<JoinedRoomFlowNode.NavTarget>(
         backstack = BackStack(
@@ -62,11 +64,12 @@ class JoinedRoomFlowNode(
     ) {
     data class Inputs(
         val roomId: RoomId,
+        val joinedRoom: JoinedRoom?,
         val initialElement: RoomNavigationTarget,
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    private val loadingRoomStateStateFlow = loadingRoomStateFlowFactory.create(lifecycleScope, inputs.roomId)
+    private val loadingRoomStateStateFlow = loadingRoomStateFlowFactory.create(lifecycleScope, inputs.roomId, inputs.joinedRoom)
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
@@ -116,15 +119,18 @@ class JoinedRoomFlowNode(
 
     private fun loadingNode(buildContext: BuildContext, onBackClick: () -> Unit) = node(buildContext) { modifier ->
         val loadingRoomState by loadingRoomStateStateFlow.collectAsState()
-        val isOnline by syncService.isOnline.collectAsState()
         LoadingRoomNodeView(
             state = loadingRoomState,
-            hasNetworkConnection = isOnline,
-            modifier = modifier,
-            onBackClick = onBackClick
+            onBackClick = onBackClick,
+            modifier = modifier
         )
     }
 
+    suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?) {
+        waitForChildAttached<JoinedRoomLoadedFlowNode>()
+            .attachThread(threadId, focusedEventId)
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         BackstackView(
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 f0f8dff3e7..0b3ba57776 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
@@ -1,13 +1,16 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package io.element.android.appnav.room.joined
 
+import android.app.Activity
 import android.os.Parcelable
+import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
@@ -16,27 +19,39 @@ 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.pop
 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.appnav.di.RoomGraphFactory
+import io.element.android.appnav.di.TimelineBindings
 import io.element.android.appnav.room.RoomNavigationTarget
+import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
+import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 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.architecture.waitForChildAttached
 import io.element.android.libraries.di.DependencyInjectionGraphOwner
 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.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.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadJoinedRoomFlow
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadMessagesUi
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
@@ -51,29 +66,27 @@ class JoinedRoomLoadedFlowNode(
     @Assisted plugins: List<Plugin>,
     private val messagesEntryPoint: MessagesEntryPoint,
     private val roomDetailsEntryPoint: RoomDetailsEntryPoint,
+    private val spaceEntryPoint: SpaceEntryPoint,
+    private val forwardEntryPoint: ForwardEntryPoint,
     private val appNavigationStateService: AppNavigationStateService,
     @SessionCoroutineScope
     private val sessionCoroutineScope: CoroutineScope,
     private val matrixClient: MatrixClient,
     private val activeRoomsHolder: ActiveRoomsHolder,
+    private val analyticsService: AnalyticsService,
     roomGraphFactory: RoomGraphFactory,
 ) : BaseFlowNode<JoinedRoomLoadedFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = when (val input = plugins.filterIsInstance<Inputs>().first().initialElement) {
-            is RoomNavigationTarget.Messages -> NavTarget.Messages(input.focusedEventId)
-            RoomNavigationTarget.Details -> NavTarget.RoomDetails
-            RoomNavigationTarget.NotificationSettings -> NavTarget.RoomNotificationSettings
-        },
+        initialElement = initialElement(plugins),
         savedStateMap = buildContext.savedStateMap,
     ),
     buildContext = buildContext,
     plugins = plugins,
 ), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
-        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
-        fun onForwardedToSingleRoom(roomId: RoomId)
-        fun onOpenGlobalNotificationSettings()
+        fun navigateToRoom(roomId: RoomId, serverNames: List<String>)
+        fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
+        fun navigateToGlobalNotificationSettings()
     }
 
     data class Inputs(
@@ -82,12 +95,17 @@ class JoinedRoomLoadedFlowNode(
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    private val callbacks = plugins.filterIsInstance<Callback>()
+    private val callback: Callback = callback()
     override val graph = roomGraphFactory.create(inputs.room)
 
+    // This is an ugly hack to check activity recreation
+    private var currentActivity: Activity? = null
+
     init {
         lifecycle.subscribe(
             onCreate = {
+                val parent = analyticsService.getLongRunningTransaction(OpenRoom)
+                analyticsService.startLongRunningTransaction(LoadMessagesUi, parent)
                 Timber.v("OnCreate => ${inputs.room.roomId}")
                 appNavigationStateService.onNavigateToRoom(id, inputs.room.roomId)
                 activeRoomsHolder.addRoom(inputs.room)
@@ -95,14 +113,19 @@ class JoinedRoomLoadedFlowNode(
                 trackVisitedRoom()
             },
             onResume = {
+                analyticsService.finishLongRunningTransaction(LoadJoinedRoomFlow)
                 sessionCoroutineScope.launch {
                     inputs.room.subscribeToSync()
                 }
             },
             onDestroy = {
                 Timber.v("OnDestroy")
-                activeRoomsHolder.removeRoom(inputs.room.sessionId, inputs.room.roomId)
-                inputs.room.destroy()
+                // If we're just going through an activity recreation there's no need to destroy the Room object
+                // Destroying it would actually cause an issue where its methods can no longer be called
+                if (currentActivity?.isChangingConfigurations != true) {
+                    activeRoomsHolder.removeRoom(inputs.room.sessionId, inputs.room.roomId)
+                    inputs.room.destroy()
+                }
                 appNavigationStateService.onLeavingRoom(id)
             }
         )
@@ -118,26 +141,28 @@ class JoinedRoomLoadedFlowNode(
 
     private fun createRoomDetailsNode(buildContext: BuildContext, initialTarget: RoomDetailsEntryPoint.InitialTarget): Node {
         val callback = object : RoomDetailsEntryPoint.Callback {
-            override fun onOpenGlobalNotificationSettings() {
-                callbacks.forEach { it.onOpenGlobalNotificationSettings() }
+            override fun navigateToGlobalNotificationSettings() {
+                callback.navigateToGlobalNotificationSettings()
             }
 
-            override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
-                callbacks.forEach { it.onOpenRoom(roomId, serverNames) }
+            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
+                callback.navigateToRoom(roomId, serverNames)
             }
 
-            override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
-                callbacks.forEach { it.onPermalinkClick(data, pushToBackstack) }
+            override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                callback.handlePermalinkClick(data, pushToBackstack)
             }
 
-            override fun onForwardedToSingleRoom(roomId: RoomId) {
-                callbacks.forEach { it.onForwardedToSingleRoom(roomId) }
+            override fun startForwardEventFlow(eventId: EventId, fromPinnedEvents: Boolean) {
+                backstack.push(NavTarget.ForwardEvent(eventId, fromPinnedEvents))
             }
         }
-        return roomDetailsEntryPoint.nodeBuilder(this, buildContext)
-            .params(RoomDetailsEntryPoint.Params(initialTarget))
-            .callback(callback)
-            .build()
+        return roomDetailsEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = RoomDetailsEntryPoint.Params(initialTarget),
+            callback = callback,
+        )
     }
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@@ -154,55 +179,142 @@ class JoinedRoomLoadedFlowNode(
             NavTarget.RoomNotificationSettings -> {
                 createRoomDetailsNode(buildContext, RoomDetailsEntryPoint.InitialTarget.RoomNotificationSettings)
             }
+            NavTarget.RoomMemberList -> {
+                createRoomDetailsNode(buildContext, RoomDetailsEntryPoint.InitialTarget.RoomMemberList)
+            }
+            NavTarget.Space -> {
+                createSpaceNode(buildContext)
+            }
+            is NavTarget.ForwardEvent -> {
+                val timelineProvider = if (navTarget.fromPinnedEvents) {
+                    (graph as TimelineBindings).pinnedEventsTimelineProvider
+                } else {
+                    (graph as TimelineBindings).timelineProvider
+                }
+                val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider)
+                val callback = object : ForwardEntryPoint.Callback {
+                    override fun onDone(roomIds: List<RoomId>) {
+                        backstack.pop()
+                        roomIds.singleOrNull()?.let { roomId ->
+                            callback.navigateToRoom(roomId, emptyList())
+                        }
+                    }
+                }
+                forwardEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
+            }
         }
     }
 
+    private fun createSpaceNode(buildContext: BuildContext): Node {
+        val callback = object : SpaceEntryPoint.Callback {
+            override fun navigateToRoom(roomId: RoomId, viaParameters: List<String>) {
+                callback.navigateToRoom(roomId, viaParameters)
+            }
+
+            override fun navigateToRoomMemberList() {
+                backstack.push(NavTarget.RoomMemberList)
+            }
+        }
+        return spaceEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            inputs = SpaceEntryPoint.Inputs(roomId = inputs.room.roomId),
+            callback = callback,
+        )
+    }
+
     private fun createMessagesNode(
         buildContext: BuildContext,
         navTarget: NavTarget.Messages,
     ): Node {
         val callback = object : MessagesEntryPoint.Callback {
-            override fun onRoomDetailsClick() {
+            override fun navigateToRoomDetails() {
                 backstack.push(NavTarget.RoomDetails)
             }
 
-            override fun onUserDataClick(userId: UserId) {
+            override fun navigateToRoomMemberDetails(userId: UserId) {
                 backstack.push(NavTarget.RoomMemberDetails(userId))
             }
 
-            override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
-                callbacks.forEach { it.onPermalinkClick(data, pushToBackstack) }
+            override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                callback.handlePermalinkClick(data, pushToBackstack)
             }
 
-            override fun onForwardedToSingleRoom(roomId: RoomId) {
-                callbacks.forEach { it.onForwardedToSingleRoom(roomId) }
+            override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
+                backstack.push(NavTarget.ForwardEvent(eventId, fromPinnedEvents))
+            }
+
+            override fun navigateToRoom(roomId: RoomId) {
+                callback.navigateToRoom(roomId, emptyList())
             }
         }
         val params = MessagesEntryPoint.Params(
             MessagesEntryPoint.InitialTarget.Messages(navTarget.focusedEventId)
         )
-        return messagesEntryPoint.nodeBuilder(this, buildContext)
-            .params(params)
-            .callback(callback)
-            .build()
+        return messagesEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = params,
+            callback = callback,
+        )
     }
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
-        data class Messages(val focusedEventId: EventId? = null) : NavTarget
+        data object Space : NavTarget
+
+        @Parcelize
+        data class Messages(
+            val focusedEventId: EventId? = null,
+        ) : NavTarget
 
         @Parcelize
         data object RoomDetails : NavTarget
 
+        @Parcelize
+        data object RoomMemberList : NavTarget
+
         @Parcelize
         data class RoomMemberDetails(val userId: UserId) : NavTarget
 
+        @Parcelize
+        data class ForwardEvent(val eventId: EventId, val fromPinnedEvents: Boolean) : NavTarget
+
         @Parcelize
         data object RoomNotificationSettings : NavTarget
     }
 
+    suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?) {
+        val messageNode = waitForChildAttached<Node, NavTarget> { navTarget ->
+            navTarget is NavTarget.Messages
+        }
+        (messageNode as? MessagesEntryPoint.NodeProxy)?.attachThread(threadId, focusedEventId)
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
+        currentActivity = LocalActivity.current
+
         BackstackView()
     }
 }
+
+private fun initialElement(plugins: List<Plugin>): JoinedRoomLoadedFlowNode.NavTarget {
+    val input = plugins.filterIsInstance<JoinedRoomLoadedFlowNode.Inputs>().single()
+    return when (input.initialElement) {
+        is RoomNavigationTarget.Root -> {
+            if (input.room.roomInfoFlow.value.isSpace) {
+                JoinedRoomLoadedFlowNode.NavTarget.Space
+            } else {
+                JoinedRoomLoadedFlowNode.NavTarget.Messages(input.initialElement.eventId)
+            }
+        }
+        RoomNavigationTarget.Details -> JoinedRoomLoadedFlowNode.NavTarget.RoomDetails
+        RoomNavigationTarget.NotificationSettings -> JoinedRoomLoadedFlowNode.NavTarget.RoomNotificationSettings
+    }
+}
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
index 938e46f915..a596052fca 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
@@ -1,15 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package io.element.android.appnav.room.joined
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -21,9 +20,6 @@ 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.features.networkmonitor.api.ui.ConnectivityIndicatorView
-import io.element.android.libraries.designsystem.atomic.molecules.IconTitlePlaceholdersRowMolecule
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 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
@@ -31,6 +27,7 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
 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.DelayedVisibility
 import io.element.android.libraries.matrix.ui.room.LoadingRoomState
 import io.element.android.libraries.matrix.ui.room.LoadingRoomStateProvider
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -38,17 +35,13 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun LoadingRoomNodeView(
     state: LoadingRoomState,
-    hasNetworkConnection: Boolean,
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
         modifier = modifier,
         topBar = {
-            Column {
-                ConnectivityIndicatorView(isOnline = hasNetworkConnection)
-                LoadingRoomTopBar(onBackClick)
-            }
+            LoadingRoomTopBar(onBackClick)
         },
         content = { padding ->
             Box(
@@ -66,7 +59,9 @@ fun LoadingRoomNodeView(
                         style = ElementTheme.typography.fontBodyMdRegular,
                     )
                 } else {
-                    CircularProgressIndicator()
+                    DelayedVisibility {
+                        CircularProgressIndicator()
+                    }
                 }
             }
         },
@@ -83,9 +78,7 @@ private fun LoadingRoomTopBar(
             BackButton(onClick = onBackClick)
         },
         title = {
-            IconTitlePlaceholdersRowMolecule(iconSize = AvatarSize.TimelineRoom.dp)
         },
-        windowInsets = WindowInsets(0.dp),
     )
 }
 
@@ -94,7 +87,6 @@ private fun LoadingRoomTopBar(
 internal fun LoadingRoomNodeViewPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = ElementPreview {
     LoadingRoomNodeView(
         state = state,
-        onBackClick = {},
-        hasNetworkConnection = false
+        onBackClick = {}
     )
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavState.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavState.kt
index a98ad0e0fd..9015872e62 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavState.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt
index dfa478d6be..9a91e9765b 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt
index d987c2a7ec..75704c499d 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootState.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootState.kt
index 3ea7362efa..0d7f362c1e 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootState.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootState.kt
@@ -1,18 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package io.element.android.appnav.root
 
-import androidx.compose.runtime.Immutable
 import io.element.android.features.rageshake.api.crash.CrashDetectionState
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionState
 import io.element.android.services.apperror.api.AppErrorState
 
-@Immutable
 data class RootState(
     val rageshakeDetectionState: RageshakeDetectionState,
     val crashDetectionState: CrashDetectionState,
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootStateProvider.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootStateProvider.kt
index 4d84e06070..26db205498 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootStateProvider.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bd7db5e9c2..2bc76d7a5b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/main/res/values-hr/translations.xml b/appnav/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..f75fa613f2
--- /dev/null
+++ b/appnav/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="banner_migrate_to_native_sliding_sync_action">"Odjava i nadogradnja"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s više ne podržava stari protokol. Odjavite se i ponovno prijavite kako biste se nastavili služiti aplikacijom."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Vaš matični poslužitelj više ne podržava stari protokol. Odjavite se i ponovno prijavite kako biste se nastavili služiti aplikacijom."</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 dfb2638dc1..6cd7df025b 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,22 +20,32 @@ import com.bumble.appyx.testing.unit.common.helper.parentNodeTestHelper
 import com.google.common.truth.Truth.assertThat
 import io.element.android.appnav.di.RoomGraphFactory
 import io.element.android.appnav.room.RoomNavigationTarget
+import io.element.android.appnav.room.joined.FakeJoinedRoomLoadedFlowNodeCallback
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
+import io.element.android.features.forward.api.ForwardEntryPoint
+import io.element.android.features.forward.test.FakeForwardEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
+import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.childNode
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 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.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
+import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 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 {
     @get:Rule
     val instantTaskExecutorRule = InstantTaskExecutorRule()
@@ -42,29 +53,20 @@ class JoinedRoomLoadedFlowNodeTest {
     @get:Rule
     val mainDispatcherRule = MainDispatcherRule()
 
-    private class FakeMessagesEntryPoint : MessagesEntryPoint, MessagesEntryPoint.NodeBuilder {
-        var buildContext: BuildContext? = null
+    private class FakeMessagesEntryPoint : MessagesEntryPoint {
         var nodeId: String? = null
         var parameters: MessagesEntryPoint.Params? = null
         var callback: MessagesEntryPoint.Callback? = null
 
-        override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MessagesEntryPoint.NodeBuilder {
-            this.buildContext = buildContext
-            return this
-        }
-
-        override fun params(params: MessagesEntryPoint.Params): MessagesEntryPoint.NodeBuilder {
+        override fun createNode(
+            parentNode: Node,
+            buildContext: BuildContext,
+            params: MessagesEntryPoint.Params,
+            callback: MessagesEntryPoint.Callback,
+        ): Node {
             parameters = params
-            return this
-        }
-
-        override fun callback(callback: MessagesEntryPoint.Callback): MessagesEntryPoint.NodeBuilder {
             this.callback = callback
-            return this
-        }
-
-        override fun build(): Node {
-            return node(buildContext!!) {}.also {
+            return node(buildContext) {}.also {
                 nodeId = it.id
             }
         }
@@ -79,22 +81,26 @@ class JoinedRoomLoadedFlowNodeTest {
     private class FakeRoomDetailsEntryPoint : RoomDetailsEntryPoint {
         var nodeId: String? = null
 
-        override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomDetailsEntryPoint.NodeBuilder {
-            return object : RoomDetailsEntryPoint.NodeBuilder {
-                override fun params(params: RoomDetailsEntryPoint.Params): RoomDetailsEntryPoint.NodeBuilder {
-                    return this
-                }
+        override fun createNode(
+            parentNode: Node,
+            buildContext: BuildContext,
+            params: RoomDetailsEntryPoint.Params,
+            callback: RoomDetailsEntryPoint.Callback,
+        ) = node(buildContext) {}.also {
+            nodeId = it.id
+        }
+    }
 
-                override fun callback(callback: RoomDetailsEntryPoint.Callback): RoomDetailsEntryPoint.NodeBuilder {
-                    return this
-                }
+    private class FakeSpaceEntryPoint : SpaceEntryPoint {
+        var nodeId: String? = null
 
-                override fun build(): Node {
-                    return node(buildContext) {}.also {
-                        nodeId = it.id
-                    }
-                }
-            }
+        override fun createNode(
+            parentNode: Node,
+            buildContext: BuildContext,
+            inputs: SpaceEntryPoint.Inputs,
+            callback: SpaceEntryPoint.Callback,
+        ) = node(buildContext) {}.also {
+            nodeId = it.id
         }
     }
 
@@ -102,27 +108,33 @@ class JoinedRoomLoadedFlowNodeTest {
         plugins: List<Plugin>,
         messagesEntryPoint: MessagesEntryPoint = FakeMessagesEntryPoint(),
         roomDetailsEntryPoint: RoomDetailsEntryPoint = FakeRoomDetailsEntryPoint(),
-        activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(),
+        spaceEntryPoint: SpaceEntryPoint = FakeSpaceEntryPoint(),
+        forwardEntryPoint: ForwardEntryPoint = FakeForwardEntryPoint(),
+        activeRoomsHolder: ActiveRoomsHolder = DefaultActiveRoomsHolder(),
+        matrixClient: FakeMatrixClient = FakeMatrixClient(),
     ) = JoinedRoomLoadedFlowNode(
         buildContext = BuildContext.root(savedStateMap = null),
         plugins = plugins,
         messagesEntryPoint = messagesEntryPoint,
         roomDetailsEntryPoint = roomDetailsEntryPoint,
+        spaceEntryPoint = spaceEntryPoint,
+        forwardEntryPoint = forwardEntryPoint,
         appNavigationStateService = FakeAppNavigationStateService(),
-        sessionCoroutineScope = this,
+        sessionCoroutineScope = backgroundScope,
         roomGraphFactory = FakeRoomGraphFactory(),
-        matrixClient = FakeMatrixClient(),
+        matrixClient = matrixClient,
         activeRoomsHolder = activeRoomsHolder,
+        analyticsService = FakeAnalyticsService(),
     )
 
     @Test
-    fun `given a room flow node when initialized then it loads messages entry point`() = runTest {
+    fun `given a room flow node when initialized then it loads messages entry point if room is not space`() = runTest {
         // GIVEN
-        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}))
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}, initialRoomInfo = aRoomInfo(isSpace = false)))
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
-        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
+        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
             messagesEntryPoint = fakeMessagesEntryPoint,
         )
         // WHEN
@@ -135,21 +147,41 @@ class JoinedRoomLoadedFlowNodeTest {
         assertThat(messagesNode.id).isEqualTo(fakeMessagesEntryPoint.nodeId)
     }
 
+    @Test
+    fun `given a room flow node when initialized then it loads space entry point if room is space`() = runTest {
+        // GIVEN
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}, initialRoomInfo = aRoomInfo(isSpace = true)))
+        val spaceEntryPoint = FakeSpaceEntryPoint()
+        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
+        val roomFlowNode = createJoinedRoomLoadedFlowNode(
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
+            spaceEntryPoint = spaceEntryPoint,
+        )
+        // WHEN
+        val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()
+
+        // THEN
+        assertThat(roomFlowNode.backstack.activeElement).isEqualTo(JoinedRoomLoadedFlowNode.NavTarget.Space)
+        roomFlowNodeTestHelper.assertChildHasLifecycle(JoinedRoomLoadedFlowNode.NavTarget.Space, Lifecycle.State.CREATED)
+        val spaceNode = roomFlowNode.childNode(JoinedRoomLoadedFlowNode.NavTarget.Space)!!
+        assertThat(spaceNode.id).isEqualTo(spaceEntryPoint.nodeId)
+    }
+
     @Test
     fun `given a room flow node when callback on room details is triggered then it loads room details entry point`() = runTest {
         // GIVEN
         val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}))
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
-        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
+        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
             messagesEntryPoint = fakeMessagesEntryPoint,
             roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
         )
         val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()
         // WHEN
-        fakeMessagesEntryPoint.callback?.onRoomDetailsClick()
+        fakeMessagesEntryPoint.callback?.navigateToRoomDetails()
         // THEN
         roomFlowNodeTestHelper.assertChildHasLifecycle(JoinedRoomLoadedFlowNode.NavTarget.RoomDetails, Lifecycle.State.CREATED)
         val roomDetailsNode = roomFlowNode.childNode(JoinedRoomLoadedFlowNode.NavTarget.RoomDetails)!!
@@ -162,10 +194,10 @@ class JoinedRoomLoadedFlowNodeTest {
         val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}))
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
-        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
-        val activeRoomsHolder = ActiveRoomsHolder()
+        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
+        val activeRoomsHolder = DefaultActiveRoomsHolder()
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
             messagesEntryPoint = fakeMessagesEntryPoint,
             roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
             activeRoomsHolder = activeRoomsHolder,
@@ -185,12 +217,12 @@ class JoinedRoomLoadedFlowNodeTest {
         val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}))
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
-        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
-        val activeRoomsHolder = ActiveRoomsHolder().apply {
+        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
+        val activeRoomsHolder = DefaultActiveRoomsHolder().apply {
             addRoom(room)
         }
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
             messagesEntryPoint = fakeMessagesEntryPoint,
             roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
             activeRoomsHolder = activeRoomsHolder,
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 2a343a1592..73d55135fb 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
index f26df83a56..7309ca6ac2 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
 import io.element.android.libraries.matrix.api.sync.SyncState
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -389,5 +391,6 @@ class SyncOrchestratorTest {
         networkMonitor = networkMonitor,
         appForegroundStateService = appForegroundStateService,
         dispatchers = testCoroutineDispatchers(),
+        analyticsService = FakeAnalyticsService(),
     )
 }
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixSessionCacheTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixSessionCacheTest.kt
index 6df80ee95d..36fa471dd0 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixSessionCacheTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixSessionCacheTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,32 +15,35 @@ import io.element.android.libraries.matrix.api.sync.SyncService
 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.auth.FakeMatrixAuthenticationService
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
 import io.element.android.tests.testutils.testCoroutineDispatchers
 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
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class MatrixSessionCacheTest {
     @Test
     fun `test getOrNull`() = runTest {
-        val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
+        val matrixSessionCache = createMatrixSessionCache()
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isNull()
     }
 
     @Test
     fun `test getSyncOrchestratorOrNull`() = runTest {
         val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
+        val matrixSessionCache = createMatrixSessionCache(fakeAuthenticationService)
 
         // With no matrix client there is no sync orchestrator
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isNull()
         assertThat(matrixSessionCache.getSyncOrchestrator(A_SESSION_ID)).isNull()
 
         // But as soon as we receive a client, we can get the sync orchestrator
-        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope)
+        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope, userIdServerNameLambda = { A_SESSION_ID.value })
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
         assertThat(matrixSessionCache.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
         assertThat(matrixSessionCache.getSyncOrchestrator(A_SESSION_ID)).isNotNull()
@@ -48,8 +52,8 @@ class MatrixSessionCacheTest {
     @Test
     fun `test getOrRestore`() = runTest {
         val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
-        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope)
+        val matrixSessionCache = createMatrixSessionCache(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope, userIdServerNameLambda = { A_SESSION_ID.value })
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isNull()
         assertThat(matrixSessionCache.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
@@ -61,8 +65,8 @@ class MatrixSessionCacheTest {
     @Test
     fun `test remove`() = runTest {
         val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
-        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope)
+        val matrixSessionCache = createMatrixSessionCache(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope, userIdServerNameLambda = { A_SESSION_ID.value })
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
         assertThat(matrixSessionCache.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isEqualTo(fakeMatrixClient)
@@ -74,8 +78,8 @@ class MatrixSessionCacheTest {
     @Test
     fun `test remove all`() = runTest {
         val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
-        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope)
+        val matrixSessionCache = createMatrixSessionCache(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope, userIdServerNameLambda = { A_SESSION_ID.value })
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
         assertThat(matrixSessionCache.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isEqualTo(fakeMatrixClient)
@@ -87,8 +91,8 @@ class MatrixSessionCacheTest {
     @Test
     fun `test save and restore`() = runTest {
         val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
-        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope)
+        val matrixSessionCache = createMatrixSessionCache(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient(sessionCoroutineScope = backgroundScope, userIdServerNameLambda = { A_SESSION_ID.value })
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
         matrixSessionCache.getOrRestore(A_SESSION_ID)
         val savedStateMap = MutableSavedStateMapImpl { true }
@@ -107,28 +111,45 @@ class MatrixSessionCacheTest {
     @Test
     fun `test AuthenticationService listenToNewMatrixClients emits a Client value and we save it`() = runTest {
         val fakeAuthenticationService = FakeMatrixAuthenticationService()
-        val matrixSessionCache = MatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
+        val matrixSessionCache = createMatrixSessionCache(fakeAuthenticationService, createSyncOrchestratorFactory())
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isNull()
 
-        fakeAuthenticationService.givenMatrixClient(FakeMatrixClient(sessionId = A_SESSION_ID, sessionCoroutineScope = backgroundScope))
         val loginSucceeded = fakeAuthenticationService.login("user", "pass")
 
         assertThat(loginSucceeded.isSuccess).isTrue()
+
+        runCurrent()
+
         assertThat(matrixSessionCache.getOrNull(A_SESSION_ID)).isNotNull()
     }
 
-    private fun TestScope.createSyncOrchestratorFactory() = object : SyncOrchestrator.Factory {
-        override fun create(
-            syncService: SyncService,
-            sessionCoroutineScope: CoroutineScope,
-        ): SyncOrchestrator {
-            return SyncOrchestrator(
-                syncService = syncService,
-                sessionCoroutineScope = sessionCoroutineScope,
-                appForegroundStateService = FakeAppForegroundStateService(),
-                networkMonitor = FakeNetworkMonitor(),
-                dispatchers = testCoroutineDispatchers(),
-            )
+    private fun TestScope.createMatrixSessionCache(
+        authenticationService: FakeMatrixAuthenticationService = FakeMatrixAuthenticationService(),
+        syncOrchestratorFactory: SyncOrchestrator.Factory = createSyncOrchestratorFactory(),
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    ) = MatrixSessionCache(
+        authenticationService = authenticationService,
+        syncOrchestratorFactory = syncOrchestratorFactory,
+        analyticsService = analyticsService,
+    )
+
+    private fun TestScope.createSyncOrchestratorFactory(): SyncOrchestrator.Factory {
+        val dispatchers = testCoroutineDispatchers()
+
+        return object : SyncOrchestrator.Factory {
+            override fun create(
+                syncService: SyncService,
+                sessionCoroutineScope: CoroutineScope,
+            ): SyncOrchestrator {
+                return SyncOrchestrator(
+                    syncService = syncService,
+                    sessionCoroutineScope = sessionCoroutineScope,
+                    appForegroundStateService = FakeAppForegroundStateService(),
+                    networkMonitor = FakeNetworkMonitor(),
+                    dispatchers = dispatchers,
+                    analyticsService = FakeAnalyticsService(),
+                )
+            }
         }
     }
 }
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 def1f33253..bf673602c1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,7 @@ import io.element.android.features.login.test.FakeLoginIntentResolver
 import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
+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_THREAD_ID
@@ -67,6 +69,7 @@ class IntentResolverTest {
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
                 threadId = null,
+                eventId = null,
             )
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
@@ -79,6 +82,7 @@ class IntentResolverTest {
                     sessionId = A_SESSION_ID,
                     roomId = A_ROOM_ID,
                     threadId = null,
+                    eventId = null,
                 )
             )
         )
@@ -91,6 +95,7 @@ class IntentResolverTest {
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
                 threadId = A_THREAD_ID,
+                eventId = null,
             )
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
@@ -103,6 +108,59 @@ class IntentResolverTest {
                     sessionId = A_SESSION_ID,
                     roomId = A_ROOM_ID,
                     threadId = A_THREAD_ID,
+                    eventId = null,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `test resolve navigation intent event`() {
+        val sut = createIntentResolver(
+            deeplinkParserResult = DeeplinkData.Room(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID,
+                threadId = null,
+                eventId = AN_EVENT_ID,
+            )
+        )
+        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
+            action = Intent.ACTION_VIEW
+        }
+        val result = sut.resolve(intent)
+        assertThat(result).isEqualTo(
+            ResolvedIntent.Navigation(
+                deeplinkData = DeeplinkData.Room(
+                    sessionId = A_SESSION_ID,
+                    roomId = A_ROOM_ID,
+                    threadId = null,
+                    eventId = AN_EVENT_ID,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `test resolve navigation intent thread and event`() {
+        val sut = createIntentResolver(
+            deeplinkParserResult = DeeplinkData.Room(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID,
+                threadId = A_THREAD_ID,
+                eventId = AN_EVENT_ID,
+            )
+        )
+        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
+            action = Intent.ACTION_VIEW
+        }
+        val result = sut.resolve(intent)
+        assertThat(result).isEqualTo(
+            ResolvedIntent.Navigation(
+                deeplinkData = DeeplinkData.Room(
+                    sessionId = A_SESSION_ID,
+                    roomId = A_ROOM_ID,
+                    threadId = A_THREAD_ID,
+                    eventId = AN_EVENT_ID,
                 )
             )
         )
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateMappingTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateMappingTest.kt
index e965d15c6e..50b9df5820 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateMappingTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/AnalyticsVerificationStateMappingTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 47cbda4b91..849dfa85b2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,6 +34,7 @@ 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.push.api.PushService
+import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.libraries.push.test.FakePushService
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
@@ -41,7 +43,6 @@ 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.consumeItemsUntilPredicate
-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
@@ -114,7 +115,9 @@ class LoggedInPresenterTest {
                 encryptionService = encryptionService,
             ),
             syncService = FakeSyncService(initialSyncState = SyncState.Running),
-            pushService = FakePushService(),
+            pushService = FakePushService(
+                ensurePusherIsRegisteredResult = { Result.success(Unit) },
+            ),
             sessionVerificationService = verificationService,
             analyticsService = analyticsService,
             encryptionService = encryptionService,
@@ -138,10 +141,10 @@ class LoggedInPresenterTest {
 
     @Test
     fun `present - ensure default pusher is not registered if session is not verified`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
+        val lambda = lambdaRecorder<Result<Unit>> {
             Result.success(Unit)
         }
-        val pushService = createFakePushService(registerWithLambda = lambda)
+        val pushService = createFakePushService(ensurePusherIsRegisteredResult = lambda)
         val verificationService = FakeSessionVerificationService(
             initialSessionVerifiedStatus = SessionVerifiedStatus.NotVerified
         )
@@ -152,21 +155,18 @@ class LoggedInPresenterTest {
             val finalState = awaitFirstItem()
             assertThat(finalState.pusherRegistrationState.errorOrNull())
                 .isInstanceOf(PusherRegistrationFailure.AccountNotVerified::class.java)
-            lambda.assertions()
-                .isNeverCalled()
+            lambda.assertions().isNeverCalled()
         }
     }
 
     @Test
     fun `present - ensure default pusher is registered with default provider`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
+        val lambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
         val sessionVerificationService = FakeSessionVerificationService(
             initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
         )
         val pushService = createFakePushService(
-            registerWithLambda = lambda,
+            ensurePusherIsRegisteredResult = lambda,
         )
         createLoggedInPresenter(
             pushService = pushService,
@@ -179,27 +179,17 @@ class LoggedInPresenterTest {
             assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()
             lambda.assertions()
                 .isCalledOnce()
-                .with(
-                    // MatrixClient
-                    any(),
-                    // PushProvider with highest priority (lower index)
-                    value(pushService.getAvailablePushProviders()[0]),
-                    // First distributor
-                    value(pushService.getAvailablePushProviders()[0].getDistributors()[0]),
-                )
         }
     }
 
     @Test
     fun `present - ensure default pusher is registered with default provider - fail to register`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.failure(AN_EXCEPTION)
-        }
+        val lambda = lambdaRecorder<Result<Unit>> { Result.failure(AN_EXCEPTION) }
         val sessionVerificationService = FakeSessionVerificationService(
             initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
         )
         val pushService = createFakePushService(
-            registerWithLambda = lambda,
+            ensurePusherIsRegisteredResult = lambda,
         )
         createLoggedInPresenter(
             pushService = pushService,
@@ -212,158 +202,36 @@ class LoggedInPresenterTest {
             assertThat(finalState.pusherRegistrationState.isFailure()).isTrue()
             lambda.assertions()
                 .isCalledOnce()
-                .with(
-                    // MatrixClient
-                    any(),
-                    // PushProvider with highest priority (lower index)
-                    value(pushService.getAvailablePushProviders()[0]),
-                    // First distributor
-                    value(pushService.getAvailablePushProviders()[0].getDistributors()[0]),
-                )
+            // Reset the error and do not show again
+            finalState.eventSink(LoggedInEvents.CloseErrorDialog(doNotShowAgain = false))
+            val lastState = awaitItem()
+            assertThat(lastState.pusherRegistrationState.isUninitialized()).isTrue()
+            assertThat(lastState.ignoreRegistrationError).isFalse()
         }
     }
 
     @Test
-    fun `present - ensure current provider is registered with current distributor`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
-        val sessionVerificationService = FakeSessionVerificationService(
-            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
-        )
-        val distributor = Distributor("aDistributorValue1", "aDistributorName1")
-        val pushProvider = FakePushProvider(
-            index = 0,
-            name = "aFakePushProvider0",
-            distributors = listOf(
-                Distributor("aDistributorValue0", "aDistributorName0"),
-                distributor,
-            ),
-            currentDistributor = { distributor },
-        )
-        val pushService = createFakePushService(
-            pushProvider1 = pushProvider,
-            currentPushProvider = { pushProvider },
-            registerWithLambda = lambda,
-        )
-        createLoggedInPresenter(
-            pushService = pushService,
-            sessionVerificationService = sessionVerificationService,
-            matrixClient = FakeMatrixClient(
-                accountManagementUrlResult = { Result.success(null) },
-            ),
-        ).test {
-            val finalState = awaitFirstItem()
-            assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()
-            lambda.assertions()
-                .isCalledOnce()
-                .with(
-                    // MatrixClient
-                    any(),
-                    // Current push provider
-                    value(pushProvider),
-                    // Current distributor
-                    value(distributor),
-                )
-        }
-    }
-
-    @Test
-    fun `present - if current push provider does not have current distributor, the first one is used`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
-        val sessionVerificationService = FakeSessionVerificationService(
-            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
-        )
-        val pushProvider = FakePushProvider(
-            index = 0,
-            name = "aFakePushProvider0",
-            distributors = listOf(
-                Distributor("aDistributorValue0", "aDistributorName0"),
-                Distributor("aDistributorValue1", "aDistributorName1"),
-            ),
-            currentDistributor = { null },
-        )
-        val pushService = createFakePushService(
-            pushProvider0 = pushProvider,
-            currentPushProvider = { pushProvider },
-            registerWithLambda = lambda,
-        )
-        createLoggedInPresenter(
-            pushService = pushService,
-            sessionVerificationService = sessionVerificationService,
-            matrixClient = FakeMatrixClient(
-                accountManagementUrlResult = { Result.success(null) },
-            ),
-        ).test {
-            val finalState = awaitFirstItem()
-            assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()
-            lambda.assertions()
-                .isCalledOnce()
-                .with(
-                    // MatrixClient
-                    any(),
-                    // PushProvider with highest priority (lower index)
-                    value(pushService.getAvailablePushProviders()[0]),
-                    // First distributor
-                    value(pushService.getAvailablePushProviders()[0].getDistributors()[0]),
-                )
-        }
-    }
-
-    @Test
-    fun `present - if current push provider does not have distributors, nothing happen`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
-        val sessionVerificationService = FakeSessionVerificationService(
-            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
-        )
-        val pushProvider = FakePushProvider(
-            index = 0,
-            name = "aFakePushProvider0",
-            distributors = emptyList(),
-        )
-        val pushService = createFakePushService(
-            pushProvider0 = pushProvider,
-            currentPushProvider = { pushProvider },
-            registerWithLambda = lambda,
-        )
-        createLoggedInPresenter(
-            pushService = pushService,
-            sessionVerificationService = sessionVerificationService,
-        ).test {
-            val finalState = awaitFirstItem()
-            assertThat(finalState.pusherRegistrationState.errorOrNull())
-                .isInstanceOf(PusherRegistrationFailure.NoDistributorsAvailable::class.java)
-            lambda.assertions()
-                .isNeverCalled()
-        }
-    }
-
-    @Test
-    fun `present - case no push provider available provider`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
-        val sessionVerificationService = FakeSessionVerificationService(SessionVerifiedStatus.Verified)
+    fun `present - ensure default pusher is registered with default provider - fail to register - do not show again`() = runTest {
+        val lambda = lambdaRecorder<Result<Unit>> { Result.failure(AN_EXCEPTION) }
         val setIgnoreRegistrationErrorLambda = lambdaRecorder<SessionId, Boolean, Unit> { _, _ -> }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
         val pushService = createFakePushService(
-            pushProvider0 = null,
-            pushProvider1 = null,
-            registerWithLambda = lambda,
+            ensurePusherIsRegisteredResult = lambda,
             setIgnoreRegistrationErrorLambda = setIgnoreRegistrationErrorLambda,
         )
         createLoggedInPresenter(
             pushService = pushService,
             sessionVerificationService = sessionVerificationService,
+            matrixClient = FakeMatrixClient(
+                accountManagementUrlResult = { Result.success(null) },
+            ),
         ).test {
             val finalState = awaitFirstItem()
-            assertThat(finalState.pusherRegistrationState.errorOrNull())
-                .isInstanceOf(PusherRegistrationFailure.NoProvidersAvailable::class.java)
+            assertThat(finalState.pusherRegistrationState.isFailure()).isTrue()
             lambda.assertions()
-                .isNeverCalled()
+                .isCalledOnce()
             // Reset the error and do not show again
             finalState.eventSink(LoggedInEvents.CloseErrorDialog(doNotShowAgain = true))
             skipItems(1)
@@ -381,95 +249,6 @@ class LoggedInPresenterTest {
         }
     }
 
-    @Test
-    fun `present - case one push provider but no distributor available`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
-        val selectPushProviderLambda = lambdaRecorder<SessionId, PushProvider, Unit> { _, _ -> }
-        val sessionVerificationService = FakeSessionVerificationService(
-            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
-        )
-        val pushProvider = FakePushProvider(
-            index = 0,
-            name = "aFakePushProvider",
-            distributors = emptyList(),
-        )
-        val pushService = createFakePushService(
-            pushProvider0 = pushProvider,
-            pushProvider1 = null,
-            registerWithLambda = lambda,
-            selectPushProviderLambda = selectPushProviderLambda,
-        )
-        createLoggedInPresenter(
-            pushService = pushService,
-            sessionVerificationService = sessionVerificationService,
-        ).test {
-            val finalState = awaitFirstItem()
-            assertThat(finalState.pusherRegistrationState.errorOrNull())
-                .isInstanceOf(PusherRegistrationFailure.NoDistributorsAvailable::class.java)
-            lambda.assertions()
-                .isNeverCalled()
-            selectPushProviderLambda.assertions()
-                .isCalledOnce()
-                .with(
-                    // SessionId
-                    value(A_SESSION_ID),
-                    // PushProvider
-                    value(pushProvider),
-                )
-            // Reset the error
-            finalState.eventSink(LoggedInEvents.CloseErrorDialog(doNotShowAgain = false))
-            val lastState = awaitItem()
-            assertThat(lastState.pusherRegistrationState.isUninitialized()).isTrue()
-        }
-    }
-
-    @Test
-    fun `present - case two push providers but first one does not have distributor - second one will be used`() = runTest {
-        val lambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ ->
-            Result.success(Unit)
-        }
-        val sessionVerificationService = FakeSessionVerificationService(
-            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
-        )
-        val pushProvider0 = FakePushProvider(
-            index = 0,
-            name = "aFakePushProvider0",
-            distributors = emptyList(),
-        )
-        val distributor = Distributor("aDistributorValue1", "aDistributorName1")
-        val pushProvider1 = FakePushProvider(
-            index = 1,
-            name = "aFakePushProvider1",
-            distributors = listOf(distributor),
-        )
-        val pushService = createFakePushService(
-            pushProvider0 = pushProvider0,
-            pushProvider1 = pushProvider1,
-            registerWithLambda = lambda,
-        )
-        createLoggedInPresenter(
-            pushService = pushService,
-            sessionVerificationService = sessionVerificationService,
-            matrixClient = FakeMatrixClient(
-                accountManagementUrlResult = { Result.success(null) },
-            ),
-        ).test {
-            val finalState = awaitFirstItem()
-            assertThat(finalState.pusherRegistrationState.isSuccess()).isTrue()
-            lambda.assertions().isCalledOnce()
-                .with(
-                    // MatrixClient
-                    any(),
-                    // PushProvider with the distributor
-                    value(pushProvider1),
-                    // First distributor of second push provider
-                    value(distributor),
-                )
-        }
-    }
-
     private fun createFakePushService(
         pushProvider0: PushProvider? = FakePushProvider(
             index = 0,
@@ -483,16 +262,16 @@ class LoggedInPresenterTest {
             distributors = listOf(Distributor("aDistributorValue1", "aDistributorName1")),
             currentDistributor = { null },
         ),
-        registerWithLambda: (MatrixClient, PushProvider, Distributor) -> Result<Unit> = { _, _, _ ->
+        ensurePusherIsRegisteredResult: () -> Result<Unit> = {
             Result.success(Unit)
         },
         selectPushProviderLambda: (SessionId, PushProvider) -> Unit = { _, _ -> lambdaError() },
-        currentPushProvider: () -> PushProvider? = { null },
+        currentPushProvider: (SessionId) -> PushProvider? = { null },
         setIgnoreRegistrationErrorLambda: (SessionId, Boolean) -> Unit = { _, _ -> lambdaError() },
     ): PushService {
         return FakePushService(
             availablePushProviders = listOfNotNull(pushProvider0, pushProvider1),
-            registerWithLambda = registerWithLambda,
+            ensurePusherIsRegisteredResult = ensurePusherIsRegisteredResult,
             currentPushProvider = currentPushProvider,
             selectPushProviderLambda = selectPushProviderLambda,
             setIgnoreRegistrationErrorLambda = setIgnoreRegistrationErrorLambda,
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt
index 459abc64d4..8e081bdad7 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigrationTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt
index c117dfb8f7..3c5d8dc076 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
index 91e0b9f968..14128ac33a 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,6 +23,19 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class LoadingBaseRoomStateFlowFactoryTest {
+    @Test
+    fun `flow should emit only Loaded when we already pass a JoinedRoom`() = runTest {
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID))
+        val matrixClient = FakeMatrixClient(A_SESSION_ID)
+        val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
+        flowFactory
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = room)
+            .test {
+                assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loaded(room))
+                ensureAllEventsConsumed()
+            }
+    }
+
     @Test
     fun `flow should emit Loading and then Loaded when there is a room in cache`() = runTest {
         val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID))
@@ -30,7 +44,7 @@ class LoadingBaseRoomStateFlowFactoryTest {
         }
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
-            .create(this, A_ROOM_ID)
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = null)
             .test {
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loaded(room))
@@ -44,7 +58,7 @@ class LoadingBaseRoomStateFlowFactoryTest {
         val matrixClient = FakeMatrixClient(A_SESSION_ID, roomListService = roomListService)
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
-            .create(this, A_ROOM_ID)
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = null)
             .test {
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
                 matrixClient.givenGetRoomResult(A_ROOM_ID, room)
@@ -59,7 +73,7 @@ class LoadingBaseRoomStateFlowFactoryTest {
         val matrixClient = FakeMatrixClient(A_SESSION_ID, roomListService = roomListService)
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
         flowFactory
-            .create(this, A_ROOM_ID)
+            .create(lifecycleScope = this, roomId = A_ROOM_ID, joinedRoom = null)
             .test {
                 assertThat(awaitItem()).isEqualTo(LoadingRoomState.Loading)
                 roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
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
new file mode 100644
index 0000000000..40778ae353
--- /dev/null
+++ b/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.appnav.room.joined
+
+import io.element.android.libraries.matrix.api.core.RoomId
+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 handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
+    override fun navigateToGlobalNotificationSettings() = lambdaError()
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index b7662aeb56..61e17c149c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,10 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,6 +30,8 @@ tasks.register<Delete>("clean").configure {
     delete(rootProject.layout.buildDirectory)
 }
 
+private val ktLintVersion = the<LibrariesForLibs>().versions.ktlint.get()
+
 allprojects {
     // Detekt
     apply {
@@ -41,7 +46,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.27")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.5.3")
         detektPlugins(project(":tests:detekt-rules"))
     }
 
@@ -56,14 +61,12 @@ allprojects {
 
     // See https://github.com/JLLeitschuh/ktlint-gradle#configuration
     configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
-        // See https://github.com/pinterest/ktlint/releases/
-        // TODO Regularly check for new version here ^
-        version.set("1.1.1")
-        android.set(true)
-        ignoreFailures.set(false)
-        enableExperimentalRules.set(true)
+        version = ktLintVersion
+        android = true
+        ignoreFailures = false
+        enableExperimentalRules = true
         // display the corresponding rule
-        verbose.set(true)
+        verbose = true
         reporters {
             reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
             // To have XML report for Danger
diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
index 640c9ee366..5c71c170bf 100644
--- a/codegen/build.gradle.kts
+++ b/codegen/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
index 15bb4afbe0..7ddf80b92c 100644
--- a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
+++ b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessorProvider.kt b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessorProvider.kt
index 9631167419..8412fbf847 100644
--- a/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessorProvider.kt
+++ b/codegen/src/main/kotlin/io/element/android/codegen/ContributesNodeProcessorProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/enterprise b/enterprise
index ffc02b8d0f..6207ddc1cb 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit ffc02b8d0f35188c3ef8a876dc1532bfe3e533da
+Subproject commit 6207ddc1cb7dac7fdb6212c0158497a1d9752c75
diff --git a/fastlane/metadata/android/en-US/changelogs/202510010.txt b/fastlane/metadata/android/en-US/changelogs/202510010.txt
new file mode 100644
index 0000000000..3c916fed88
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202510010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes around notifications and UX improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/202511000.txt b/fastlane/metadata/android/en-US/changelogs/202511000.txt
new file mode 100644
index 0000000000..8afd7460fc
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202511000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: fixes an issue that prevented Element Call notifications from being displayed sometimes.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/202511020.txt b/fastlane/metadata/android/en-US/changelogs/202511020.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202511020.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/202511030.txt b/fastlane/metadata/android/en-US/changelogs/202511030.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202511030.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/202512000.txt b/fastlane/metadata/android/en-US/changelogs/202512000.txt
new file mode 100644
index 0000000000..e287435043
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202512000.txt
@@ -0,0 +1,6 @@
+Main changes in this version: 
+- Improve the room security and privacy screens. 
+- Better room list sorting.
+- Fixed crashes when recording long voice messages.
+- Improved the UX when opening a room from the room list.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/features/analytics/api/build.gradle.kts b/features/analytics/api/build.gradle.kts
index 4bf21e265e..5c7f0b223a 100644
--- a/features/analytics/api/build.gradle.kts
+++ b/features/analytics/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsEntryPoint.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsEntryPoint.kt
index 37a78fd727..5d5c1ba286 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsEntryPoint.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsOptInEvents.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsOptInEvents.kt
index 74d26c4f04..4181f52ba8 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsOptInEvents.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsOptInEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesState.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesState.kt
index 4cb3767c72..20a180446c 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesState.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
index 647b205722..02e07a86a2 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 70461f22d3..e91c77079f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/api/src/main/res/values-hr/translations.xml b/features/analytics/api/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..ac1e83c87b
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-hr/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">"Podijelite anonimne podatke o korištenju kako biste nam pomogli u otkrivanju problema."</string>
+  <string name="screen_analytics_settings_read_terms">"Možete pročitati sve naše uvjete %1$s ."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"ovdje"</string>
+  <string name="screen_analytics_settings_share_data">"Dijeljenje analitičkih podataka"</string>
+</resources>
diff --git a/features/analytics/impl/build.gradle.kts b/features/analytics/impl/build.gradle.kts
index ddf093d9c3..cdb172f888 100644
--- a/features/analytics/impl/build.gradle.kts
+++ b/features/analytics/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt
index b952bdb4e1..545f306a68 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt
index fd590955c8..d7bdb85e35 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,7 @@ class AnalyticsOptInPresenter(
     override fun present(): AnalyticsOptInState {
         val localCoroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: AnalyticsOptInEvents) {
+        fun handleEvent(event: AnalyticsOptInEvents) {
             when (event) {
                 is AnalyticsOptInEvents.EnableAnalytics -> localCoroutineScope.setIsEnabled(event.isEnabled)
             }
@@ -39,7 +40,7 @@ class AnalyticsOptInPresenter(
         return AnalyticsOptInState(
             applicationName = buildMeta.applicationName,
             hasPolicyLink = AnalyticsConfig.POLICY_LINK.isNotEmpty(),
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInState.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInState.kt
index a0913bdb4f..b2ebd37e20 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInState.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
index ec37542b31..30a396c178 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f04f4dc273..4fc9ce5c6b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt
index 134535e881..fb85387950 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.analytics.api.AnalyticsEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAnalyticsEntryPoint : AnalyticsEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<AnalyticsOptInNode>(buildContext)
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt
index e5d3342e2d..32a3d5826a 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt
index fee6188d23..110cb98d41 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -30,7 +31,7 @@ class AnalyticsPreferencesPresenter(
         val localCoroutineScope = rememberCoroutineScope()
         val isEnabled = analyticsService.userConsentFlow.collectAsState(initial = false)
 
-        fun handleEvents(event: AnalyticsOptInEvents) {
+        fun handleEvent(event: AnalyticsOptInEvents) {
             when (event) {
                 is AnalyticsOptInEvents.EnableAnalytics -> localCoroutineScope.setIsEnabled(event.isEnabled)
             }
@@ -40,7 +41,7 @@ class AnalyticsPreferencesPresenter(
             applicationName = buildMeta.applicationName,
             isEnabled = isEnabled.value,
             policyUrl = AnalyticsConfig.POLICY_LINK,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/analytics/impl/src/main/res/values-hr/translations.xml b/features/analytics/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..b85046c7a9
--- /dev/null
+++ b/features/analytics/impl/src/main/res/values-hr/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">"Nećemo bilježiti niti profilirati nikakve osobne podatke"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Podijelite anonimne podatke o korištenju kako biste nam pomogli u otkrivanju problema."</string>
+  <string name="screen_analytics_prompt_read_terms">"Možete pročitati sve naše uvjete %1$s ."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"ovdje"</string>
+  <string name="screen_analytics_prompt_settings">"Ovo možete isključiti u bilo kojem trenutku"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Nećemo dijeliti vaše podatke s trećim stranama"</string>
+  <string name="screen_analytics_prompt_title">"Pomozite nam poboljšati %1$s"</string>
+</resources>
diff --git a/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt b/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt
index e9319fd7ba..6521c7f597 100644
--- a/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt
+++ b/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPointTest.kt b/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPointTest.kt
index b5ec819632..0340bd3d68 100644
--- a/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPointTest.kt
+++ b/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt b/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt
index 8ba915f03c..174935a1ad 100644
--- a/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt
+++ b/features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/announcement/api/build.gradle.kts b/features/announcement/api/build.gradle.kts
index 0fa87f039e..0c2f5bb7b9 100644
--- a/features/announcement/api/build.gradle.kts
+++ b/features/announcement/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 21b83e7449..0bf35650a0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/AnnouncementService.kt b/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/AnnouncementService.kt
index a98c0af199..42c66aa29d 100644
--- a/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/AnnouncementService.kt
+++ b/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/AnnouncementService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/announcement/impl/build.gradle.kts b/features/announcement/impl/build.gradle.kts
index 222d080d6e..443e343e43 100644
--- a/features/announcement/impl/build.gradle.kts
+++ b/features/announcement/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 432aad4a0a..508f1e44a0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c8ea728d64..e762dd607f 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6d616f14e9..0e5c30178c 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-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.announcement.impl.spaces.SpaceAnnouncementState
@@ -29,7 +29,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAnnouncementService(
     private val announcementStore: AnnouncementStore,
     private val announcementPresenter: Presenter<AnnouncementState>,
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
index 4fbc9118bc..4cfc073271 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 9741608b1e..3b968d09a6 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 4d1b2f3e4b..7c4bc7b5eb 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,7 +25,7 @@ class SpaceAnnouncementPresenter(
     override fun present(): SpaceAnnouncementState {
         val localCoroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: SpaceAnnouncementEvents) {
+        fun handleEvent(event: SpaceAnnouncementEvents) {
             when (event) {
                 SpaceAnnouncementEvents.Continue -> localCoroutineScope.launch {
                     announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
@@ -33,7 +34,7 @@ class SpaceAnnouncementPresenter(
         }
 
         return SpaceAnnouncementState(
-            eventSink = ::handleEvents
+            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
index 7628ed27ae..9407fad872 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index d994edf3d8..27f48cc7ed 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 2a8c5257aa..3fe6ec4456 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -80,7 +81,7 @@ private fun SpaceAnnouncementHeader(
         showBetaLabel = true,
         subTitle = stringResource(id = R.string.screen_space_announcement_subtitle),
         iconStyle = BigIcon.Style.Default(
-            vectorIcon = CompoundIcons.WorkspaceSolid(),
+            vectorIcon = CompoundIcons.SpaceSolid(),
             usePrimaryTint = true,
         ),
     )
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStatus.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStatus.kt
index e275a140e1..5f3dc7d0e4 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStatus.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStatus.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStore.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStore.kt
index 3385165c52..c818e90c4a 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStore.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 37acf9f6b4..ad166e4ef5 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
@@ -21,7 +21,6 @@ private val spaceAnnouncementKey = intPreferencesKey("spaceAnnouncement")
 private val newNotificationSoundKey = intPreferencesKey("newNotificationSound")
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAnnouncementStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : AnnouncementStore {
diff --git a/features/announcement/impl/src/main/res/values-bg/translations.xml b/features/announcement/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..853cf5f027
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-bg/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_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
new file mode 100644
index 0000000000..cf7ead1962
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-cs/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_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
index 933ae95d6d..d07871b19e 100644
--- a/features/announcement/impl/src/main/res/values-da/translations.xml
+++ b/features/announcement/impl/src/main/res/values-da/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_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">"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>
+  <string name="screen_space_announcement_item1">"Se grupper, du har oprettet eller tilmeldt dig"</string>
+  <string name="screen_space_announcement_item2">"Acceptere eller afvise invitationer til grupper"</string>
+  <string name="screen_space_announcement_item3">"Finde alle rum, du kan deltage i, i dine grupper"</string>
+  <string name="screen_space_announcement_item4">"Deltage i offentlige grupper"</string>
+  <string name="screen_space_announcement_item5">"Forlade de grupper, du har tilsluttet dig"</string>
+  <string name="screen_space_announcement_notice">"Filtrering, oprettelse og administration af grupper kommer snart."</string>
+  <string name="screen_space_announcement_subtitle">"Velkommen til betaversionen af Grupper! Med denne første version kan du:"</string>
+  <string name="screen_space_announcement_title">"Introduktion til Grupper"</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
index c38a9b5cd9..11f5f3a99c 100644
--- a/features/announcement/impl/src/main/res/values-de/translations.xml
+++ b/features/announcement/impl/src/main/res/values-de/translations.xml
@@ -5,7 +5,7 @@
   <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 Erstellen und Verwalten von Spaces ist bald verfügbar."</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-et/translations.xml b/features/announcement/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..ee2ba9c3b4
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-et/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_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
new file mode 100644
index 0000000000..2e8902ae23
--- /dev/null
+++ b/features/announcement/impl/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="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
index a5de5465ec..8e7674487f 100644
--- a/features/announcement/impl/src/main/res/values-fi/translations.xml
+++ b/features/announcement/impl/src/main/res/values-fi/translations.xml
@@ -5,7 +5,7 @@
   <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 luominen ja hallinta on tulossa pian."</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
index 04a35b0fc0..7e042c65ff 100644
--- a/features/announcement/impl/src/main/res/values-fr/translations.xml
+++ b/features/announcement/impl/src/main/res/values-fr/translations.xml
@@ -5,7 +5,7 @@
   <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">"La création et la gestion des espaces seront bientôt disponibles."</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
new file mode 100644
index 0000000000..e78f29f19a
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-hr/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_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
new file mode 100644
index 0000000000..b09f70419b
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-hu/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_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
new file mode 100644
index 0000000000..584ddcdf21
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-it/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_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-nb/translations.xml b/features/announcement/impl/src/main/res/values-nb/translations.xml
index 0765e557f8..553ff9f997 100644
--- a/features/announcement/impl/src/main/res/values-nb/translations.xml
+++ b/features/announcement/impl/src/main/res/values-nb/translations.xml
@@ -5,7 +5,7 @@
   <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 og administrasjon av områder kommer snart."</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
new file mode 100644
index 0000000000..4308bdd81d
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-pl/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_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
new file mode 100644
index 0000000000..32a9bf85af
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-pt-rBR/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_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-ro/translations.xml b/features/announcement/impl/src/main/res/values-ro/translations.xml
index 48fa06fca4..716f1faeb2 100644
--- a/features/announcement/impl/src/main/res/values-ro/translations.xml
+++ b/features/announcement/impl/src/main/res/values-ro/translations.xml
@@ -5,7 +5,7 @@
   <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">"Crearea și gestionarea spațiilor vor fi disponibile în curând."</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
index 8b930b2ca0..7ff445bd69 100644
--- a/features/announcement/impl/src/main/res/values-ru/translations.xml
+++ b/features/announcement/impl/src/main/res/values-ru/translations.xml
@@ -5,7 +5,7 @@
   <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_notice">"Работа с пространствами скоро станет доступна"</string>
   <string name="screen_space_announcement_subtitle">"Добро пожаловать в бета-версию Spaces! В этой первой версии вы сможете:"</string>
-  <string name="screen_space_announcement_title">"Знакомство с пространствами"</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
new file mode 100644
index 0000000000..0b305499a7
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-sk/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_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-zh-rTW/translations.xml b/features/announcement/impl/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..a5b82752bc
--- /dev/null
+++ b/features/announcement/impl/src/main/res/values-zh-rTW/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_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
index 66608eb6e5..e01e63b2ae 100644
--- a/features/announcement/impl/src/main/res/values-zh/translations.xml
+++ b/features/announcement/impl/src/main/res/values-zh/translations.xml
@@ -2,4 +2,10 @@
 <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/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 9290773b30..18deb8b2fd 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 990f506223..e16619129c 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 2c35bccf41..672f677407 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 96b98668a4..ad3d83f1b5 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f7d438784a..ab3e85124f 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/announcement/test/build.gradle.kts b/features/announcement/test/build.gradle.kts
index 9387dc0caf..d9e9251798 100644
--- a/features/announcement/test/build.gradle.kts
+++ b/features/announcement/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/announcement/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeAnnouncementService.kt b/features/announcement/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeAnnouncementService.kt
index 74c2adf95f..fefb61d722 100644
--- a/features/announcement/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeAnnouncementService.kt
+++ b/features/announcement/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeAnnouncementService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/cachecleaner/api/build.gradle.kts b/features/cachecleaner/api/build.gradle.kts
index 81f689bb63..705107298a 100644
--- a/features/cachecleaner/api/build.gradle.kts
+++ b/features/cachecleaner/api/build.gradle.kts
@@ -1,9 +1,8 @@
-import extension.setupDependencyInjection
-
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,8 +14,6 @@ android {
     namespace = "io.element.android.features.cachecleaner.api"
 }
 
-setupDependencyInjection()
-
 dependencies {
     implementation(projects.libraries.architecture)
     implementation(libs.androidx.startup)
diff --git a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleaner.kt b/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleaner.kt
index 192886ef17..b5a5396b16 100644
--- a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleaner.kt
+++ b/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleaner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/cachecleaner/impl/build.gradle.kts b/features/cachecleaner/impl/build.gradle.kts
index 8603de6322..3321e2a80f 100644
--- a/features/cachecleaner/impl/build.gradle.kts
+++ b/features/cachecleaner/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt b/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/CacheCleanerBindings.kt
similarity index 60%
rename from features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt
rename to features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/CacheCleanerBindings.kt
index 9be2a10525..2137b7b905 100644
--- a/features/cachecleaner/api/src/main/kotlin/io/element/android/features/cachecleaner/api/CacheCleanerBindings.kt
+++ b/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/CacheCleanerBindings.kt
@@ -1,14 +1,16 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.cachecleaner.api
+package io.element.android.features.cachecleaner.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesTo
+import io.element.android.features.cachecleaner.api.CacheCleaner
 
 @ContributesTo(AppScope::class)
 interface CacheCleanerBindings {
diff --git a/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleaner.kt b/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleaner.kt
index fc06174806..44351412f0 100644
--- a/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleaner.kt
+++ b/features/cachecleaner/impl/src/main/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleaner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.cachecleaner.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.cachecleaner.api.CacheCleaner
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -24,7 +24,6 @@ import java.io.File
  * Default implementation of [CacheCleaner].
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCacheCleaner(
     @AppCoroutineScope
     private val coroutineScope: CoroutineScope,
diff --git a/features/cachecleaner/impl/src/test/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleanerTest.kt b/features/cachecleaner/impl/src/test/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleanerTest.kt
index 997c0fe703..6094f1e16d 100644
--- a/features/cachecleaner/impl/src/test/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleanerTest.kt
+++ b/features/cachecleaner/impl/src/test/kotlin/io/element/android/features/cachecleaner/impl/DefaultCacheCleanerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/api/build.gradle.kts b/features/call/api/build.gradle.kts
index c9c86e8948..1480a31fd3 100644
--- a/features/call/api/build.gradle.kts
+++ b/features/call/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/CallType.kt
index 2c279b7725..5beb9f7c54 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/CallType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCall.kt b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCall.kt
index 42fd4e873d..a6932a148e 100644
--- a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCall.kt
+++ b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCall.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCallService.kt b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCallService.kt
index f7abf845c5..25720596ba 100644
--- a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCallService.kt
+++ b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CurrentCallService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8de7a3839b..caa557f4de 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/build.gradle.kts b/features/call/impl/build.gradle.kts
index 9efe5ba75b..e77c09e19a 100644
--- a/features/call/impl/build.gradle.kts
+++ b/features/call/impl/build.gradle.kts
@@ -4,9 +4,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -73,7 +74,7 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.matrix.impl)
-    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.network)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.push.api)
@@ -93,8 +94,10 @@ dependencies {
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.matrixmedia.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.services.analytics.test)
+    testImplementation(projects.services.appnavstate.impl)
     testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.services.toolbox.test)
 }
diff --git a/features/call/impl/src/main/AndroidManifest.xml b/features/call/impl/src/main/AndroidManifest.xml
index dfc3c13632..daf1a910c9 100644
--- a/features/call/impl/src/main/AndroidManifest.xml
+++ b/features/call/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
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 a1c07462f8..9ed479f5b8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.call.impl
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.notifications.CallNotificationData
@@ -21,7 +21,6 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultElementCallEntryPoint(
     @ApplicationContext private val context: Context,
     private val activeCallManager: ActiveCallManager,
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/data/WidgetMessage.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/data/WidgetMessage.kt
index 5001d598d9..421ac9d37a 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/data/WidgetMessage.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/data/WidgetMessage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/di/CallBindings.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/di/CallBindings.kt
index 887da8d188..66efe82d38 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/di/CallBindings.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/di/CallBindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt
index 0bfbfb0411..dcc434e84d 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2f8ce3e53a..e7d270ef8e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.notifications
@@ -21,6 +22,8 @@ import io.element.android.features.call.api.CallType
 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
+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.CommonDrawables
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.MatrixClientProvider
@@ -69,11 +72,19 @@ class RingingCallNotificationCreator(
     ): Notification? {
         val matrixClient = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return null
         val imageLoader = imageLoaderHolder.get(matrixClient)
-        val largeIcon = notificationBitmapLoader.getUserIcon(roomAvatarUrl, imageLoader)
+        val userIcon = notificationBitmapLoader.getUserIcon(
+            avatarData = AvatarData(
+                id = roomId.value,
+                name = roomName,
+                url = roomAvatarUrl,
+                size = AvatarSize.RoomDetailsHeader,
+            ),
+            imageLoader = imageLoader,
+        )
 
         val caller = Person.Builder()
             .setName(senderDisplayName)
-            .setIcon(largeIcon)
+            .setIcon(userIcon)
             .setImportant(true)
             .build()
 
@@ -122,12 +133,8 @@ class RingingCallNotificationCreator(
             .setWhen(timestamp)
             .setOngoing(true)
             .setShowWhen(false)
-            .apply {
-                if (textContent != null) {
-                    setContentText(textContent)
-                    // Else the content text is set by the style (will be "Incoming call")
-                }
-            }
+            // If textContent is null, the content text is set by the style (will be "Incoming call")
+            .setContentText(textContent)
             .setSound(Settings.System.DEFAULT_RINGTONE_URI, AudioManager.STREAM_RING)
             .setTimeoutAfter(ElementCallConfig.RINGING_CALL_DURATION_SECONDS.seconds.inWholeMilliseconds)
             .setContentIntent(answerIntent)
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/PictureInPictureEvents.kt
index 79b075cf92..9522d44b22 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/PictureInPictureEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8cca46f9f4..5125b464dc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1bd84b409a..b1fef4f28b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f2afcd0196..6324820eec 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipSupportProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipSupportProvider.kt
index 96e68fabf3..54109f0180 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipSupportProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipSupportProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import android.os.Build
 import androidx.annotation.ChecksSdkIntAtLeast
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.di.annotations.ApplicationContext
 
@@ -23,7 +23,6 @@ interface PipSupportProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPipSupportProvider(
     @ApplicationContext private val context: Context,
 ) : PipSupportProvider {
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipView.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipView.kt
index 593d37a1f2..90f74a37fd 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipView.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PipView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 22b5f0477d..d2cbb0184d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/services/CallForegroundService.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/services/CallForegroundService.kt
index b779465a34..89c9fdb52c 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/services/CallForegroundService.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/services/CallForegroundService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,7 +22,6 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.IconCompat
 import io.element.android.features.call.impl.R
 import io.element.android.features.call.impl.ui.ElementCallActivity
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -68,7 +68,7 @@ class CallForegroundService : Service() {
         val callActivityIntent = Intent(this, ElementCallActivity::class.java)
         val pendingIntent = PendingIntentCompat.getActivity(this, 0, callActivityIntent, 0, false)
         val notification = NotificationCompat.Builder(this, foregroundServiceChannel.id)
-            .setSmallIcon(IconCompat.createWithResource(this, CommonDrawables.ic_notification))
+            .setSmallIcon(CommonDrawables.ic_notification)
             .setContentTitle(getString(R.string.call_foreground_service_title_android))
             .setContentText(getString(R.string.call_foreground_service_message_android))
             .setContentIntent(pendingIntent)
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/CallScreenEvents.kt
index 45bfa81e38..8fbbce896f 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/CallScreenEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 06929093f5..7fbcf1ba71 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -64,6 +65,7 @@ class CallScreenPresenter(
     private val appForegroundStateService: AppForegroundStateService,
     @AppCoroutineScope
     private val appCoroutineScope: CoroutineScope,
+    private val widgetMessageSerializer: WidgetMessageSerializer,
 ) : Presenter<CallScreenState> {
     @AssistedFactory
     interface Factory {
@@ -160,7 +162,7 @@ class CallScreenPresenter(
             }
         }
 
-        fun handleEvents(event: CallScreenEvents) {
+        fun handleEvent(event: CallScreenEvents) {
             when (event) {
                 is CallScreenEvents.Hangup -> {
                     val widgetId = callWidgetDriver.value?.id
@@ -200,7 +202,7 @@ class CallScreenPresenter(
             userAgent = userAgent,
             isCallActive = isWidgetLoaded,
             isInWidgetMode = isInWidgetMode,
-            eventSink = { handleEvents(it) },
+            eventSink = ::handleEvent,
         )
     }
 
@@ -258,7 +260,7 @@ class CallScreenPresenter(
     }
 
     private fun parseMessage(message: String): WidgetMessage? {
-        return WidgetMessageSerializer.deserialize(message).getOrNull()
+        return widgetMessageSerializer.deserialize(message).getOrNull()
     }
 
     private fun sendHangupMessage(widgetId: String, messageInterceptor: WidgetMessageInterceptor) {
@@ -269,7 +271,7 @@ class CallScreenPresenter(
             action = WidgetMessage.Action.HangUp,
             data = null,
         )
-        messageInterceptor.sendMessage(WidgetMessageSerializer.serialize(message))
+        messageInterceptor.sendMessage(widgetMessageSerializer.serialize(message))
     }
 
     private fun CoroutineScope.close(widgetDriver: MatrixWidgetDriver?, navigator: CallScreenNavigator) = launch(dispatchers.io) {
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 5b1288db42..c07594aebb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 77680a8e00..3e72f96f87 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 88d2e81f8b..f8657a9ece 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
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 android.annotation.SuppressLint
-import android.util.Log
 import android.view.ViewGroup
 import android.webkit.ConsoleMessage
 import android.webkit.JavascriptInterface
@@ -60,6 +60,7 @@ interface CallScreenNavigator {
 internal fun CallScreenView(
     state: CallScreenState,
     pipState: PictureInPictureState,
+    onConsoleMessage: (ConsoleMessage) -> Unit,
     requestPermissions: (Array<String>, RequestPermissionCallback) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -108,6 +109,7 @@ internal fun CallScreenView(
                     val callback: RequestPermissionCallback = { request.grant(it) }
                     requestPermissions(androidPermissions.toTypedArray(), callback)
                 },
+                onConsoleMessage = onConsoleMessage,
                 onCreateWebView = { webView ->
                     webView.addBackHandler(onBackPressed = ::handleBack)
                     val interceptor = WebViewWidgetMessageInterceptor(
@@ -174,6 +176,7 @@ private fun CallWebView(
     url: AsyncData<String>,
     userAgent: String,
     onPermissionsRequest: (PermissionRequest) -> Unit,
+    onConsoleMessage: (ConsoleMessage) -> Unit,
     onCreateWebView: (WebView) -> Unit,
     onDestroyWebView: (WebView) -> Unit,
     modifier: Modifier = Modifier,
@@ -188,7 +191,11 @@ private fun CallWebView(
             factory = { context ->
                 WebView(context).apply {
                     onCreateWebView(this)
-                    setup(userAgent, onPermissionsRequest)
+                    setup(
+                        userAgent = userAgent,
+                        onPermissionsRequested = onPermissionsRequest,
+                        onConsoleMessage = onConsoleMessage,
+                    )
                 }
             },
             update = { webView ->
@@ -208,6 +215,7 @@ private fun CallWebView(
 private fun WebView.setup(
     userAgent: String,
     onPermissionsRequested: (PermissionRequest) -> Unit,
+    onConsoleMessage: (ConsoleMessage) -> Unit,
 ) {
     layoutParams = ViewGroup.LayoutParams(
         ViewGroup.LayoutParams.MATCH_PARENT,
@@ -232,35 +240,7 @@ private fun WebView.setup(
         }
 
         override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean {
-            val priority = when (consoleMessage.messageLevel()) {
-                ConsoleMessage.MessageLevel.ERROR -> Log.ERROR
-                ConsoleMessage.MessageLevel.WARNING -> Log.WARN
-                else -> Log.DEBUG
-            }
-
-            val message = buildString {
-                append(consoleMessage.sourceId())
-                append(":")
-                append(consoleMessage.lineNumber())
-                append(" ")
-                append(consoleMessage.message())
-            }
-
-            if (message.contains("password=")) {
-                // Avoid logging any messages that contain "password" to prevent leaking sensitive information
-                return true
-            }
-
-            Timber.tag("WebView").log(
-                priority = priority,
-                message = buildString {
-                    append(consoleMessage.sourceId())
-                    append(":")
-                    append(consoleMessage.lineNumber())
-                    append(" ")
-                    append(consoleMessage.message())
-                },
-            )
+            onConsoleMessage(consoleMessage)
             return true
         }
     }
@@ -286,6 +266,7 @@ internal fun CallScreenViewPreview(
         state = state,
         pipState = aPictureInPictureState(),
         requestPermissions = { _, _ -> },
+        onConsoleMessage = {},
     )
 }
 
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
new file mode 100644
index 0000000000..0c18c3e1a4
--- /dev/null
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallTypeExtension.kt
@@ -0,0 +1,19 @@
+/*
+ * 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 bf210b0a42..bf4f836294 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,14 +24,17 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 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.rememberUpdatedState
 import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.content.IntentCompat
 import androidx.core.util.Consumer
 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.features.call.impl.DefaultElementCallEntryPoint
@@ -42,6 +46,7 @@ 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
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.audio.api.AudioFocus
@@ -65,6 +70,7 @@ class ElementCallActivity :
     @Inject lateinit var pictureInPicturePresenter: PictureInPicturePresenter
     @Inject lateinit var buildMeta: BuildMeta
     @Inject lateinit var audioFocus: AudioFocus
+    @Inject lateinit var consoleMessageLogger: ConsoleMessageLogger
 
     private lateinit var presenter: Presenter<CallScreenState>
 
@@ -103,9 +109,13 @@ class ElementCallActivity :
         setContent {
             val pipState = pictureInPicturePresenter.present()
             ListenToAndroidEvents(pipState)
+            val colors by remember(webViewTarget.value?.getSessionId()) {
+                enterpriseService.semanticColorsFlow(sessionId = webViewTarget.value?.getSessionId())
+            }.collectAsState(SemanticColorsLightDark.default)
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
-                enterpriseService = enterpriseService,
+                compoundLight = colors.light,
+                compoundDark = colors.dark,
                 buildMeta = buildMeta,
             ) {
                 val state = presenter.present()
@@ -119,6 +129,9 @@ class ElementCallActivity :
                 CallScreenView(
                     state = state,
                     pipState = pipState,
+                    onConsoleMessage = {
+                        consoleMessageLogger.log("ElementCall", it)
+                    },
                     requestPermissions = { permissions, callback ->
                         requestPermissionCallback = callback
                         requestPermissionsLauncher.launch(permissions)
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 daf0e26797..714360a702 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,9 +12,13 @@ import android.os.Bundle
 import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 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.ElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
@@ -78,9 +83,13 @@ class IncomingCallActivity : AppCompatActivity() {
         val notificationData = intent?.let { IntentCompat.getParcelableExtra(it, EXTRA_NOTIFICATION_DATA, CallNotificationData::class.java) }
         if (notificationData != null) {
             setContent {
+                val colors by remember {
+                    enterpriseService.semanticColorsFlow(sessionId = notificationData.sessionId)
+                }.collectAsState(SemanticColorsLightDark.default)
                 ElementThemeApp(
                     appPreferencesStore = appPreferencesStore,
-                    enterpriseService = enterpriseService,
+                    compoundLight = colors.light,
+                    compoundDark = colors.dark,
                     buildMeta = buildMeta,
                 ) {
                     IncomingCallScreen(
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt
index 9483b91a14..682c4cec73 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/LanguageTagProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/LanguageTagProvider.kt
index 74016fd210..c9abd7b735 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/LanguageTagProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/LanguageTagProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalConfiguration
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 
 interface LanguageTagProvider {
     @Composable
@@ -19,7 +19,6 @@ interface LanguageTagProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLanguageTagProvider : LanguageTagProvider {
     @Composable
     override fun provideLanguageTag(): String? {
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 34f46d1ea0..4183e22531 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,6 @@ import coil3.SingletonImageLoader
 import coil3.annotation.DelicateCoilApi
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ElementCallConfig
 import io.element.android.features.call.api.CallType
@@ -87,7 +87,6 @@ interface ActiveCallManager {
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultActiveCallManager(
     @ApplicationContext context: Context,
     @AppCoroutineScope
@@ -101,7 +100,7 @@ class DefaultActiveCallManager(
     private val imageLoaderHolder: ImageLoaderHolder,
     private val systemClock: SystemClock,
 ) : ActiveCallManager {
-    private val tag = "DefaultActiveCallManager"
+    private val tag = "ActiveCallManager"
     private var timedOutCallJob: Job? = null
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
@@ -178,8 +177,8 @@ class DefaultActiveCallManager(
     suspend fun incomingCallTimedOut(displayMissedCallNotification: Boolean) = mutex.withLock {
         Timber.tag(tag).d("Incoming call timed out")
 
-        val previousActiveCall = activeCall.value ?: return
-        val notificationData = (previousActiveCall.callState as? CallState.Ringing)?.notificationData ?: return
+        val previousActiveCall = activeCall.value ?: return@withLock
+        val notificationData = (previousActiveCall.callState as? CallState.Ringing)?.notificationData ?: return@withLock
         activeCall.value = null
         if (activeWakeLock?.isHeld == true) {
             Timber.tag(tag).d("Releasing partial wakelock after timeout")
@@ -197,11 +196,11 @@ class DefaultActiveCallManager(
         Timber.tag(tag).d("Hung up call: $callType")
         val currentActiveCall = activeCall.value ?: run {
             Timber.tag(tag).w("No active call, ignoring hang up")
-            return
+            return@withLock
         }
         if (currentActiveCall.callType != callType) {
             Timber.tag(tag).w("Call type $callType does not match the active call type, ignoring")
-            return
+            return@withLock
         }
         if (currentActiveCall.callState is CallState.Ringing) {
             // Decline the call
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
index 09fcfe3940..f5433c15a0 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
index ec4c7a79d4..6ce73bc5e6 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallAnalyticCredentialsProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallAnalyticCredentialsProvider.kt
index aafb7fdde0..6ba075b7fc 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallAnalyticCredentialsProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallAnalyticCredentialsProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.features.call.impl.utils
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.call.impl.BuildConfig
 import io.element.android.libraries.matrix.api.widget.CallAnalyticCredentialsProvider
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCallAnalyticCredentialsProvider : CallAnalyticCredentialsProvider {
     override val posthogUserId: String? = BuildConfig.POSTHOG_USER_ID.takeIf { it.isNotBlank() }
     override val posthogApiHost: String? = BuildConfig.POSTHOG_API_HOST.takeIf { it.isNotBlank() }
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 dc217bc118..1728a0cace 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.call.impl.utils
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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
@@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.firstOrNull
 private const val EMBEDDED_CALL_WIDGET_BASE_URL = "https://appassets.androidplatform.net/element-call/index.html"
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCallWidgetProvider(
     private val matrixClientsProvider: MatrixClientProvider,
     private val appPreferencesStore: AppPreferencesStore,
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCurrentCallService.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCurrentCallService.kt
index 3ae65e338b..1c8c0b342b 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCurrentCallService.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCurrentCallService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.call.impl.utils
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.api.CurrentCallService
@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCurrentCallService : CurrentCallService {
     override val currentCall = MutableStateFlow<CurrentCall>(CurrentCall.None)
 
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 774367a52d..0f74ba86d4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/PipController.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/PipController.kt
index f1e3e2756b..b259816f9d 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/PipController.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/PipController.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7745cda13b..d4811d65d5 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -44,6 +45,13 @@ class WebViewAudioManager(
     private val coroutineScope: CoroutineScope,
     private val onInvalidAudioDeviceAdded: (InvalidAudioDeviceReason) -> Unit,
 ) {
+    private val json by lazy {
+        Json {
+            encodeDefaults = true
+            explicitNulls = false
+        }
+    }
+
     /**
      * Whether to disable bluetooth audio devices. This must be done on Android versions lower than Android 12,
      * since the WebView approach breaks when using the legacy Bluetooth audio APIs.
@@ -308,11 +316,7 @@ class WebViewAudioManager(
         devices: List<SerializableAudioDevice> = listAudioDevices().map(SerializableAudioDevice::fromAudioDeviceInfo),
     ) {
         Timber.d("Updating available audio devices")
-        val jsonSerializer = Json {
-            encodeDefaults = true
-            explicitNulls = false
-        }
-        val deviceList = jsonSerializer.encodeToString(devices)
+        val deviceList = json.encodeToString(devices)
         webView.evaluateJavascript("controls.setAvailableOutputDevices($deviceList);", {
             Timber.d("Audio: setAvailableOutputDevices result: $it")
         })
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewPipController.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewPipController.kt
index f46db3ca2b..12f8dfd00f 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewPipController.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewPipController.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 82500c5937..f7ab2c57af 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageInterceptor.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageInterceptor.kt
index 91ea0add66..ea158c5ddc 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageInterceptor.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageInterceptor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageSerializer.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageSerializer.kt
index a21cadab7a..9a489c61ce 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageSerializer.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WidgetMessageSerializer.kt
@@ -1,24 +1,27 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 dev.zacsweers.metro.Inject
 import io.element.android.features.call.impl.data.WidgetMessage
+import io.element.android.libraries.androidutils.json.JsonProvider
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import kotlinx.serialization.json.Json
-
-object WidgetMessageSerializer {
-    private val coder = Json { ignoreUnknownKeys = true }
 
+@Inject
+class WidgetMessageSerializer(
+    private val json: JsonProvider,
+) {
     fun deserialize(message: String): Result<WidgetMessage> {
-        return runCatchingExceptions { coder.decodeFromString(WidgetMessage.serializer(), message) }
+        return runCatchingExceptions { json().decodeFromString(WidgetMessage.serializer(), message) }
     }
 
     fun serialize(message: WidgetMessage): String {
-        return coder.encodeToString(WidgetMessage.serializer(), message)
+        return json().encodeToString(WidgetMessage.serializer(), message)
     }
 }
diff --git a/features/call/impl/src/main/res/values-hr/translations.xml b/features/call/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..e58dc362fa
--- /dev/null
+++ b/features/call/impl/src/main/res/values-hr/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">"Poziv u tijeku"</string>
+  <string name="call_foreground_service_message_android">"Dodirnite za povratak u poziv"</string>
+  <string name="call_foreground_service_title_android">"☎️ Poziv u tijeku"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call ne podržava korištenje Bluetooth audiouređaja u ovoj inačici Androida. Odaberite drugi audiouređaj."</string>
+  <string name="screen_incoming_call_subtitle_android">"Dolazni Element Call"</string>
+</resources>
diff --git a/features/call/impl/src/main/res/values/do_not_translate.xml b/features/call/impl/src/main/res/values/do_not_translate.xml
index d998d4b1c6..deb835b35c 100644
--- a/features/call/impl/src/main/res/values/do_not_translate.xml
+++ b/features/call/impl/src/main/res/values/do_not_translate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <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 7d0f15b540..bfc6565d11 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt
index 57de826164..e356358437 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipController.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipController.kt
index 9c5406a8a5..5153f79c31 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipController.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipController.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipSupportProvider.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipSupportProvider.kt
index 43fc0a562a..c17e31261c 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipSupportProvider.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipSupportProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipView.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipView.kt
index a15fbbefa0..55e94312bf 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipView.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/FakePipView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d870382e48..c087fa3c35 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0af482fc49..28e2747ba9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,13 +13,14 @@ import androidx.test.platform.app.InstrumentationRegistry
 import coil3.ImageLoader
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.call.impl.notifications.RingingCallNotificationCreator
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 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_USER_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
+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 kotlinx.coroutines.test.runTest
@@ -52,7 +54,7 @@ class RingingCallNotificationCreatorTest {
 
     @Test
     fun `createNotification - tries to load the avatar URL`() = runTest {
-        val getUserIconLambda = lambdaRecorder<String?, ImageLoader, IconCompat?> { _, _ -> null }
+        val getUserIconLambda = lambdaRecorder<AvatarData, ImageLoader, IconCompat?> { _, _ -> null }
         val notificationCreator = createRingingCallNotificationCreator(
             matrixClientProvider = FakeMatrixClientProvider(getClient = { Result.success(FakeMatrixClient()) }),
             notificationBitmapLoader = FakeNotificationBitmapLoader(getUserIconResult = getUserIconLambda)
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 47a91afa1c..09aaaf8271 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,9 +17,11 @@ import io.element.android.features.call.api.CallType
 import io.element.android.features.call.impl.ui.CallScreenEvents
 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
 import io.element.android.features.call.utils.FakeActiveCallManager
 import io.element.android.features.call.utils.FakeCallWidgetProvider
 import io.element.android.features.call.utils.FakeWidgetMessageInterceptor
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.sync.SyncState
@@ -50,7 +53,8 @@ import org.junit.Rule
 import org.junit.Test
 import kotlin.time.Duration.Companion.seconds
 
-@OptIn(ExperimentalCoroutinesApi::class) class CallScreenPresenterTest {
+@OptIn(ExperimentalCoroutinesApi::class)
+class CallScreenPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -409,6 +413,7 @@ import kotlin.time.Duration.Companion.seconds
             languageTagProvider = FakeLanguageTagProvider("en-US"),
             appForegroundStateService = appForegroundStateService,
             appCoroutineScope = backgroundScope,
+            widgetMessageSerializer = WidgetMessageSerializer(DefaultJsonProvider()),
         )
     }
 }
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
new file mode 100644
index 0000000000..0c91b2159a
--- /dev/null
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt
@@ -0,0 +1,44 @@
+/*
+ * 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,
+            ).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).toString())
+            .isEqualTo("RoomCall(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID)")
+    }
+}
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeCallScreenNavigator.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeCallScreenNavigator.kt
index 3e1d47bb57..431b746362 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeCallScreenNavigator.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeCallScreenNavigator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeLanguageTagProvider.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeLanguageTagProvider.kt
index 5f80db1540..f68842813b 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeLanguageTagProvider.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/FakeLanguageTagProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index bafbe3f570..43f7f931f1 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3d1c35df4d..df14b4b423 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,9 +34,9 @@ import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 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.ui.media.test.FakeImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.ForegroundServiceType
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.FakeOnMissedCallNotificationHandler
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
@@ -415,6 +416,7 @@ class DefaultActiveCallManagerTest {
 
         verify { notificationManagerCompat.cancel(any()) }
     }
+
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `IncomingCall - ignore expired ring lifetime`() = runTest {
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
index a93dd5f91c..95d5398704 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,6 +23,7 @@ import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
+import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -85,7 +87,7 @@ class DefaultCallWidgetProviderTest {
             // No room from the client
             givenGetRoomResult(A_ROOM_ID, null)
         }
-        val activeRoomsHolder = ActiveRoomsHolder().apply {
+        val activeRoomsHolder = DefaultActiveRoomsHolder().apply {
             // A current active room with the same room id
             addRoom(
                 FakeJoinedRoom(
@@ -129,7 +131,7 @@ class DefaultCallWidgetProviderTest {
         matrixClientProvider: MatrixClientProvider = FakeMatrixClientProvider(),
         appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
         callWidgetSettingsProvider: CallWidgetSettingsProvider = FakeCallWidgetSettingsProvider(),
-        activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(),
+        activeRoomsHolder: ActiveRoomsHolder = DefaultActiveRoomsHolder(),
     ) = DefaultCallWidgetProvider(
         matrixClientsProvider = matrixClientProvider,
         appPreferencesStore = appPreferencesStore,
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 90527370e7..74bd1c36ac 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
index 257b92b709..11e6d9e399 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeWidgetMessageInterceptor.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeWidgetMessageInterceptor.kt
index c41339b8df..6b68b1519c 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeWidgetMessageInterceptor.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeWidgetMessageInterceptor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/test/build.gradle.kts b/features/call/test/build.gradle.kts
index 4fe9b95384..76fbf9915e 100644
--- a/features/call/test/build.gradle.kts
+++ b/features/call/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt b/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
index 2c56ab299b..2c7d1914c7 100644
--- a/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
+++ b/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeCurrentCallService.kt b/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeCurrentCallService.kt
index 995b0d0a54..45f527720c 100644
--- a/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeCurrentCallService.kt
+++ b/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeCurrentCallService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 cd2e617b4d..fdf3ca566b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesState.kt b/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesState.kt
deleted file mode 100644
index 027ef76e69..0000000000
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesState.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.changeroommemberroles.impl
-
-import io.element.android.libraries.architecture.AsyncAction
-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
-import io.element.android.libraries.matrix.api.user.MatrixUser
-import io.element.android.libraries.matrix.ui.room.PowerLevelRoomMemberComparator
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-
-data class ChangeRolesState(
-    val role: RoomMember.Role,
-    val query: String?,
-    val isSearchActive: Boolean,
-    val searchResults: SearchBarResultState<MembersByRole>,
-    val selectedUsers: ImmutableList<MatrixUser>,
-    val hasPendingChanges: Boolean,
-    val exitState: AsyncAction<Unit>,
-    val savingState: AsyncAction<Unit>,
-    val canChangeMemberRole: (UserId) -> Boolean,
-    val eventSink: (ChangeRolesEvent) -> Unit,
-)
-
-data class MembersByRole(
-    val owners: ImmutableList<RoomMember>,
-    val admins: ImmutableList<RoomMember>,
-    val moderators: ImmutableList<RoomMember>,
-    val members: ImmutableList<RoomMember>,
-) {
-    constructor(members: List<RoomMember>) : this(
-            owners = members.filter { it.role is RoomMember.Role.Owner }.sorted(),
-            admins = members.filter { it.role == RoomMember.Role.Admin }.sorted(),
-            moderators = members.filter { it.role == RoomMember.Role.Moderator }.sorted(),
-            members = members.filter { it.role == RoomMember.Role.User }.sorted(),
-    )
-
-    fun isEmpty() = owners.isEmpty() && admins.isEmpty() && moderators.isEmpty() && members.isEmpty()
-}
-
-private fun Iterable<RoomMember>.sorted(): ImmutableList<RoomMember> {
-    return sortedWith(PowerLevelRoomMemberComparator()).toImmutableList()
-}
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt b/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt
deleted file mode 100644
index 8a9117776d..0000000000
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.changeroommemberroles.impl
-
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
-import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.matrix.api.room.JoinedRoom
-
-@ContributesBinding(SessionScope::class)
-@Inject
-class DefaultChangeRoomMemberRolesEntyPoint : ChangeRoomMemberRolesEntryPoint {
-    override fun builder(parentNode: Node, buildContext: BuildContext): ChangeRoomMemberRolesEntryPoint.Builder {
-        return object : ChangeRoomMemberRolesEntryPoint.Builder {
-            private lateinit var changeRoomMemberRolesListType: ChangeRoomMemberRolesListType
-            private lateinit var room: JoinedRoom
-
-            override fun room(room: JoinedRoom): ChangeRoomMemberRolesEntryPoint.Builder {
-                this.room = room
-                return this
-            }
-
-            override fun listType(changeRoomMemberRolesListType: ChangeRoomMemberRolesListType): ChangeRoomMemberRolesEntryPoint.Builder {
-                this.changeRoomMemberRolesListType = changeRoomMemberRolesListType
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<ChangeRoomMemberRolesRootNode>(
-                    buildContext = buildContext,
-                    plugins = listOf(
-                        ChangeRoomMemberRolesRootNode.Inputs(joinedRoom = room, listType = changeRoomMemberRolesListType),
-                    )
-                )
-            }
-        }
-    }
-}
diff --git a/features/createroom/api/build.gradle.kts b/features/createroom/api/build.gradle.kts
index 7f39051b0e..b4d7d2a995 100644
--- a/features/createroom/api/build.gradle.kts
+++ b/features/createroom/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt b/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
index 5fc71f2a3b..1c6a9f04db 100644
--- a/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
+++ b/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,12 +15,11 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface CreateRoomEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onRoomCreated(roomId: RoomId)
diff --git a/features/createroom/impl/build.gradle.kts b/features/createroom/impl/build.gradle.kts
index 712ce110f8..1adaac1f6d 100644
--- a/features/createroom/impl/build.gradle.kts
+++ b/features/createroom/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
index 8f46103ba5..7fea6fc0e5 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.replace
 import dev.zacsweers.metro.Assisted
@@ -24,6 +24,7 @@ import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
 import io.element.android.features.createroom.impl.configureroom.ConfigureRoomNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -42,9 +43,7 @@ class CreateRoomFlowNode(
     buildContext = buildContext,
     plugins = plugins
 ) {
-    private fun onRoomCreated(roomId: RoomId) {
-        plugins<CreateRoomEntryPoint.Callback>().forEach { it.onRoomCreated(roomId) }
-    }
+    private val callback: CreateRoomEntryPoint.Callback = callback()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
@@ -60,7 +59,7 @@ class CreateRoomFlowNode(
                 val inputs = AddPeopleNode.Inputs(navTarget.roomId)
                 val callback: AddPeopleNode.Callback = object : AddPeopleNode.Callback {
                     override fun onFinish() {
-                        onRoomCreated(navTarget.roomId)
+                        callback.onRoomCreated(navTarget.roomId)
                     }
                 }
                 createNode<AddPeopleNode>(buildContext, plugins = listOf(inputs, callback))
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
index 0d62542504..2261d294cf 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.features.createroom.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultCreateRoomEntryPoint : CreateRoomEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : CreateRoomEntryPoint.NodeBuilder {
-            override fun callback(callback: CreateRoomEntryPoint.Callback): CreateRoomEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<CreateRoomFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: CreateRoomEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<CreateRoomFlowNode>(buildContext, listOf(callback))
     }
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
index 9ea89912cb..2e5c16e62c 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,13 +13,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.invitepeople.api.InvitePeoplePresenter
 import io.element.android.features.invitepeople.api.InvitePeopleRenderer
 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
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -39,10 +40,7 @@ class AddPeopleNode(
         fun onFinish()
     }
 
-    private fun onFinish() {
-        plugins<Callback>().forEach { it.onFinish() }
-    }
-
+    private val callback: Callback = callback()
     private val roomId = inputs<Inputs>().roomId
     private val invitePeoplePresenter = invitePeoplePresenterFactory.create(
         joinedRoom = null,
@@ -54,7 +52,7 @@ class AddPeopleNode(
         val state = invitePeoplePresenter.present()
         AddPeopleView(
             state = state,
-            onFinish = ::onFinish,
+            onFinish = callback::onFinish,
         ) {
             invitePeopleRenderer.Render(state, Modifier)
         }
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 1c9a5f84d3..0a7309a2b0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt
index cd5470bc24..fed8404143 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
index 9e721d28bd..43ceee3594 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,11 +14,11 @@ 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.core.plugin.plugins
 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.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService
@@ -42,9 +43,7 @@ class ConfigureRoomNode(
         )
     }
 
-    private fun onCreateRoomSuccess(roomId: RoomId) {
-        plugins<Callback>().forEach { it.onCreateRoomSuccess(roomId) }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -53,7 +52,7 @@ class ConfigureRoomNode(
             state = state,
             modifier = modifier,
             onBackClick = this::navigateUp,
-            onCreateRoomSuccess = ::onCreateRoomSuccess,
+            onCreateRoomSuccess = callback::onCreateRoomSuccess,
         )
     }
 }
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 29b9842abe..dbec30c0c5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.core.net.toUri
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.CreatedRoom
 import io.element.android.libraries.architecture.AsyncAction
@@ -38,7 +40,7 @@ import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidityEf
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.toImmutableList
@@ -115,7 +117,7 @@ class ConfigureRoomPresenter(
             localCoroutineScope.createRoom(config, createRoomAction)
         }
 
-        fun handleEvents(event: ConfigureRoomEvents) {
+        fun handleEvent(event: ConfigureRoomEvents) {
             when (event) {
                 is ConfigureRoomEvents.RoomNameChanged -> dataStore.setRoomName(event.name)
                 is ConfigureRoomEvents.TopicChanged -> dataStore.setTopic(event.topic)
@@ -130,7 +132,7 @@ class ConfigureRoomPresenter(
                             cameraPhotoPicker.launch()
                         } else {
                             pendingPermissionRequest = true
-                            cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
+                            cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
                         }
                         AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
                     }
@@ -148,7 +150,7 @@ class ConfigureRoomPresenter(
             cameraPermissionState = cameraPermissionState,
             homeserverName = homeserverName,
             roomAddressValidity = roomAddressValidity.value,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
@@ -157,7 +159,7 @@ class ConfigureRoomPresenter(
         createRoomAction: MutableState<AsyncAction<RoomId>>
     ) = launch {
         suspend {
-            val avatarUrl = config.avatarUri?.let { uploadAvatar(it) }
+            val avatarUrl = config.avatarUri?.let { uploadAvatar(it.toUri()) }
             val params = if (config.roomVisibility is RoomVisibilityState.Public) {
                 CreateRoomParameters(
                     name = config.roomName,
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt
index 90022a9204..127aa20ccb 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt
index 7db8744408..7f760b46fb 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8c56607a22..6715a7c1e9 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
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.createroom.impl.configureroom
 
-import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -192,7 +192,7 @@ private fun ConfigureRoomToolbar(
 
 @Composable
 private fun RoomNameWithAvatar(
-    avatarUri: Uri?,
+    avatarUri: String?,
     roomName: String,
     onAvatarClick: () -> Unit,
     onChangeRoomName: (String) -> Unit,
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfig.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfig.kt
index 9ec71f5b76..b9d05a144f 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfig.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfig.kt
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.createroom.impl.configureroom
 
-import android.net.Uri
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -15,7 +15,7 @@ import kotlinx.collections.immutable.persistentListOf
 data class CreateRoomConfig(
     val roomName: String? = null,
     val topic: String? = null,
-    val avatarUri: Uri? = null,
+    val avatarUri: String? = null,
     val invites: ImmutableList<MatrixUser> = persistentListOf(),
     val roomVisibility: RoomVisibilityState = RoomVisibilityState.Private,
 )
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt
index f2701216c3..5e8637ddd6 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -62,7 +63,7 @@ class CreateRoomConfigStore(
     fun setAvatarUri(uri: Uri?, cached: Boolean = false) {
         cachedAvatarUri = uri.takeIf { cached }
         createRoomConfigFlow.getAndUpdate { config ->
-            config.copy(avatarUri = uri)
+            config.copy(avatarUri = uri?.toString())
         }
     }
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt
index ef35b654cc..9d8167cce2 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccess.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
index b3da88bd31..2d37be9103 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAddress.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAddress.kt
index 7e6da51711..a8e4e39999 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAddress.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAddress.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityItem.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityItem.kt
index 13e0ad7ea7..b92dee4d6e 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt
index 8337a81eae..82af5a5614 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d7df703abb..9c48001c92 100644
--- a/features/createroom/impl/src/main/res/values-de/translations.xml
+++ b/features/createroom/impl/src/main/res/values-de/translations.xml
@@ -14,7 +14,7 @@ Du kannst dies jederzeit in den Einstellungen des Chats ändern."</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">"Beitritt beantragen"</string>
   <string name="screen_create_room_room_address_section_footer">"Du benötigst eine Chat-Adresse, damit dieser Chat im öffentlichen Verzeichnis sichtbar ist."</string>
-  <string name="screen_create_room_room_address_section_title">"Chat-Adresse"</string>
+  <string name="screen_create_room_room_address_section_title">"Chatroom Adresse"</string>
   <string name="screen_create_room_room_name_label">"Chat-Name"</string>
   <string name="screen_create_room_room_visibility_section_title">" Sichtbarkeit des Chats"</string>
   <string name="screen_create_room_title">"Chat erstellen"</string>
diff --git a/features/createroom/impl/src/main/res/values-el/translations.xml b/features/createroom/impl/src/main/res/values-el/translations.xml
index a3084a4e70..37ccd49d0e 100644
--- a/features/createroom/impl/src/main/res/values-el/translations.xml
+++ b/features/createroom/impl/src/main/res/values-el/translations.xml
@@ -14,7 +14,7 @@
   <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_address_section_footer">"Για να είναι ορατή αυτή η αίθουσα στον δημόσιο κατάλογο αιθουσών, θα χρειαστείτε μια διεύθυνση αίθουσας."</string>
-  <string name="screen_create_room_room_address_section_title">"Διεύθυνση αίθουσας"</string>
+  <string name="screen_create_room_room_address_section_title">"Διεύθυνση δωματίου"</string>
   <string name="screen_create_room_room_name_label">"Όνομα αίθουσας"</string>
   <string name="screen_create_room_room_visibility_section_title">"Ορατότητα αίθουσας"</string>
   <string name="screen_create_room_title">"Δημιουργία αίθουσας"</string>
diff --git a/features/createroom/impl/src/main/res/values-es/translations.xml b/features/createroom/impl/src/main/res/values-es/translations.xml
index 521f761174..64806977c0 100644
--- a/features/createroom/impl/src/main/res/values-es/translations.xml
+++ b/features/createroom/impl/src/main/res/values-es/translations.xml
@@ -14,7 +14,6 @@ Puedes cambiar esto en cualquier momento en los ajustes de la sala."</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Cualquiera puede solicitar unirse a la sala, pero un administrador o un moderador tendrá que aceptar la solicitud"</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Solicitud para unirse"</string>
   <string name="screen_create_room_room_address_section_footer">"Para que esta sala sea visible en el directorio de salas públicas, necesitarás una dirección de sala."</string>
-  <string name="screen_create_room_room_address_section_title">"Dirección de la sala"</string>
   <string name="screen_create_room_room_name_label">"Nombre de la sala"</string>
   <string name="screen_create_room_room_visibility_section_title">"Visibilidad de la sala"</string>
   <string name="screen_create_room_title">"Crear una sala"</string>
diff --git a/features/createroom/impl/src/main/res/values-et/translations.xml b/features/createroom/impl/src/main/res/values-et/translations.xml
index 6a1d9dc58a..98449f4817 100644
--- a/features/createroom/impl/src/main/res/values-et/translations.xml
+++ b/features/createroom/impl/src/main/res/values-et/translations.xml
@@ -9,7 +9,7 @@
 Sa võid seda jututoa seadistustest alati muuta."</string>
   <string name="screen_create_room_public_option_title">"Avalik jututuba"</string>
   <string name="screen_create_room_room_access_section_anyone_option_description">"Kõik võivad selle jututoaga liituda"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Kõik"</string>
+  <string name="screen_create_room_room_access_section_anyone_option_title">"Kõik kasutajad"</string>
   <string name="screen_create_room_room_access_section_header">"Ligipääs jututoale"</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Kõik võivad paluda selle jututoaga liitumist, kuid peakasutaja või moderaator peavad selle kinnitama"</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Küsi võimalust liitumiseks"</string>
diff --git a/features/createroom/impl/src/main/res/values-fi/translations.xml b/features/createroom/impl/src/main/res/values-fi/translations.xml
index 31589ab997..df541d3dee 100644
--- a/features/createroom/impl/src/main/res/values-fi/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fi/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_create_room_action_create_room">"Uusi huone"</string>
-  <string name="screen_create_room_add_people_title">"Kutsu ihmisiä"</string>
+  <string name="screen_create_room_add_people_title">"Kutsu henkilöitä"</string>
   <string name="screen_create_room_error_creating_room">"Huoneen luomisessa tapahtui virhe"</string>
   <string name="screen_create_room_private_option_description">"Vain kutsutut henkilöt pääsevät tähän huoneeseen. Kaikki viestit ovat päästä päähän salattuja."</string>
   <string name="screen_create_room_private_option_title">"Yksityinen huone"</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
new file mode 100644
index 0000000000..1d6d7e5af7
--- /dev/null
+++ b/features/createroom/impl/src/main/res/values-hr/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_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_private_option_description">"Samo pozvane osobe mogu pristupiti ovoj sobi. Sve su poruke sveobuhvatno šifrirane."</string>
+  <string name="screen_create_room_private_option_title">"Privatna soba"</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_title">"Javna soba"</string>
+  <string name="screen_create_room_room_access_section_anyone_option_description">"Svatko se može pridružiti ovoj sobi"</string>
+  <string name="screen_create_room_room_access_section_anyone_option_title">"Svatko"</string>
+  <string name="screen_create_room_room_access_section_header">"Pristup sobi"</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_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_name_label">"Naziv sobe"</string>
+  <string name="screen_create_room_room_visibility_section_title">"Vidljivost sobe"</string>
+  <string name="screen_create_room_title">"Stvori sobu"</string>
+  <string name="screen_create_room_topic_label">"Tema (neobavezno)"</string>
+</resources>
diff --git a/features/createroom/impl/src/main/res/values-hu/translations.xml b/features/createroom/impl/src/main/res/values-hu/translations.xml
index 8833afcdec..24f71983ce 100644
--- a/features/createroom/impl/src/main/res/values-hu/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hu/translations.xml
@@ -14,7 +14,7 @@ Ezt bármikor módosíthatja a szobabeállításokban."</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Bárki kérheti, hogy csatlakozzon a szobához, de egy adminisztrátornak vagy moderátornak el kell fogadnia a kérést"</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Csatlakozás kérése"</string>
   <string name="screen_create_room_room_address_section_footer">"Ahhoz, hogy ez a szoba látható legyen a nyilvános szobák címtárában, meg kell adnia a szoba címét."</string>
-  <string name="screen_create_room_room_address_section_title">"A szoba címe"</string>
+  <string name="screen_create_room_room_address_section_title">"Szoba címe"</string>
   <string name="screen_create_room_room_name_label">"Szoba neve"</string>
   <string name="screen_create_room_room_visibility_section_title">"Szoba láthatósága"</string>
   <string name="screen_create_room_title">"Szoba létrehozása"</string>
diff --git a/features/createroom/impl/src/main/res/values-ko/translations.xml b/features/createroom/impl/src/main/res/values-ko/translations.xml
index cac10c0b1f..3dfdc46e7c 100644
--- a/features/createroom/impl/src/main/res/values-ko/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ko/translations.xml
@@ -14,7 +14,6 @@
   <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_address_section_footer">"이 방이 공개 방 디렉토리에 표시되려면 방 주소가 필요합니다."</string>
-  <string name="screen_create_room_room_address_section_title">"방 주소"</string>
   <string name="screen_create_room_room_name_label">"방 이름"</string>
   <string name="screen_create_room_room_visibility_section_title">"방 표시 여부"</string>
   <string name="screen_create_room_title">"방 만들기"</string>
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
index 61c7c052c5..35b6637bbf 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -38,9 +39,11 @@ class DefaultCreateRoomEntryPointTest {
         val callback = object : CreateRoomEntryPoint.Callback {
             override fun onRoomCreated(roomId: RoomId) = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result.plugins).contains(callback)
     }
 }
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/startchat/impl/configureroom/ConfigureRoomPresenterTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/startchat/impl/configureroom/ConfigureRoomPresenterTest.kt
index 635a2b330e..6de15904d7 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/startchat/impl/configureroom/ConfigureRoomPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/startchat/impl/configureroom/ConfigureRoomPresenterTest.kt
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.startchat.impl.configureroom
 
 import android.net.Uri
+import androidx.core.net.toUri
 import app.cash.turbine.TurbineTestContext
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.CreatedRoom
@@ -49,15 +51,10 @@ 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.test
-import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkStatic
-import io.mockk.unmockkAll
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
-import org.junit.After
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -74,17 +71,6 @@ class ConfigureRoomPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
-    @Before
-    fun setup() {
-        mockkStatic(File::readBytes)
-        every { any<File>().readBytes() } returns byteArrayOf()
-    }
-
-    @After
-    fun tearDown() {
-        unmockkAll()
-    }
-
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createConfigureRoomPresenter()
@@ -155,15 +141,15 @@ class ConfigureRoomPresenterTest {
             // Pick avatar
             pickerProvider.givenResult(null)
             // From gallery
-            val uriFromGallery = Uri.parse(AN_URI_FROM_GALLERY)
-            pickerProvider.givenResult(uriFromGallery)
+            val uriFromGallery = AN_URI_FROM_GALLERY
+            pickerProvider.givenResult(uriFromGallery.toUri())
             newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(avatarUri = uriFromGallery)
             assertThat(newState.config).isEqualTo(expectedConfig)
             // From camera
-            val uriFromCamera = Uri.parse(AN_URI_FROM_CAMERA)
-            pickerProvider.givenResult(uriFromCamera)
+            val uriFromCamera = AN_URI_FROM_CAMERA
+            pickerProvider.givenResult(uriFromCamera.toUri())
             assertThat(newState.cameraPermissionState.permissionGranted).isFalse()
             newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.TakePhoto))
             newState = awaitItem()
@@ -175,8 +161,8 @@ class ConfigureRoomPresenterTest {
             expectedConfig = expectedConfig.copy(avatarUri = uriFromCamera)
             assertThat(newState.config).isEqualTo(expectedConfig)
             // Do it again, no permission is requested
-            val uriFromCamera2 = Uri.parse(AN_URI_FROM_CAMERA_2)
-            pickerProvider.givenResult(uriFromCamera2)
+            val uriFromCamera2 = AN_URI_FROM_CAMERA_2
+            pickerProvider.givenResult(uriFromCamera2.toUri())
             newState.eventSink(ConfigureRoomEvents.HandleAvatarAction(AvatarAction.TakePhoto))
             newState = awaitItem()
             expectedConfig = expectedConfig.copy(avatarUri = uriFromCamera2)
@@ -259,20 +245,25 @@ class ConfigureRoomPresenterTest {
             val initialState = initialState()
             dataStore.setAvatarUri(Uri.parse(AN_URI_FROM_GALLERY))
             skipItems(1)
-            mediaPreProcessor.givenResult(Result.success(MediaUploadInfo.Image(mockk(), mockk(), mockk())))
-            matrixClient.givenUploadMediaResult(Result.failure(AN_EXCEPTION))
+            val file = File.createTempFile("test", "jpg")
+            try {
+                mediaPreProcessor.givenResult(Result.success(MediaUploadInfo.Image(file, mockk(), mockk())))
+                matrixClient.givenUploadMediaResult(Result.failure(AN_EXCEPTION))
 
-            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
-            assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
-            val stateAfterCreateRoom = awaitItem()
-            assertThat(stateAfterCreateRoom.createRoomAction).isInstanceOf(AsyncAction.Failure::class.java)
-            assertThat(analyticsService.capturedEvents.filterIsInstance<CreatedRoom>()).isEmpty()
+                initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+                assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
+                val stateAfterCreateRoom = awaitItem()
+                assertThat(stateAfterCreateRoom.createRoomAction).isInstanceOf(AsyncAction.Failure::class.java)
+                assertThat(analyticsService.capturedEvents.filterIsInstance<CreatedRoom>()).isEmpty()
 
-            matrixClient.givenUploadMediaResult(Result.success(AN_AVATAR_URL))
-            stateAfterCreateRoom.eventSink(ConfigureRoomEvents.CreateRoom)
-            assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-            assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
-            assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Success::class.java)
+                matrixClient.givenUploadMediaResult(Result.success(AN_AVATAR_URL))
+                stateAfterCreateRoom.eventSink(ConfigureRoomEvents.CreateRoom)
+                assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+                assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Loading::class.java)
+                assertThat(awaitItem().createRoomAction).isInstanceOf(AsyncAction.Success::class.java)
+            } finally {
+                file.delete()
+            }
         }
     }
 
diff --git a/features/createroom/test/build.gradle.kts b/features/createroom/test/build.gradle.kts
new file mode 100644
index 0000000000..98aeac8a4c
--- /dev/null
+++ b/features/createroom/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.createroom.test"
+}
+
+dependencies {
+    implementation(projects.features.createroom.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt b/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt
new file mode 100644
index 0000000000..2beaecf013
--- /dev/null
+++ b/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.createroom.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeCreateRoomEntryPoint : CreateRoomEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: CreateRoomEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/features/deactivation/api/build.gradle.kts b/features/deactivation/api/build.gradle.kts
index 58a73813ea..64a9f25071 100644
--- a/features/deactivation/api/build.gradle.kts
+++ b/features/deactivation/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/deactivation/api/src/main/kotlin/io/element/android/features/deactivation/api/AccountDeactivationEntryPoint.kt b/features/deactivation/api/src/main/kotlin/io/element/android/features/deactivation/api/AccountDeactivationEntryPoint.kt
index a6bf42e03a..6694d1ecb4 100644
--- a/features/deactivation/api/src/main/kotlin/io/element/android/features/deactivation/api/AccountDeactivationEntryPoint.kt
+++ b/features/deactivation/api/src/main/kotlin/io/element/android/features/deactivation/api/AccountDeactivationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/build.gradle.kts b/features/deactivation/impl/build.gradle.kts
index 842206bab7..bca144071b 100644
--- a/features/deactivation/impl/build.gradle.kts
+++ b/features/deactivation/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationEvents.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationEvents.kt
index 755f4a7b1f..5ceb97b232 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationEvents.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationNode.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationNode.kt
index 3e554672a8..44be7b5d53 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationNode.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt
index eb751366a8..eaeacd022c 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,7 +34,7 @@ class AccountDeactivationPresenter(
 
         val formState = remember { mutableStateOf(DeactivateFormState.Default) }
 
-        fun handleEvents(event: AccountDeactivationEvents) {
+        fun handleEvent(event: AccountDeactivationEvents) {
             when (event) {
                 is AccountDeactivationEvents.SetEraseData -> {
                     updateFormState(formState) {
@@ -63,7 +64,7 @@ class AccountDeactivationPresenter(
         return AccountDeactivationState(
             deactivateFormState = formState.value,
             accountDeactivationAction = action.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationState.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationState.kt
index 2ef2db318b..ca9751efcc 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationState.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationStateProvider.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationStateProvider.kt
index 12b9a7d554..5c832a4d75 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationStateProvider.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 af1bcdad8d..c0d625a45e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPoint.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPoint.kt
index 0f34e18b9f..c93d519e67 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPoint.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.deactivation.api.AccountDeactivationEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAccountDeactivationEntryPoint : AccountDeactivationEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<AccountDeactivationNode>(buildContext)
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationActionDialog.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationActionDialog.kt
index 4e927cd07d..84037d7eb1 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationActionDialog.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationActionDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b3dfc931d4..905112a78d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/main/res/values-hr/translations.xml b/features/deactivation/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..04148fdc48
--- /dev/null
+++ b/features/deactivation/impl/src/main/res/values-hr/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">"Potvrdite da želite deaktivirati svoj račun. Ova se radnja ne može poništiti."</string>
+  <string name="screen_deactivate_account_delete_all_messages">"Izbriši sve moje poruke"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"Upozorenje: budući korisnici mogu vidjeti nepotpune razgovore."</string>
+  <string name="screen_deactivate_account_description">"Deaktiviranje vašeg računa je %1$s, to će:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"nepovratno"</string>
+  <string name="screen_deactivate_account_list_item_1">"%1$s vaš račun (ne možete se ponovno prijaviti i vaš ID se ne može ponovno upotrijebiti)."</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"Trajno onemogući"</string>
+  <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>
+</resources>
diff --git a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenterTest.kt b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenterTest.kt
index d0b9f57dd9..ee7f8e470d 100644
--- a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenterTest.kt
+++ b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1da7568aae..eff479d21c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPointTest.kt b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPointTest.kt
index 05ad52efe9..a9fdf3ff36 100644
--- a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPointTest.kt
+++ b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/deactivation/test/build.gradle.kts b/features/deactivation/test/build.gradle.kts
new file mode 100644
index 0000000000..e1050d7aaa
--- /dev/null
+++ b/features/deactivation/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.deactivation.test"
+}
+
+dependencies {
+    implementation(projects.features.deactivation.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/deactivation/test/src/main/kotlin/io/element/android/features/deactivation/test/FakeAccountDeactivationEntryPoint.kt b/features/deactivation/test/src/main/kotlin/io/element/android/features/deactivation/test/FakeAccountDeactivationEntryPoint.kt
new file mode 100644
index 0000000000..ada24833f6
--- /dev/null
+++ b/features/deactivation/test/src/main/kotlin/io/element/android/features/deactivation/test/FakeAccountDeactivationEntryPoint.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.deactivation.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.deactivation.api.AccountDeactivationEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeAccountDeactivationEntryPoint : AccountDeactivationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/enterprise/api/build.gradle.kts b/features/enterprise/api/build.gradle.kts
index b32f42e31f..1c541c5080 100644
--- a/features/enterprise/api/build.gradle.kts
+++ b/features/enterprise/api/build.gradle.kts
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
diff --git a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/BugReportUrl.kt b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/BugReportUrl.kt
index 8c1b659ab6..86ba110da7 100644
--- a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/BugReportUrl.kt
+++ b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/BugReportUrl.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 03ecda80c0..ecf1ba6b64 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
@@ -1,13 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.enterprise.api
 
-import io.element.android.compound.tokens.generated.SemanticColors
+import androidx.compose.ui.graphics.Color
+import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.Flow
 
@@ -17,13 +19,21 @@ interface EnterpriseService {
     fun defaultHomeserverList(): List<String>
     suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String): Boolean
 
-    fun semanticColorsLight(): SemanticColors
-    fun semanticColorsDark(): SemanticColors
+    /**
+     * Override the brand color.
+     * @param sessionId the session to override the brand color for, or null to set the brand color to use when there is no session.
+     * @param brandColor the color in hex format (#RRGGBBAA or #RRGGBB), or null to reset to default.
+     */
+    suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?)
+
+    fun brandColorsFlow(sessionId: SessionId?): Flow<Color?>
+
+    fun semanticColorsFlow(sessionId: SessionId?): Flow<SemanticColorsLightDark>
 
     fun firebasePushGateway(): String?
     fun unifiedPushDefaultPushGateway(): String?
 
-    val bugReportUrlFlow: Flow<BugReportUrl>
+    fun bugReportUrlFlow(sessionId: SessionId?): Flow<BugReportUrl>
 
     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 aff3d93e8e..6bd6c78de5 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/enterprise/impl-foss/build.gradle.kts b/features/enterprise/impl-foss/build.gradle.kts
index c5c194807f..f0c63f5655 100644
--- a/features/enterprise/impl-foss/build.gradle.kts
+++ b/features/enterprise/impl-foss/build.gradle.kts
@@ -2,13 +2,14 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
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 4d52e83a8f..b154d78afa 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
@@ -1,25 +1,24 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.enterprise.impl
 
+import androidx.compose.ui.graphics.Color
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
-import io.element.android.compound.tokens.generated.SemanticColors
-import io.element.android.compound.tokens.generated.compoundColorsDark
-import io.element.android.compound.tokens.generated.compoundColorsLight
+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 kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultEnterpriseService : EnterpriseService {
     override val isEnterpriseBuild = false
 
@@ -28,12 +27,20 @@ class DefaultEnterpriseService : EnterpriseService {
     override fun defaultHomeserverList(): List<String> = emptyList()
     override suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String) = true
 
-    override fun semanticColorsLight(): SemanticColors = compoundColorsLight
+    override suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) = Unit
 
-    override fun semanticColorsDark(): SemanticColors = compoundColorsDark
+    override fun brandColorsFlow(sessionId: SessionId?): Flow<Color?> {
+        return flowOf(null)
+    }
+
+    override fun semanticColorsFlow(sessionId: SessionId?): Flow<SemanticColorsLightDark> {
+        return flowOf(SemanticColorsLightDark.default)
+    }
 
     override fun firebasePushGateway(): String? = null
     override fun unifiedPushDefaultPushGateway(): String? = null
 
-    override val bugReportUrlFlow = flowOf(BugReportUrl.UseDefault)
+    override fun bugReportUrlFlow(sessionId: SessionId?): Flow<BugReportUrl> {
+        return flowOf(BugReportUrl.UseDefault)
+    }
 }
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 f25c38531a..3441063a8a 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
@@ -1,19 +1,18 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.enterprise.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultSessionEnterpriseService : SessionEnterpriseService {
     override suspend fun init() = Unit
     override suspend fun isElementCallAvailable(): Boolean = true
diff --git a/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
index 9f3ebbb845..ff95fd8721 100644
--- a/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
+++ b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
@@ -1,13 +1,17 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.enterprise.impl
 
+import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.compound.colors.SemanticColorsLightDark
+import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import kotlinx.coroutines.test.runTest
@@ -37,4 +41,61 @@ class DefaultEnterpriseServiceTest {
         val defaultEnterpriseService = DefaultEnterpriseService()
         assertThat(defaultEnterpriseService.isEnterpriseUser(A_SESSION_ID)).isFalse()
     }
+
+    @Test
+    fun `semanticColorsFlow always emits the same value`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        defaultEnterpriseService.semanticColorsFlow(null).test {
+            val initialState = awaitItem()
+            assertThat(initialState).isEqualTo(SemanticColorsLightDark.default)
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `brandColorsFlow always emits null`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        defaultEnterpriseService.brandColorsFlow(null).test {
+            val initialState = awaitItem()
+            assertThat(initialState).isNull()
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `semanticColorsFlow always emits the same value for a session`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        defaultEnterpriseService.semanticColorsFlow(A_SESSION_ID).test {
+            val initialState = awaitItem()
+            assertThat(initialState).isEqualTo(SemanticColorsLightDark.default)
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `overrideBrandColor has no effect`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        defaultEnterpriseService.overrideBrandColor(A_SESSION_ID, "aColor")
+    }
+
+    @Test
+    fun `firebasePushGateway returns null`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        assertThat(defaultEnterpriseService.firebasePushGateway()).isNull()
+    }
+
+    @Test
+    fun `unifiedPushDefaultPushGateway returns null`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        assertThat(defaultEnterpriseService.unifiedPushDefaultPushGateway()).isNull()
+    }
+
+    @Test
+    fun `bugReportUrlFlow only emits UseDefault`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        defaultEnterpriseService.bugReportUrlFlow(A_SESSION_ID).test {
+            assertThat(awaitItem()).isEqualTo(BugReportUrl.UseDefault)
+            awaitComplete()
+        }
+    }
 }
diff --git a/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt
index b1e70ef045..391878a0a4 100644
--- a/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt
+++ b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/enterprise/test/build.gradle.kts b/features/enterprise/test/build.gradle.kts
index 38cc7aaaa9..542e73717a 100644
--- a/features/enterprise/test/build.gradle.kts
+++ b/features/enterprise/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 30ccc4c48d..b2c386267a 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
@@ -1,13 +1,15 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.enterprise.test
 
-import io.element.android.compound.tokens.generated.SemanticColors
+import androidx.compose.ui.graphics.Color
+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
@@ -22,11 +24,15 @@ class FakeEnterpriseService(
     private val isEnterpriseUserResult: (SessionId) -> Boolean = { lambdaError() },
     private val defaultHomeserverListResult: () -> List<String> = { emptyList() },
     private val isAllowedToConnectToHomeserverResult: (String) -> Boolean = { lambdaError() },
-    private val semanticColorsLightResult: () -> SemanticColors = { lambdaError() },
-    private val semanticColorsDarkResult: () -> SemanticColors = { lambdaError() },
+    initialSemanticColors: SemanticColorsLightDark = SemanticColorsLightDark.default,
+    initialBrandColor: Color? = null,
+    private val overrideBrandColorResult: (SessionId?, String?) -> Unit = { _, _ -> lambdaError() },
     private val firebasePushGatewayResult: () -> String? = { lambdaError() },
     private val unifiedPushDefaultPushGatewayResult: () -> String? = { lambdaError() },
 ) : EnterpriseService {
+    private val brandColorState = MutableStateFlow(initialBrandColor)
+    private val semanticColorsState = MutableStateFlow(initialSemanticColors)
+
     override suspend fun isEnterpriseUser(sessionId: SessionId): Boolean = simulateLongTask {
         isEnterpriseUserResult(sessionId)
     }
@@ -39,12 +45,16 @@ class FakeEnterpriseService(
         isAllowedToConnectToHomeserverResult(homeserverUrl)
     }
 
-    override fun semanticColorsLight(): SemanticColors {
-        return semanticColorsLightResult()
+    override suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) = simulateLongTask {
+        overrideBrandColorResult(sessionId, brandColor)
     }
 
-    override fun semanticColorsDark(): SemanticColors {
-        return semanticColorsDarkResult()
+    override fun brandColorsFlow(sessionId: SessionId?): Flow<Color?> {
+        return brandColorState.asStateFlow()
+    }
+
+    override fun semanticColorsFlow(sessionId: SessionId?): Flow<SemanticColorsLightDark> {
+        return semanticColorsState.asStateFlow()
     }
 
     override fun firebasePushGateway(): String? {
@@ -56,5 +66,7 @@ class FakeEnterpriseService(
     }
 
     val bugReportUrlMutableFlow = MutableStateFlow<BugReportUrl>(BugReportUrl.UseDefault)
-    override val bugReportUrlFlow: Flow<BugReportUrl> = bugReportUrlMutableFlow.asStateFlow()
+    override fun bugReportUrlFlow(sessionId: SessionId?): Flow<BugReportUrl> {
+        return bugReportUrlMutableFlow.asStateFlow()
+    }
 }
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 e3125a19e6..3914c60155 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/forward/api/build.gradle.kts b/features/forward/api/build.gradle.kts
new file mode 100644
index 0000000000..1c5f47a048
--- /dev/null
+++ b/features/forward/api/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.forward.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt
new file mode 100644
index 0000000000..95b8c43808
--- /dev/null
+++ b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.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.features.forward.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.NodeInputs
+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.timeline.TimelineProvider
+
+interface ForwardEntryPoint : FeatureEntryPoint {
+    interface Callback : Plugin {
+        fun onDone(roomIds: List<RoomId>)
+    }
+
+    data class Params(
+        val eventId: EventId,
+        val timelineProvider: TimelineProvider,
+    ) : NodeInputs
+
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
+}
diff --git a/features/forward/impl/build.gradle.kts b/features/forward/impl/build.gradle.kts
new file mode 100644
index 0000000000..5d692c861e
--- /dev/null
+++ b/features/forward/impl/build.gradle.kts
@@ -0,0 +1,41 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.forward.impl"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.features.forward.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.roomselect.api)
+    implementation(projects.libraries.uiStrings)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.roomselect.test)
+    testImplementation(projects.libraries.testtags)
+}
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt
new file mode 100644
index 0000000000..97256c6576
--- /dev/null
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt
@@ -0,0 +1,37 @@
+/*
+ * 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.forward.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.forward.api.ForwardEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.SessionScope
+
+@ContributesBinding(SessionScope::class)
+class DefaultForwardEntryPoint : ForwardEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ForwardEntryPoint.Params,
+        callback: ForwardEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<ForwardMessagesNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ForwardMessagesNode.Inputs(
+                    eventId = params.eventId,
+                    timelineProvider = params.timelineProvider,
+                ),
+                callback,
+            )
+        )
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesEvents.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt
similarity index 62%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesEvents.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt
index 05a77b61a7..0161a5d657 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesEvents.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 sealed interface ForwardMessagesEvents {
     data object ClearError : ForwardMessagesEvents
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
similarity index 75%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
index 2cf0c6e1e7..eb085d19c5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import android.os.Parcelable
 import androidx.compose.foundation.layout.Box
@@ -20,9 +21,11 @@ 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.forward.api.ForwardEntryPoint
 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.RoomScope
+import io.element.android.libraries.di.SessionScope
 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.timeline.TimelineProvider
@@ -30,7 +33,7 @@ import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import kotlinx.parcelize.Parcelize
 
-@ContributesNode(RoomScope::class)
+@ContributesNode(SessionScope::class)
 @AssistedInject
 class ForwardMessagesNode(
     @Assisted buildContext: BuildContext,
@@ -48,18 +51,14 @@ class ForwardMessagesNode(
     @Parcelize
     object NavTarget : Parcelable
 
-    interface Callback : Plugin {
-        fun onForwardedToSingleRoom(roomId: RoomId)
-    }
-
     data class Inputs(
         val eventId: EventId,
         val timelineProvider: TimelineProvider,
     ) : NodeInputs
 
     private val inputs = inputs<Inputs>()
+    private val callback: ForwardEntryPoint.Callback = callback()
     private val presenter = presenterFactory.create(inputs.eventId.value, inputs.timelineProvider)
-    private val callbacks = plugins.filterIsInstance<Callback>()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         val callback = object : RoomSelectEntryPoint.Callback {
@@ -68,14 +67,16 @@ class ForwardMessagesNode(
             }
 
             override fun onCancel() {
-                navigateUp()
+                callback.onDone(emptyList())
             }
         }
 
-        return roomSelectEntryPoint.nodeBuilder(this, buildContext)
-            .callback(callback)
-            .params(RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward))
-            .build()
+        return roomSelectEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward),
+            callback = callback,
+        )
     }
 
     @Composable
@@ -89,16 +90,8 @@ class ForwardMessagesNode(
             val state = presenter.present()
             ForwardMessagesView(
                 state = state,
-                onForwardSuccess = ::onForwardSuccess,
+                onForwardSuccess = callback::onDone,
             )
         }
     }
-
-    private fun onForwardSuccess(roomIds: List<RoomId>) {
-        navigateUp()
-        if (roomIds.size == 1) {
-            val targetRoomId = roomIds.first()
-            callbacks.forEach { it.onForwardedToSingleRoom(targetRoomId) }
-        }
-    }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
similarity index 77%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
index 3e3860db3e..1145f294a3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenter.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -21,10 +22,9 @@ 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.timeline.TimelineProvider
 import io.element.android.libraries.matrix.api.timeline.getActiveTimeline
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @AssistedInject
 class ForwardMessagesPresenter(
@@ -36,19 +36,19 @@ class ForwardMessagesPresenter(
     private val eventId: EventId = EventId(eventId)
 
     @AssistedFactory
-    interface Factory {
+    fun interface Factory {
         fun create(eventId: String, timelineProvider: TimelineProvider): ForwardMessagesPresenter
     }
 
     private val forwardingActionState: MutableState<AsyncAction<List<RoomId>>> = mutableStateOf(AsyncAction.Uninitialized)
 
     fun onRoomSelected(roomIds: List<RoomId>) {
-        sessionCoroutineScope.forwardEvent(eventId, roomIds.toImmutableList(), forwardingActionState)
+        sessionCoroutineScope.forwardEvent(eventId, roomIds)
     }
 
     @Composable
     override fun present(): ForwardMessagesState {
-        fun handleEvents(event: ForwardMessagesEvents) {
+        fun handleEvent(event: ForwardMessagesEvents) {
             when (event) {
                 ForwardMessagesEvents.ClearError -> forwardingActionState.value = AsyncAction.Uninitialized
             }
@@ -56,18 +56,21 @@ class ForwardMessagesPresenter(
 
         return ForwardMessagesState(
             forwardAction = forwardingActionState.value,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
     private fun CoroutineScope.forwardEvent(
         eventId: EventId,
-        roomIds: ImmutableList<RoomId>,
-        isForwardMessagesState: MutableState<AsyncAction<List<RoomId>>>,
+        roomIds: List<RoomId>,
     ) = launch {
         suspend {
-            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds).getOrThrow()
+            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds)
+                .onFailure {
+                    Timber.e(it, "Error while forwarding event")
+                }
+                .getOrThrow()
             roomIds
-        }.runCatchingUpdatingState(isForwardMessagesState)
+        }.runCatchingUpdatingState(forwardingActionState)
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt
similarity index 73%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt
index a1de911c72..b1e46adb03 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesState.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStateProvider.kt
similarity index 89%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStateProvider.kt
index b1728f4657..bbb5b380ae 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStateProvider.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
similarity index 76%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
index 9ea76d754f..8065054b2d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
@@ -1,18 +1,21 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 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.matrix.api.core.RoomId
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun ForwardMessagesView(
@@ -24,6 +27,9 @@ fun ForwardMessagesView(
         onSuccess = {
             onForwardSuccess(it)
         },
+        errorMessage = {
+            stringResource(id = CommonStrings.error_unknown)
+        },
         onErrorDismiss = {
             state.eventSink(ForwardMessagesEvents.ClearError)
         },
diff --git a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt
new file mode 100644
index 0000000000..9ee932a246
--- /dev/null
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt
@@ -0,0 +1,66 @@
+/*
+ * 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.forward.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.forward.api.ForwardEntryPoint
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.timeline.FakeTimelineProvider
+import io.element.android.libraries.roomselect.test.FakeRoomSelectEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.node.TestParentNode
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class DefaultForwardEntryPointTest {
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @get:Rule
+    val mainDispatcherRule = MainDispatcherRule()
+
+    @Test
+    fun `test node builder`() = runTest {
+        val entryPoint = DefaultForwardEntryPoint()
+        val parentNode = TestParentNode.create { buildContext, plugins ->
+            ForwardMessagesNode(
+                buildContext = buildContext,
+                plugins = plugins,
+                presenterFactory = { _, _ -> createForwardMessagesPresenter() },
+                roomSelectEntryPoint = FakeRoomSelectEntryPoint(),
+            )
+        }
+        val callback = object : ForwardEntryPoint.Callback {
+            override fun onDone(roomIds: List<RoomId>) = lambdaError()
+        }
+        val params = ForwardEntryPoint.Params(
+            eventId = AN_EVENT_ID,
+            timelineProvider = FakeTimelineProvider(),
+        )
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
+        assertThat(result).isInstanceOf(ForwardMessagesNode::class.java)
+        assertThat(result.plugins).contains(
+            ForwardMessagesNode.Inputs(
+                eventId = params.eventId,
+                timelineProvider = params.timelineProvider,
+            )
+        )
+        assertThat(result.plugins).contains(callback)
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt
similarity index 84%
rename from features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt
rename to features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt
index 757e682592..5e2f74ccad 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
@@ -32,7 +33,7 @@ class ForwardMessagesPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
-        val presenter = aForwardMessagesPresenter()
+        val presenter = createForwardMessagesPresenter()
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -50,7 +51,7 @@ class ForwardMessagesPresenterTest {
             this.forwardEventLambda = forwardEventLambda
         }
         val room = FakeJoinedRoom(liveTimeline = timeline)
-        val presenter = aForwardMessagesPresenter(fakeRoom = room)
+        val presenter = createForwardMessagesPresenter(fakeRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -74,7 +75,7 @@ class ForwardMessagesPresenterTest {
             this.forwardEventLambda = forwardEventLambda
         }
         val room = FakeJoinedRoom(liveTimeline = timeline)
-        val presenter = aForwardMessagesPresenter(fakeRoom = room)
+        val presenter = createForwardMessagesPresenter(fakeRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -90,13 +91,13 @@ class ForwardMessagesPresenterTest {
             forwardEventLambda.assertions().isCalledOnce()
         }
     }
-
-    private fun TestScope.aForwardMessagesPresenter(
-        eventId: EventId = AN_EVENT_ID,
-        fakeRoom: FakeJoinedRoom = FakeJoinedRoom(),
-    ) = ForwardMessagesPresenter(
-        eventId = eventId.value,
-        timelineProvider = LiveTimelineProvider(fakeRoom),
-        sessionCoroutineScope = this,
-    )
 }
+
+fun TestScope.createForwardMessagesPresenter(
+    eventId: EventId = AN_EVENT_ID,
+    fakeRoom: FakeJoinedRoom = FakeJoinedRoom(),
+) = ForwardMessagesPresenter(
+    eventId = eventId.value,
+    timelineProvider = LiveTimelineProvider(fakeRoom),
+    sessionCoroutineScope = this,
+)
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesViewTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
similarity index 94%
rename from features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesViewTest.kt
rename to features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
index 0912fcc75c..f1e9bd8fc6 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesViewTest.kt
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.forward
+package io.element.android.features.forward.impl
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
diff --git a/features/forward/test/build.gradle.kts b/features/forward/test/build.gradle.kts
new file mode 100644
index 0000000000..bf9db05e34
--- /dev/null
+++ b/features/forward/test/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.forward.test"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.features.forward.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/forward/test/src/main/kotlin/io/element/android/features/forward/test/FakeForwardEntryPoint.kt b/features/forward/test/src/main/kotlin/io/element/android/features/forward/test/FakeForwardEntryPoint.kt
new file mode 100644
index 0000000000..9306ebcb29
--- /dev/null
+++ b/features/forward/test/src/main/kotlin/io/element/android/features/forward/test/FakeForwardEntryPoint.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.forward.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.forward.api.ForwardEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeForwardEntryPoint : ForwardEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ForwardEntryPoint.Params,
+        callback: ForwardEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/features/ftue/api/build.gradle.kts b/features/ftue/api/build.gradle.kts
index 933dbbd62a..4f1d8b14bc 100644
--- a/features/ftue/api/build.gradle.kts
+++ b/features/ftue/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt
index 3d5aae3860..fe5ffc3b44 100644
--- a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt
+++ b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt
index b596f328d5..1bc585f015 100644
--- a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt
+++ b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/build.gradle.kts b/features/ftue/impl/build.gradle.kts
index d7d61f6d8d..49b3baa71b 100644
--- a/features/ftue/impl/build.gradle.kts
+++ b/features/ftue/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt
index 4fa086f4cd..812910e182 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFtueEntryPoint : FtueEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<FtueFlowNode>(buildContext)
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
index 6552a3b360..8d66258e12 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -110,9 +111,12 @@ class FtueFlowNode(
                         defaultFtueService.updateFtueStep()
                     }
                 }
-                lockScreenEntryPoint.nodeBuilder(this, buildContext, LockScreenEntryPoint.Target.Setup)
-                    .callback(callback)
-                    .build()
+                lockScreenEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    navTarget = LockScreenEntryPoint.Target.Setup,
+                    callback = callback,
+                )
             }
         }
     }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueModule.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueModule.kt
index 656ffac512..52f7a43bde 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueModule.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/di/FtueModule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInEvents.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInEvents.kt
index dd133f8fd8..e0bd5acf43 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInEvents.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInNode.kt
index 6e13e23a31..52ad70b242 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt
index b6f5d76351..deb7fc59b9 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.permissions.api.PermissionStateProvider
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter
 import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
@@ -51,13 +52,13 @@ class NotificationsOptInPresenter(
     override fun present(): NotificationsOptInState {
         val notificationsPermissionsState = postNotificationPermissionsPresenter.present()
 
-        fun handleEvents(event: NotificationsOptInEvents) {
+        fun handleEvent(event: NotificationsOptInEvents) {
             when (event) {
                 NotificationsOptInEvents.ContinueClicked -> {
                     if (notificationsPermissionsState.permissionGranted) {
                         callback.onNotificationsOptInFinished()
                     } else {
-                        notificationsPermissionsState.eventSink(PermissionsEvents.RequestPermissions)
+                        notificationsPermissionsState.eventSink(PermissionsEvent.RequestPermissions)
                     }
                 }
                 NotificationsOptInEvents.NotNowClicked -> {
@@ -78,7 +79,7 @@ class NotificationsOptInPresenter(
 
         return NotificationsOptInState(
             notificationsPermissionState = notificationsPermissionsState,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInState.kt
index 92074d75ee..d12cec0778 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInState.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInStateProvider.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInStateProvider.kt
index 265c4e8a99..1b2e5d2d58 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInStateProvider.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInView.kt
index f23b9bafcd..6955d8e501 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInView.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt
index 02a27d381d..085240d83e 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,6 @@ 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
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.pop
@@ -29,6 +29,7 @@ import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.utils.OpenUrlInTabView
 import io.element.android.libraries.di.SessionScope
@@ -69,6 +70,8 @@ class FtueSessionVerificationFlowNode(
         fun onDone()
     }
 
+    private val callback: Callback = callback()
+
     private val secureBackupEntryPointCallback = object : SecureBackupEntryPoint.Callback {
         override fun onDone() {
             lifecycleScope.launch {
@@ -82,62 +85,67 @@ class FtueSessionVerificationFlowNode(
         return when (navTarget) {
             is NavTarget.Root -> {
                 val callback = object : ChooseSelfVerificationModeNode.Callback {
-                    override fun onUseAnotherDevice() {
+                    override fun navigateToUseAnotherDevice() {
                         backstack.push(NavTarget.UseAnotherDevice)
                     }
 
-                    override fun onUseRecoveryKey() {
+                    override fun navigateToUseRecoveryKey() {
                         backstack.push(NavTarget.EnterRecoveryKey)
                     }
 
-                    override fun onResetKey() {
+                    override fun navigateToResetKey() {
                         backstack.push(NavTarget.ResetIdentity)
                     }
 
-                    override fun onLearnMoreAboutEncryption() {
+                    override fun navigateToLearnMoreAboutEncryption() {
                         learnMoreUrl.value = LearnMoreConfig.DEVICE_VERIFICATION_URL
                     }
                 }
-
                 createNode<ChooseSelfVerificationModeNode>(buildContext, plugins = listOf(callback))
             }
             is NavTarget.UseAnotherDevice -> {
-                outgoingVerificationEntryPoint.nodeBuilder(this, buildContext)
-                    .params(OutgoingVerificationEntryPoint.Params(
+                outgoingVerificationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = OutgoingVerificationEntryPoint.Params(
                         showDeviceVerifiedScreen = true,
                         verificationRequest = VerificationRequest.Outgoing.CurrentSession,
-                    ))
-                    .callback(object : OutgoingVerificationEntryPoint.Callback {
+                    ),
+                    callback = object : OutgoingVerificationEntryPoint.Callback {
                         override fun onDone() {
-                            plugins<Callback>().forEach { it.onDone() }
+                            callback.onDone()
                         }
 
                         override fun onBack() {
                             backstack.pop()
                         }
 
-                        override fun onLearnMoreAboutEncryption() {
+                        override fun navigateToLearnMoreAboutEncryption() {
                             // Note that this callback is never called. The "Learn more" link is not displayed
                             // for the self session interactive verification.
                         }
-                    })
-                    .build()
+                    }
+                )
             }
             is NavTarget.EnterRecoveryKey -> {
-                secureBackupEntryPoint.nodeBuilder(this, buildContext)
-                    .params(SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))
-                    .callback(secureBackupEntryPointCallback)
-                    .build()
+                secureBackupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey),
+                    callback = secureBackupEntryPointCallback
+                )
             }
             is NavTarget.ResetIdentity -> {
-                secureBackupEntryPoint.nodeBuilder(this, buildContext)
-                    .params(SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity))
-                    .callback(object : SecureBackupEntryPoint.Callback {
+                secureBackupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity),
+                    callback = object : SecureBackupEntryPoint.Callback {
                         override fun onDone() {
-                            plugins<Callback>().forEach { it.onDone() }
+                            callback.onDone()
                         }
-                    })
-                    .build()
+                    },
+                )
             }
         }
     }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeEvent.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeEvent.kt
index 99e5950693..de7e1767f5 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeEvent.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeEvent.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt
index 99409ac2d2..e78eef7edb 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.logout.api.direct.DirectLogoutView
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -29,13 +30,13 @@ class ChooseSelfVerificationModeNode(
     private val directLogoutView: DirectLogoutView,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onUseAnotherDevice()
-        fun onUseRecoveryKey()
-        fun onResetKey()
-        fun onLearnMoreAboutEncryption()
+        fun navigateToUseAnotherDevice()
+        fun navigateToUseRecoveryKey()
+        fun navigateToResetKey()
+        fun navigateToLearnMoreAboutEncryption()
     }
 
-    private val callback = plugins<Callback>().first()
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -43,10 +44,10 @@ class ChooseSelfVerificationModeNode(
 
         ChooseSelfVerificationModeView(
             state = state,
-            onUseAnotherDevice = callback::onUseAnotherDevice,
-            onUseRecoveryKey = callback::onUseRecoveryKey,
-            onResetKey = callback::onResetKey,
-            onLearnMore = callback::onLearnMoreAboutEncryption,
+            onUseAnotherDevice = callback::navigateToUseAnotherDevice,
+            onUseRecoveryKey = callback::navigateToUseRecoveryKey,
+            onResetKey = callback::navigateToResetKey,
+            onLearnMore = callback::navigateToLearnMoreAboutEncryption,
             modifier = modifier,
         )
 
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt
index eb3c1330b3..ace890be9c 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,9 @@ import androidx.compose.runtime.remember
 import dev.zacsweers.metro.Inject
 import io.element.android.features.logout.api.direct.DirectLogoutEvents
 import io.element.android.features.logout.api.direct.DirectLogoutState
+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.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
 
@@ -27,22 +30,46 @@ class ChooseSelfVerificationModePresenter(
     @Composable
     override fun present(): ChooseSelfVerificationModeState {
         val hasDevicesToVerifyAgainst by encryptionService.hasDevicesToVerifyAgainst.collectAsState()
-        val recoveryState by encryptionService.recoveryStateStateFlow.collectAsState()
-        val canEnterRecoveryKey by remember { derivedStateOf { recoveryState == RecoveryState.INCOMPLETE } }
+        val canEnterRecoveryKey by encryptionService.recoveryStateStateFlow
+            .mapState { recoveryState ->
+                when (recoveryState) {
+                    RecoveryState.WAITING_FOR_SYNC,
+                    RecoveryState.UNKNOWN -> AsyncData.Loading()
+                    RecoveryState.INCOMPLETE -> AsyncData.Success(true)
+                    RecoveryState.ENABLED,
+                    RecoveryState.DISABLED -> AsyncData.Success(false)
+                }
+            }
+            .collectAsState()
+        val buttonsState by remember {
+            derivedStateOf {
+                val canUseAnotherDevice = hasDevicesToVerifyAgainst.dataOrNull()
+                val canEnterRecoveryKey = canEnterRecoveryKey.dataOrNull()
+                if (canUseAnotherDevice == null || canEnterRecoveryKey == null) {
+                    AsyncData.Loading()
+                } else {
+                    AsyncData.Success(
+                        ChooseSelfVerificationModeState.ButtonsState(
+                            canUseAnotherDevice = canUseAnotherDevice,
+                            canEnterRecoveryKey = canEnterRecoveryKey,
+                        )
+                    )
+                }
+            }
+        }
 
         val directLogoutState = directLogoutPresenter.present()
 
-        fun eventHandler(event: ChooseSelfVerificationModeEvent) {
+        fun handleEvent(event: ChooseSelfVerificationModeEvent) {
             when (event) {
                 ChooseSelfVerificationModeEvent.SignOut -> directLogoutState.eventSink(DirectLogoutEvents.Logout(ignoreSdkError = false))
             }
         }
 
         return ChooseSelfVerificationModeState(
-            canUseAnotherDevice = hasDevicesToVerifyAgainst,
-            canEnterRecoveryKey = canEnterRecoveryKey,
+            buttonsState = buttonsState,
             directLogoutState = directLogoutState,
-            eventSink = ::eventHandler,
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt
index 117768a6d2..4e27043f40 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt
@@ -1,17 +1,23 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.ftue.impl.sessionverification.choosemode
 
 import io.element.android.features.logout.api.direct.DirectLogoutState
+import io.element.android.libraries.architecture.AsyncData
 
 data class ChooseSelfVerificationModeState(
-    val canUseAnotherDevice: Boolean,
-    val canEnterRecoveryKey: Boolean,
+    val buttonsState: AsyncData<ButtonsState>,
     val directLogoutState: DirectLogoutState,
     val eventSink: (ChooseSelfVerificationModeEvent) -> Unit,
-)
+) {
+    data class ButtonsState(
+        val canUseAnotherDevice: Boolean,
+        val canEnterRecoveryKey: Boolean,
+    )
+}
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt
index e053728e2c..676c77211f 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,23 +10,49 @@ package io.element.android.features.ftue.impl.sessionverification.choosemode
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.logout.api.direct.aDirectLogoutState
+import io.element.android.libraries.architecture.AsyncData
 
 class ChooseSelfVerificationModeStateProvider :
     PreviewParameterProvider<ChooseSelfVerificationModeState> {
     override val values = sequenceOf(
-        aChooseSelfVerificationModeState(canUseAnotherDevice = false, canEnterRecoveryKey = true),
-        aChooseSelfVerificationModeState(canUseAnotherDevice = false, canEnterRecoveryKey = false),
-        aChooseSelfVerificationModeState(canUseAnotherDevice = true, canEnterRecoveryKey = true),
-        aChooseSelfVerificationModeState(canUseAnotherDevice = true, canEnterRecoveryKey = false),
+        aChooseSelfVerificationModeState(
+            buttonsState = AsyncData.Success(
+                aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = true),
+            ),
+        ),
+        aChooseSelfVerificationModeState(
+            buttonsState = AsyncData.Success(
+                aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = false),
+            ),
+        ),
+        aChooseSelfVerificationModeState(
+            buttonsState = AsyncData.Success(
+                aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = true),
+            ),
+        ),
+        aChooseSelfVerificationModeState(
+            buttonsState = AsyncData.Success(
+                aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = false),
+            ),
+        ),
+        aChooseSelfVerificationModeState(
+            buttonsState = AsyncData.Loading(),
+        ),
     )
 }
 
 fun aChooseSelfVerificationModeState(
-    canUseAnotherDevice: Boolean = true,
-    canEnterRecoveryKey: Boolean = true,
+    buttonsState: AsyncData<ChooseSelfVerificationModeState.ButtonsState> = AsyncData.Success(aButtonsState()),
 ) = ChooseSelfVerificationModeState(
-    canUseAnotherDevice = canUseAnotherDevice,
-    canEnterRecoveryKey = canEnterRecoveryKey,
+    buttonsState = buttonsState,
     directLogoutState = aDirectLogoutState(),
     eventSink = {},
 )
+
+fun aButtonsState(
+    canUseAnotherDevice: Boolean = true,
+    canEnterRecoveryKey: Boolean = true,
+) = ChooseSelfVerificationModeState.ButtonsState(
+    canUseAnotherDevice = canUseAnotherDevice,
+    canEnterRecoveryKey = canEnterRecoveryKey,
+)
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 b07c04ac9c..8f72f038de 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,6 +24,8 @@ 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.ftue.impl.R
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.atomic.atoms.LoadingButtonAtom
 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
@@ -50,7 +53,6 @@ fun ChooseSelfVerificationModeView(
     BackHandler {
         activity?.finish()
     }
-
     HeaderFooterPage(
         modifier = modifier,
         topBar = {
@@ -73,29 +75,12 @@ fun ChooseSelfVerificationModeView(
             )
         },
         footer = {
-            ButtonColumnMolecule(
-                modifier = Modifier.padding(bottom = 16.dp)
-            ) {
-                if (state.canUseAnotherDevice) {
-                    Button(
-                        modifier = Modifier.fillMaxWidth(),
-                        text = stringResource(R.string.screen_identity_use_another_device),
-                        onClick = onUseAnotherDevice,
-                    )
-                }
-                if (state.canEnterRecoveryKey) {
-                    Button(
-                        modifier = Modifier.fillMaxWidth(),
-                        text = stringResource(R.string.screen_session_verification_enter_recovery_key),
-                        onClick = onUseRecoveryKey,
-                    )
-                }
-                OutlinedButton(
-                    modifier = Modifier.fillMaxWidth(),
-                    text = stringResource(R.string.screen_identity_confirmation_cannot_confirm),
-                    onClick = onResetKey,
-                )
-            }
+            ChooseSelfVerificationModeButtons(
+                state = state,
+                onUseAnotherDevice = onUseAnotherDevice,
+                onUseRecoveryKey = onUseRecoveryKey,
+                onResetKey = onResetKey,
+            )
         }
     ) {
         Row(
@@ -113,6 +98,47 @@ fun ChooseSelfVerificationModeView(
     }
 }
 
+@Composable
+private fun ChooseSelfVerificationModeButtons(
+    state: ChooseSelfVerificationModeState,
+    onUseAnotherDevice: () -> Unit,
+    onUseRecoveryKey: () -> Unit,
+    onResetKey: () -> Unit,
+) {
+    ButtonColumnMolecule(
+        modifier = Modifier.padding(bottom = 16.dp)
+    ) {
+        when (state.buttonsState) {
+            AsyncData.Uninitialized,
+            is AsyncData.Failure,
+            is AsyncData.Loading -> {
+                LoadingButtonAtom()
+            }
+            is AsyncData.Success -> {
+                if (state.buttonsState.data.canUseAnotherDevice) {
+                    Button(
+                        modifier = Modifier.fillMaxWidth(),
+                        text = stringResource(R.string.screen_identity_use_another_device),
+                        onClick = onUseAnotherDevice,
+                    )
+                }
+                if (state.buttonsState.data.canEnterRecoveryKey) {
+                    Button(
+                        modifier = Modifier.fillMaxWidth(),
+                        text = stringResource(R.string.screen_session_verification_enter_recovery_key),
+                        onClick = onUseRecoveryKey,
+                    )
+                }
+                OutlinedButton(
+                    modifier = Modifier.fillMaxWidth(),
+                    text = stringResource(R.string.screen_identity_confirmation_cannot_confirm),
+                    onClick = onResetKey,
+                )
+            }
+        }
+    }
+}
+
 @PreviewsDayNight
 @Composable
 internal fun ChooseSelfVerificationModeViewPreview(
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt
index 40f19b1e7a..78bb5f5c38 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.ftue.impl.state
 import android.Manifest
 import android.os.Build
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
@@ -35,7 +35,6 @@ import kotlinx.coroutines.launch
 
 @ContributesBinding(SessionScope::class)
 @SingleIn(SessionScope::class)
-@Inject
 class DefaultFtueService(
     private val sdkVersionProvider: BuildVersionSdkIntProvider,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/InternalFtueState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/InternalFtueState.kt
index c620a2ca5b..b352a43fe5 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/InternalFtueState.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/InternalFtueState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/main/res/values-eo/translations.xml b/features/ftue/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index fae7da561c..0000000000
--- a/features/ftue/impl/src/main/res/values-eo/translations.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_identity_confirmation_create_new_recovery_key">"Create a new backup password"</string>
-  <string name="screen_identity_confirmation_subtitle">"Confirm this device to set up secure messaging."</string>
-  <string name="screen_identity_confirmation_title">"Confirm it\'s you"</string>
-  <string name="screen_identity_confirmation_use_recovery_key">"Use backup password"</string>
-  <string name="screen_identity_confirmed_title">"Device confirmed"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Enter backup password"</string>
-</resources>
diff --git a/features/ftue/impl/src/main/res/values-hr/translations.xml b/features/ftue/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..cb0e330872
--- /dev/null
+++ b/features/ftue/impl/src/main/res/values-hr/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_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_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>
+  <string name="screen_identity_confirmed_title">"Uređaj je potvrđen"</string>
+  <string name="screen_identity_use_another_device">"Upotrijebite drugi uređaj"</string>
+  <string name="screen_identity_waiting_on_other_device">"Čekanje na drugi uređaj…"</string>
+  <string name="screen_notification_optin_subtitle">"Postavke možete promijeniti poslije."</string>
+  <string name="screen_notification_optin_title">"Omogućite obavijesti i nikada ne propustite poruku"</string>
+  <string name="screen_session_verification_enter_recovery_key">"Unesi ključ za oporavak"</string>
+</resources>
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
index 3a8ed11ea2..bbab0fc647 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
@@ -1,19 +1,18 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.ftue.impl
 
-import android.content.Context
-import android.content.Intent
 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.lockscreen.api.LockScreenEntryPoint
+import io.element.android.features.lockscreen.test.FakeLockScreenEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@@ -36,19 +35,7 @@ class DefaultFtueEntryPointTest {
                 plugins = plugins,
                 analyticsEntryPoint = { _, _ -> lambdaError() },
                 defaultFtueService = createDefaultFtueService(),
-                lockScreenEntryPoint = object : LockScreenEntryPoint {
-                    override fun nodeBuilder(
-                        parentNode: com.bumble.appyx.core.node.Node,
-                        buildContext: BuildContext,
-                        navTarget: LockScreenEntryPoint.Target
-                    ): LockScreenEntryPoint.NodeBuilder {
-                        lambdaError()
-                    }
-
-                    override fun pinUnlockIntent(context: Context): Intent {
-                        lambdaError()
-                    }
-                },
+                lockScreenEntryPoint = FakeLockScreenEntryPoint(),
             )
         }
         val result = entryPoint.createNode(parentNode, BuildContext.root(null))
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
index e46f43f3c3..dee8c7c091 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt
index fbdc9d1dd1..32d68dd1e1 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt
index 3dbf5a6932..c95c455bfd 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,7 @@ import com.google.common.truth.Truth.assertThat
 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
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
@@ -22,23 +24,92 @@ import org.junit.Test
 
 class ChooseSessionVerificationModePresenterTest {
     @Test
-    fun `initial state - is relayed from EncryptionService`() = runTest {
-        val encryptionService = FakeEncryptionService().apply {
-            // Has device to verify against
-            emitHasDevicesToVerifyAgainst(false)
-            // Can enter recovery key
-            emitRecoveryState(RecoveryState.INCOMPLETE)
-        }
-        val presenter = createPresenter(encryptionService = encryptionService)
+    fun `present - initial state`() = runTest {
+        val presenter = createPresenter()
         presenter.test {
             awaitItem().run {
-                assertThat(canUseAnotherDevice).isFalse()
-                assertThat(canEnterRecoveryKey).isTrue()
+                assertThat(buttonsState.isLoading()).isTrue()
                 assertThat(directLogoutState.logoutAction.isUninitialized()).isTrue()
             }
         }
     }
 
+    @Test
+    fun `present - state is relayed from EncryptionService, order 1`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val presenter = createPresenter(encryptionService = encryptionService)
+        presenter.test {
+            assertThat(awaitItem().buttonsState.isLoading()).isTrue()
+            // Has device to verify against
+            encryptionService.emitHasDevicesToVerifyAgainst(AsyncData.Success(false))
+            // Can enter recovery key
+            encryptionService.emitRecoveryState(RecoveryState.DISABLED)
+            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
+                ChooseSelfVerificationModeState.ButtonsState(
+                    canUseAnotherDevice = false,
+                    canEnterRecoveryKey = false,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - state is relayed from EncryptionService, order 2`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val presenter = createPresenter(encryptionService = encryptionService)
+        presenter.test {
+            assertThat(awaitItem().buttonsState.isLoading()).isTrue()
+            // Can enter recovery key
+            encryptionService.emitRecoveryState(RecoveryState.DISABLED)
+            // Has device to verify against
+            encryptionService.emitHasDevicesToVerifyAgainst(AsyncData.Success(false))
+            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
+                ChooseSelfVerificationModeState.ButtonsState(
+                    canUseAnotherDevice = false,
+                    canEnterRecoveryKey = false,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - can use another device`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val presenter = createPresenter(encryptionService = encryptionService)
+        presenter.test {
+            assertThat(awaitItem().buttonsState.isLoading()).isTrue()
+            // Can enter recovery key
+            encryptionService.emitRecoveryState(RecoveryState.DISABLED)
+            // Has device to verify against
+            encryptionService.emitHasDevicesToVerifyAgainst(AsyncData.Success(true))
+            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
+                ChooseSelfVerificationModeState.ButtonsState(
+                    canUseAnotherDevice = true,
+                    canEnterRecoveryKey = false,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - can enter recovery key`() = runTest {
+        val encryptionService = FakeEncryptionService()
+        val presenter = createPresenter(encryptionService = encryptionService)
+        presenter.test {
+            assertThat(awaitItem().buttonsState.isLoading()).isTrue()
+            // Can enter recovery key
+            encryptionService.emitRecoveryState(RecoveryState.INCOMPLETE)
+            // Has device to verify against
+            encryptionService.emitHasDevicesToVerifyAgainst(AsyncData.Success(false))
+            assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo(
+                ChooseSelfVerificationModeState.ButtonsState(
+                    canUseAnotherDevice = false,
+                    canEnterRecoveryKey = true,
+                )
+            )
+        }
+    }
+
     @Test
     fun `sing out action triggers a direct logout`() = runTest {
         val logoutEventRecorder = lambdaRecorder<DirectLogoutEvents, Unit> {}
@@ -49,8 +120,8 @@ class ChooseSessionVerificationModePresenterTest {
         presenter.test {
             val initial = awaitItem()
             initial.eventSink(ChooseSelfVerificationModeEvent.SignOut)
-
-            logoutEventRecorder.assertions().isCalledOnce().with(value(DirectLogoutEvents.Logout(ignoreSdkError = false)))
+            logoutEventRecorder.assertions().isCalledOnce()
+                .with(value(DirectLogoutEvents.Logout(ignoreSdkError = false)))
         }
     }
 
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 ed7d99dd19..f201cb6c41 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ 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.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
@@ -43,7 +45,7 @@ class ChooseSessionVerificationModeViewTest {
     fun `clicking on use another device calls the callback`() {
         ensureCalledOnce { callback ->
             rule.setChooseSelfVerificationModeView(
-                aChooseSelfVerificationModeState(canUseAnotherDevice = true),
+                aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canUseAnotherDevice = true))),
                 onUseAnotherDevice = callback,
             )
             rule.clickOn(R.string.screen_identity_use_another_device)
@@ -55,7 +57,7 @@ class ChooseSessionVerificationModeViewTest {
     fun `clicking on enter recovery key calls the callback`() {
         ensureCalledOnce { callback ->
             rule.setChooseSelfVerificationModeView(
-                aChooseSelfVerificationModeState(canEnterRecoveryKey = true),
+                aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canEnterRecoveryKey = true))),
                 onEnterRecoveryKey = callback,
             )
             rule.clickOn(R.string.screen_session_verification_enter_recovery_key)
diff --git a/features/ftue/test/build.gradle.kts b/features/ftue/test/build.gradle.kts
index 9c0d4ffadd..4c7dc57535 100644
--- a/features/ftue/test/build.gradle.kts
+++ b/features/ftue/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/ftue/test/src/main/kotlin/io/element/android/features/ftue/test/FakeFtueService.kt b/features/ftue/test/src/main/kotlin/io/element/android/features/ftue/test/FakeFtueService.kt
index 1dbc2c281b..963f67c8e6 100644
--- a/features/ftue/test/src/main/kotlin/io/element/android/features/ftue/test/FakeFtueService.kt
+++ b/features/ftue/test/src/main/kotlin/io/element/android/features/ftue/test/FakeFtueService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/api/build.gradle.kts b/features/home/api/build.gradle.kts
index c1aee95e67..2e725659c1 100644
--- a/features/home/api/build.gradle.kts
+++ b/features/home/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
index 9beb147568..71ee093985 100644
--- a/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
+++ b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,21 +13,22 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 interface HomeEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onRoomClick(roomId: RoomId)
-        fun onStartChatClick()
-        fun onSettingsClick()
-        fun onSetUpRecoveryClick()
-        fun onSessionConfirmRecoveryKeyClick()
-        fun onRoomSettingsClick(roomId: RoomId)
-        fun onReportBugClick()
+        fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?)
+        fun navigateToCreateRoom()
+        fun navigateToSettings()
+        fun navigateToSetUpRecovery()
+        fun navigateToEnterRecoveryKey()
+        fun navigateToRoomSettings(roomId: RoomId)
+        fun navigateToBugReport()
     }
 }
diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts
index 9a29532ef0..b36ee6aed2 100644
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,7 +57,7 @@ dependencies {
     implementation(libs.haze)
     implementation(libs.haze.materials)
     implementation(projects.features.reportroom.api)
-    implementation(projects.features.changeroommemberroles.api)
+    implementation(projects.features.rolesandpermissions.api)
     implementation(projects.libraries.previewutils)
     api(projects.features.home.api)
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilder.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilder.kt
index 9c29766067..b29dc788a7 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilder.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilder.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt
index 272a9bc9b1..8da31b601d 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.features.home.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultHomeEntryPoint : HomeEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): HomeEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : HomeEntryPoint.NodeBuilder {
-            override fun callback(callback: HomeEntryPoint.Callback): HomeEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<HomeFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: HomeEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<HomeFlowNode>(buildContext, listOf(callback))
     }
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeEvents.kt
index bc0f821845..db9dafba63 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeEvents.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 94f243b634..d9f87e2edd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,8 @@ import androidx.activity.compose.LocalActivity
 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.ui.Modifier
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
@@ -21,7 +24,6 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -29,8 +31,6 @@ 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.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.features.home.impl.components.RoomListMenuAction
 import io.element.android.features.home.impl.model.RoomListRoomSummary
@@ -41,19 +41,35 @@ import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBl
 import io.element.android.features.leaveroom.api.LeaveRoomRenderer
 import io.element.android.features.logout.api.direct.DirectLogoutView
 import io.element.android.features.reportroom.api.ReportRoomEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.launchMolecule
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.deeplink.api.usecase.InviteFriendsUseCase
+import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.utils.DelayedVisibility
 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.services.analytics.api.AnalyticsService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
+import timber.log.Timber
+import kotlin.coroutines.cancellation.CancellationException
+import kotlin.time.Duration.Companion.milliseconds
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -70,6 +86,7 @@ class HomeFlowNode(
     private val declineInviteAndBlockUserEntryPoint: DeclineInviteAndBlockEntryPoint,
     private val changeRoomMemberRolesEntryPoint: ChangeRoomMemberRolesEntryPoint,
     private val leaveRoomRenderer: LeaveRoomRenderer,
+    @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
 ) : BaseFlowNode<HomeFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Root,
@@ -78,6 +95,7 @@ class HomeFlowNode(
     buildContext = buildContext,
     plugins = plugins
 ) {
+    private val callback: HomeEntryPoint.Callback = callback()
     private val stateFlow = launchMolecule { presenter.present() }
 
     override fun onBuilt() {
@@ -87,13 +105,17 @@ class HomeFlowNode(
                 analyticsService.screen(MobileScreen(screenName = MobileScreen.ScreenName.Home))
             }
         )
-        whenChildAttached { commonLifecycle: Lifecycle,
-                            changeRoomMemberRolesNode: ChangeRoomMemberRolesEntryPoint.NodeProxy ->
+        whenChildAttached {
+            commonLifecycle: Lifecycle,
+            changeRoomMemberRolesNode: ChangeRoomMemberRolesEntryPoint.NodeProxy,
+            ->
             commonLifecycle.coroutineScope.launch {
-                changeRoomMemberRolesNode.waitForRoleChanged()
+                val isNewOwnerSelected = changeRoomMemberRolesNode.waitForCompletion()
                 withContext(NonCancellable) {
                     backstack.pop()
-                    onNewOwnersSelected(changeRoomMemberRolesNode.roomId)
+                    if (isNewOwnerSelected) {
+                        onNewOwnersSelected(changeRoomMemberRolesNode.roomId)
+                    }
                 }
             }
         }
@@ -113,35 +135,11 @@ class HomeFlowNode(
         data class SelectNewOwnersWhenLeavingRoom(val roomId: RoomId) : NavTarget
     }
 
-    private fun onRoomClick(roomId: RoomId) {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onRoomClick(roomId) }
-    }
-
-    private fun onOpenSettings() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onSettingsClick() }
-    }
-
-    private fun onStartChatClick() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onStartChatClick() }
-    }
-
-    private fun onSetUpRecoveryClick() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onSetUpRecoveryClick() }
-    }
-
-    private fun onSessionConfirmRecoveryKeyClick() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClick() }
-    }
-
-    private fun onRoomSettingsClick(roomId: RoomId) {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onRoomSettingsClick(roomId) }
-    }
-
-    private fun onReportRoomClick(roomId: RoomId) {
+    private fun navigateToReportRoom(roomId: RoomId) {
         backstack.push(NavTarget.ReportRoom(roomId))
     }
 
-    private fun onDeclineInviteAndBlockUserClick(roomSummary: RoomListRoomSummary) {
+    private fun navigateToDeclineInviteAndBlockUser(roomSummary: RoomListRoomSummary) {
         backstack.push(NavTarget.DeclineInviteAndBlockUser(roomSummary.toInviteData()))
     }
 
@@ -151,12 +149,12 @@ class HomeFlowNode(
                 inviteFriendsUseCase.execute(activity)
             }
             RoomListMenuAction.ReportBug -> {
-                plugins<HomeEntryPoint.Callback>().forEach { it.onReportBugClick() }
+                callback.navigateToBugReport()
             }
         }
     }
 
-    private fun onSelectNewOwnersWhenLeavingRoom(roomId: RoomId) {
+    private fun navigateToSelectNewOwnersWhenLeavingRoom(roomId: RoomId) {
         backstack.push(NavTarget.SelectNewOwnersWhenLeavingRoom(roomId))
     }
 
@@ -168,22 +166,71 @@ class HomeFlowNode(
         return node(buildContext) { modifier ->
             val state by stateFlow.collectAsState()
             val activity = requireNotNull(LocalActivity.current)
+
+            val loadingJoinedRoomJob = remember { mutableStateOf<AsyncData<Job>>(AsyncData.Uninitialized) }
+            if (loadingJoinedRoomJob.value.isLoading()) {
+                DelayedVisibility(duration = 400.milliseconds) {
+                    ProgressDialog(
+                        onDismissRequest = {
+                            loadingJoinedRoomJob.value.dataOrNull()?.cancel()
+                            loadingJoinedRoomJob.value = AsyncData.Uninitialized
+                        }
+                    )
+                }
+            }
+
+            fun navigateToRoom(
+                roomId: RoomId,
+            ) {
+                if (!loadingJoinedRoomJob.value.isUninitialized()) {
+                    Timber.w("Already loading a room, ignoring navigateToRoom for $roomId")
+                    return
+                }
+
+                val job = sessionCoroutineScope.launch {
+                    runCatchingExceptions {
+                        matrixClient.getJoinedRoom(roomId)
+                    }.fold(
+                        onSuccess = { joinedRoom ->
+                            if (isActive) {
+                                callback.navigateToRoom(roomId, joinedRoom)
+                                loadingJoinedRoomJob.value = AsyncData.Success(coroutineContext.job)
+                                // Wait a bit before resetting the state to avoid allowing to open several rooms
+                                delay(200.milliseconds)
+                                loadingJoinedRoomJob.value = AsyncData.Uninitialized
+                            }
+                        },
+                        onFailure = {
+                            // If the operation wasn't cancelled, navigate without the room, using the room id
+                            if (it !is CancellationException) {
+                                callback.navigateToRoom(roomId, null)
+                            }
+                            loadingJoinedRoomJob.value = AsyncData.Failure(error = it, prevData = coroutineContext.job)
+                            // Wait a bit before resetting the state to avoid allowing to open several rooms
+                            delay(200.milliseconds)
+                            loadingJoinedRoomJob.value = AsyncData.Uninitialized
+                        }
+                    )
+                }
+                loadingJoinedRoomJob.value = AsyncData.Loading(job)
+            }
+
             HomeView(
                 homeState = state,
-                onRoomClick = this::onRoomClick,
-                onSettingsClick = this::onOpenSettings,
-                onStartChatClick = this::onStartChatClick,
-                onSetUpRecoveryClick = this::onSetUpRecoveryClick,
-                onConfirmRecoveryKeyClick = this::onSessionConfirmRecoveryKeyClick,
-                onRoomSettingsClick = this::onRoomSettingsClick,
+                onRoomClick = ::navigateToRoom,
+                onSettingsClick = callback::navigateToSettings,
+                onStartChatClick = callback::navigateToCreateRoom,
+                onSetUpRecoveryClick = callback::navigateToSetUpRecovery,
+                onConfirmRecoveryKeyClick = callback::navigateToEnterRecoveryKey,
+                onRoomSettingsClick = callback::navigateToRoomSettings,
                 onMenuActionClick = { onMenuActionClick(activity, it) },
-                onReportRoomClick = this::onReportRoomClick,
-                onDeclineInviteAndBlockUser = this::onDeclineInviteAndBlockUserClick,
+                onReportRoomClick = ::navigateToReportRoom,
+                onDeclineInviteAndBlockUser = ::navigateToDeclineInviteAndBlockUser,
                 modifier = modifier,
                 acceptDeclineInviteView = {
                     acceptDeclineInviteView.Render(
                         state = state.roomListState.acceptDeclineInviteState,
-                        onAcceptInviteSuccess = this::onRoomClick,
+                        onAcceptInviteSuccess = ::navigateToRoom,
                         onDeclineInviteSuccess = { },
                         modifier = Modifier
                     )
@@ -191,7 +238,7 @@ class HomeFlowNode(
                 leaveRoomView = {
                     leaveRoomRenderer.Render(
                         state = state.roomListState.leaveRoomState,
-                        onSelectNewOwners = this::onSelectNewOwnersWhenLeavingRoom,
+                        onSelectNewOwners = ::navigateToSelectNewOwnersWhenLeavingRoom,
                         modifier = Modifier
                     )
                 }
@@ -207,14 +254,28 @@ class HomeFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            is NavTarget.ReportRoom -> reportRoomEntryPoint.createNode(this, buildContext, navTarget.roomId)
-            is NavTarget.DeclineInviteAndBlockUser -> declineInviteAndBlockUserEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            is NavTarget.ReportRoom -> {
+                reportRoomEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    roomId = navTarget.roomId,
+                )
+            }
+            is NavTarget.DeclineInviteAndBlockUser -> {
+                declineInviteAndBlockUserEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inviteData = navTarget.inviteData,
+                )
+            }
             is NavTarget.SelectNewOwnersWhenLeavingRoom -> {
                 val room = runBlocking { matrixClient.getJoinedRoom(navTarget.roomId) } ?: error("Room ${navTarget.roomId} not found")
-                changeRoomMemberRolesEntryPoint.builder(this, buildContext)
-                    .room(room)
-                    .listType(ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving)
-                    .build()
+                changeRoomMemberRolesEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    room = room,
+                    listType = ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving,
+                )
             }
             NavTarget.Root -> rootNode(buildContext)
         }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeNavigationBarItem.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeNavigationBarItem.kt
index 328661c834..035e953b23 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeNavigationBarItem.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeNavigationBarItem.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,7 @@ enum class HomeNavigationBarItem(
         isSelected: Boolean,
     ) = when (this) {
         Chats -> if (isSelected) CompoundIcons.ChatSolid() else CompoundIcons.Chat()
-        Spaces -> if (isSelected) CompoundIcons.WorkspaceSolid() else CompoundIcons.Workspace()
+        Spaces -> if (isSelected) CompoundIcons.SpaceSolid() else CompoundIcons.Space()
     }
 
     companion object {
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 e3ca9612d1..e53d20857e 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -85,7 +86,7 @@ class HomePresenter(
         val showAvatarIndicator by indicatorService.showRoomListTopBarIndicator()
         val directLogoutState = logoutPresenter.present()
 
-        fun handleEvents(event: HomeEvents) {
+        fun handleEvent(event: HomeEvents) {
             when (event) {
                 is HomeEvents.SelectHomeNavigationBarItem -> coroutineState.launch {
                     if (event.item == HomeNavigationBarItem.Spaces) {
@@ -117,7 +118,7 @@ class HomePresenter(
             canReportBug = canReportBug,
             directLogoutState = directLogoutState,
             isSpaceFeatureEnabled = isSpaceFeatureEnabled,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 }
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 d35412734f..90667a8734 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
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import androidx.compose.runtime.Immutable
 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
@@ -15,7 +15,6 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
-@Immutable
 data class HomeState(
     /**
      * The current user of this session, in case of multiple accounts, will contains 3 items, with the
@@ -34,5 +33,6 @@ data class HomeState(
     val eventSink: (HomeEvents) -> Unit,
 ) {
     val displayActions = currentHomeNavigationBarItem == HomeNavigationBarItem.Chats
+    val displayRoomListFilters = currentHomeNavigationBarItem == HomeNavigationBarItem.Chats && roomListState.displayFilters
     val showNavigationBar = isSpaceFeatureEnabled && homeSpacesState.spaceRooms.isNotEmpty()
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeStateProvider.kt
index c5bb339661..43010b1720 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 aa4742f074..42e4f72073 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,7 @@ import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -40,9 +41,9 @@ import dev.chrisbanes.haze.materials.HazeMaterials
 import dev.chrisbanes.haze.rememberHazeState
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.home.impl.components.HomeTopBar
 import io.element.android.features.home.impl.components.RoomListContentView
 import io.element.android.features.home.impl.components.RoomListMenuAction
-import io.element.android.features.home.impl.components.RoomListTopBar
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.roomlist.RoomListContextMenu
 import io.element.android.features.home.impl.roomlist.RoomListDeclineInviteMenu
@@ -50,7 +51,6 @@ import io.element.android.features.home.impl.roomlist.RoomListEvents
 import io.element.android.features.home.impl.roomlist.RoomListState
 import io.element.android.features.home.impl.search.RoomListSearchView
 import io.element.android.features.home.impl.spaces.HomeSpacesView
-import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorContainer
 import io.element.android.libraries.androidutils.throttler.FirstThrottler
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -64,6 +64,7 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 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
+import kotlinx.coroutines.launch
 
 @Composable
 fun HomeView(
@@ -84,56 +85,47 @@ fun HomeView(
     val state: RoomListState = homeState.roomListState
     val coroutineScope = rememberCoroutineScope()
     val firstThrottler = remember { FirstThrottler(300, coroutineScope) }
-
-    ConnectivityIndicatorContainer(
-        modifier = modifier,
-        isOnline = homeState.hasNetworkConnection,
-    ) { topPadding ->
-        Box {
-            if (state.contextMenu is RoomListState.ContextMenu.Shown) {
-                RoomListContextMenu(
-                    contextMenu = state.contextMenu,
-                    canReportRoom = state.canReportRoom,
-                    eventSink = state.eventSink,
-                    onRoomSettingsClick = onRoomSettingsClick,
-                    onReportRoomClick = onReportRoomClick,
-                )
-            }
-            if (state.declineInviteMenu is RoomListState.DeclineInviteMenu.Shown) {
-                RoomListDeclineInviteMenu(
-                    menu = state.declineInviteMenu,
-                    canReportRoom = state.canReportRoom,
-                    eventSink = state.eventSink,
-                    onDeclineAndBlockClick = onDeclineInviteAndBlockUser,
-                )
-            }
-
-            leaveRoomView()
-
-            HomeScaffold(
-                state = homeState,
-                onSetUpRecoveryClick = onSetUpRecoveryClick,
-                onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
-                onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },
-                onOpenSettings = { if (firstThrottler.canHandle()) onSettingsClick() },
-                onStartChatClick = { if (firstThrottler.canHandle()) onStartChatClick() },
-                onMenuActionClick = onMenuActionClick,
-                modifier = Modifier.padding(top = topPadding),
-            )
-            // This overlaid view will only be visible when state.displaySearchResults is true
-            RoomListSearchView(
-                state = state.searchState,
+    Box(modifier) {
+        if (state.contextMenu is RoomListState.ContextMenu.Shown) {
+            RoomListContextMenu(
+                contextMenu = state.contextMenu,
+                canReportRoom = state.canReportRoom,
                 eventSink = state.eventSink,
-                hideInvitesAvatars = state.hideInvitesAvatars,
-                onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },
-                modifier = Modifier
-                    .statusBarsPadding()
-                    .padding(top = topPadding)
-                    .fillMaxSize()
-                    .background(ElementTheme.colors.bgCanvasDefault)
+                onRoomSettingsClick = onRoomSettingsClick,
+                onReportRoomClick = onReportRoomClick,
             )
-            acceptDeclineInviteView()
         }
+        if (state.declineInviteMenu is RoomListState.DeclineInviteMenu.Shown) {
+            RoomListDeclineInviteMenu(
+                menu = state.declineInviteMenu,
+                canReportRoom = state.canReportRoom,
+                eventSink = state.eventSink,
+                onDeclineAndBlockClick = onDeclineInviteAndBlockUser,
+            )
+        }
+
+        leaveRoomView()
+
+        HomeScaffold(
+            state = homeState,
+            onSetUpRecoveryClick = onSetUpRecoveryClick,
+            onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
+            onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },
+            onOpenSettings = { if (firstThrottler.canHandle()) onSettingsClick() },
+            onStartChatClick = { if (firstThrottler.canHandle()) onStartChatClick() },
+            onMenuActionClick = onMenuActionClick,
+        )
+        // This overlaid view will only be visible when state.displaySearchResults is true
+        RoomListSearchView(
+            state = state.searchState,
+            eventSink = state.eventSink,
+            hideInvitesAvatars = state.hideInvitesAvatars,
+            onRoomClick = { if (firstThrottler.canHandle()) onRoomClick(it) },
+            modifier = Modifier
+                .fillMaxSize()
+                .background(ElementTheme.colors.bgCanvasDefault)
+        )
+        acceptDeclineInviteView()
     }
 }
 
@@ -154,7 +146,7 @@ private fun HomeScaffold(
     }
 
     val appBarState = rememberTopAppBarState()
-    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(appBarState)
+    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(appBarState)
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
     val roomListState: RoomListState = state.roomListState
 
@@ -165,11 +157,13 @@ private fun HomeScaffold(
     }
 
     val hazeState = rememberHazeState()
+    val roomsLazyListState = rememberLazyListState()
+    val spacesLazyListState = rememberLazyListState()
 
     Scaffold(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
-            RoomListTopBar(
+            HomeTopBar(
                 title = stringResource(state.currentHomeNavigationBarItem.labelRes),
                 currentUserAndNeighbors = state.currentUserAndNeighbors,
                 showAvatarIndicator = state.showAvatarIndicator,
@@ -182,7 +176,7 @@ private fun HomeScaffold(
                 },
                 scrollBehavior = scrollBehavior,
                 displayMenuItems = state.displayActions,
-                displayFilters = roomListState.displayFilters && state.currentHomeNavigationBarItem == HomeNavigationBarItem.Chats,
+                displayFilters = state.displayRoomListFilters,
                 filtersState = roomListState.filtersState,
                 canReportBug = state.canReportBug,
                 modifier = if (state.isSpaceFeatureEnabled) {
@@ -191,41 +185,39 @@ private fun HomeScaffold(
                         style = HazeMaterials.thick(),
                     )
                 } else {
-                    Modifier
-                        .background(ElementTheme.colors.bgCanvasDefault)
+                    Modifier.background(ElementTheme.colors.bgCanvasDefault)
                 }
             )
         },
         bottomBar = {
             if (state.showNavigationBar) {
-                NavigationBar(
-                    containerColor = Color.Transparent,
-                    modifier = Modifier
-                        .hazeEffect(
-                            state = hazeState,
-                            style = HazeMaterials.thick(),
-                        )
-                ) {
-                    HomeNavigationBarItem.entries.forEach { item ->
-                        val isSelected = state.currentHomeNavigationBarItem == item
-                        NavigationBarItem(
-                            selected = isSelected,
-                            onClick = {
-                                state.eventSink(HomeEvents.SelectHomeNavigationBarItem(item))
-                            },
-                            icon = {
-                                NavigationBarIcon(
-                                    imageVector = item.icon(isSelected),
-                                )
-                            },
-                            label = {
-                                NavigationBarText(
-                                    text = stringResource(item.labelRes),
-                                )
+                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(HomeEvents.SelectHomeNavigationBarItem(item))
+                        }
+                    },
+                    modifier = Modifier.hazeEffect(
+                        state = hazeState,
+                        style = HazeMaterials.thick(),
+                    )
+                )
             }
         },
         content = { padding ->
@@ -234,6 +226,7 @@ private fun HomeScaffold(
                     RoomListContentView(
                         contentState = roomListState.contentState,
                         filtersState = roomListState.filtersState,
+                        lazyListState = roomsLazyListState,
                         hideInvitesAvatars = roomListState.hideInvitesAvatars,
                         eventSink = roomListState.eventSink,
                         onSetUpRecoveryClick = onSetUpRecoveryClick,
@@ -271,6 +264,7 @@ private fun HomeScaffold(
                             .consumeWindowInsets(padding)
                             .hazeSource(state = hazeState),
                         state = state.homeSpacesState,
+                        lazyListState = spacesLazyListState,
                         onSpaceClick = { spaceId ->
                             onRoomClick(spaceId)
                         }
@@ -294,6 +288,38 @@ private fun HomeScaffold(
     )
 }
 
+@Composable
+private fun HomeBottomBar(
+    currentHomeNavigationBarItem: HomeNavigationBarItem,
+    onItemClick: (HomeNavigationBarItem) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    NavigationBar(
+        containerColor = Color.Transparent,
+        modifier = modifier
+    ) {
+        HomeNavigationBarItem.entries.forEach { item ->
+            val isSelected = currentHomeNavigationBarItem == item
+            NavigationBarItem(
+                selected = isSelected,
+                onClick = {
+                    onItemClick(item)
+                },
+                icon = {
+                    NavigationBarIcon(
+                        imageVector = item.icon(isSelected),
+                    )
+                },
+                label = {
+                    NavigationBarText(
+                        text = stringResource(item.labelRes),
+                    )
+                }
+            )
+        }
+    }
+}
+
 internal fun RoomListRoomSummary.contentType() = displayType.ordinal
 
 @PreviewsDayNight
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt
index 389c2aecfb..cc3227f965 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BannerPadding.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt
index 017ca9592d..c6a9480bc9 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt
index c833e2914a..c0f83538c9 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/ConfirmRecoveryKeyBanner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt
index e89392da62..92a5d8dbaa 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/FullScreenIntentPermissionBanner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt
similarity index 51%
rename from features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt
rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt
index abd6e7892d..093b91fb66 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,14 +11,12 @@ 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.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.pager.VerticalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
@@ -32,7 +31,6 @@ 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.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
@@ -46,22 +44,20 @@ import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.filters.RoomListFiltersView
 import io.element.android.features.home.impl.filters.aRoomListFiltersState
 import io.element.android.libraries.designsystem.atomic.atoms.RedIndicatorAtom
+import io.element.android.libraries.designsystem.components.TopAppBarScrollBehaviorLayout
 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
 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.text.applyScaleDown
-import io.element.android.libraries.designsystem.text.toSp
 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
-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.MediumTopAppBar
 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
@@ -76,7 +72,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun RoomListTopBar(
+fun HomeTopBar(
     title: String,
     currentUserAndNeighbors: ImmutableList<MatrixUser>,
     showAvatarIndicator: Boolean,
@@ -87,169 +83,113 @@ fun RoomListTopBar(
     onAccountSwitch: (SessionId) -> Unit,
     scrollBehavior: TopAppBarScrollBehavior,
     displayMenuItems: Boolean,
+    canReportBug: Boolean,
     displayFilters: Boolean,
     filtersState: RoomListFiltersState,
-    canReportBug: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    DefaultRoomListTopBar(
-        title = title,
-        currentUserAndNeighbors = currentUserAndNeighbors,
-        showAvatarIndicator = showAvatarIndicator,
-        areSearchResultsDisplayed = areSearchResultsDisplayed,
-        onOpenSettings = onOpenSettings,
-        onAccountSwitch = onAccountSwitch,
-        onSearchClick = onToggleSearch,
-        onMenuActionClick = onMenuActionClick,
-        scrollBehavior = scrollBehavior,
-        displayMenuItems = displayMenuItems,
-        displayFilters = displayFilters,
-        filtersState = filtersState,
-        canReportBug = canReportBug,
-        modifier = modifier,
-    )
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun DefaultRoomListTopBar(
-    title: String,
-    currentUserAndNeighbors: ImmutableList<MatrixUser>,
-    showAvatarIndicator: Boolean,
-    areSearchResultsDisplayed: Boolean,
-    scrollBehavior: TopAppBarScrollBehavior,
-    onOpenSettings: () -> Unit,
-    onAccountSwitch: (SessionId) -> Unit,
-    onSearchClick: () -> Unit,
-    onMenuActionClick: (RoomListMenuAction) -> Unit,
-    displayMenuItems: Boolean,
-    displayFilters: Boolean,
-    filtersState: RoomListFiltersState,
-    canReportBug: Boolean,
-    modifier: Modifier = Modifier,
-) {
-    val collapsedFraction = scrollBehavior.state.collapsedFraction
-    Box(modifier = modifier) {
-        val collapsedTitleTextStyle = ElementTheme.typography.aliasScreenTitle
-        val expandedTitleTextStyle = ElementTheme.typography.fontHeadingLgBold.copy(
-            // Due to a limitation of MediumTopAppBar, and to avoid the text to be truncated,
-            // ensure that the font size will never be bigger than 28.dp.
-            fontSize = 28.dp.applyScaleDown().toSp()
-        )
-        MaterialTheme(
-            colorScheme = ElementTheme.materialColors,
-            shapes = MaterialTheme.shapes,
-            typography = ElementTheme.materialTypography.copy(
-                headlineSmall = expandedTitleTextStyle,
-                titleLarge = collapsedTitleTextStyle
+    Column(modifier) {
+        TopAppBar(
+            modifier = Modifier
+                .backgroundVerticalGradient(
+                    isVisible = !areSearchResultsDisplayed,
+                )
+                .statusBarsPadding(),
+            colors = TopAppBarDefaults.topAppBarColors(
+                containerColor = Color.Transparent,
+                scrolledContainerColor = Color.Transparent,
             ),
-        ) {
-            Column {
-                MediumTopAppBar(
-                    modifier = Modifier
-                        .backgroundVerticalGradient(
-                            isVisible = !areSearchResultsDisplayed,
-                        )
-                        .statusBarsPadding(),
-                    colors = TopAppBarDefaults.mediumTopAppBarColors(
-                        containerColor = Color.Transparent,
-                        scrolledContainerColor = Color.Transparent,
-                    ),
-                    title = {
-                        Text(
-                            modifier = Modifier.semantics {
-                                heading()
-                            },
-                            text = title,
-                        )
+            title = {
+                Text(
+                    modifier = Modifier.semantics {
+                        heading()
                     },
-                    navigationIcon = {
-                        NavigationIcon(
-                            currentUserAndNeighbors = currentUserAndNeighbors,
-                            showAvatarIndicator = showAvatarIndicator,
-                            onAccountSwitch = onAccountSwitch,
-                            onClick = onOpenSettings,
+                    style = ElementTheme.typography.aliasScreenTitle,
+                    text = title,
+                )
+            },
+            navigationIcon = {
+                NavigationIcon(
+                    currentUserAndNeighbors = currentUserAndNeighbors,
+                    showAvatarIndicator = showAvatarIndicator,
+                    onAccountSwitch = onAccountSwitch,
+                    onClick = onOpenSettings,
+                )
+            },
+            actions = {
+                if (displayMenuItems) {
+                    IconButton(
+                        onClick = onToggleSearch,
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.Search(),
+                            contentDescription = stringResource(CommonStrings.action_search),
                         )
-                    },
-                    actions = {
-                        if (displayMenuItems) {
-                            IconButton(
-                                onClick = onSearchClick,
-                            ) {
-                                Icon(
-                                    imageVector = CompoundIcons.Search(),
-                                    contentDescription = stringResource(CommonStrings.action_search),
+                    }
+                    if (RoomListConfig.HAS_DROP_DOWN_MENU) {
+                        var showMenu by remember { mutableStateOf(false) }
+                        IconButton(
+                            onClick = { showMenu = !showMenu }
+                        ) {
+                            Icon(
+                                imageVector = CompoundIcons.OverflowVertical(),
+                                contentDescription = null,
+                            )
+                        }
+                        DropdownMenu(
+                            expanded = showMenu,
+                            onDismissRequest = { showMenu = false }
+                        ) {
+                            if (RoomListConfig.SHOW_INVITE_MENU_ITEM) {
+                                DropdownMenuItem(
+                                    onClick = {
+                                        showMenu = false
+                                        onMenuActionClick(RoomListMenuAction.InviteFriends)
+                                    },
+                                    text = { Text(stringResource(id = CommonStrings.action_invite)) },
+                                    leadingIcon = {
+                                        Icon(
+                                            imageVector = CompoundIcons.ShareAndroid(),
+                                            tint = ElementTheme.colors.iconSecondary,
+                                            contentDescription = null,
+                                        )
+                                    }
                                 )
                             }
-                            if (RoomListConfig.HAS_DROP_DOWN_MENU) {
-                                var showMenu by remember { mutableStateOf(false) }
-                                IconButton(
-                                    onClick = { showMenu = !showMenu }
-                                ) {
-                                    Icon(
-                                        imageVector = CompoundIcons.OverflowVertical(),
-                                        contentDescription = null,
-                                    )
-                                }
-                                DropdownMenu(
-                                    expanded = showMenu,
-                                    onDismissRequest = { showMenu = false }
-                                ) {
-                                    if (RoomListConfig.SHOW_INVITE_MENU_ITEM) {
-                                        DropdownMenuItem(
-                                            onClick = {
-                                                showMenu = false
-                                                onMenuActionClick(RoomListMenuAction.InviteFriends)
-                                            },
-                                            text = { Text(stringResource(id = CommonStrings.action_invite)) },
-                                            leadingIcon = {
-                                                Icon(
-                                                    imageVector = CompoundIcons.ShareAndroid(),
-                                                    tint = ElementTheme.colors.iconSecondary,
-                                                    contentDescription = null,
-                                                )
-                                            }
+                            if (RoomListConfig.SHOW_REPORT_PROBLEM_MENU_ITEM && canReportBug) {
+                                DropdownMenuItem(
+                                    onClick = {
+                                        showMenu = false
+                                        onMenuActionClick(RoomListMenuAction.ReportBug)
+                                    },
+                                    text = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
+                                    leadingIcon = {
+                                        Icon(
+                                            imageVector = CompoundIcons.ChatProblem(),
+                                            tint = ElementTheme.colors.iconSecondary,
+                                            contentDescription = null,
                                         )
                                     }
-                                    if (RoomListConfig.SHOW_REPORT_PROBLEM_MENU_ITEM && canReportBug) {
-                                        DropdownMenuItem(
-                                            onClick = {
-                                                showMenu = false
-                                                onMenuActionClick(RoomListMenuAction.ReportBug)
-                                            },
-                                            text = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
-                                            leadingIcon = {
-                                                Icon(
-                                                    imageVector = CompoundIcons.ChatProblem(),
-                                                    tint = ElementTheme.colors.iconSecondary,
-                                                    contentDescription = null,
-                                                )
-                                            }
-                                        )
-                                    }
-                                }
+                                )
                             }
                         }
-                    },
-                    scrollBehavior = scrollBehavior,
-                    windowInsets = WindowInsets(0.dp),
-                )
-                if (displayFilters) {
-                    RoomListFiltersView(
-                        state = filtersState,
-                        modifier = Modifier.padding(bottom = 16.dp)
-                    )
+                    }
                 }
+            },
+            // We want a 16dp left padding for the navigationIcon :
+            // 4dp from default TopAppBarHorizontalPadding
+            // 8dp from AccountIcon default padding (because of IconButton)
+            // 4dp extra padding using left insets
+            windowInsets = WindowInsets(left = 4.dp),
+        )
+        if (displayFilters) {
+            TopAppBarScrollBehaviorLayout(scrollBehavior = scrollBehavior) {
+                RoomListFiltersView(
+                    state = filtersState,
+                    modifier = Modifier.padding(bottom = 16.dp)
+                )
             }
         }
-
-        HorizontalDivider(
-            modifier = Modifier
-                .fillMaxWidth()
-                .alpha(collapsedFraction)
-                .align(Alignment.BottomCenter),
-            color = ElementTheme.materialColors.outlineVariant,
-        )
     }
 }
 
@@ -301,9 +241,11 @@ private fun AccountIcon(
     isCurrentAccount: Boolean,
     showAvatarIndicator: Boolean,
     onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
+    val testTag = if (isCurrentAccount) Modifier.testTag(TestTags.homeScreenSettings) else Modifier
     IconButton(
-        modifier = if (isCurrentAccount) Modifier.testTag(TestTags.homeScreenSettings) else Modifier,
+        modifier = modifier.then(testTag),
         onClick = onClick,
     ) {
         Box {
@@ -329,20 +271,20 @@ private fun AccountIcon(
 @OptIn(ExperimentalMaterial3Api::class)
 @PreviewsDayNight
 @Composable
-internal fun DefaultRoomListTopBarPreview() = ElementPreview {
-    DefaultRoomListTopBar(
+internal fun HomeTopBarPreview() = ElementPreview {
+    HomeTopBar(
         title = stringResource(R.string.screen_roomlist_main_space_title),
         currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
-        scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
+        scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
         onOpenSettings = {},
         onAccountSwitch = {},
-        onSearchClick = {},
+        onToggleSearch = {},
         displayMenuItems = true,
+        canReportBug = true,
         displayFilters = true,
         filtersState = aRoomListFiltersState(),
-        canReportBug = true,
         onMenuActionClick = {},
     )
 }
@@ -350,20 +292,20 @@ internal fun DefaultRoomListTopBarPreview() = ElementPreview {
 @OptIn(ExperimentalMaterial3Api::class)
 @PreviewsDayNight
 @Composable
-internal fun DefaultRoomListTopBarWithIndicatorPreview() = ElementPreview {
-    DefaultRoomListTopBar(
+internal fun HomeTopBarWithIndicatorPreview() = ElementPreview {
+    HomeTopBar(
         title = stringResource(R.string.screen_roomlist_main_space_title),
         currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
         showAvatarIndicator = true,
         areSearchResultsDisplayed = false,
-        scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
+        scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
         onOpenSettings = {},
         onAccountSwitch = {},
-        onSearchClick = {},
+        onToggleSearch = {},
         displayMenuItems = true,
+        canReportBug = true,
         displayFilters = true,
         filtersState = aRoomListFiltersState(),
-        canReportBug = true,
         onMenuActionClick = {},
     )
 }
@@ -371,20 +313,20 @@ internal fun DefaultRoomListTopBarWithIndicatorPreview() = ElementPreview {
 @OptIn(ExperimentalMaterial3Api::class)
 @PreviewsDayNight
 @Composable
-internal fun DefaultRoomListTopBarMultiAccountPreview() = ElementPreview {
-    DefaultRoomListTopBar(
+internal fun HomeTopBarMultiAccountPreview() = ElementPreview {
+    HomeTopBar(
         title = stringResource(R.string.screen_roomlist_main_space_title),
         currentUserAndNeighbors = aMatrixUserList().take(3).toImmutableList(),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
-        scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
+        scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
         onOpenSettings = {},
         onAccountSwitch = {},
-        onSearchClick = {},
+        onToggleSearch = {},
         displayMenuItems = true,
+        canReportBug = true,
         displayFilters = true,
         filtersState = aRoomListFiltersState(),
-        canReportBug = true,
         onMenuActionClick = {},
     )
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/NewNotificationSoundBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/NewNotificationSoundBanner.kt
index f7516e41e8..c1c5ac0aef 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/NewNotificationSoundBanner.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/NewNotificationSoundBanner.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 34d036b204..364fe596f8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 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.runtime.Composable
@@ -60,6 +62,7 @@ import kotlinx.collections.immutable.ImmutableList
 fun RoomListContentView(
     contentState: RoomListContentState,
     filtersState: RoomListFiltersState,
+    lazyListState: LazyListState,
     hideInvitesAvatars: Boolean,
     eventSink: (RoomListEvents) -> Unit,
     onSetUpRecoveryClick: () -> Unit,
@@ -97,6 +100,7 @@ fun RoomListContentView(
                 onSetUpRecoveryClick = onSetUpRecoveryClick,
                 onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
                 onRoomClick = onRoomClick,
+                lazyListState = lazyListState,
                 contentPadding = contentPadding,
             )
         }
@@ -176,6 +180,7 @@ private fun RoomsView(
     onConfirmRecoveryKeyClick: () -> Unit,
     onRoomClick: (RoomListRoomSummary) -> Unit,
     contentPadding: PaddingValues,
+    lazyListState: LazyListState,
     modifier: Modifier = Modifier,
 ) {
     if (state.summaries.isEmpty() && filtersState.hasAnyFilterSelected) {
@@ -192,6 +197,7 @@ private fun RoomsView(
             onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
             onRoomClick = onRoomClick,
             contentPadding = contentPadding,
+            lazyListState = lazyListState,
             modifier = modifier.fillMaxSize(),
         )
     }
@@ -206,9 +212,9 @@ private fun RoomsViewList(
     onConfirmRecoveryKeyClick: () -> Unit,
     onRoomClick: (RoomListRoomSummary) -> Unit,
     contentPadding: PaddingValues,
+    lazyListState: LazyListState,
     modifier: Modifier = Modifier,
 ) {
-    val lazyListState = rememberLazyListState()
     val visibleRange by remember {
         derivedStateOf {
             val layoutInfo = lazyListState.layoutInfo
@@ -343,6 +349,7 @@ internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePr
         onConfirmRecoveryKeyClick = {},
         onRoomClick = {},
         onCreateRoomClick = {},
+        lazyListState = rememberLazyListState(),
         contentPadding = PaddingValues(0.dp),
     )
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt
index 9f17fc835e..2cfc589131 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListMenuAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt
index f07fe880b3..466abb76d3 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryPlaceholderRow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c5e1798baa..50b9559e94 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,6 +40,7 @@ import androidx.compose.ui.zIndex
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.home.impl.R
+import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomListRoomSummaryProvider
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
@@ -218,16 +220,20 @@ private fun NameAndTimestampRow(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = spacedBy(16.dp)
     ) {
-        // Name
-        Text(
+        Row(
             modifier = Modifier.weight(1f),
-            style = ElementTheme.typography.fontBodyLgMedium,
-            text = name ?: stringResource(id = CommonStrings.common_no_room_name),
-            fontStyle = FontStyle.Italic.takeIf { name == null },
-            color = ElementTheme.colors.roomListRoomName,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis
-        )
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            // Name
+            Text(
+                style = ElementTheme.typography.fontBodyLgMedium,
+                text = name ?: stringResource(id = CommonStrings.common_no_room_name),
+                fontStyle = FontStyle.Italic.takeIf { name == null },
+                color = ElementTheme.colors.roomListRoomName,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
         // Timestamp
         Text(
             text = timestamp ?: "",
@@ -271,24 +277,64 @@ private fun MessagePreviewAndIndicatorRow(
 ) {
     Row(
         modifier = modifier.fillMaxWidth(),
-        horizontalArrangement = spacedBy(28.dp)
     ) {
-        val messagePreview = if (room.isTombstoned) {
-            stringResource(R.string.screen_roomlist_tombstoned_room_description)
+        if (room.isTombstoned) {
+            Text(
+                modifier = Modifier.weight(1f),
+                text = stringResource(R.string.screen_roomlist_tombstoned_room_description),
+                color = ElementTheme.colors.roomListRoomMessage,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                minLines = 2,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
         } else {
-            room.lastMessage.orEmpty()
+            if (room.latestEvent is LatestEvent.Error) {
+                Icon(
+                    modifier = Modifier
+                        .padding(top = 2.dp)
+                        .size(16.dp),
+                    imageVector = CompoundIcons.ErrorSolid(),
+                    // The last message contains the error.
+                    contentDescription = null,
+                    tint = ElementTheme.colors.iconCriticalPrimary,
+                )
+                Spacer(modifier = Modifier.width(6.dp))
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = stringResource(CommonStrings.common_message_failed_to_send),
+                    color = ElementTheme.colors.textCriticalPrimary,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    minLines = 2,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            } else {
+                if (room.latestEvent is LatestEvent.Sending) {
+                    Icon(
+                        modifier = Modifier
+                            .padding(top = 2.dp)
+                            .size(16.dp),
+                        imageVector = CompoundIcons.Time(),
+                        contentDescription = stringResource(CommonStrings.common_sending),
+                        tint = ElementTheme.colors.iconTertiary,
+                    )
+                    Spacer(modifier = Modifier.width(6.dp))
+                }
+                val messagePreview = room.latestEvent.content()
+                val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.orEmpty().toString())
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = annotatedMessagePreview,
+                    color = ElementTheme.colors.roomListRoomMessage,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    minLines = 2,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
         }
-        val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.toString())
-        Text(
-            modifier = Modifier.weight(1f),
-            text = annotatedMessagePreview,
-            color = ElementTheme.colors.roomListRoomMessage,
-            style = ElementTheme.typography.fontBodyMdRegular,
-            minLines = 2,
-            maxLines = 2,
-            overflow = TextOverflow.Ellipsis
-        )
-
+        Spacer(modifier = Modifier.width(16.dp))
         // Call and unread
         Row(
             modifier = Modifier
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt
index 37aed6d130..0d3bf87b07 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/SetUpRecoveryKeyBanner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b9e8d27bf7..ef5d1ffcc6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ffd6f640ac..0200f495ef 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
@@ -1,22 +1,25 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.datasource
 
 import dev.zacsweers.metro.Inject
+import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.libraries.core.extensions.orEmpty
 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.RoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 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.getAvatarData
 import io.element.android.libraries.matrix.ui.model.toInviteSender
@@ -25,7 +28,7 @@ import kotlinx.collections.immutable.toImmutableList
 @Inject
 class RoomListRoomSummaryFactory(
     private val dateFormatter: DateFormatter,
-    private val roomLastMessageFormatter: RoomLastMessageFormatter,
+    private val roomLatestEventFormatter: RoomLatestEventFormatter,
 ) {
     fun create(roomSummary: RoomSummary): RoomListRoomSummary {
         val roomInfo = roomSummary.info
@@ -39,13 +42,11 @@ class RoomListRoomSummaryFactory(
             numberOfUnreadNotifications = roomInfo.numUnreadNotifications,
             isMarkedUnread = roomInfo.isMarkedUnread,
             timestamp = dateFormatter.format(
-                timestamp = roomSummary.lastMessageTimestamp,
+                timestamp = roomSummary.latestEventTimestamp,
                 mode = DateFormatterMode.TimeOrDate,
                 useRelative = true,
             ),
-            lastMessage = roomSummary.lastMessage?.let { message ->
-                roomLastMessageFormatter.format(message.event, roomInfo.isDm)
-            }.orEmpty(),
+            latestEvent = computeLatestEvent(roomSummary.latestEvent, roomInfo.isDm),
             avatarData = avatarData,
             userDefinedNotificationMode = roomInfo.userDefinedNotificationMode,
             hasRoomCall = roomInfo.hasRoomCall,
@@ -72,4 +73,28 @@ class RoomListRoomSummaryFactory(
             isSpace = roomInfo.isSpace,
         )
     }
+
+    private fun computeLatestEvent(latestEvent: LatestEventValue, dm: Boolean): LatestEvent {
+        return when (latestEvent) {
+            is LatestEventValue.None -> {
+                LatestEvent.None
+            }
+            is LatestEventValue.Local -> {
+                if (latestEvent.isSending) {
+                    val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty()
+                    LatestEvent.Sending(
+                        content = content,
+                    )
+                } else {
+                    LatestEvent.Error
+                }
+            }
+            is LatestEventValue.Remote -> {
+                val content = roomLatestEventFormatter.format(latestEvent, dm).orEmpty()
+                LatestEvent.Synced(
+                    content = content,
+                )
+            }
+        }
+    }
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/HomeSpacesModule.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/HomeSpacesModule.kt
index e8631431ca..5e2212375d 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/HomeSpacesModule.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/HomeSpacesModule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt
index 926205cbea..ea80c1b3cb 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/di/RoomListModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt
index 2c7ebc3573..1f627eca4e 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFilter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt
index 61436a0054..7381ac308e 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResources.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt
index 13fcc656e8..8b1906d28f 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt
index 08c34d60ff..4b20c69751 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,7 @@ class RoomListFiltersPresenter(
 
     @Composable
     override fun present(): RoomListFiltersState {
-        fun handleEvents(event: RoomListFiltersEvents) {
+        fun handleEvent(event: RoomListFiltersEvents) {
             when (event) {
                 RoomListFiltersEvents.ClearSelectedFilters -> {
                     filterSelectionStrategy.clear()
@@ -63,7 +64,7 @@ class RoomListFiltersPresenter(
 
         return RoomListFiltersState(
             filterSelectionStates = filters,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt
index 215641c5b2..104a99cfbd 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt
index 8cba01163c..7d73727484 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt
index 91b00b1180..588da6b9db 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,6 +20,7 @@ import androidx.compose.foundation.layout.PaddingValues
 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.lazy.LazyRow
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
@@ -34,6 +36,7 @@ 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.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -48,6 +51,9 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 
+/**
+ * Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2191-606
+ */
 @Composable
 fun RoomListFiltersView(
     state: RoomListFiltersState,
@@ -143,9 +149,12 @@ private fun RoomListClearFiltersButton(
             .clip(CircleShape)
             .background(ElementTheme.colors.bgActionPrimaryRest)
             .clickable(onClick = onClick)
+            .padding(4.dp)
     ) {
         Icon(
-            modifier = Modifier.align(Alignment.Center),
+            modifier = Modifier
+                .align(Alignment.Center)
+                .size(16.dp),
             imageVector = CompoundIcons.Close(),
             tint = ElementTheme.colors.iconOnSolidPrimary,
             contentDescription = stringResource(id = R.string.screen_roomlist_clear_filters),
@@ -170,21 +179,34 @@ private fun RoomListFilterView(
         animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
         label = "chip text colour",
     )
+    val borderColour = animateColorAsState(
+        targetValue = if (selected) Color.Transparent else ElementTheme.colors.borderInteractiveSecondary,
+        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+        label = "chip border colour",
+    )
 
     FilterChip(
         selected = selected,
         onClick = { onClick(roomListFilter) },
-        modifier = modifier.height(36.dp),
+        modifier = modifier.height(32.dp),
         shape = CircleShape,
         colors = FilterChipDefaults.filterChipColors(
             containerColor = background.value,
             selectedContainerColor = background.value,
             labelColor = textColour.value,
-            selectedLabelColor = textColour.value
+            selectedLabelColor = textColour.value,
         ),
         label = {
-            Text(text = stringResource(id = roomListFilter.stringResource))
-        }
+            Text(
+                text = stringResource(id = roomListFilter.stringResource),
+                style = ElementTheme.typography.fontBodyMdRegular,
+            )
+        },
+        border = FilterChipDefaults.filterChipBorder(
+            enabled = true,
+            selected = selected,
+            borderColor = borderColour.value,
+        ),
     )
 }
 
@@ -192,6 +214,7 @@ private fun RoomListFilterView(
 @Composable
 internal fun RoomListFiltersViewPreview(@PreviewParameter(RoomListFiltersStateProvider::class) state: RoomListFiltersState) = ElementPreview {
     RoomListFiltersView(
+        modifier = Modifier.padding(vertical = 4.dp),
         state = state,
     )
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt
index c1da8b18b2..877e934727 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/DefaultFilterSelectionStrategy.kt
@@ -1,20 +1,19 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.filters.selection
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.home.impl.filters.RoomListFilter
 import io.element.android.libraries.di.SessionScope
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultFilterSelectionStrategy : FilterSelectionStrategy {
     private val selectedFilters = LinkedHashSet<RoomListFilter>()
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt
index d604e51f84..3a13688582 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt
index 8396a4e2a2..f0877b5e0d 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/selection/FilterSelectionStrategy.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
new file mode 100644
index 0000000000..d6ddcf258c
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/LatestEvent.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.home.impl.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed interface LatestEvent {
+    data object None : LatestEvent
+
+    data class Synced(
+        val content: CharSequence?,
+    ) : LatestEvent
+
+    data class Sending(
+        val content: CharSequence?,
+    ) : LatestEvent
+
+    data object Error : LatestEvent
+
+    fun content(): CharSequence? {
+        return when (this) {
+            is None -> null
+            is Synced -> content
+            is Sending -> content
+            is Error -> null
+        }
+    }
+}
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 8af359d3e5..a59e444455 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,7 +29,7 @@ data class RoomListRoomSummary(
     val numberOfUnreadNotifications: Long,
     val isMarkedUnread: Boolean,
     val timestamp: String?,
-    val lastMessage: CharSequence?,
+    val latestEvent: LatestEvent,
     val avatarData: AvatarData,
     val userDefinedNotificationMode: RoomNotificationMode?,
     val hasRoomCall: Boolean,
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 1e763843af..400decff6f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,12 +25,14 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                 aRoomListRoomSummary(displayType = RoomSummaryDisplayType.PLACEHOLDER),
                 aRoomListRoomSummary(),
                 aRoomListRoomSummary(name = null),
-                aRoomListRoomSummary(lastMessage = null),
+                aRoomListRoomSummary(latestEvent = LatestEvent.None),
                 aRoomListRoomSummary(
                     name = "A very long room name that should be truncated",
-                    lastMessage = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" +
-                        " ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
-                        "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
+                    latestEvent = LatestEvent.Synced(
+                        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt" +
+                            " ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
+                            "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
+                    ),
                     timestamp = "yesterday",
                     numberOfUnreadMessages = 1,
                 ),
@@ -43,7 +46,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     listOf(
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "No activity" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Synced("No activity" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 0,
                             numberOfUnreadMentions = 0,
@@ -51,7 +54,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "New messages" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Synced("New messages" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 1,
                             numberOfUnreadMentions = 0,
@@ -59,7 +62,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "New messages, mentions" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Synced("New messages, mentions" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 1,
                             numberOfUnreadMentions = 1,
@@ -67,7 +70,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                         ),
                         aRoomListRoomSummary(
                             name = roomNotificationMode.name,
-                            lastMessage = "New mentions" + if (hasCall) ", call" else "",
+                            latestEvent = LatestEvent.Synced("New mentions" + if (hasCall) ", call" else ""),
                             notificationMode = roomNotificationMode,
                             numberOfUnreadMessages = 0,
                             numberOfUnreadMentions = 1,
@@ -126,6 +129,10 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     isTombstoned = true,
                 )
             ),
+            listOf(
+                aRoomListRoomSummary(latestEvent = LatestEvent.Sending("A sending message")),
+                aRoomListRoomSummary(latestEvent = LatestEvent.Error),
+            )
         ).flatten()
 }
 
@@ -147,8 +154,8 @@ internal fun aRoomListRoomSummary(
     numberOfUnreadMentions: Long = 0,
     numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
-    lastMessage: String? = "Last message",
-    timestamp: String? = lastMessage?.let { "88:88" },
+    latestEvent: LatestEvent = LatestEvent.Synced("Last message"),
+    timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" },
     notificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,
     avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
@@ -170,7 +177,7 @@ internal fun aRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    lastMessage = lastMessage,
+    latestEvent = latestEvent,
     avatarData = avatarData,
     userDefinedNotificationMode = notificationMode,
     hasRoomCall = hasRoomCall,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt
index 8fcef46faf..a27a83d955 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomSummaryDisplayType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 86ab5cd39c..c79e79be73 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6ef73770f6..5c7ef158fd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c6b91a02fc..4c91e14dcd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvents.kt
index 52da613be7..36953224c3 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvents.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 65d4eb297d..5fc07ab21c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -50,6 +51,7 @@ import io.element.android.libraries.preferences.api.store.SessionPreferencesStor
 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
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
@@ -85,6 +87,7 @@ class RoomListPresenter(
     private val appPreferencesStore: AppPreferencesStore,
     private val seenInvitesStore: SeenInvitesStore,
     private val announcementService: AnnouncementService,
+    private val coldStartWatcher: AnalyticsColdStartWatcher,
 ) : Presenter<RoomListState> {
     private val encryptionService = client.encryptionService
 
@@ -113,7 +116,7 @@ class RoomListPresenter(
         val contextMenu = remember { mutableStateOf<RoomListState.ContextMenu>(RoomListState.ContextMenu.Hidden) }
         val declineInviteMenu = remember { mutableStateOf<RoomListState.DeclineInviteMenu>(RoomListState.DeclineInviteMenu.Hidden) }
 
-        fun handleEvents(event: RoomListEvents) {
+        fun handleEvent(event: RoomListEvents) {
             when (event) {
                 is RoomListEvents.UpdateVisibleRange -> coroutineScope.launch {
                     updateVisibleRange(event.range)
@@ -169,7 +172,7 @@ class RoomListPresenter(
             acceptDeclineInviteState = acceptDeclineInviteState,
             hideInvitesAvatars = hideInvitesAvatar,
             canReportRoom = canReportRoom,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
@@ -235,6 +238,8 @@ class RoomListPresenter(
             )
             showSkeleton -> RoomListContentState.Skeleton(count = 16)
             else -> {
+                coldStartWatcher.onRoomListVisible()
+
                 RoomListContentState.Rooms(
                     securityBannerState = securityBannerState,
                     showNewNotificationSoundBanner = showNewNotificationSoundBanner,
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 80cd6394e8..2b5ca0391e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,7 +20,6 @@ import io.element.android.libraries.push.api.battery.BatteryOptimizationState
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
 
-@Immutable
 data class RoomListState(
     val contextMenu: ContextMenu,
     val declineInviteMenu: DeclineInviteMenu,
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 856b7662af..3f2499657e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
index faa811b920..188f4468de 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,7 @@ package io.element.android.features.home.impl.roomlist
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.filters.aRoomListFiltersState
+import io.element.android.features.home.impl.model.LatestEvent
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.model.RoomSummaryDisplayType
 import io.element.android.features.home.impl.model.aRoomListRoomSummary
@@ -87,7 +89,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room",
             numberOfUnreadMessages = 1,
             timestamp = "14:18",
-            lastMessage = "A very very very very long message which suites on two lines",
+            latestEvent = LatestEvent.Synced("A very very very very long message which suites on two lines"),
             avatarData = AvatarData("!id", "R", size = AvatarSize.RoomListItem),
             id = "!roomId:domain",
         ),
@@ -95,7 +97,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room#2",
             numberOfUnreadMessages = 0,
             timestamp = "14:16",
-            lastMessage = "A short message",
+            latestEvent = LatestEvent.Synced("A short message"),
             avatarData = AvatarData("!id", "Z", size = AvatarSize.RoomListItem),
             id = "!roomId2:domain",
         ),
@@ -118,7 +120,7 @@ internal fun generateRoomListRoomSummaryList(
             name = "Room#$index",
             numberOfUnreadMessages = 0,
             timestamp = "14:16",
-            lastMessage = "A message",
+            latestEvent = LatestEvent.Synced("A message"),
             avatarData = AvatarData("!id$index", "${(65 + index % 26).toChar()}", size = AvatarSize.RoomListItem),
             id = "!roomId$index:domain",
         )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt
index ef853bd1cf..44f53a2663 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchDataSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt
index 26f713da81..20222c144d 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt
index ba77b0cdce..ad06b12f5e 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -40,7 +41,7 @@ class RoomListSearchPresenter(
             dataSource.setSearchQuery(searchQuery)
         }
 
-        fun handleEvents(event: RoomListSearchEvents) {
+        fun handleEvent(event: RoomListSearchEvents) {
             when (event) {
                 RoomListSearchEvents.ClearQuery -> {
                     searchQuery = ""
@@ -61,7 +62,7 @@ class RoomListSearchPresenter(
             isSearchActive = isSearchActive,
             query = searchQuery,
             results = searchResults,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt
index 9d50f52a33..92e8c1ff03 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt
index 503e334418..a5015a5003 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2302b3325f..58d6ba7e00 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,11 +21,12 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TextFieldDefaults
-import androidx.compose.material3.TopAppBarDefaults
 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.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
@@ -33,6 +35,7 @@ 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.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -41,7 +44,6 @@ import io.element.android.features.home.impl.contentType
 import io.element.android.features.home.impl.model.RoomListRoomSummary
 import io.element.android.features.home.impl.roomlist.RoomListEvents
 import io.element.android.libraries.designsystem.components.button.BackButton
-import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.FilledTextField
@@ -49,7 +51,6 @@ 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.TopAppBar
-import io.element.android.libraries.designsystem.utils.copy
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -111,18 +112,22 @@ private fun RoomListSearchContent(
                 },
                 navigationIcon = { BackButton(onClick = ::onBackButtonClick) },
                 title = {
-                    var filter by textFieldState(state.query)
+                    // TODO replace `state.query` with TextFieldState when it's available for M3 TextField
+                    // The stateSaver will keep the selection state when returning to this UI
+                    var value by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+                        mutableStateOf(TextFieldValue(state.query))
+                    }
 
                     val focusRequester = remember { FocusRequester() }
                     FilledTextField(
                         modifier = Modifier
                             .fillMaxWidth()
                             .focusRequester(focusRequester),
-                        value = filter,
+                        value = value,
                         singleLine = true,
                         onValueChange = {
-                            filter = it
-                            state.eventSink(RoomListSearchEvents.QueryChanged(it))
+                            value = it
+                            state.eventSink(RoomListSearchEvents.QueryChanged(it.text))
                         },
                         colors = TextFieldDefaults.colors(
                             focusedContainerColor = Color.Transparent,
@@ -134,9 +139,11 @@ private fun RoomListSearchContent(
                             errorIndicatorColor = Color.Transparent,
                         ),
                         trailingIcon = {
-                            if (filter.isNotEmpty()) {
+                            if (value.text.isNotEmpty()) {
                                 IconButton(onClick = {
                                     state.eventSink(RoomListSearchEvents.ClearQuery)
+                                    // Clear local state too
+                                    value = value.copy(text = "")
                                 }) {
                                     Icon(
                                         imageVector = CompoundIcons.Close(),
@@ -148,10 +155,12 @@ private fun RoomListSearchContent(
                     )
 
                     LaunchedEffect(Unit) {
-                        focusRequester.requestFocus()
+                        if (!focusRequester.restoreFocusedChild()) {
+                            focusRequester.requestFocus()
+                        }
+                        focusRequester.saveFocusedChild()
                     }
                 },
-                windowInsets = TopAppBarDefaults.windowInsets.copy(top = 0)
             )
         }
     ) { padding ->
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesEvents.kt
index 5d07a5e358..88290417dd 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesEvents.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8c3e2962ac..a890a61ac3 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,9 @@ import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.flow.map
 
@@ -28,12 +31,15 @@ class HomeSpacesPresenter(
     @Composable
     override fun present(): HomeSpacesState {
         val hideInvitesAvatar by client.rememberHideInvitesAvatar()
-        val spaceRooms by client.spaceService.spaceRoomsFlow.collectAsState(emptyList())
+        val spaceRooms by remember {
+            client.spaceService.spaceRoomsFlow.map { it.toImmutableList() }
+        }.collectAsState(persistentListOf())
+
         val seenSpaceInvites by remember {
             seenInvitesStore.seenRoomIds().map { it.toImmutableSet() }
         }.collectAsState(persistentSetOf())
 
-        fun handleEvents(event: HomeSpacesEvents) {
+        fun handleEvent(event: HomeSpacesEvents) {
             // when (event) { }
         }
 
@@ -42,7 +48,7 @@ class HomeSpacesPresenter(
             spaceRooms = spaceRooms,
             seenSpaceInvites = seenSpaceInvites,
             hideInvitesAvatar = hideInvitesAvatar,
-            eventSink = ::handleEvents,
+            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 96733991f9..7dcb370219 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,12 @@ package io.element.android.features.home.impl.spaces
 
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
 
 data class HomeSpacesState(
     val space: CurrentSpace,
-    val spaceRooms: List<SpaceRoom>,
+    val spaceRooms: ImmutableList<SpaceRoom>,
     val seenSpaceInvites: ImmutableSet<RoomId>,
     val hideInvitesAvatar: 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 921c340886..8c03cff7ee 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.previewutils.room.aSpaceRoom
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 
 open class HomeSpacesStateProvider : PreviewParameterProvider<HomeSpacesState> {
@@ -39,7 +41,7 @@ internal fun aHomeSpacesState(
     eventSink: (HomeSpacesEvents) -> Unit = {},
 ) = HomeSpacesState(
     space = space,
-    spaceRooms = spaceRooms,
+    spaceRooms = spaceRooms.toImmutableList(),
     seenSpaceInvites = seenSpaceInvites.toImmutableSet(),
     hideInvitesAvatar = hideInvitesAvatar,
     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 b18e732b42..2505cf831d 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
@@ -1,19 +1,24 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.spaces
 
 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.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
 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.HorizontalDivider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.ui.components.SpaceHeaderRootView
@@ -25,10 +30,14 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 fun HomeSpacesView(
     state: HomeSpacesState,
+    lazyListState: LazyListState,
     onSpaceClick: (RoomId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    LazyColumn(modifier) {
+    LazyColumn(
+        modifier = modifier,
+        state = lazyListState
+    ) {
         val space = state.space
         when (space) {
             CurrentSpace.Root -> {
@@ -47,20 +56,27 @@ fun HomeSpacesView(
                 )
             }
         }
-        state.spaceRooms.forEach { spaceRoom ->
-            item(spaceRoom.roomId) {
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                SpaceRoomItemView(
-                    spaceRoom = spaceRoom,
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    onClick = {
-                        onSpaceClick(spaceRoom.roomId)
-                    },
-                    onLongClick = {
-                        // TODO
-                    },
-                )
+        item {
+            HorizontalDivider()
+        }
+        itemsIndexed(
+            items = state.spaceRooms,
+            key = { _, spaceRoom -> spaceRoom.roomId }
+        ) { index, spaceRoom ->
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            SpaceRoomItemView(
+                spaceRoom = spaceRoom,
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
+                onClick = {
+                    onSpaceClick(spaceRoom.roomId)
+                },
+                onLongClick = {
+                    // TODO
+                },
+            )
+            if (index != state.spaceRooms.lastIndex) {
+                HorizontalDivider()
             }
         }
     }
@@ -73,6 +89,7 @@ internal fun HomeSpacesViewPreview(
 ) = ElementPreview {
     HomeSpacesView(
         state = state,
+        lazyListState = rememberLazyListState(),
         onSpaceClick = {},
         modifier = Modifier,
     )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
index b1b3ac1950..4a77e45372 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/main/res/values-bg/translations.xml b/features/home/impl/src/main/res/values-bg/translations.xml
index f988aee0fd..44a0bd575e 100644
--- a/features/home/impl/src/main/res/values-bg/translations.xml
+++ b/features/home/impl/src/main/res/values-bg/translations.xml
@@ -4,6 +4,7 @@
   <string name="confirm_recovery_key_banner_primary_button_title">"Въведете ключа си за възстановяване"</string>
   <string name="confirm_recovery_key_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>
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 3699b7975e..1eab814e06 100644
--- a/features/home/impl/src/main/res/values-cs/translations.xml
+++ b/features/home/impl/src/main/res/values-cs/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Zakažte optimalizaci baterie pro tuto aplikaci, abyste měli jistotu, že budou přijata všechna oznámení."</string>
   <string name="banner_battery_optimization_submit_android">"Zakázat optimalizaci"</string>
   <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>
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 b686fb6e03..b0763591aa 100644
--- a/features/home/impl/src/main/res/values-da/translations.xml
+++ b/features/home/impl/src/main/res/values-da/translations.xml
@@ -15,7 +15,7 @@
   <string name="full_screen_intent_banner_message">"For at sikre, at du aldrig går glip af et vigtigt opkald, skal du ændre dine indstillinger til at tillade underretninger i fuld skærm, når din telefon er låst."</string>
   <string name="full_screen_intent_banner_title">"Gør din opkaldsoplevelse bedre"</string>
   <string name="screen_home_tab_chats">"Samtaler"</string>
-  <string name="screen_home_tab_spaces">"Klynger"</string>
+  <string name="screen_home_tab_spaces">"Grupper"</string>
   <string name="screen_invites_decline_chat_message">"Er du sikker på, at du vil afvise invitationen til at deltage i %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Afvis invitation"</string>
   <string name="screen_invites_decline_direct_chat_message">"Er du sikker på, at du vil afvise denne private samtale med %1$s?"</string>
diff --git a/features/home/impl/src/main/res/values-eo/translations.xml b/features/home/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index 46986026aa..0000000000
--- a/features/home/impl/src/main/res/values-eo/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="banner_set_up_recovery_content">"Restore your account security and message history with a backup password if you have lost all your existing devices."</string>
-  <string name="banner_set_up_recovery_submit">"Set up backup"</string>
-  <string name="banner_set_up_recovery_title">"Set up backup to protect your account"</string>
-  <string name="confirm_recovery_key_banner_message">"Confirm your backup password to maintain access to your message backup and message history."</string>
-  <string name="confirm_recovery_key_banner_primary_button_title">"Enter your backup password"</string>
-  <string name="confirm_recovery_key_banner_secondary_button_title">"Forgot your backup password?"</string>
-  <string name="confirm_recovery_key_banner_title">"Your message backup is out of sync"</string>
-  <string name="session_verification_banner_message">"Looks like you\'re using a new device. Confirm it with another linked device to access your encrypted messages."</string>
-</resources>
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 43dd57cdfa..d5b6fa06d4 100644
--- a/features/home/impl/src/main/res/values-et/translations.xml
+++ b/features/home/impl/src/main/res/values-et/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Kui tahad olla kindel, et näed õigel ajal kõiki teavitusi, siis palun lülita akukasutuse optimeerimine välja."</string>
   <string name="banner_battery_optimization_submit_android">"Lülita akukasutuse optimeerimine välja"</string>
   <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>
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 be83431f7d..aec50309d8 100644
--- a/features/home/impl/src/main/res/values-fa/translations.xml
+++ b/features/home/impl/src/main/res/values-fa/translations.xml
@@ -6,10 +6,12 @@
   <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_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>
   <string name="screen_invites_decline_chat_title">"رد دعوت"</string>
   <string name="screen_invites_decline_direct_chat_message">"مطمئنید که می‌خواهید این گپ خصوصی با %1$s را رد کنید؟"</string>
@@ -19,6 +21,7 @@
   <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>
@@ -39,6 +42,7 @@
   <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="session_verification_banner_message">"گویا از افزاره‌ای جدید استفاده می‌کنید. تأیید با افزاره‌ای دیگر برای دسترسی به پیام‌های رمزنگاری شده‌تان."</string>
   <string name="session_verification_banner_title">"تأیید کنید که خودتانید"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-hr/translations.xml b/features/home/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..dd1769b998
--- /dev/null
+++ b/features/home/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,55 @@
+<?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">"Onemogućite optimizaciju baterije za ovu aplikaciju kako biste bili sigurni da ćete primati sve obavijesti."</string>
+  <string name="banner_battery_optimization_submit_android">"Onemogući optimizaciju"</string>
+  <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="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>
+  <string name="confirm_recovery_key_banner_title">"Vaša pohrana ključeva nije sinkronizirana"</string>
+  <string name="full_screen_intent_banner_message">"Kako biste bili sigurni da nikada nećete propustiti važan poziv, promijenite postavke kako biste omogućili obavijesti preko cijelog zaslona kada je telefon zaključan."</string>
+  <string name="full_screen_intent_banner_title">"Poboljšajte svoje iskustvo poziva"</string>
+  <string name="screen_home_tab_chats">"Razgovori"</string>
+  <string name="screen_home_tab_spaces">"Prostori"</string>
+  <string name="screen_invites_decline_chat_message">"Jeste li sigurni da želite odbiti poziv za pridruživanje %1$s?"</string>
+  <string name="screen_invites_decline_chat_title">"Odbij poziv"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Jeste li sigurni da želite odbiti ovaj privatni razgovor s korisnikom %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Odbij razgovor"</string>
+  <string name="screen_invites_empty_list">"Nema pozivnica"</string>
+  <string name="screen_invites_invited_you">"Pozvao vas je korisnik %1$s (%2$s)"</string>
+  <string name="screen_migration_message">"Ovaj se postupak izvodi samo jednom, hvala na čekanju."</string>
+  <string name="screen_migration_title">"Postavljanje vašeg računa."</string>
+  <string name="screen_roomlist_a11y_create_message">"Stvori novi razgovor ili sobu"</string>
+  <string name="screen_roomlist_clear_filters">"Ukloni filtre"</string>
+  <string name="screen_roomlist_empty_message">"Započnite tako da nekome pošaljete poruku."</string>
+  <string name="screen_roomlist_empty_title">"Još nema razgovora."</string>
+  <string name="screen_roomlist_filter_favourites">"Favoriti"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Razgovor možete dodati u favorite u postavkama razgovora.
+Zasad možete poništiti odabir filtera kako biste vidjeli ostale razgovore."</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"Još nemate omiljenih razgovora"</string>
+  <string name="screen_roomlist_filter_invites">"Pozivnice"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Nemate pozivnica na čekanju."</string>
+  <string name="screen_roomlist_filter_low_priority">"Nizak prioritet"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Još nemate razgovora niskog prioriteta"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Možete poništiti odabir filtera kako biste vidjeli ostale razgovore"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"Nemate razgovora za ovaj odabir"</string>
+  <string name="screen_roomlist_filter_people">"Osobe"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"Nemate još nijednu izravnu poruku"</string>
+  <string name="screen_roomlist_filter_rooms">"Sobe"</string>
+  <string name="screen_roomlist_filter_rooms_empty_state_title">"Niste još ni u jednoj sobi"</string>
+  <string name="screen_roomlist_filter_unreads">"Nepročitano"</string>
+  <string name="screen_roomlist_filter_unreads_empty_state_title">"Čestitamo!
+Nemate nepročitanih poruka!"</string>
+  <string name="screen_roomlist_knock_event_sent_description">"Zahtjev za pridruživanje je poslan"</string>
+  <string name="screen_roomlist_main_space_title">"Razgovori"</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="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-hu/translations.xml b/features/home/impl/src/main/res/values-hu/translations.xml
index 7250794095..cca927910b 100644
--- a/features/home/impl/src/main/res/values-hu/translations.xml
+++ b/features/home/impl/src/main/res/values-hu/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Kapcsolja ki az alkalmazás akkumulátoroptimalizálását, hogy biztosan megkapja az összes értesítést."</string>
   <string name="banner_battery_optimization_submit_android">"Optimalizálás letiltása"</string>
   <string name="banner_battery_optimization_title_android">"Nem érkeznek meg az értesítések?"</string>
+  <string name="banner_new_sound_message">"Értesítési hangja frissült – tisztább, gyorsabb és kevésbé zavaró lett."</string>
+  <string name="banner_new_sound_title">"Frissítettük a hangokat"</string>
   <string name="banner_set_up_recovery_content">"Hozzon létre egy új helyreállítási kulcsot, amellyel visszaállíthatja a titkosított üzenetek előzményeit, ha elveszíti az eszközökhöz való hozzáférést."</string>
   <string name="banner_set_up_recovery_submit">"Helyreállítás beállítása"</string>
   <string name="banner_set_up_recovery_title">"Helyreállítás beállítása a fiókja védelméhez"</string>
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 74f8d4abac..932545c7b0 100644
--- a/features/home/impl/src/main/res/values-it/translations.xml
+++ b/features/home/impl/src/main/res/values-it/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Disabilita l\'ottimizzazione della batteria per questa app, per assicurarti che tutte le notifiche vengano ricevute."</string>
   <string name="banner_battery_optimization_submit_android">"Disabilita l\'ottimizzazione"</string>
   <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>
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 51dbc0512b..73e0b5e52e 100644
--- a/features/home/impl/src/main/res/values-pl/translations.xml
+++ b/features/home/impl/src/main/res/values-pl/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Wyłącz optymalizację baterii dla tej aplikacji, aby upewnić się, że wszystkie powiadomienia są odbierane."</string>
   <string name="banner_battery_optimization_submit_android">"Wyłącz optymalizację"</string>
   <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>
@@ -13,6 +15,7 @@
   <string name="full_screen_intent_banner_message">"Upewnij się, że nie pominiesz żadnego połączenia. Zmień swoje ustawienia i zezwól na powiadomienia na blokadzie ekranu."</string>
   <string name="full_screen_intent_banner_title">"Popraw jakość swoich rozmów"</string>
   <string name="screen_home_tab_chats">"Wszystkie czaty"</string>
+  <string name="screen_home_tab_spaces">"Przestrzenie"</string>
   <string name="screen_invites_decline_chat_message">"Czy na pewno chcesz odrzucić zaproszenie dołączenia do %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Odrzuć zaproszenie"</string>
   <string name="screen_invites_decline_direct_chat_message">"Czy na pewno chcesz odrzucić rozmowę prywatną z %1$s?"</string>
@@ -32,6 +35,7 @@ Na razie możesz wyczyścić filtry, aby zobaczyć pozostałe czaty"</string>
   <string name="screen_roomlist_filter_invites">"Zaproszenia"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"Nie masz żadnych oczekujących zaproszeń."</string>
   <string name="screen_roomlist_filter_low_priority">"Niski priorytet"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Nie masz jeszcze żadnych czatów o niskim priorytecie"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Wyczyść filtry, aby zobaczyć pozostałe czaty"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Brak czatów dla podanych kryteriów"</string>
   <string name="screen_roomlist_filter_people">"Osoby"</string>
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 7aab508a38..10f5cf9585 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
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Desative a otimização de bateria para este app, para que tenha certeza que todas as notificações sejam recebidas."</string>
   <string name="banner_battery_optimization_submit_android">"Desativar otimização"</string>
   <string name="banner_battery_optimization_title_android">"As notificações não chegam?"</string>
+  <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_title">"Configure a recuperação para proteger sua conta"</string>
@@ -33,6 +35,7 @@ Por enquanto, você pode desmarcar os filtros para ver suas outras conversas"</s
   <string name="screen_roomlist_filter_invites">"Convites"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"Você não tem nenhum convite pendente."</string>
   <string name="screen_roomlist_filter_low_priority">"Baixa prioridade"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Você ainda não tem nenhuma conversa de baixa prioridade"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Você pode desmarcar filtros para ver suas outras conversas"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Você não tem conversas para esta seleção"</string>
   <string name="screen_roomlist_filter_people">"Pessoas"</string>
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 0f77d56db4..a5007784ee 100644
--- a/features/home/impl/src/main/res/values-ru/translations.xml
+++ b/features/home/impl/src/main/res/values-ru/translations.xml
@@ -44,7 +44,7 @@
   <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 f44e294432..275a4824b3 100644
--- a/features/home/impl/src/main/res/values-sk/translations.xml
+++ b/features/home/impl/src/main/res/values-sk/translations.xml
@@ -3,6 +3,8 @@
   <string name="banner_battery_optimization_content_android">"Vypnite optimalizáciu batérie pre túto aplikáciu, aby ste sa uistili, že sú prijaté všetky upozornenia."</string>
   <string name="banner_battery_optimization_submit_android">"Zakázať optimalizáciu"</string>
   <string name="banner_battery_optimization_title_android">"Oznámenia neprichádzajú?"</string>
+  <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_title">"Nastaviť obnovenie"</string>
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 fbfeca156a..2de9b1b266 100644
--- a/features/home/impl/src/main/res/values-uz/translations.xml
+++ b/features/home/impl/src/main/res/values-uz/translations.xml
@@ -13,6 +13,7 @@
   <string name="full_screen_intent_banner_message">"Muhim qoʻngʻiroqlarni oʻtkazib yubormasligingiz uchun telefoningiz qulflangan holatida toʻliq ekranli bildirishnomalarni ko‘rsatishga ruxsat beradigan qilib sozlamalaringizni oʻzgartiring."</string>
   <string name="full_screen_intent_banner_title">"Qoʻngʻiroq tajribangizni yaxshilang"</string>
   <string name="screen_home_tab_chats">"Suhbatlar"</string>
+  <string name="screen_home_tab_spaces">"Bo‘shliqlar"</string>
   <string name="screen_invites_decline_chat_message">"Haqiqatan ham qo\'shilish taklifini rad qilmoqchimisiz%1$s ?"</string>
   <string name="screen_invites_decline_chat_title">"Taklifni rad etish"</string>
   <string name="screen_invites_decline_direct_chat_message">"Haqiqatan ham bu shaxsiy chatni rad qilmoqchimisiz%1$s ?"</string>
@@ -22,6 +23,7 @@
   <string name="screen_migration_message">"Bu bir martalik jarayon, kutganingiz uchun rahmat."</string>
   <string name="screen_migration_title">"Hisobingiz sozlanmoqda."</string>
   <string name="screen_roomlist_a11y_create_message">"Yangi suhbat yoki xona yarating"</string>
+  <string name="screen_roomlist_clear_filters">"Filtrlarni tozalash"</string>
   <string name="screen_roomlist_empty_message">"Kimgadir xabar yuborishdan boshlang."</string>
   <string name="screen_roomlist_empty_title">"Hozircha chatlar yo‘q."</string>
   <string name="screen_roomlist_filter_favourites">"Sevimlilar"</string>
@@ -31,6 +33,7 @@ Hozircha, boshqa suhbatlaringizni ko‘rish uchun filtrlarni bekor qilishingiz m
   <string name="screen_roomlist_filter_invites">"Takliflar"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"Sizda hech qanday kutilayotgan takliflar yoʻq."</string>
   <string name="screen_roomlist_filter_low_priority">"Past darajali"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"Sizda hali past ustuvor chatlar yoʻq"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Boshqa suhbatlaringizni koʻrish uchun filtrlarni bekor qilishingiz mumkin"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Sizda bu tanlov uchun chatlar yo‘q"</string>
   <string name="screen_roomlist_filter_people">"Odamlar"</string>
@@ -44,6 +47,7 @@ Sizda oʻqilmagan xabarlar yoʻq!"</string>
   <string name="screen_roomlist_main_space_title">"Suhbatlar"</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="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-zh-rTW/translations.xml b/features/home/impl/src/main/res/values-zh-rTW/translations.xml
index 625ce3ceb0..20ee59da98 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
@@ -3,6 +3,8 @@
   <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">"若您遺失了所有現有裝置，則請使用復原金鑰以救援您的密碼學身份與訊息歷史紀錄。"</string>
   <string name="banner_set_up_recovery_submit">"設定復原"</string>
   <string name="banner_set_up_recovery_title">"設定備援以保護您的帳號"</string>
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 805b56de5c..748159d80f 100644
--- a/features/home/impl/src/main/res/values-zh/translations.xml
+++ b/features/home/impl/src/main/res/values-zh/translations.xml
@@ -3,6 +3,8 @@
   <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">"生成新的恢复密钥，该密钥可用于在您无法访问设备时恢复加密的消息历史记录。"</string>
   <string name="banner_set_up_recovery_submit">"设置恢复"</string>
   <string name="banner_set_up_recovery_title">"设置恢复"</string>
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilderTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilderTest.kt
index a03c0d0065..13c9585386 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilderTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilderTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7d0c95befd..9778556dd2 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,17 +13,19 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 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 kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class DefaultHomeEntryPointTest {
     @Test
-    fun `test node builder`() {
+    fun `test node builder`() = runTest {
         val entryPoint = DefaultHomeEntryPoint()
         val parentNode = TestParentNode.create { buildContext, plugins ->
             HomeFlowNode(
@@ -36,22 +39,25 @@ class DefaultHomeEntryPointTest {
                 directLogoutView = { _ -> lambdaError() },
                 reportRoomEntryPoint = { _, _, _ -> lambdaError() },
                 declineInviteAndBlockUserEntryPoint = { _, _, _ -> lambdaError() },
-                changeRoomMemberRolesEntryPoint = { _, _ -> lambdaError() },
+                changeRoomMemberRolesEntryPoint = { _, _, _, _ -> lambdaError() },
                 leaveRoomRenderer = { _, _, _ -> lambdaError() },
+                sessionCoroutineScope = backgroundScope,
             )
         }
         val callback = object : HomeEntryPoint.Callback {
-            override fun onRoomClick(roomId: RoomId) = lambdaError()
-            override fun onStartChatClick() = lambdaError()
-            override fun onSettingsClick() = lambdaError()
-            override fun onSetUpRecoveryClick() = lambdaError()
-            override fun onSessionConfirmRecoveryKeyClick() = lambdaError()
-            override fun onRoomSettingsClick(roomId: RoomId) = lambdaError()
-            override fun onReportBugClick() = lambdaError()
+            override fun navigateToRoom(roomId: RoomId, joinedRoom: JoinedRoom?) = lambdaError()
+            override fun navigateToCreateRoom() = lambdaError()
+            override fun navigateToSettings() = lambdaError()
+            override fun navigateToSetUpRecovery() = lambdaError()
+            override fun navigateToEnterRecoveryKey() = lambdaError()
+            override fun navigateToRoomSettings(roomId: RoomId) = lambdaError()
+            override fun navigateToBugReport() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(HomeFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/FakeDateTimeObserver.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/FakeDateTimeObserver.kt
index 6cbebb3135..3e88ff7641 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/FakeDateTimeObserver.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/FakeDateTimeObserver.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 938e0720d7..0ae3ea1ff3 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 03fe2efd94..35c30af86e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
index 95444b6c4f..5f307918be 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,13 @@ package io.element.android.features.home.impl.datasource
 
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
 
 fun aRoomListRoomSummaryFactory(
     dateFormatter: DateFormatter = FakeDateFormatter { _, _, _ -> "Today" },
-    roomLastMessageFormatter: RoomLastMessageFormatter = RoomLastMessageFormatter { _, _ -> "Hey" }
+    roomLatestEventFormatter: RoomLatestEventFormatter = FakeRoomLatestEventFormatter(),
 ) = RoomListRoomSummaryFactory(
     dateFormatter = dateFormatter,
-    roomLastMessageFormatter = roomLastMessageFormatter
+    roomLatestEventFormatter = roomLatestEventFormatter,
 )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt
index 3f4f45afae..250f43ee8f 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEmptyStateResourcesTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt
index a71afca607..df1bc18107 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1fd37d9252..9e99220885 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b62c19fc7b..28e7051a55 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -95,7 +96,7 @@ internal fun createRoomListRoomSummary(
     numberOfUnreadNotifications = numberOfUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     timestamp = timestamp,
-    lastMessage = "",
+    latestEvent = LatestEvent.Synced(""),
     avatarData = AvatarData(id = A_ROOM_ID.value, name = A_ROOM_NAME, size = AvatarSize.RoomListItem),
     displayType = displayType,
     userDefinedNotificationMode = userDefinedNotificationMode,
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 66753da035..b692d49d1e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 48a51b87bb..0803993a0b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bef312cdea..acc68db018 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,8 +35,8 @@ 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.RoomLastMessageFormatter
-import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
 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
@@ -69,6 +70,7 @@ 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.services.analytics.test.watchers.FakeAnalyticsColdStartWatcher
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
@@ -637,7 +639,7 @@ class RoomListPresenterTest {
         client: MatrixClient = FakeMatrixClient(),
         leaveRoomState: LeaveRoomState = aLeaveRoomState(),
         dateFormatter: DateFormatter = FakeDateFormatter(),
-        roomLastMessageFormatter: RoomLastMessageFormatter = FakeRoomLastMessageFormatter(),
+        roomLatestEventFormatter: RoomLatestEventFormatter = FakeRoomLatestEventFormatter(),
         sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),
         analyticsService: AnalyticsService = FakeAnalyticsService(),
         filtersPresenter: Presenter<RoomListFiltersState> = Presenter { aRoomListFiltersState() },
@@ -654,7 +656,7 @@ class RoomListPresenterTest {
             roomListService = client.roomListService,
             roomListRoomSummaryFactory = aRoomListRoomSummaryFactory(
                 dateFormatter = dateFormatter,
-                roomLastMessageFormatter = roomLastMessageFormatter,
+                roomLatestEventFormatter = roomLatestEventFormatter,
             ),
             coroutineDispatchers = testCoroutineDispatchers(),
             notificationSettingsService = client.notificationSettingsService,
@@ -672,5 +674,6 @@ class RoomListPresenterTest {
         appPreferencesStore = appPreferencesStore,
         seenInvitesStore = seenInvitesStore,
         announcementService = announcementService,
+        coldStartWatcher = FakeAnalyticsColdStartWatcher(),
     )
 }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt
index 3837fe6f55..2f158ec4b9 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4fcbcd170b..bb82d51a79 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -169,7 +170,7 @@ class RoomListViewTest {
             // Remove automatic initial events
             eventsRecorder.clear()
 
-            rule.onNodeWithText(room0.lastMessage!!.toString()).performClick()
+            rule.onNodeWithText(room0.latestEvent.content().toString()).performClick()
         }
 
         eventsRecorder.assertEmpty()
@@ -191,7 +192,7 @@ class RoomListViewTest {
             )
             // Remove automatic initial events
             eventsRecorder.clear()
-            rule.onNodeWithText(room0.lastMessage!!.toString())
+            rule.onNodeWithText(room0.latestEvent.content().toString())
                 .performClick()
                 .performClick()
         }
@@ -213,7 +214,7 @@ class RoomListViewTest {
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        rule.onNodeWithText(room0.lastMessage!!.toString()).performTouchInput { longClick() }
+        rule.onNodeWithText(room0.latestEvent.content().toString()).performTouchInput { longClick() }
         eventsRecorder.assertSingle(RoomListEvents.ShowContextMenu(room0))
     }
 
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt
index 7649b6141e..dee0601915 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.home.impl.datasource.aRoomListRoomSummaryFactory
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
-import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.test.room.aRoomSummary
@@ -125,7 +126,7 @@ fun TestScope.createRoomListSearchPresenter(
             roomListService = roomListService,
             roomSummaryFactory = aRoomListRoomSummaryFactory(
                 dateFormatter = FakeDateFormatter(),
-                roomLastMessageFormatter = FakeRoomLastMessageFormatter(),
+                roomLatestEventFormatter = FakeRoomLatestEventFormatter(),
             ),
             coroutineDispatchers = testCoroutineDispatchers(),
         ),
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 ef75dcad81..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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/build.gradle.kts b/features/invite/api/build.gradle.kts
index d17b392e59..084ad1088d 100644
--- a/features/invite/api/build.gradle.kts
+++ b/features/invite/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9f826ac228..696e02a0d7 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt
index 682970ffe7..046303ca4f 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/SeenInvitesStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt
index 015fc16182..2caaacab2b 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt
index f4645383df..3bfd0430fe 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt
index bd5c5e6749..18acc11e5e 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt
index a098443c45..b6eec03a6f 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt
index f0c4366351..0ebf675966 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
index 8517fe2786..4174d99222 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,5 +14,9 @@ import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 fun interface DeclineInviteAndBlockEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inviteData: InviteData,
+    ): Node
 }
diff --git a/features/invite/impl/build.gradle.kts b/features/invite/impl/build.gradle.kts
index 4caeafb71f..80b98464f7 100644
--- a/features/invite/impl/build.gradle.kts
+++ b/features/invite/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt
index 0972701435..217c5e4c74 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.invite.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.libraries.core.extensions.mapFailure
@@ -30,7 +30,6 @@ interface AcceptInvite {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultAcceptInvite(
     private val client: MatrixClient,
     private val joinRoom: JoinRoom,
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt
index 6c2588de7e..ca3ad28395 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.invite.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -32,7 +32,6 @@ interface DeclineInvite {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultDeclineInvite(
     private val client: MatrixClient,
     private val notificationCleaner: NotificationCleaner,
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt
index 38295daa27..9e36b68656 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,8 +34,7 @@ class DefaultSeenInvitesStore(
 ) : SeenInvitesStore {
     init {
         sessionObserver.addListener(object : SessionListener {
-            override suspend fun onSessionCreated(userId: String) = Unit
-            override suspend fun onSessionDeleted(userId: String) {
+            override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
                 if (sessionId.value == userId) {
                     clear()
                 }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStoreFactory.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStoreFactory.kt
index 10812eeb80..b1a46f8035 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStoreFactory.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DefaultSeenInvitesStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.invite.impl
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSeenInvitesStoreFactory(
     @ApplicationContext private val context: Context,
     private val sessionObserver: SessionObserver,
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/SeenInvitesStoreFactory.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/SeenInvitesStoreFactory.kt
index 4d681e8462..5b5ef54077 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/SeenInvitesStoreFactory.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/SeenInvitesStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt
index 7d15971fe4..9be255fe1a 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,7 +40,7 @@ class AcceptDeclineInvitePresenter(
         val declinedAction: MutableState<AsyncAction<RoomId>> =
             remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        fun handleEvents(event: AcceptDeclineInviteEvents) {
+        fun handleEvent(event: AcceptDeclineInviteEvents) {
             when (event) {
                 is AcceptDeclineInviteEvents.AcceptInvite -> {
                     localCoroutineScope.acceptInvite(event.invite.roomId, acceptedAction)
@@ -70,7 +71,7 @@ class AcceptDeclineInvitePresenter(
         return AcceptDeclineInviteState(
             acceptAction = acceptedAction.value,
             declineAction = declinedAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
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 6db000d3db..3f8bf93afa 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt
index 46cc496508..da035f0ff1 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt
index 487865065d..f819de650c 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,14 +11,12 @@ package io.element.android.features.invite.impl.acceptdecline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteView
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultAcceptDeclineInviteView : AcceptDeclineInviteView {
     @Composable
     override fun Render(
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt
index df05b69645..765c7055d3 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt
index 033d2e58de..1fc160e530 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt
index 51cdf59b6a..2fe5c23088 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt
index 59812a5e04..af2a10cbfd 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -48,7 +49,7 @@ class DeclineAndBlockPresenter(
 
         val coroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: DeclineAndBlockEvents) {
+        fun handleEvent(event: DeclineAndBlockEvents) {
             when (event) {
                 DeclineAndBlockEvents.ClearDeclineAction -> declineAction.value = AsyncAction.Uninitialized
                 DeclineAndBlockEvents.Decline -> coroutineScope.decline(reportReason, blockUser, reportRoom, declineAction)
@@ -63,7 +64,7 @@ class DeclineAndBlockPresenter(
             reportReason = reportReason,
             blockUser = blockUser,
             declineAction = declineAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt
index 0ee7444b2c..7dbbbfd60e 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt
index 87016d13cc..2e78214306 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 05110f982c..1028a4c142 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
index ea5456feb2..d6e93fb805 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,15 +12,17 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.invite.api.InviteData
 import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultDeclineAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inviteData: InviteData,
+    ): Node {
         val inputs = DeclineAndBlockNode.Inputs(inviteData)
         return parentNode.createNode<DeclineAndBlockNode>(buildContext, plugins = listOf(inputs))
     }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt
index 3f62408b20..f78c0358a6 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/main/res/values-bg/translations.xml b/features/invite/impl/src/main/res/values-bg/translations.xml
index e089814fe9..d4c19eca2b 100644
--- a/features/invite/impl/src/main/res/values-bg/translations.xml
+++ b/features/invite/impl/src/main/res/values-bg/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_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>
diff --git a/features/invite/impl/src/main/res/values-eu/translations.xml b/features/invite/impl/src/main/res/values-eu/translations.xml
index 289a8fa418..dfc8310366 100644
--- a/features/invite/impl/src/main/res/values-eu/translations.xml
+++ b/features/invite/impl/src/main/res/values-eu/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_decline_and_block_block_user_option_title">"Blokeatu erabiltzailea"</string>
-  <string name="screen_decline_and_block_title">"Eman ezetza eta blokeatu"</string>
+  <string name="screen_decline_and_block_title">"Baztertu eta blokeatu"</string>
   <string name="screen_invites_decline_chat_message">"Ziur %1$s(e)ra batzeko gonbidapena baztertu nahi duzula?"</string>
   <string name="screen_invites_decline_chat_title">"Baztertu gonbidapena"</string>
   <string name="screen_invites_decline_direct_chat_message">"Ziur %1$s(r)en txat pribatua baztertu nahi duzula?"</string>
diff --git a/features/invite/impl/src/main/res/values-hr/translations.xml b/features/invite/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..6d853dacf1
--- /dev/null
+++ b/features/invite/impl/src/main/res/values-hr/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">"Nećete vidjeti nikakve poruke ili pozivnice za sobu od ovog korisnika"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Blokiraj korisnika"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Prijavite ovu sobu svom davatelju usluga računa."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Navedite razlog prijave…"</string>
+  <string name="screen_decline_and_block_title">"Odbij i blokiraj"</string>
+  <string name="screen_invites_decline_chat_message">"Jeste li sigurni da želite odbiti poziv za pridruživanje %1$s?"</string>
+  <string name="screen_invites_decline_chat_title">"Odbij poziv"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Jeste li sigurni da želite odbiti ovaj privatni razgovor s korisnikom %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Odbij razgovor"</string>
+  <string name="screen_invites_empty_list">"Nema pozivnica"</string>
+  <string name="screen_invites_invited_you">"Pozvao vas je korisnik %1$s (%2$s)"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Da, odbij i blokiraj"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Jeste li sigurni da želite odbiti poziv za pridruživanje ovoj sobi? Time ćete također spriječiti da %1$s kontaktira s vama ili vas pozove u sobe."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Odbij poziv i blokiraj"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Odbij i blokiraj"</string>
+</resources>
diff --git a/features/invite/impl/src/main/res/values-nl/translations.xml b/features/invite/impl/src/main/res/values-nl/translations.xml
index 4abfdda76d..de0f69097c 100644
--- a/features/invite/impl/src/main/res/values-nl/translations.xml
+++ b/features/invite/impl/src/main/res/values-nl/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_decline_and_block_block_user_option_title">"Gebruiker blokkeren"</string>
+  <string name="screen_decline_and_block_title">"Weigeren en blokkeren"</string>
   <string name="screen_invites_decline_chat_message">"Weet je zeker dat je de uitnodiging om toe te treden tot %1$s wilt weigeren?"</string>
   <string name="screen_invites_decline_chat_title">"Uitnodiging weigeren"</string>
   <string name="screen_invites_decline_direct_chat_message">"Weet je zeker dat je deze privéchat met %1$s wilt weigeren?"</string>
diff --git a/features/invite/impl/src/main/res/values-pt/translations.xml b/features/invite/impl/src/main/res/values-pt/translations.xml
index 1bdf28b8f6..f00ce6151b 100644
--- a/features/invite/impl/src/main/res/values-pt/translations.xml
+++ b/features/invite/impl/src/main/res/values-pt/translations.xml
@@ -4,7 +4,7 @@
   <string name="screen_decline_and_block_block_user_option_title">"Bloquear utilizador"</string>
   <string name="screen_decline_and_block_report_user_option_description">"Denunciar esta sala ao fornecedor da tua conta."</string>
   <string name="screen_decline_and_block_report_user_reason_placeholder">"Descreve a razão para denunciar…"</string>
-  <string name="screen_decline_and_block_title">"Rejeitar e bloquear"</string>
+  <string name="screen_decline_and_block_title">"Recusar e bloquear"</string>
   <string name="screen_invites_decline_chat_message">"Tens a certeza que queres rejeitar o convite para entra em %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Rejeitar convite"</string>
   <string name="screen_invites_decline_direct_chat_message">"Tens a certeza que queres rejeitar esta conversa privada com %1$s?"</string>
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 f22b81feb2..90d467e62c 100644
--- a/features/invite/impl/src/main/res/values-ru/translations.xml
+++ b/features/invite/impl/src/main/res/values-ru/translations.xml
@@ -3,7 +3,7 @@
   <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_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>
diff --git a/features/invite/impl/src/main/res/values-uz/translations.xml b/features/invite/impl/src/main/res/values-uz/translations.xml
index 1db05ad0d9..ab20b58101 100644
--- a/features/invite/impl/src/main/res/values-uz/translations.xml
+++ b/features/invite/impl/src/main/res/values-uz/translations.xml
@@ -1,11 +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">"Siz bu foydalanuvchidan hech qanday xabar yoki xonaga taklif ko‘rmaysiz"</string>
   <string name="screen_decline_and_block_block_user_option_title">"Foydalanuvchini bloklash"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Bu xona haqida hisobingiz provayderiga xabar bering."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Xabar berish sababini tushuntiring…"</string>
+  <string name="screen_decline_and_block_title">"Rad etish va bloklash"</string>
   <string name="screen_invites_decline_chat_message">"Haqiqatan ham qo\'shilish taklifini rad qilmoqchimisiz%1$s ?"</string>
   <string name="screen_invites_decline_chat_title">"Taklifni rad etish"</string>
   <string name="screen_invites_decline_direct_chat_message">"Haqiqatan ham bu shaxsiy chatni rad qilmoqchimisiz%1$s ?"</string>
   <string name="screen_invites_decline_direct_chat_title">"Chatni rad etish"</string>
   <string name="screen_invites_empty_list">"Takliflar yo\'q"</string>
   <string name="screen_invites_invited_you">"%1$s(%2$s ) sizni taklif qildi"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Ha, rad etish va bloklash"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Ushbu xonaga qo‘shilish taklifini rad etishga ishonchingiz komilmi? Bu %1$sning siz bilan bog‘lanishiga yoki sizni xonalarga taklif qilishiga ham to‘sqinlik qiladi."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Taklifni rad etish va bloklash"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Rad etish va bloklash"</string>
 </resources>
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt
index eeefe688a1..b1a0c30a38 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt
index cb07bd5191..40621f4c08 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,14 +35,14 @@ class DefaultDeclineInviteTest {
     private val notificationCleaner =
         FakeNotificationCleaner(clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda)
 
-    private val successLeaveRoomLambda = lambdaRecorder<Result<Unit>> { -> Result.success(Unit) }
+    private val successLeaveRoomLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
     private val successIgnoreUserLambda =
         lambdaRecorder<UserId, Result<Unit>> { _ -> Result.success(Unit) }
     private val successReportRoomLambda =
         lambdaRecorder<String?, Result<Unit>> { _ -> Result.success(Unit) }
 
     private val failureLeaveRoomLambda =
-        lambdaRecorder<Result<Unit>> { -> Result.failure(Exception("Leave room error")) }
+        lambdaRecorder<Result<Unit>> { Result.failure(Exception("Leave room error")) }
     private val failureIgnoreUserLambda =
         lambdaRecorder<UserId, Result<Unit>> { _ -> Result.failure(Exception("Ignore user error")) }
     private val failureReportRoomLambda =
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt
index 6a5c225acb..ba080293f8 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt
index 651b7bb6bb..67c2d55490 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 60e00f8e35..299fec8565 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPointTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPointTest.kt
index 7cdf208b9a..13bb13dccf 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPointTest.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt
index 1ba95bc76e..de210de558 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt
index 18b46dbd5f..cb7af7828b 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/test/build.gradle.kts b/features/invite/test/build.gradle.kts
index e504873c3b..2df267f155 100644
--- a/features/invite/test/build.gradle.kts
+++ b/features/invite/test/build.gradle.kts
@@ -1,17 +1,9 @@
 /*
- * Copyright (c) 2025 New Vector Ltd
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
  */
 
 plugins {
@@ -26,5 +18,6 @@ dependencies {
     implementation(libs.coroutines.core)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrix.test)
+    implementation(projects.tests.testutils)
     api(projects.features.invite.api)
 }
diff --git a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InMemorySeenInvitesStore.kt b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InMemorySeenInvitesStore.kt
index 25db72532e..709a4a0f2a 100644
--- a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InMemorySeenInvitesStore.kt
+++ b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InMemorySeenInvitesStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt
index 62e6d8b322..84810f2e65 100644
--- a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt
+++ b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/declineandblock/FakeDeclineInviteAndBlockEntryPoint.kt b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/declineandblock/FakeDeclineInviteAndBlockEntryPoint.kt
new file mode 100644
index 0000000000..52d4d17790
--- /dev/null
+++ b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/declineandblock/FakeDeclineInviteAndBlockEntryPoint.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.invite.test.declineandblock
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeDeclineInviteAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inviteData: InviteData,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/invitepeople/api/build.gradle.kts b/features/invitepeople/api/build.gradle.kts
index 3cbd83724a..9fba48462e 100644
--- a/features/invitepeople/api/build.gradle.kts
+++ b/features/invitepeople/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 0ab097462b..264aafd570 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeoplePresenter.kt b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeoplePresenter.kt
index 46903bfb18..0be0798680 100644
--- a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeoplePresenter.kt
+++ b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeoplePresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleRenderer.kt b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleRenderer.kt
index 30144a11d1..7bad81ab65 100644
--- a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleRenderer.kt
+++ b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleRenderer.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 75fd211295..9d342d191f 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fdcebb17a2..ce30bcc1f6 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invitepeople/impl/build.gradle.kts b/features/invitepeople/impl/build.gradle.kts
index f0fcde6a00..e2025405ff 100644
--- a/features/invitepeople/impl/build.gradle.kts
+++ b/features/invitepeople/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 984eefbc77..b0c8994a62 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5e2b00a3f1..5ac3bc2824 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -103,7 +104,7 @@ class DefaultInvitePeoplePresenter(
             )
         }
 
-        fun handleEvents(event: InvitePeopleEvents) {
+        fun handleEvent(event: InvitePeopleEvents) {
             when (event) {
                 is DefaultInvitePeopleEvents.OnSearchActiveChanged -> {
                     searchActive = event.active
@@ -139,7 +140,7 @@ class DefaultInvitePeoplePresenter(
             searchResults = searchResults.value,
             showSearchLoader = showSearchLoader.value,
             sendInvitesAction = sendInvitesAction.value,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleRenderer.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleRenderer.kt
index 3301b7ec2c..59f25f82f1 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleRenderer.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleRenderer.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,13 +11,11 @@ package io.element.android.features.invitepeople.impl
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.invitepeople.api.InvitePeopleRenderer
 import io.element.android.features.invitepeople.api.InvitePeopleState
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultInvitePeopleRenderer : InvitePeopleRenderer {
     @Composable
     override fun Render(state: InvitePeopleState, modifier: Modifier) {
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 5ae51a8698..917915e4d6 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ebcd932a55..2f28db8786 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt
index 7dfd6a0f36..d2fd3f5edf 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitableUser.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5363ca43f1..a8e056c7aa 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/invitepeople/impl/src/main/res/values-hr/translations.xml b/features/invitepeople/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..66031c5fd7
--- /dev/null
+++ b/features/invitepeople/impl/src/main/res/values-hr/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">"Već je član"</string>
+  <string name="screen_invite_users_already_invited">"Već je pozvan/a"</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 e51c3ee352..388baf15e6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/api/build.gradle.kts b/features/joinroom/api/build.gradle.kts
index 10c33410d4..6ba5f9c761 100644
--- a/features/joinroom/api/build.gradle.kts
+++ b/features/joinroom/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt b/features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt
index 9af4703949..4d61f27763 100644
--- a/features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt
+++ b/features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,11 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import java.util.Optional
 
 interface JoinRoomEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: Inputs,
+    ): Node
 
     data class Inputs(
         val roomId: RoomId,
diff --git a/features/joinroom/impl/build.gradle.kts b/features/joinroom/impl/build.gradle.kts
index 476aacd863..71acdad128 100644
--- a/features/joinroom/impl/build.gradle.kts
+++ b/features/joinroom/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
index 5f217b26c2..2343860aab 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +12,16 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.joinroom.api.JoinRoomEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultJoinRoomEntryPoint : JoinRoomEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: JoinRoomEntryPoint.Inputs,
+    ): Node {
         return parentNode.createNode<JoinRoomFlowNode>(
             buildContext = buildContext,
             plugins = listOf(inputs)
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt
index 323b556c38..51245dd8f6 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
index f501752544..93f8f53412 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -64,7 +65,11 @@ class JoinRoomFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(
+                parentNode = this,
+                buildContext = buildContext,
+                inviteData = navTarget.inviteData,
+            )
             NavTarget.Root -> rootNode(buildContext)
         }
     }
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 6e123630d6..49c5ffb85f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,8 +40,6 @@ import io.element.android.libraries.core.meta.BuildMeta
 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
-import io.element.android.libraries.matrix.api.exception.ClientException
-import io.element.android.libraries.matrix.api.exception.ErrorKind
 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
@@ -141,11 +140,7 @@ class JoinRoomPresenter(
                             preview.previewInfo.toContentState(membershipDetails)
                         },
                         onFailure = { throwable ->
-                            if (throwable is ClientException.MatrixApi && (throwable.kind == ErrorKind.NotFound || throwable.kind == ErrorKind.Forbidden)) {
-                                ContentState.UnknownRoom
-                            } else {
-                                ContentState.Failure(throwable)
-                            }
+                            ContentState.UnknownRoom
                         }
                     )
                 }
@@ -157,7 +152,7 @@ class JoinRoomPresenter(
             contentState.markRoomInviteAsSeen()
         }
 
-        fun handleEvents(event: JoinRoomEvents) {
+        fun handleEvent(event: JoinRoomEvents) {
             when (event) {
                 JoinRoomEvents.JoinRoom -> coroutineScope.joinRoom(joinAction)
                 is JoinRoomEvents.KnockRoom -> coroutineScope.knockRoom(knockAction, knockMessage)
@@ -203,7 +198,7 @@ class JoinRoomPresenter(
             knockMessage = knockMessage,
             hideInviteAvatars = hideInviteAvatars,
             canReportRoom = canReportRoom,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
index f27a290f5d..e109bb1315 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,7 +25,6 @@ import kotlinx.collections.immutable.ImmutableList
 
 internal const val MAX_KNOCK_MESSAGE_LENGTH = 500
 
-@Immutable
 data class JoinRoomState(
     val roomIdOrAlias: RoomIdOrAlias,
     val contentState: ContentState,
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 e5f7df67a3..7e5142321a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 38d084c7d3..8992b92056 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt
index 675fb98a0c..11614dc737 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.joinroom.impl.di
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -18,7 +18,6 @@ interface CancelKnockRoom {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultCancelKnockRoom(private val client: MatrixClient) : CancelKnockRoom {
     override suspend fun invoke(roomId: RoomId): Result<Unit> {
         return client
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt
index 711439a44c..c93ea6807d 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.joinroom.impl.di
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -18,7 +18,6 @@ interface ForgetRoom {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultForgetRoom(private val client: MatrixClient) : ForgetRoom {
     override suspend fun invoke(roomId: RoomId): Result<Unit> {
         return client.getRoom(roomId)?.use { it.forget() }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt
index a3a4a778f0..3304169b1a 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/KnockRoom.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/KnockRoom.kt
index 4d32043b0f..1e34fddacd 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/KnockRoom.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/KnockRoom.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.joinroom.impl.di
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
@@ -22,7 +22,6 @@ interface KnockRoom {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultKnockRoom(private val client: MatrixClient) : KnockRoom {
     override suspend fun invoke(
         roomIdOrAlias: RoomIdOrAlias,
diff --git a/features/joinroom/impl/src/main/res/values-cs/translations.xml b/features/joinroom/impl/src/main/res/values-cs/translations.xml
index 0c00c0c4bd..85403339e8 100644
--- a/features/joinroom/impl/src/main/res/values-cs/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-cs/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_join_room_ban_by_message">"Z této místnosti jste byl vykázán uživatelem %1$s."</string>
-  <string name="screen_join_room_ban_message">"Byl vám zakázán vstup do této místnosti"</string>
+  <string name="screen_join_room_ban_by_message">"Byli jste vykázáni uživatelem %1$s."</string>
+  <string name="screen_join_room_ban_message">"Byl vám zakázán vstup"</string>
   <string name="screen_join_room_ban_reason">"Důvod: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Zrušit žádost"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Ano, zrušit"</string>
@@ -11,10 +11,10 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Opravdu chcete odmítnout pozvánku do této místnosti? Tím také zabráníte tomu, aby vás %1$s kontaktoval(a) nebo pozval(a) do místností."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Odmítnout pozvání a zablokovat"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Odmítnout a zablokovat"</string>
-  <string name="screen_join_room_fail_message">"Vstup do místnosti se nezdařil."</string>
-  <string name="screen_join_room_fail_reason">"Tato místnost je buď určena pouze pro zvané, nebo do ní může být omezen přístup na úrovni prostoru."</string>
-  <string name="screen_join_room_forget_action">"Zapomenout na tuto místnost"</string>
-  <string name="screen_join_room_invite_required_message">"Abyste se mohli připojit k této místnosti, potřebujete pozvánku."</string>
+  <string name="screen_join_room_fail_message">"Vstup se nezdařil"</string>
+  <string name="screen_join_room_fail_reason">"Buď musíte být pozváni ke vstupu, nebo mohou existovat omezení přístupu."</string>
+  <string name="screen_join_room_forget_action">"Zapomenout"</string>
+  <string name="screen_join_room_invite_required_message">"Pro vstup potřebujete pozvánku"</string>
   <string name="screen_join_room_invited_by">"Pozván(a)"</string>
   <string name="screen_join_room_join_action">"Vstoupit"</string>
   <string name="screen_join_room_join_restricted_message">"Abyste se mohli připojit, musíte být pozváni nebo být členem některého prostoru."</string>
diff --git a/features/joinroom/impl/src/main/res/values-da/translations.xml b/features/joinroom/impl/src/main/res/values-da/translations.xml
index ac1cd26191..12613b5878 100644
--- a/features/joinroom/impl/src/main/res/values-da/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-da/translations.xml
@@ -17,7 +17,7 @@
   <string name="screen_join_room_invite_required_message">"Du har brug for en invitation for at deltage"</string>
   <string name="screen_join_room_invited_by">"Inviteret af"</string>
   <string name="screen_join_room_join_action">"Deltag"</string>
-  <string name="screen_join_room_join_restricted_message">"Du skal muligvis være inviteret eller være medlem af en klynge for at deltage."</string>
+  <string name="screen_join_room_join_restricted_message">"Du skal muligvis være inviteret eller være medlem af en gruppe for at deltage."</string>
   <string name="screen_join_room_knock_action">"Send anmodning om at deltage"</string>
   <string name="screen_join_room_knock_message_characters_count">"Tilladte tegn %1$d af %2$d"</string>
   <string name="screen_join_room_knock_message_description">"Besked (valgfrit)"</string>
@@ -25,8 +25,8 @@
   <string name="screen_join_room_knock_sent_title">"Anmodning om at deltage sendt"</string>
   <string name="screen_join_room_loading_alert_message">"Vi kunne ikke forhåndsvise rummet. Dette kan skyldes netværks- eller serverproblemer."</string>
   <string name="screen_join_room_loading_alert_title">"Vi kunne ikke forhåndsvise rummet"</string>
-  <string name="screen_join_room_space_not_supported_description">"%1$s understøtter ikke klynger endnu. Du kan få adgang til klynger på nettet."</string>
-  <string name="screen_join_room_space_not_supported_title">"Klynger er ikke understøttet endnu"</string>
+  <string name="screen_join_room_space_not_supported_description">"%1$s understøtter ikke grupper endnu. Du kan få adgang til grupper på nettet."</string>
+  <string name="screen_join_room_space_not_supported_title">"Grupper er ikke understøttet endnu"</string>
   <string name="screen_join_room_subtitle_knock">"Klik på knappen nedenfor, og en rumadministrator vil blive underrettet. Du kan deltage i samtalen, når din anmodning er godkendt."</string>
   <string name="screen_join_room_subtitle_no_preview">"Du skal være medlem af dette rum for at kunne se meddelelseshistorikken."</string>
   <string name="screen_join_room_title_knock">"Vil du deltage i dette rum?"</string>
diff --git a/features/joinroom/impl/src/main/res/values-et/translations.xml b/features/joinroom/impl/src/main/res/values-et/translations.xml
index b3c51abbf1..572e499d99 100644
--- a/features/joinroom/impl/src/main/res/values-et/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-et/translations.xml
@@ -11,8 +11,8 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Kas sa oled kindel, et soovid keelduda kutsest sellesse jututuppa? Samaga kaob kasutajal %1$s võimalus sinuga suhelda ja saata sulle jututubade kutseid."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Keeldu kutsest ja blokeeri"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Keeldu ja blokeeri"</string>
-  <string name="screen_join_room_fail_message">"Jututoaga liitumine ei õnnestunud."</string>
-  <string name="screen_join_room_fail_reason">"Ligipääs siia jututuppa on võimalik vaid kutse alusel või kehtivad siin kogukonnakohased piirangud."</string>
+  <string name="screen_join_room_fail_message">"Jututoaga liitumine ei õnnestunud"</string>
+  <string name="screen_join_room_fail_reason">"Ligipääs siia on võimalik vaid kutse alusel või siin kehtivad ligipääsupiirangud."</string>
   <string name="screen_join_room_forget_action">"Unusta see jututuba"</string>
   <string name="screen_join_room_invite_required_message">"Selle jututoaga liitumiseks vajad sa kutset"</string>
   <string name="screen_join_room_invited_by">"Kutsuja"</string>
diff --git a/features/joinroom/impl/src/main/res/values-fa/translations.xml b/features/joinroom/impl/src/main/res/values-fa/translations.xml
index 77468f41ef..3f9fc99877 100644
--- a/features/joinroom/impl/src/main/res/values-fa/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-fa/translations.xml
@@ -9,10 +9,12 @@
   <string name="screen_join_room_decline_and_block_alert_confirmation">"بله. رد و انسداد"</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_message">"پیوستن شکست خورد"</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_description">"پیام (اختیاری)"</string>
   <string name="screen_join_room_knock_sent_title">"درخواست پیوستن فرستاده شد"</string>
diff --git a/features/joinroom/impl/src/main/res/values-fi/translations.xml b/features/joinroom/impl/src/main/res/values-fi/translations.xml
index 9a8a7e2a16..38ba043955 100644
--- a/features/joinroom/impl/src/main/res/values-fi/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-fi/translations.xml
@@ -15,6 +15,7 @@
   <string name="screen_join_room_fail_reason">"Sinun on joko saatava kutsu liittyäksesi tai pääsyyn voi olla rajoituksia."</string>
   <string name="screen_join_room_forget_action">"Unohda"</string>
   <string name="screen_join_room_invite_required_message">"Tarvitset kutsun liittyäksesi"</string>
+  <string name="screen_join_room_invited_by">"Kutsuja"</string>
   <string name="screen_join_room_join_action">"Liity"</string>
   <string name="screen_join_room_join_restricted_message">"Saatat tarvita kutsun tai olla tilan jäsen, jotta voit liittyä."</string>
   <string name="screen_join_room_knock_action">"Lähetä liittymispyyntö"</string>
diff --git a/features/joinroom/impl/src/main/res/values-hr/translations.xml b/features/joinroom/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..1a8489255a
--- /dev/null
+++ b/features/joinroom/impl/src/main/res/values-hr/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">"Korisnik %1$s vam je zabranio pristup."</string>
+  <string name="screen_join_room_ban_message">"Zabranjen vam je pristup"</string>
+  <string name="screen_join_room_ban_reason">"Razlog: %1$s."</string>
+  <string name="screen_join_room_cancel_knock_action">"Otkaži zahtjev"</string>
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"Da, otkaži"</string>
+  <string name="screen_join_room_cancel_knock_alert_description">"Jeste li sigurni da želite otkazati svoj zahtjev za pridruživanje ovoj sobi?"</string>
+  <string name="screen_join_room_cancel_knock_alert_title">"Otkaži zahtjev za pridruživanje"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Da, odbij i blokiraj"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Jeste li sigurni da želite odbiti poziv za pridruživanje ovoj sobi? Time ćete također spriječiti da %1$s kontaktira s vama ili vas pozove u sobe."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Odbij poziv i blokiraj"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Odbij i blokiraj"</string>
+  <string name="screen_join_room_fail_message">"Pridruživanje nije uspjelo"</string>
+  <string name="screen_join_room_fail_reason">"Morate biti pozvani da se pridružite ili možda postoje ograničenja pristupa."</string>
+  <string name="screen_join_room_forget_action">"Zaboravi"</string>
+  <string name="screen_join_room_invite_required_message">"Trebate imati pozivnicu kako biste se pridružili"</string>
+  <string name="screen_join_room_invited_by">"Pozvao/la"</string>
+  <string name="screen_join_room_join_action">"Pridruži se"</string>
+  <string name="screen_join_room_join_restricted_message">"Možda ćete morati biti pozvani ili biti član prostora kako biste se pridružili."</string>
+  <string name="screen_join_room_knock_action">"Pošalji zahtjev za pridruživanje"</string>
+  <string name="screen_join_room_knock_message_characters_count">"Dopuštenih znakova %1$d od %2$d"</string>
+  <string name="screen_join_room_knock_message_description">"Poruka (nije obavezna)"</string>
+  <string name="screen_join_room_knock_sent_description">"Primit ćete pozivnicu za pridruživanje sobi ako vaš zahtjev bude prihvaćen."</string>
+  <string name="screen_join_room_knock_sent_title">"Zahtjev za pridruživanje je poslan"</string>
+  <string name="screen_join_room_loading_alert_message">"Nismo mogli prikazati pregled sobe. To bi moglo biti zbog problema s mrežom ili poslužiteljem."</string>
+  <string name="screen_join_room_loading_alert_title">"Nismo mogli prikazati pregled ove sobe"</string>
+  <string name="screen_join_room_space_not_supported_description">"%1$s još ne podržava prostore. Prostorima možete pristupiti na internetu."</string>
+  <string name="screen_join_room_space_not_supported_title">"Prostori još nisu podržani"</string>
+  <string name="screen_join_room_subtitle_knock">"Kliknite donji gumb i administrator sobe dobit će obavijest. Moći ćete se pridružiti razgovoru nakon što dobijete odobrenje."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Morate biti član ove sobe da biste vidjeli povijest poruka."</string>
+  <string name="screen_join_room_title_knock">"Želite li se pridružiti ovoj sobi?"</string>
+  <string name="screen_join_room_title_no_preview">"Pregled nije dostupan"</string>
+</resources>
diff --git a/features/joinroom/impl/src/main/res/values-hu/translations.xml b/features/joinroom/impl/src/main/res/values-hu/translations.xml
index 8fafb9aa7a..facb3edbf2 100644
--- a/features/joinroom/impl/src/main/res/values-hu/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-hu/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_join_room_ban_by_message">"%1$s kitiltotta a szobából."</string>
-  <string name="screen_join_room_ban_message">"Kitiltották ebből a szobából"</string>
+  <string name="screen_join_room_ban_message">"Kitiltották"</string>
   <string name="screen_join_room_ban_reason">"Ok: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Kérés visszavonása"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Igen, visszavonás"</string>
@@ -11,10 +11,10 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Biztos, hogy elutasítja a meghívást, hogy csatlakozzon ehhez a szobához? Ez azt is megakadályozza, hogy %1$s kapcsolatba lépjen Önnel, vagy szobákba hívja."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Meghívó elutasítása és blokkolás"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Elutasítás és letiltás"</string>
-  <string name="screen_join_room_fail_message">"A szobához való csatlakozás sikertelen."</string>
-  <string name="screen_join_room_fail_reason">"Ebbe a szobába csak meghívóval vagy tértagsággal lehet belépni."</string>
-  <string name="screen_join_room_forget_action">"Szoba elfelejtése"</string>
-  <string name="screen_join_room_invite_required_message">"Meghívóra van szüksége ahhoz, hogy csatlakozzon ehhez a szobához"</string>
+  <string name="screen_join_room_fail_message">"A csatlakozás sikertelen"</string>
+  <string name="screen_join_room_fail_reason">"Csatlakozáshoz meghívóra van szükség, vagy lehet, hogy korlátozva van a hozzáférés."</string>
+  <string name="screen_join_room_forget_action">"Elfelejt"</string>
+  <string name="screen_join_room_invite_required_message">"A csatlakozáshoz meghívóra van szükség."</string>
   <string name="screen_join_room_invited_by">"Meghívta:"</string>
   <string name="screen_join_room_join_action">"Csatlakozás"</string>
   <string name="screen_join_room_join_restricted_message">"A csatlakozáshoz meghívásra vagy tértagságra lehet szüksége."</string>
diff --git a/features/joinroom/impl/src/main/res/values-it/translations.xml b/features/joinroom/impl/src/main/res/values-it/translations.xml
index deb025db27..756d6edc40 100644
--- a/features/joinroom/impl/src/main/res/values-it/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-it/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_join_room_ban_by_message">"Sei stato bandito da questa stanza da %1$s."</string>
-  <string name="screen_join_room_ban_message">"Sei stato bandito da questa stanza"</string>
+  <string name="screen_join_room_ban_by_message">"Sei stato bannato da %1$s ."</string>
+  <string name="screen_join_room_ban_message">"Sei stato bannato"</string>
   <string name="screen_join_room_ban_reason">"Motivo: %1$s"</string>
   <string name="screen_join_room_cancel_knock_action">"Cancella richiesta"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Sì, annulla"</string>
@@ -11,10 +11,11 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Sei sicuro di voler rifiutare l\'invito a entrare in questa stanza? Ciò impedirà a %1$s di contattarti o invitarti nuovamente in una stanza."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Rifiuta invito e blocca"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Rifiuta e blocca"</string>
-  <string name="screen_join_room_fail_message">"L\'accesso alla stanza non è riuscito."</string>
-  <string name="screen_join_room_fail_reason">"Questa stanza è solo su invito o potrebbero esserci delle restrizioni all\'accesso al livello dello spazio."</string>
-  <string name="screen_join_room_forget_action">"Dimentica questa stanza"</string>
-  <string name="screen_join_room_invite_required_message">"Hai bisogno di un invito per entrare in questa stanza"</string>
+  <string name="screen_join_room_fail_message">"Partecipazione non riuscita"</string>
+  <string name="screen_join_room_fail_reason">"Devi essere invitato per partecipare o potrebbero esserci delle restrizioni di accesso."</string>
+  <string name="screen_join_room_forget_action">"Dimentica"</string>
+  <string name="screen_join_room_invite_required_message">"Per partecipare è necessario un invito"</string>
+  <string name="screen_join_room_invited_by">"Invitato da"</string>
   <string name="screen_join_room_join_action">"Entra"</string>
   <string name="screen_join_room_join_restricted_message">"Potrebbe essere necessario essere invitati o essere membro di uno spazio per partecipare."</string>
   <string name="screen_join_room_knock_action">"Bussa per partecipare"</string>
diff --git a/features/joinroom/impl/src/main/res/values-pl/translations.xml b/features/joinroom/impl/src/main/res/values-pl/translations.xml
index dea02ea7cd..fcac55d546 100644
--- a/features/joinroom/impl/src/main/res/values-pl/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-pl/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_join_room_ban_by_message">"Zostałeś zbanowany z tego pokoju przez %1$s."</string>
-  <string name="screen_join_room_ban_message">"Zostałeś zbanowany z tego pokoju"</string>
+  <string name="screen_join_room_ban_by_message">"Zostałeś zbanowany przez %1$s ."</string>
+  <string name="screen_join_room_ban_message">"Zostałeś zbanowany"</string>
   <string name="screen_join_room_ban_reason">"Powód: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Anuluj prośbę"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Tak, anuluj"</string>
@@ -11,10 +11,11 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Czy na pewno chcesz odrzucić zaproszenie dołączenia do tego pokoju? %1$s nie będzie mógł się również z Tobą skontaktować, ani zaprosić Cię do pokoju."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Odrzuć zaproszenie i zablokuj"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Odrzuć i zablokuj"</string>
-  <string name="screen_join_room_fail_message">"Nie udało się dołączyć do pokoju."</string>
-  <string name="screen_join_room_fail_reason">"Ten pokój wymaga zaproszenia lub jest ograniczony z poziomu przestrzeni."</string>
-  <string name="screen_join_room_forget_action">"Zapomnij o tym pokoju"</string>
-  <string name="screen_join_room_invite_required_message">"Potrzebujesz zaproszenia, aby dołączyć do tego pokoju"</string>
+  <string name="screen_join_room_fail_message">"Nie udało się dołączyć do pokoju"</string>
+  <string name="screen_join_room_fail_reason">"Ten pokój wymaga zaproszenia lub dołączanie zostało ograniczone."</string>
+  <string name="screen_join_room_forget_action">"Zapomnij"</string>
+  <string name="screen_join_room_invite_required_message">"Aby dołączyć, potrzebujesz zaproszenia"</string>
+  <string name="screen_join_room_invited_by">"Zaproszony przez"</string>
   <string name="screen_join_room_join_action">"Dołącz"</string>
   <string name="screen_join_room_join_restricted_message">"Aby dołączyć, musisz uzyskać zaproszenie lub być członkiem danej przestrzeni."</string>
   <string name="screen_join_room_knock_action">"Wyślij prośbę o dołączenie"</string>
diff --git a/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml b/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml
index ed553bd93a..247532946f 100644
--- a/features/joinroom/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-pt-rBR/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_join_room_ban_by_message">"Você foi banido desta sala por %1$s."</string>
-  <string name="screen_join_room_ban_message">"Você foi banido desta sala"</string>
+  <string name="screen_join_room_ban_by_message">"Você foi banido por %1$s."</string>
+  <string name="screen_join_room_ban_message">"Você foi banido"</string>
   <string name="screen_join_room_ban_reason">"Motivo: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Cancelar pedido"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Sim, cancelar"</string>
@@ -11,10 +11,11 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Tem certeza de que quer recusar o convite para entrar nesta sala? Isso também impedirá que %1$s entre em contato com você ou o convide para salas."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Recusar convite e bloquear"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Recusar e bloquear"</string>
-  <string name="screen_join_room_fail_message">"A entrada na sala falhou."</string>
-  <string name="screen_join_room_fail_reason">"Esta sala é apenas para convidados ou pode haver restrições de acesso a nível do espaço."</string>
-  <string name="screen_join_room_forget_action">"Esquecer esta sala"</string>
-  <string name="screen_join_room_invite_required_message">"Você precisa de um convite para entrar nesta sala"</string>
+  <string name="screen_join_room_fail_message">"Falha ao entrar"</string>
+  <string name="screen_join_room_fail_reason">"Você precisa ser convidado ou pode haver restrições ao acesso."</string>
+  <string name="screen_join_room_forget_action">"Esquecer"</string>
+  <string name="screen_join_room_invite_required_message">"Você precisa de um convite para entrar"</string>
+  <string name="screen_join_room_invited_by">"Convidado por"</string>
   <string name="screen_join_room_join_action">"Entrar"</string>
   <string name="screen_join_room_join_restricted_message">"Talvez você precise ser convidado ou ser membro de um espaço para participar."</string>
   <string name="screen_join_room_knock_action">"Enviar solicitação para entrar"</string>
diff --git a/features/joinroom/impl/src/main/res/values-pt/translations.xml b/features/joinroom/impl/src/main/res/values-pt/translations.xml
index 4ed5e4219f..5a20d62b8c 100644
--- a/features/joinroom/impl/src/main/res/values-pt/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-pt/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_join_room_ban_by_message">"Foste banido desta sala por %1$s."</string>
-  <string name="screen_join_room_ban_message">"Foste banido desta sala."</string>
+  <string name="screen_join_room_ban_by_message">"Foste banido(a) por %1$s."</string>
+  <string name="screen_join_room_ban_message">"Foste banido(a)"</string>
   <string name="screen_join_room_ban_reason">"Razão: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Cancelar pedido"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Sim, cancelar"</string>
@@ -11,10 +11,10 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Tens a certeza de que queres recusar o convite para entrar nesta sala? Isto também evitará que %1$s te contacte ou te convide para salas."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Recusar convite &amp; bloquear"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Recusar e bloquear"</string>
-  <string name="screen_join_room_fail_message">"Falha ao entrar na sala."</string>
-  <string name="screen_join_room_fail_reason">"A entrada nesta sala ou está limitada a convites ou a alguma configuração de espaço."</string>
-  <string name="screen_join_room_forget_action">"Esquecer esta sala"</string>
-  <string name="screen_join_room_invite_required_message">"Precisas de um convite para entrares nesta sala"</string>
+  <string name="screen_join_room_fail_message">"Falha ao entrar"</string>
+  <string name="screen_join_room_fail_reason">"A entrada pode estar limitada a convites ou pode haver uma outra limitação de acesso."</string>
+  <string name="screen_join_room_forget_action">"Esquecer"</string>
+  <string name="screen_join_room_invite_required_message">"Precisas de um convite para entrares"</string>
   <string name="screen_join_room_invited_by">"Convidado por"</string>
   <string name="screen_join_room_join_action">"Entrar"</string>
   <string name="screen_join_room_join_restricted_message">"Podes ter que ser convidado ou pertenceres a um espaço para poderes entrar."</string>
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 9b50f35da4..207bc4bfde 100644
--- a/features/joinroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/joinroom/impl/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="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>
@@ -12,7 +12,7 @@
   <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_invited_by">"Приглашен"</string>
diff --git a/features/joinroom/impl/src/main/res/values-sk/translations.xml b/features/joinroom/impl/src/main/res/values-sk/translations.xml
index 35cc31af32..b6af52ca83 100644
--- a/features/joinroom/impl/src/main/res/values-sk/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-sk/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_join_room_ban_by_message">"Používateľ %1$s vám zakázal prístup do tejto miestnosti."</string>
-  <string name="screen_join_room_ban_message">"Bol vám zakázaný vstup do tejto miestnosti"</string>
+  <string name="screen_join_room_ban_by_message">"Používateľ %1$s vám zakázal prístup."</string>
+  <string name="screen_join_room_ban_message">"Bol vám zakázaný vstup"</string>
   <string name="screen_join_room_ban_reason">"Dôvod: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Zrušiť žiadosť"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Áno, zrušiť"</string>
@@ -11,10 +11,11 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Ste si istí, že chcete odmietnuť pozvanie na vstup do tejto miestnosti? To tiež zabráni tomu, aby vás %1$s kontaktoval/a alebo vás pozval/a do miestností."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Odmietnuť pozvánku a zablokovať"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Odmietnuť a zablokovať"</string>
-  <string name="screen_join_room_fail_message">"Pripojenie do miestnosti zlyhalo."</string>
-  <string name="screen_join_room_fail_reason">"Táto miestnosť je buď len pre pozvaných, alebo môžu existovať obmedzenia na prístup na úrovni priestoru."</string>
-  <string name="screen_join_room_forget_action">"Zabudnúť túto miestnosť"</string>
-  <string name="screen_join_room_invite_required_message">"Potrebujete pozvanie, aby ste sa mohli pripojiť k tejto miestnosti"</string>
+  <string name="screen_join_room_fail_message">"Vstup sa nepodaril"</string>
+  <string name="screen_join_room_fail_reason">"Buď musíte byť pozvaní pripojiť sa, alebo môžu existovať obmedzenia prístupu."</string>
+  <string name="screen_join_room_forget_action">"Zabudnúť"</string>
+  <string name="screen_join_room_invite_required_message">"Potrebujete pozvanie, aby ste sa mohli pripojiť"</string>
+  <string name="screen_join_room_invited_by">"Pozvaný/á používateľom"</string>
   <string name="screen_join_room_join_action">"Pripojiť sa"</string>
   <string name="screen_join_room_join_restricted_message">"Možno budete musieť byť pozvaní alebo byť členom priestoru, aby ste sa mohli pripojiť."</string>
   <string name="screen_join_room_knock_action">"Zaklopaním sa pripojíte"</string>
diff --git a/features/joinroom/impl/src/main/res/values-uz/translations.xml b/features/joinroom/impl/src/main/res/values-uz/translations.xml
index e8c50922c4..de8b10f2b1 100644
--- a/features/joinroom/impl/src/main/res/values-uz/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-uz/translations.xml
@@ -1,15 +1,29 @@
 <?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">"Siz %1$s tomonidan ushbu xonadan ban qilingansiz."</string>
+  <string name="screen_join_room_ban_message">"Siz bu xonadan chetlashtirilgansiz"</string>
+  <string name="screen_join_room_ban_reason">"Sababi: %1$s ."</string>
   <string name="screen_join_room_cancel_knock_action">"So‘rovni bekor qilish"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Ha, bekor qiling"</string>
   <string name="screen_join_room_cancel_knock_alert_description">"Bu xonaga qo‘shilish so‘rovingizni bekor qilishni xohlayotganingizga ishonchingiz komilmi?"</string>
   <string name="screen_join_room_cancel_knock_alert_title">"Qo‘shilish so‘rovini bekor qilish"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Ha, rad etish va bloklash"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Ushbu xonaga qo‘shilish taklifini rad etishga ishonchingiz komilmi? Bu %1$sning siz bilan bog‘lanishiga yoki sizni xonalarga taklif qilishiga ham to‘sqinlik qiladi."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Taklifni rad etish va bloklash"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Rad etish va bloklash"</string>
+  <string name="screen_join_room_fail_message">"Xonaga qo‘shilish amalga oshmadi"</string>
+  <string name="screen_join_room_fail_reason">"Bu xona faqat taklif etilganlar uchun yoki bu maydonga kirish huquqi cheklangan bo‘lishi mumkin."</string>
+  <string name="screen_join_room_forget_action">"Bu xonani esdan chiqarish"</string>
+  <string name="screen_join_room_invite_required_message">"Bu xonaga kirish uchun taklifnoma kerak"</string>
   <string name="screen_join_room_join_action">"Qo\'shilish"</string>
+  <string name="screen_join_room_join_restricted_message">"Qo‘shilish uchun sizga taklif kerak yoki siz maydonga a’zo bo‘lishingiz kerak."</string>
   <string name="screen_join_room_knock_action">"Qoʻshilish soʻrovini yuborish"</string>
+  <string name="screen_join_room_knock_message_characters_count">"Ruxsat etilgan belgilar: %1$d / %2$d"</string>
   <string name="screen_join_room_knock_message_description">"Xabar (ixtiyoriy)"</string>
   <string name="screen_join_room_knock_sent_description">"Agar so‘rovingiz qabul qilinsa, xonaga qo‘shilish taklifini olasiz."</string>
   <string name="screen_join_room_knock_sent_title">"Qo‘shilish so‘rovi yuborildi"</string>
+  <string name="screen_join_room_loading_alert_message">"Xona ko‘rinishini namoyish eta olmadik. Bu tarmoq yoki server muammolari tufayli yuz bergan bo‘lishi mumkin."</string>
+  <string name="screen_join_room_loading_alert_title">"Biz bu xonani oldindan ko‘rishni ko‘rsata olmadik "</string>
   <string name="screen_join_room_space_not_supported_description">"%1$s hali maydon xizmatini qoʻllab-quvvatlamaydi. maydonga veb-sayt orqali kirishingiz mumkin."</string>
   <string name="screen_join_room_space_not_supported_title">"Maydonlar hali qoʻllab-quvvatlanmaydi"</string>
   <string name="screen_join_room_subtitle_knock">"Quyidagi tugmani bosing va xona administratoriga xabar beriladi. Ruxsat berilgandan soʻng suhbatga qoʻshilishingiz mumkin boʻladi."</string>
diff --git a/features/joinroom/impl/src/main/res/values-zh-rTW/translations.xml b/features/joinroom/impl/src/main/res/values-zh-rTW/translations.xml
index aa7bbc261d..00887ad12a 100644
--- a/features/joinroom/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-zh-rTW/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_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>
@@ -11,10 +11,11 @@
   <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_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>
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 52361e01aa..7bea362c81 100644
--- a/features/joinroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/joinroom/impl/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_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>
@@ -11,10 +11,10 @@
   <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_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>
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt
index af75fd528c..3f44650c3f 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.features.joinroom.impl
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.features.invite.api.InviteData
-import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.features.invite.test.declineandblock.FakeDeclineInviteAndBlockEntryPoint
 import io.element.android.features.joinroom.api.JoinRoomEntryPoint
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -40,9 +39,7 @@ class DefaultJoinRoomEntryPointTest {
                 plugins = plugins,
                 presenterFactory = { _, _, _, _, _ -> createJoinRoomPresenter() },
                 acceptDeclineInviteView = { _, _, _, _ -> lambdaError() },
-                declineAndBlockEntryPoint = object : DeclineInviteAndBlockEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData) = lambdaError()
-                }
+                declineAndBlockEntryPoint = FakeDeclineInviteAndBlockEntryPoint(),
             )
         }
         val inputs = JoinRoomEntryPoint.Inputs(
@@ -52,7 +49,11 @@ class DefaultJoinRoomEntryPointTest {
             serverNames = emptyList(),
             trigger = JoinedRoom.Trigger.RoomDirectory,
         )
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null), inputs)
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            inputs = inputs,
+        )
         assertThat(result).isInstanceOf(JoinRoomFlowNode::class.java)
         assertThat(result.plugins).contains(inputs)
     }
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeCancelKnockRoom.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeCancelKnockRoom.kt
index e7f487fade..8badc1bc2c 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeCancelKnockRoom.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeCancelKnockRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeForgetRoom.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeForgetRoom.kt
index 48d3eec077..b7e0fc5b07 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeForgetRoom.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeForgetRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeKnockRoom.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeKnockRoom.kt
index 6ee281c853..d80312fb62 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeKnockRoom.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/FakeKnockRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
index 10b5c1a712..aec50d1761 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -1193,46 +1194,8 @@ class JoinRoomPresenterTest {
             skipItems(1)
             awaitItem().also { state ->
                 assertThat(state.contentState).isEqualTo(
-                    ContentState.Failure(error = AN_EXCEPTION)
+                    ContentState.UnknownRoom
                 )
-                state.eventSink(JoinRoomEvents.RetryFetchingContent)
-            }
-            skipItems(1)
-            awaitItem().also { state ->
-                assertThat(state.contentState).isEqualTo(ContentState.Loading)
-            }
-            awaitItem().also { state ->
-                assertThat(state.contentState).isEqualTo(
-                    ContentState.Failure(error = AN_EXCEPTION)
-                )
-            }
-        }
-    }
-
-    @Test
-    fun `present - when room is not known RoomPreview is loaded with error - dismiss`() = runTest {
-        val client = FakeMatrixClient(
-            getNotJoinedRoomResult = { _, _ ->
-                Result.failure(AN_EXCEPTION)
-            },
-            spaceService = FakeSpaceService(
-                spaceRoomListResult = { FakeSpaceRoomList() },
-            ),
-        )
-        val presenter = createJoinRoomPresenter(
-            matrixClient = client
-        )
-        presenter.test {
-            skipItems(1)
-            awaitItem().also { state ->
-                assertThat(state.contentState).isEqualTo(
-                    ContentState.Failure(error = AN_EXCEPTION)
-                )
-                state.eventSink(JoinRoomEvents.DismissErrorAndHideContent)
-            }
-            skipItems(1)
-            awaitItem().also { state ->
-                assertThat(state.contentState).isEqualTo(ContentState.Dismissing)
             }
         }
     }
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 f3487a43b6..0a3b1ca3c6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/api/build.gradle.kts b/features/knockrequests/api/build.gradle.kts
index 4beea72bed..25f419acff 100644
--- a/features/knockrequests/api/build.gradle.kts
+++ b/features/knockrequests/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/KnockRequestPermissions.kt b/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/KnockRequestPermissions.kt
new file mode 100644
index 0000000000..82bceb5be0
--- /dev/null
+++ b/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/KnockRequestPermissions.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.knockrequests.api
+
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+
+data class KnockRequestPermissions(
+    val canAccept: Boolean,
+    val canDecline: Boolean,
+    val canBan: Boolean,
+) {
+    val hasAny = canAccept || canDecline || canBan
+
+    companion object {
+        val DEFAULT = KnockRequestPermissions(
+            canAccept = false,
+            canDecline = false,
+            canBan = false,
+        )
+    }
+}
+
+fun RoomPermissions.knockRequestPermissions(): KnockRequestPermissions {
+    return KnockRequestPermissions(
+        canAccept = canOwnUserInvite(),
+        canDecline = canOwnUserKick(),
+        canBan = canOwnUserBan(),
+    )
+}
diff --git a/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/banner/KnockRequestsBannerRenderer.kt b/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/banner/KnockRequestsBannerRenderer.kt
index 9886c439e1..34061db335 100644
--- a/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/banner/KnockRequestsBannerRenderer.kt
+++ b/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/banner/KnockRequestsBannerRenderer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/list/KnockRequestsListEntryPoint.kt b/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/list/KnockRequestsListEntryPoint.kt
index b1b174580e..9975911266 100644
--- a/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/list/KnockRequestsListEntryPoint.kt
+++ b/features/knockrequests/api/src/main/kotlin/io/element/android/features/knockrequests/api/list/KnockRequestsListEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/build.gradle.kts b/features/knockrequests/impl/build.gradle.kts
index 41fadb00da..6f030479f5 100644
--- a/features/knockrequests/impl/build.gradle.kts
+++ b/features/knockrequests/impl/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/DefaultKnockRequestsBannerRenderer.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/DefaultKnockRequestsBannerRenderer.kt
index 612ddc5a6a..32e551a09d 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/DefaultKnockRequestsBannerRenderer.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/DefaultKnockRequestsBannerRenderer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,12 +11,10 @@ package io.element.android.features.knockrequests.impl.banner
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.knockrequests.api.banner.KnockRequestsBannerRenderer
 import io.element.android.libraries.di.RoomScope
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultKnockRequestsBannerRenderer(
     private val presenter: KnockRequestsBannerPresenter,
 ) : KnockRequestsBannerRenderer {
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt
index 2100e1f5ff..740982b612 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt
index a1db930500..f340d597b1 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -48,11 +49,11 @@ class KnockRequestsBannerPresenter(
 
         val shouldShowBanner by remember {
             derivedStateOf {
-                permissions.canHandle && knockRequests.isNotEmpty()
+                permissions.hasAny && knockRequests.isNotEmpty()
             }
         }
 
-        fun handleEvents(event: KnockRequestsBannerEvents) {
+        fun handleEvent(event: KnockRequestsBannerEvents) {
             when (event) {
                 is KnockRequestsBannerEvents.AcceptSingleRequest -> {
                     sessionCoroutineScope.acceptSingleKnockRequest(
@@ -73,7 +74,7 @@ class KnockRequestsBannerPresenter(
             displayAcceptError = showAcceptError.value,
             canAccept = permissions.canAccept,
             isVisible = shouldShowBanner,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt
index 1912891afa..e9291b501a 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3cdbeba9b2..67f1aaae8f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt
index 2ee070d41c..431bd14d10 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt
index 81603d6a68..17fd0ec64a 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt
deleted file mode 100644
index 4de596a623..0000000000
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.knockrequests.impl.data
-
-import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.powerlevels.canBan
-import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
-import io.element.android.libraries.matrix.api.room.powerlevels.canKick
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-data class KnockRequestPermissions(
-    val canAccept: Boolean,
-    val canDecline: Boolean,
-    val canBan: Boolean,
-) {
-    val canHandle = canAccept || canDecline || canBan
-}
-
-fun JoinedRoom.knockRequestPermissionsFlow(): Flow<KnockRequestPermissions> {
-    return syncUpdateFlow.map {
-        val canAccept = canInvite().getOrDefault(false)
-        val canDecline = canKick().getOrDefault(false)
-        val canBan = canBan().getOrDefault(false)
-        KnockRequestPermissions(canAccept, canDecline, canBan)
-    }
-}
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPresentable.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPresentable.kt
index 1e2e549db6..dc6aeb8f0d 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPresentable.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPresentable.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestWrapper.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestWrapper.kt
index de3bcd6872..15af1b2fc5 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestWrapper.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestWrapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsException.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsException.kt
index 71cab7134e..059b128482 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsException.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8236222f07..b51b78f105 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,10 +12,13 @@ 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.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
 
 @BindingContainer
 @ContributesTo(RoomScope::class)
@@ -24,7 +28,9 @@ object KnockRequestsModule {
     fun knockRequestsService(room: JoinedRoom, featureFlagService: FeatureFlagService): KnockRequestsService {
         return KnockRequestsService(
             knockRequestsFlow = room.knockRequestsFlow,
-            permissionsFlow = room.knockRequestPermissionsFlow(),
+            permissionsFlow = room.permissionsFlow(KnockRequestPermissions.DEFAULT) { perms ->
+                perms.knockRequestPermissions()
+            },
             isKnockFeatureEnabledFlow = featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock),
             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 ccfc0b1b1f..98570e6b28 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.knockrequests.impl.data
 
+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
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPoint.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPoint.kt
index 675f3bee9e..74a8b712d3 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPoint.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultKnockRequestsListEntryPoint : KnockRequestsListEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<KnockRequestsListNode>(buildContext)
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListEvents.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListEvents.kt
index c00ffdaa50..f1350b1669 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListEvents.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListNode.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListNode.kt
index a9bec1556b..f3c8b06884 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListNode.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenter.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenter.kt
index ff943fcf6b..a56dc40731 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenter.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -38,7 +39,7 @@ class KnockRequestsListPresenter(
 
         val coroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: KnockRequestsListEvents) {
+        fun handleEvent(event: KnockRequestsListEvents) {
             when (event) {
                 KnockRequestsListEvents.AcceptAll -> {
                     currentAction = KnockRequestsAction.AcceptAll
@@ -73,7 +74,7 @@ class KnockRequestsListPresenter(
             currentAction = currentAction,
             permissions = permissions,
             asyncAction = asyncAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListState.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListState.kt
index 1042a3646f..ae770a297d 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListState.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListState.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.knockrequests.impl.list
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.knockrequests.impl.data.KnockRequestPermissions
+import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
index a83450e9bd..85fc0675ad 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.knockrequests.impl.list
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.knockrequests.impl.data.KnockRequestPermissions
+import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
 import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import io.element.android.libraries.architecture.AsyncAction
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 987125f451..1ccc0742d6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/main/res/values-hr/translations.xml b/features/knockrequests/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..7f8d39503f
--- /dev/null
+++ b/features/knockrequests/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,37 @@
+<?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">"Da, prihvati sve"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"Jeste li sigurni da želite prihvatiti sve zahtjeve za pridruživanje?"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"Prihvati sve zahtjeve"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"Prihvati sve"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Nismo mogli prihvatiti sve zahtjeve. Želite li pokušati ponovno?"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Prihvaćanje svih zahtjeva nije uspjelo"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"Prihvaćanje svih zahtjeva za pridruživanje"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"Nismo mogli prihvatiti ovaj zahtjev. Želite li pokušati ponovno?"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"Prihvaćanje zahtjeva nije uspjelo"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"Prihvaća se zahtjev za pridruživanje"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Da, odbij i zabrani"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"Jeste li sigurni da želite odbiti i zabraniti korisnika %1$s? Taj korisnik neće moći ponovno zatražiti pristup ovoj sobi."</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"Odbij i zabrani pristup"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"Odbijanje i zabrana pristupa"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"Da, odbij"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"Jeste li sigurni da želite odbiti zahtjev korisnika %1$s za pridruživanje ovoj sobi?"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"Odbij pristup"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"Odbij i zabrani"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Nismo mogli odbiti ovaj zahtjev. Želite li pokušati ponovno?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"Odbijanje zahtjeva nije uspjelo"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"Odbijanje zahtjeva za pridruživanje"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"Kada netko zatraži pridruživanje sobi, ovdje ćete moći vidjeti njihov zahtjev."</string>
+  <string name="screen_knock_requests_list_empty_state_title">"Nema zahtjeva za pridruživanje koji su na čekanju"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"Učitavanje zahtjeva za pridruživanje…"</string>
+  <string name="screen_knock_requests_list_title">"Zahtjevi za pridruživanje"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="one">"%1$s i još %2$d želi se pridružiti ovoj sobi"</item>
+    <item quantity="few">"%1$s i još %2$d želi se pridružiti ovoj sobi"</item>
+    <item quantity="other">"%1$s i još %2$d želi se pridružiti ovoj sobi"</item>
+  </plurals>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"Prikaži sve"</string>
+  <string name="screen_room_single_knock_request_accept_button_title">"Prihvati"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s želi se pridružiti ovoj sobi"</string>
+  <string name="screen_room_single_knock_request_view_button_title">"Prikaz"</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 f5e91a469a..8080d273fb 100644
--- a/features/knockrequests/impl/src/main/res/values-ru/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-ru/translations.xml
@@ -11,7 +11,7 @@
   <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_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>
diff --git a/features/knockrequests/impl/src/main/res/values-uz/translations.xml b/features/knockrequests/impl/src/main/res/values-uz/translations.xml
index 8cad1166df..24d8fb3fac 100644
--- a/features/knockrequests/impl/src/main/res/values-uz/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-uz/translations.xml
@@ -1,5 +1,36 @@
 <?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">"Ha, hammasini qabul qiling"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"Barcha qo‘shilish so‘rovlarini qabul qilishga ishonchingiz komilmi?"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"Barcha so‘rovlarni qabul qilish"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"Hammasini qabul qiling"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Biz barcha so‘rovlarni qabul qila olmadik. Qayta urinib koʻrmoqchimisiz?"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Barcha so‘rovlar qabul qilinmadi"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"Qo‘shilish so‘rovi qabul qilinmoqda"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"Biz bu so‘rovni qabul qila olmadik. Yana bir bor urinib ko‘rishni xohlaysizmi?"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"So‘rovni qabul qilib bo‘lmadi"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"Qo‘shilish so‘rovi qabul qilinmoqda"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Ha, rad eting va taqiqlang"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"Siz %1$sʼni rad etib, taqiqlashni xohlayotganingizga ishonchingiz komilmi? Bu foydalanuvchi ushbu xonaga qayta kirish uchun ruxsat so‘ray olmaydi."</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"Rad etish va kirishni taqiqlash"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"Kirishni rad etish va taqiqlash"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"Ha, rad etish"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"%1$sning bu xonaga qo‘shilish so‘rovini rad etasizmi?"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"Kirishni rad etish"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"Rad etish va taqiqlash"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Biz bu iltimosni rad etolmasdik. Yana bir bor urinib ko‘rishni xohlaysizmi?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"So‘rovni rad etib bo‘lmadi"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"Qo‘shilish so‘rovi rad etilayapti"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"Kimdir xonaga qo‘shilishni so‘raganda, uning iltimosini shu yerda ko‘rishingiz mumkin."</string>
+  <string name="screen_knock_requests_list_empty_state_title">"Qo‘shilish so‘rovi kutilmayapti"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"Qo‘shilish uchun so‘rovlar yuklanmoqda…"</string>
+  <string name="screen_knock_requests_list_title">"Qo‘shilish uchun so‘rovlar"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="one">"%1$s + %2$d kishi bu xonaga qo‘shilmoqchi"</item>
+    <item quantity="other">"%1$s + %2$d kishi bu xonaga qo‘shilmoqchi"</item>
+  </plurals>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"Hammasini ko\'rish"</string>
   <string name="screen_room_single_knock_request_accept_button_title">"Qabul qiling"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s bu xonaga qo‘shilmoqchi"</string>
   <string name="screen_room_single_knock_request_view_button_title">"Ko\'rish"</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 252a0ceaeb..3161d3e81f 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
@@ -1,14 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.knockrequests.impl.banner
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.knockrequests.impl.data.KnockRequestPermissions
+import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.impl.data.KnockRequestsService
 import io.element.android.libraries.matrix.api.room.knock.KnockRequest
 import io.element.android.libraries.matrix.test.A_USER_ID
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 e5dbb39447..a9fea0905e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPointTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPointTest.kt
index b6b6d766c7..2ef357c7c7 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPointTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 18269e06f3..7102b01773 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,7 @@
 package io.element.android.features.knockrequests.impl.list
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.knockrequests.impl.data.KnockRequestPermissions
+import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.impl.data.KnockRequestsService
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
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 5b4b8fb789..188dcc7e56 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/knockrequests/test/build.gradle.kts b/features/knockrequests/test/build.gradle.kts
new file mode 100644
index 0000000000..dc3407da01
--- /dev/null
+++ b/features/knockrequests/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.knockrequests.test"
+}
+
+dependencies {
+    implementation(projects.features.knockrequests.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/knockrequests/test/src/main/kotlin/io/element/android/features/knockrequests/test/FakeKnockRequestsListEntryPoint.kt b/features/knockrequests/test/src/main/kotlin/io/element/android/features/knockrequests/test/FakeKnockRequestsListEntryPoint.kt
new file mode 100644
index 0000000000..95fc36d693
--- /dev/null
+++ b/features/knockrequests/test/src/main/kotlin/io/element/android/features/knockrequests/test/FakeKnockRequestsListEntryPoint.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.knockrequests.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeKnockRequestsListEntryPoint : KnockRequestsListEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node = lambdaError()
+}
diff --git a/features/leaveroom/api/build.gradle.kts b/features/leaveroom/api/build.gradle.kts
index 48d78b6e7e..b548081653 100644
--- a/features/leaveroom/api/build.gradle.kts
+++ b/features/leaveroom/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomEvent.kt b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomEvent.kt
index aaa7753aba..6d228ee887 100644
--- a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomEvent.kt
+++ b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomRenderer.kt b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomRenderer.kt
index 80252a83a6..852193d874 100644
--- a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomRenderer.kt
+++ b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomRenderer.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomState.kt b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomState.kt
index 28cee237a1..92a5916858 100644
--- a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomState.kt
+++ b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomState.kt
@@ -1,12 +1,16 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.leaveroom.api
 
+import androidx.compose.runtime.Immutable
+
+@Immutable
 interface LeaveRoomState {
     val eventSink: (LeaveRoomEvent) -> Unit
 }
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 72a275d85c..167070891f 100644
--- a/features/leaveroom/api/src/main/res/values-fa/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-fa/translations.xml
@@ -2,5 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <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_title">"انتقال مالکیت"</string>
   <string name="leave_room_alert_subtitle">"مطمئنید که می‌خواهید این اتاق را ترک کنید؟"</string>
 </resources>
diff --git a/features/leaveroom/api/src/main/res/values-hr/translations.xml b/features/leaveroom/api/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..4eb9e3405c
--- /dev/null
+++ b/features/leaveroom/api/src/main/res/values-hr/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">"Jeste li sigurni da želite napustiti ovaj razgovor? Ovaj razgovor nije javan i nećete se moći ponovno pridružiti bez pozivnice."</string>
+  <string name="leave_room_alert_empty_subtitle">"Jeste li sigurni da želite napustiti ovu sobu? Ovdje ste jedino vi. Ako odete, nitko se ubuduće neće moći pridružiti, pa ni vi."</string>
+  <string name="leave_room_alert_private_subtitle">"Jeste li sigurni da želite napustiti ovu sobu? Ova soba nije javna i nećete joj se moći ponovno pridružiti bez pozivnice."</string>
+  <string name="leave_room_alert_select_new_owner_action">"Odaberi vlasnike"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"Vi ste jedini vlasnik ove sobe. Morate prenijeti vlasništvo na nekog drugog prije nego što napustite sobu."</string>
+  <string name="leave_room_alert_select_new_owner_title">"Prenesi vlasništvo"</string>
+  <string name="leave_room_alert_subtitle">"Jeste li sigurni da želite napustiti sobu?"</string>
+</resources>
diff --git a/features/leaveroom/api/src/main/res/values-uz/translations.xml b/features/leaveroom/api/src/main/res/values-uz/translations.xml
index 374fd347fc..e04bbf4b7f 100644
--- a/features/leaveroom/api/src/main/res/values-uz/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-uz/translations.xml
@@ -3,5 +3,8 @@
   <string name="leave_conversation_alert_subtitle">"Bu suhbatni tark etmoqchi ekanligingizga ishonchingiz komilmi? Bu suhbat hammaga ochiq emas va siz taklifsiz qayta qo‘shila olmaysiz."</string>
   <string name="leave_room_alert_empty_subtitle">"Bu xonani tark etmoqchi ekanligingizga ishonchingiz komilmi? Siz bu yerda yagona odamsiz. Agar siz tark etsangiz, kelajakda hech kim qo\'shila olmaydi, jumladan siz ham."</string>
   <string name="leave_room_alert_private_subtitle">"Bu xonani tark etmoqchi ekanligingizga ishonchingiz komilmi? Bu xona ochiq emas va siz taklifsiz qayta qo‘shila olmaysiz."</string>
+  <string name="leave_room_alert_select_new_owner_action">"Egalarni tanlang"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"Siz bu xonaning yagona egasisiz. Xonadan chiqishdan oldin egalikni boshqaga topshirishingiz kerak."</string>
+  <string name="leave_room_alert_select_new_owner_title">"Egalikni topshirish"</string>
   <string name="leave_room_alert_subtitle">"Xonani tark etmoqchi ekanligingizga ishonchingiz komilmi?"</string>
 </resources>
diff --git a/features/leaveroom/impl/build.gradle.kts b/features/leaveroom/impl/build.gradle.kts
index 81aedb2025..cc07e668c1 100644
--- a/features/leaveroom/impl/build.gradle.kts
+++ b/features/leaveroom/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomEvent.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomEvent.kt
index 80aaddc442..37ec70e065 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomEvent.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomRenderer.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomRenderer.kt
index be1aa3b55a..c9335bbf08 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomRenderer.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomRenderer.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,14 +11,12 @@ package io.element.android.features.leaveroom.impl
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.leaveroom.api.LeaveRoomRenderer
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class InternalLeaveRoomRenderer : LeaveRoomRenderer {
     @Composable
     override fun Render(state: LeaveRoomState, onSelectNewOwners: (RoomId) -> Unit, modifier: Modifier) {
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomState.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomState.kt
index 91d5ac84c4..68607f21d7 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomState.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomStateProvider.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomStateProvider.kt
index 9437752c89..769015f301 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomStateProvider.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/InternalLeaveRoomStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 50242ab7ea..6455b45659 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -95,10 +96,7 @@ class LeaveRoomPresenter(
         } else {
             val hasPrivilegedCreatorRole = roomInfoFlow.value.privilegedCreatorRole
             if (!hasPrivilegedCreatorRole) return false
-
-            val creators = usersWithRole(RoomMember.Role.Owner(isCreator = true)).first()
-            val superAdmins = usersWithRole(RoomMember.Role.Owner(isCreator = false)).first()
-            val owners = creators + superAdmins
+            val owners = usersWithRole { role -> role is RoomMember.Role.Owner }.first()
             return owners.size == 1 && owners.first().userId == sessionId
         }
     }
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomView.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomView.kt
index 87e4537b1a..131801b014 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomView.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/di/LeaveRoomModule.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/di/LeaveRoomModule.kt
index b13d7d3078..db5b1416ee 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/di/LeaveRoomModule.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/di/LeaveRoomModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9e8c4113ae..59d2c1ce23 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/api/build.gradle.kts b/features/licenses/api/build.gradle.kts
index 0774deb56b..fcbf81f210 100644
--- a/features/licenses/api/build.gradle.kts
+++ b/features/licenses/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt b/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt
index a2dbdde60d..835af35ca6 100644
--- a/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt
+++ b/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/build.gradle.kts b/features/licenses/impl/build.gradle.kts
index 59ad326b6f..52f21ac0bd 100644
--- a/features/licenses/impl/build.gradle.kts
+++ b/features/licenses/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt
index 8ffbc05ed3..671510e6bb 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.licenses.api.OpenSourceLicensesEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOpenSourcesLicensesEntryPoint : OpenSourceLicensesEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<DependenciesFlowNode>(buildContext)
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DependenciesFlowNode.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DependenciesFlowNode.kt
index 30e094e38e..34e734a64f 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DependenciesFlowNode.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DependenciesFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -52,7 +53,7 @@ class DependenciesFlowNode(
         return when (navTarget) {
             is NavTarget.LicensesList -> {
                 val callback = object : DependencyLicensesListNode.Callback {
-                    override fun onOpenLicense(license: DependencyLicenseItem) {
+                    override fun navigateToLicense(license: DependencyLicenseItem) {
                         backstack.push(NavTarget.LicenseDetails(license))
                     }
                 }
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/LicensesProvider.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/LicensesProvider.kt
index c5c0fa84f5..7ae6fa740a 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/LicensesProvider.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/LicensesProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.licenses.impl
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.licenses.impl.model.DependencyLicenseItem
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -24,7 +24,6 @@ interface LicensesProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AssetLicensesProvider(
     @ApplicationContext private val context: Context,
     private val dispatchers: CoroutineDispatchers,
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsNode.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsNode.kt
index 4f55f8dfa8..83e7ae231f 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsNode.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 063579414f..f463a6b8d1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListEvent.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListEvent.kt
index d1c8a88717..bf53b05d18 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListEvent.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListNode.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListNode.kt
index 7280c2ad41..424dad415e 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListNode.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.licenses.impl.model.DependencyLicenseItem
+import io.element.android.libraries.architecture.callback
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -30,13 +31,10 @@ class DependencyLicensesListNode(
     plugins = plugins
 ) {
     interface Callback : Plugin {
-        fun onOpenLicense(license: DependencyLicenseItem)
+        fun navigateToLicense(license: DependencyLicenseItem)
     }
 
-    private fun onOpenLicense(license: DependencyLicenseItem) {
-        plugins<Callback>()
-            .forEach { it.onOpenLicense(license) }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -44,7 +42,7 @@ class DependencyLicensesListNode(
         DependencyLicensesListView(
             state = state,
             onBackClick = ::navigateUp,
-            onOpenLicense = ::onOpenLicense,
+            onOpenLicense = callback::navigateToLicense,
         )
     }
 }
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenter.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenter.kt
index 0af5d1cc47..fe6973958e 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenter.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,10 +57,10 @@ class DependencyLicensesListPresenter(
             }
         }
 
-        fun handleEvent(dependencyLicensesListEvent: DependencyLicensesListEvent) {
-            when (dependencyLicensesListEvent) {
+        fun handleEvent(event: DependencyLicensesListEvent) {
+            when (event) {
                 is DependencyLicensesListEvent.SetFilter -> {
-                    filter = dependencyLicensesListEvent.filter
+                    filter = event.filter
                 }
             }
         }
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListState.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListState.kt
index 7e9be25b5a..d3aeedeb57 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListState.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListStateProvider.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListStateProvider.kt
index 2bd6a5a88e..6a74cc01eb 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListStateProvider.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3419665b65..f60c28ef2b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/model/DependencyLicenseItem.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/model/DependencyLicenseItem.kt
index 6599768acc..d26d062d57 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/model/DependencyLicenseItem.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/model/DependencyLicenseItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt
index 3209e28fe6..4b6e3d98ef 100644
--- a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt
+++ b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenterTest.kt b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenterTest.kt
index d52300b546..abc827d4e2 100644
--- a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenterTest.kt
+++ b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/FakeLicensesProvider.kt b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/FakeLicensesProvider.kt
index 6fba7ba651..ebbad0e16b 100644
--- a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/FakeLicensesProvider.kt
+++ b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/list/FakeLicensesProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/licenses/test/build.gradle.kts b/features/licenses/test/build.gradle.kts
new file mode 100644
index 0000000000..d9a2870aee
--- /dev/null
+++ b/features/licenses/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.licenses.test"
+}
+
+dependencies {
+    implementation(projects.features.licenses.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/licenses/test/src/main/kotlin/io/element/android/features/licenses/test/FakeOpenSourceLicensesEntryPoint.kt b/features/licenses/test/src/main/kotlin/io/element/android/features/licenses/test/FakeOpenSourceLicensesEntryPoint.kt
new file mode 100644
index 0000000000..366aacbe25
--- /dev/null
+++ b/features/licenses/test/src/main/kotlin/io/element/android/features/licenses/test/FakeOpenSourceLicensesEntryPoint.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.licenses.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.licenses.api.OpenSourceLicensesEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeOpenSourceLicensesEntryPoint : OpenSourceLicensesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/linknewdevice/api/build.gradle.kts b/features/linknewdevice/api/build.gradle.kts
new file mode 100644
index 0000000000..7d368f0a63
--- /dev/null
+++ b/features/linknewdevice/api/build.gradle.kts
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.linknewdevice.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+}
diff --git a/features/linknewdevice/api/src/main/kotlin/io/element/android/features/linknewdevice/api/LinkNewDeviceEntryPoint.kt b/features/linknewdevice/api/src/main/kotlin/io/element/android/features/linknewdevice/api/LinkNewDeviceEntryPoint.kt
new file mode 100644
index 0000000000..061bbeb084
--- /dev/null
+++ b/features/linknewdevice/api/src/main/kotlin/io/element/android/features/linknewdevice/api/LinkNewDeviceEntryPoint.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.linknewdevice.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import io.element.android.libraries.architecture.FeatureEntryPoint
+
+interface LinkNewDeviceEntryPoint : FeatureEntryPoint {
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
+}
diff --git a/features/linknewdevice/impl/build.gradle.kts b/features/linknewdevice/impl/build.gradle.kts
new file mode 100644
index 0000000000..9c1aa9e990
--- /dev/null
+++ b/features/linknewdevice/impl/build.gradle.kts
@@ -0,0 +1,63 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+    alias(libs.plugins.kotlin.serialization)
+}
+
+android {
+    namespace = "io.element.android.features.linknewdevice.impl"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    // TODO Cleanup
+    implementation(projects.appconfig)
+    implementation(projects.features.enterprise.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)
+    implementation(projects.libraries.testtags)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.permissions.api)
+    implementation(projects.libraries.sessionStorage.api)
+    implementation(projects.libraries.qrcode)
+    implementation(projects.libraries.oidc.api)
+    implementation(projects.libraries.uiUtils)
+    implementation(projects.libraries.wellknown.api)
+    implementation(libs.androidx.browser)
+    implementation(libs.androidx.webkit)
+    implementation(libs.serialization.json)
+    api(projects.features.linknewdevice.api)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.features.linknewdevice.test)
+    testImplementation(projects.features.enterprise.test)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.oidc.test)
+    testImplementation(projects.libraries.permissions.test)
+    testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.libraries.wellknown.test)
+}
diff --git a/features/linknewdevice/impl/src/main/AndroidManifest.xml b/features/linknewdevice/impl/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..d225716fc4
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ 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.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <queries>
+        <!-- To open URL in CustomTab (prefetch, etc.). It makes CustomTabsClient.getPackageName() work
+         see https://developer.android.com/training/package-visibility/use-cases#open-urls-custom-tabs -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
+
+</manifest>
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPoint.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPoint.kt
new file mode 100644
index 0000000000..5edc3cdfcd
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPoint.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.linknewdevice.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.linknewdevice.api.LinkNewDeviceEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.SessionScope
+
+@ContributesBinding(SessionScope::class)
+class DefaultLinkNewDeviceEntryPoint : LinkNewDeviceEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: LinkNewDeviceEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<LinkNewDeviceFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                callback,
+            )
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDesktopHandler.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDesktopHandler.kt
new file mode 100644
index 0000000000..a8a8ff14b6
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDesktopHandler.kt
@@ -0,0 +1,74 @@
+/*
+ * 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.linknewdevice.impl
+
+import dev.zacsweers.metro.Inject
+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.LinkDesktopHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import io.element.android.libraries.matrix.api.logs.LoggerTags
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+private val loggerTag = LoggerTag("LinkNewDesktopHandler", LoggerTags.linkNewDevice)
+
+@Inject
+@SingleIn(SessionScope::class)
+class LinkNewDesktopHandler(
+    private val matrixClient: MatrixClient,
+) {
+    private val sessionScope = matrixClient.sessionCoroutineScope
+    private val linkDesktopStepFlow = MutableStateFlow<LinkDesktopStep>(
+        LinkDesktopStep.Uninitialized
+    )
+
+    val stepFlow: StateFlow<LinkDesktopStep>
+        get() = linkDesktopStepFlow.asStateFlow()
+
+    private var currentJob: Job? = null
+    private var handler: LinkDesktopHandler? = null
+
+    fun createNewHandler() {
+        currentJob?.cancel()
+        currentJob = null
+        handler = matrixClient.createLinkDesktopHandler().getOrNull()
+    }
+
+    fun reset() {
+        currentJob?.cancel()
+        currentJob = null
+        sessionScope.launch {
+            linkDesktopStepFlow.emit(LinkDesktopStep.Uninitialized)
+        }
+    }
+
+    fun onScannedCode(data: ByteArray) {
+        currentJob?.cancel()
+        currentJob = null
+        val currentHandler = handler
+        if (currentHandler == null) {
+            Timber.tag(loggerTag.value).e("onScannedCode: Handler is not initialized. Call createNewHandler() first.")
+        } else {
+            currentJob = matrixClient.sessionCoroutineScope.launch {
+                currentHandler.linkDesktopStep.onEach {
+                    linkDesktopStepFlow.emit(it)
+                }.launchIn(this)
+                currentHandler.handleScannedQrCode(data)
+            }
+        }
+    }
+}
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
new file mode 100644
index 0000000000..23c6b6ab2d
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt
@@ -0,0 +1,287 @@
+/*
+ * 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.linknewdevice.impl
+
+import android.app.Activity
+import android.os.Parcelable
+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.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 com.bumble.appyx.navmodel.backstack.operation.replace
+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.linknewdevice.api.LinkNewDeviceEntryPoint
+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.LinkNewDeviceRootNode
+import io.element.android.features.linknewdevice.impl.screens.scan.ScanQrCodeNode
+import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+import io.element.android.libraries.matrix.api.logs.LoggerTags
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.parcelize.Parcelize
+import timber.log.Timber
+
+private val tag = LoggerTag("LinkNewDeviceFlowNode", LoggerTags.linkNewDevice)
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class LinkNewDeviceFlowNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    @SessionCoroutineScope
+    private val sessionCoroutineScope: CoroutineScope,
+    private val linkNewMobileHandler: LinkNewMobileHandler,
+    private val linkNewDesktopHandler: LinkNewDesktopHandler,
+) : BaseFlowNode<LinkNewDeviceFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins,
+) {
+    private val callback: LinkNewDeviceEntryPoint.Callback = callback()
+    private var activity: Activity? = null
+    private var darkTheme: Boolean = false
+
+    override fun onBuilt() {
+        super.onBuilt()
+        var linkMobileHandlerJob: Job? = null
+        var linkDesktopHandlerJob: Job? = null
+
+        lifecycle.subscribe(
+            onCreate = {
+                linkNewMobileHandler.reset()
+                linkNewDesktopHandler.reset()
+                @Suppress("AssignedValueIsNeverRead")
+                linkMobileHandlerJob = observeLinkNewMobileHandler()
+                @Suppress("AssignedValueIsNeverRead")
+                linkDesktopHandlerJob = observeLinkNewDesktopHandler()
+            },
+            onDestroy = {
+                linkMobileHandlerJob?.cancel()
+                linkDesktopHandlerJob?.cancel()
+            }
+        )
+    }
+
+    sealed interface NavTarget : Parcelable {
+        // Will display the not supported state or the device type selection
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data class MobileShowQrCode(
+            val data: String,
+        ) : NavTarget
+
+        @Parcelize
+        data object MobileEnterNumber : NavTarget
+
+        @Parcelize
+        data object DesktopNotice : NavTarget
+
+        @Parcelize
+        data object DesktopScanQrCode : NavTarget
+
+        @Parcelize
+        data class Error(
+            val errorScreenType: ErrorScreenType,
+        ) : NavTarget
+    }
+
+    private fun observeLinkNewMobileHandler(): Job {
+        Timber.tag(tag.value).d("startObservingLinkNewMobileHandler")
+        return linkNewMobileHandler.stepFlow
+            .onEach { linkMobileStep ->
+                Timber.tag(tag.value).d("step: ${linkMobileStep::class.java.simpleName}")
+                when (linkMobileStep) {
+                    LinkMobileStep.Uninitialized -> Unit
+                    LinkMobileStep.Done -> {
+                        callback.onDone()
+                    }
+                    is LinkMobileStep.Error -> {
+                        navigateToError(linkMobileStep.errorType)
+                    }
+                    is LinkMobileStep.QrReady -> {
+                        // The QrCode is ready, navigate to its display
+                        backstack.push(NavTarget.MobileShowQrCode(linkMobileStep.data))
+                    }
+                    is LinkMobileStep.QrScanned -> {
+                        backstack.replace(NavTarget.MobileEnterNumber)
+                    }
+                    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()
+                    }
+                    is LinkMobileStep.WaitingForAuth -> {
+                        navigateToBrowser(linkMobileStep.verificationUri)
+                    }
+                }
+            }
+            .launchIn(sessionCoroutineScope)
+    }
+
+    private fun observeLinkNewDesktopHandler(): Job {
+        Timber.tag(tag.value).d("startObservingLinkNewDesktopHandler")
+        return linkNewDesktopHandler.stepFlow.onEach { linkDesktopStep ->
+            Timber.tag(tag.value).d("step: ${linkDesktopStep::class.java.simpleName}")
+            when (linkDesktopStep) {
+                LinkDesktopStep.Done -> callback.onDone()
+                is LinkDesktopStep.Error -> {
+                    navigateToError(linkDesktopStep.errorType)
+                }
+                is LinkDesktopStep.EstablishingSecureChannel -> Unit
+                is LinkDesktopStep.InvalidQrCode -> {
+                    // This error will be handled by the ScanQrCodeNode
+                }
+                LinkDesktopStep.Starting -> Unit
+                LinkDesktopStep.SyncingSecrets -> Unit
+                LinkDesktopStep.Uninitialized -> Unit
+                is LinkDesktopStep.WaitingForAuth -> {
+                    navigateToBrowser(linkDesktopStep.verificationUri)
+                }
+            }
+        }
+            .launchIn(sessionCoroutineScope)
+    }
+
+    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.UnableToCreateDevice -> ErrorScreenType.UnknownError
+            is ErrorType.Unknown -> ErrorScreenType.UnknownError
+            is ErrorType.UnsupportedProtocol -> ErrorScreenType.UnknownError
+        }
+        // It is OK to push on backstack, since when user leaves the error screen, a new root will be set
+        backstack.push(NavTarget.Error(error))
+    }
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            NavTarget.Root -> {
+                val callback = object : LinkNewDeviceRootNode.Callback {
+                    override fun onDone() {
+                        callback.onDone()
+                    }
+
+                    override fun linkDesktopDevice() {
+                        linkNewDesktopHandler.reset()
+                        backstack.push(NavTarget.DesktopNotice)
+                    }
+                }
+                createNode<LinkNewDeviceRootNode>(buildContext, listOf(callback))
+            }
+            NavTarget.DesktopNotice -> {
+                val callback = object : DesktopNoticeNode.Callback {
+                    override fun navigateBack() {
+                        backstack.pop()
+                    }
+
+                    override fun navigateToQrCodeScanner() {
+                        backstack.push(NavTarget.DesktopScanQrCode)
+                    }
+                }
+                createNode<DesktopNoticeNode>(buildContext, listOf(callback))
+            }
+            NavTarget.DesktopScanQrCode -> {
+                val callback = object : ScanQrCodeNode.Callback {
+                    override fun cancel() {
+                        backstack.pop()
+                    }
+                }
+                createNode<ScanQrCodeNode>(buildContext, listOf(callback))
+            }
+            NavTarget.MobileEnterNumber -> {
+                val callback = object : EnterNumberNode.Callback {
+                    override fun navigateToWrongNumberError() {
+                        backstack.push(NavTarget.Error(ErrorScreenType.Mismatch2Digits))
+                    }
+
+                    override fun navigateBack() {
+                        backstack.pop()
+                    }
+                }
+                createNode<EnterNumberNode>(buildContext, listOf(callback))
+            }
+            is NavTarget.MobileShowQrCode -> {
+                val callback = object : ShowQrCodeNode.Callback {
+                    override fun navigateBack() {
+                        linkNewMobileHandler.reset()
+                        backstack.pop()
+                    }
+                }
+                val inputs = ShowQrCodeNode.Inputs(
+                    data = navTarget.data,
+                )
+                createNode<ShowQrCodeNode>(buildContext, listOf(inputs, callback))
+            }
+            is NavTarget.Error -> {
+                val callback = object : ErrorNode.Callback {
+                    override fun onRetry() {
+                        linkNewMobileHandler.reset()
+                        linkNewDesktopHandler.reset()
+                        backstack.newRoot(NavTarget.Root)
+                    }
+                }
+                createNode<ErrorNode>(buildContext, listOf(callback, navTarget.errorScreenType))
+            }
+        }
+    }
+
+    private fun navigateToBrowser(url: String) {
+        activity?.openUrlInChromeCustomTab(null, darkTheme, url)
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        activity = requireNotNull(LocalActivity.current)
+        darkTheme = !ElementTheme.isLightTheme
+        DisposableEffect(Unit) {
+            onDispose {
+                activity = null
+            }
+        }
+        BackstackView()
+    }
+}
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
new file mode 100644
index 0000000000..157d946eaa
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewMobileHandler.kt
@@ -0,0 +1,68 @@
+/*
+ * 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.linknewdevice.impl
+
+import dev.zacsweers.metro.Inject
+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.LinkMobileHandler
+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.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+private val loggerTag = LoggerTag("LinkNewMobileHandler", LoggerTags.linkNewDevice)
+
+@Inject
+@SingleIn(SessionScope::class)
+class LinkNewMobileHandler(
+    private val matrixClient: MatrixClient,
+) {
+    private val sessionScope = matrixClient.sessionCoroutineScope
+    private var currentJob: Job? = null
+    private var handler: LinkMobileHandler? = null
+
+    private val linkMobileStepFlow = MutableStateFlow<LinkMobileStep>(
+        LinkMobileStep.Uninitialized
+    )
+
+    val stepFlow: StateFlow<LinkMobileStep>
+        get() = linkMobileStepFlow.asStateFlow()
+
+    fun createAndStartNewHandler() {
+        Timber.tag(loggerTag.value).d("createAndStartNewHandler()")
+        currentJob?.cancel()
+        handler = matrixClient.createLinkMobileHandler().getOrNull()
+        handler?.let { h ->
+            currentJob = sessionScope.launch {
+                h.linkMobileStep
+                    .onEach {
+                        linkMobileStepFlow.emit(it)
+                    }
+                    .launchIn(this)
+                h.start()
+            }
+        }
+    }
+
+    fun reset() {
+        currentJob?.cancel()
+        currentJob = null
+        sessionScope.launch {
+            linkMobileStepFlow.emit(LinkMobileStep.Uninitialized)
+        }
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeEvent.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeEvent.kt
new file mode 100644
index 0000000000..3d94da3fc6
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeEvent.kt
@@ -0,0 +1,12 @@
+/*
+ * 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.linknewdevice.impl.screens.desktop
+
+sealed interface DesktopNoticeEvent {
+    data object Continue : DesktopNoticeEvent
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeNode.kt
new file mode 100644
index 0000000000..895d02731a
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeNode.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.linknewdevice.impl.screens.desktop
+
+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.SessionScope
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class DesktopNoticeNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: DesktopNoticePresenter,
+) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun navigateBack()
+        fun navigateToQrCodeScanner()
+    }
+
+    private val callback: Callback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        DesktopNoticeView(
+            state = state,
+            modifier = modifier,
+            onBackClick = callback::navigateBack,
+            onReadyToScanClick = callback::navigateToQrCodeScanner,
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticePresenter.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticePresenter.kt
new file mode 100644
index 0000000000..3b01725fe1
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticePresenter.kt
@@ -0,0 +1,57 @@
+/*
+ * 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.linknewdevice.impl.screens.desktop
+
+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.setValue
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.permissions.api.PermissionsEvent
+import io.element.android.libraries.permissions.api.PermissionsPresenter
+
+@Inject
+class DesktopNoticePresenter(
+    permissionsPresenterFactory: PermissionsPresenter.Factory,
+) : Presenter<DesktopNoticeState> {
+    private val cameraPermissionPresenter: PermissionsPresenter = permissionsPresenterFactory.create(Manifest.permission.CAMERA)
+    private var pendingPermissionRequest by mutableStateOf(false)
+
+    @Composable
+    override fun present(): DesktopNoticeState {
+        val cameraPermissionState = cameraPermissionPresenter.present()
+        var canContinue by remember { mutableStateOf(false) }
+        LaunchedEffect(cameraPermissionState.permissionGranted) {
+            if (cameraPermissionState.permissionGranted && pendingPermissionRequest) {
+                pendingPermissionRequest = false
+                canContinue = true
+            }
+        }
+
+        fun handleEvent(event: DesktopNoticeEvent) {
+            when (event) {
+                DesktopNoticeEvent.Continue -> if (cameraPermissionState.permissionGranted) {
+                    canContinue = true
+                } else {
+                    pendingPermissionRequest = true
+                    cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
+                }
+            }
+        }
+
+        return DesktopNoticeState(
+            cameraPermissionState = cameraPermissionState,
+            canContinue = canContinue,
+            eventSink = ::handleEvent,
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeState.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeState.kt
new file mode 100644
index 0000000000..81991b5ab2
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeState.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.linknewdevice.impl.screens.desktop
+
+import io.element.android.libraries.permissions.api.PermissionsState
+
+data class DesktopNoticeState(
+    val cameraPermissionState: PermissionsState,
+    val canContinue: Boolean,
+    val eventSink: (DesktopNoticeEvent) -> Unit,
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeStateProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeStateProvider.kt
new file mode 100644
index 0000000000..194bd6fafc
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeStateProvider.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.features.linknewdevice.impl.screens.desktop
+
+import android.Manifest
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.permissions.api.PermissionsState
+import io.element.android.libraries.permissions.api.aPermissionsState
+
+open class DesktopNoticeStateProvider : PreviewParameterProvider<DesktopNoticeState> {
+    override val values: Sequence<DesktopNoticeState>
+        get() = sequenceOf(
+            aDesktopNoticeState(),
+            aDesktopNoticeState(cameraPermissionState = aPermissionsState(showDialog = true, permission = Manifest.permission.CAMERA)),
+        )
+}
+
+fun aDesktopNoticeState(
+    cameraPermissionState: PermissionsState = aPermissionsState(
+        showDialog = false,
+        permission = Manifest.permission.CAMERA,
+    ),
+    canContinue: Boolean = false,
+    eventSink: (DesktopNoticeEvent) -> Unit = {},
+) = DesktopNoticeState(
+    cameraPermissionState = cameraPermissionState,
+    canContinue = canContinue,
+    eventSink = eventSink
+)
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
new file mode 100644
index 0000000000..c7f0bb61e7
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeView.kt
@@ -0,0 +1,112 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package io.element.android.features.linknewdevice.impl.screens.desktop
+
+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.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.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
+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.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.utils.annotatedTextWithBold
+import io.element.android.libraries.permissions.api.PermissionsView
+import kotlinx.collections.immutable.persistentListOf
+
+/**
+ * Desktop notice screen:
+ * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2027-23618
+ */
+@Composable
+fun DesktopNoticeView(
+    state: DesktopNoticeState,
+    onBackClick: () -> Unit,
+    onReadyToScanClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val latestOnReadyToScanClick by rememberUpdatedState(onReadyToScanClick)
+    LaunchedEffect(state.canContinue) {
+        if (state.canContinue) {
+            latestOnReadyToScanClick()
+        }
+    }
+
+    val appName = LocalBuildMeta.current.applicationName
+    FlowStepPage(
+        onBackClick = onBackClick,
+        title = stringResource(R.string.screen_link_new_device_desktop_title, appName),
+        iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),
+        modifier = modifier,
+        buttons = {
+            Button(
+                text = stringResource(R.string.screen_link_new_device_desktop_submit),
+                onClick = { state.eventSink(DesktopNoticeEvent.Continue) },
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    ) {
+        Column(
+            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(
+                        text = stringResource(
+                            id = R.string.screen_link_new_device_mobile_step2,
+                            stringResource(R.string.screen_link_new_device_mobile_step2_action),
+                        ),
+                        boldText = stringResource(R.string.screen_link_new_device_mobile_step2_action)
+                    ),
+                    AnnotatedString(stringResource(R.string.screen_link_new_device_desktop_step3)),
+                )
+            )
+        }
+    }
+
+    PermissionsView(
+        title = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_title),
+        content = stringResource(R.string.screen_qr_code_login_no_camera_permission_state_description, appName),
+        icon = { Icon(imageVector = CompoundIcons.TakePhotoSolid(), contentDescription = null) },
+        state = state.cameraPermissionState,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun DesktopNoticeViewPreview(
+    @PreviewParameter(DesktopNoticeStateProvider::class) state: DesktopNoticeState,
+) = ElementPreview {
+    DesktopNoticeView(
+        state = state,
+        onBackClick = { },
+        onReadyToScanClick = { },
+    )
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorNode.kt
new file mode 100644
index 0000000000..70fd3b49a4
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorNode.kt
@@ -0,0 +1,43 @@
+/*
+ * 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.linknewdevice.impl.screens.error
+
+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.architecture.inputs
+import io.element.android.libraries.di.SessionScope
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class ErrorNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : Node(buildContext = buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun onRetry()
+    }
+
+    private val callback: Callback = callback()
+    private val errorScreenType = inputs<ErrorScreenType>()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        ErrorView(
+            modifier = modifier,
+            errorScreenType = errorScreenType,
+            onRetry = callback::onRetry,
+        )
+    }
+}
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
new file mode 100644
index 0000000000..b92a19ef8a
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenType.kt
@@ -0,0 +1,40 @@
+/*
+ * 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.linknewdevice.impl.screens.error
+
+import android.os.Parcelable
+import androidx.compose.runtime.Immutable
+import io.element.android.libraries.architecture.NodeInputs
+import kotlinx.parcelize.Parcelize
+
+@Immutable
+sealed interface ErrorScreenType : NodeInputs, Parcelable {
+    @Parcelize
+    data object Cancelled : ErrorScreenType
+
+    @Parcelize
+    data object Expired : ErrorScreenType
+
+    @Parcelize
+    data object Mismatch2Digits : ErrorScreenType
+
+    @Parcelize
+    data object InsecureChannelDetected : ErrorScreenType
+
+    @Parcelize
+    data object Declined : ErrorScreenType
+
+    @Parcelize
+    data object ProtocolNotSupported : ErrorScreenType
+
+    @Parcelize
+    data object SlidingSyncNotAvailable : ErrorScreenType
+
+    @Parcelize
+    data object UnknownError : 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
new file mode 100644
index 0000000000..7fd699101b
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenTypeProvider.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.linknewdevice.impl.screens.error
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+
+class ErrorScreenTypeProvider : PreviewParameterProvider<ErrorScreenType> {
+    override val values: Sequence<ErrorScreenType> = sequenceOf(
+        ErrorScreenType.Cancelled,
+        ErrorScreenType.Declined,
+        ErrorScreenType.Expired,
+        ErrorScreenType.ProtocolNotSupported,
+        ErrorScreenType.Mismatch2Digits,
+        ErrorScreenType.InsecureChannelDetected,
+        ErrorScreenType.SlidingSyncNotAvailable,
+        ErrorScreenType.UnknownError,
+    )
+}
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
new file mode 100644
index 0000000000..3a77f19f49
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorView.kt
@@ -0,0 +1,138 @@
+/*
+ * 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.linknewdevice.impl.screens.error
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxSize
+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.runtime.Composable
+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.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.linknewdevice.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.LocalBuildMeta
+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
+
+@Composable
+fun ErrorView(
+    errorScreenType: ErrorScreenType,
+    onRetry: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val appName = LocalBuildMeta.current.applicationName
+    BackHandler(onBack = onRetry)
+    FlowStepPage(
+        modifier = modifier,
+        iconStyle = BigIcon.Style.AlertSolid,
+        title = titleText(errorScreenType, appName),
+        subTitle = subtitleText(errorScreenType, appName),
+        content = { Content(errorScreenType) },
+        buttons = { Buttons(onRetry) },
+    )
+}
+
+@Composable
+private fun titleText(errorScreenType: ErrorScreenType, appName: String) = when (errorScreenType) {
+    ErrorScreenType.Cancelled -> stringResource(R.string.screen_qr_code_login_error_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.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)
+}
+
+@Composable
+private fun subtitleText(errorScreenType: ErrorScreenType, appName: String) = when (errorScreenType) {
+    ErrorScreenType.Cancelled -> stringResource(R.string.screen_qr_code_login_error_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.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)
+}
+
+@Composable
+private fun ColumnScope.InsecureChannelDetectedError() {
+    Text(
+        modifier = Modifier
+            .fillMaxWidth()
+            .verticalScroll(rememberScrollState()),
+        text = stringResource(R.string.screen_qr_code_login_connection_note_secure_state_list_header),
+        style = ElementTheme.typography.fontBodyLgMedium,
+        textAlign = TextAlign.Center,
+    )
+    NumberedListOrganism(
+        modifier = Modifier.fillMaxSize(),
+        items = persistentListOf(
+            AnnotatedString(stringResource(R.string.screen_qr_code_login_connection_note_secure_state_list_item_1)),
+            AnnotatedString(stringResource(R.string.screen_qr_code_login_connection_note_secure_state_list_item_2)),
+            AnnotatedString(stringResource(R.string.screen_qr_code_login_connection_note_secure_state_list_item_3)),
+        )
+    )
+}
+
+@Composable
+private fun Content(errorScreenType: ErrorScreenType) {
+    when (errorScreenType) {
+        ErrorScreenType.InsecureChannelDetected -> {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 20.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(24.dp)
+            ) {
+                InsecureChannelDetectedError()
+            }
+        }
+        else -> Unit
+    }
+}
+
+@Composable
+private fun Buttons(onRetry: () -> Unit) {
+    Button(
+        modifier = Modifier.fillMaxWidth(),
+        text = stringResource(CommonStrings.action_start_over),
+        onClick = onRetry
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ErrorViewPreview(@PreviewParameter(ErrorScreenTypeProvider::class) errorScreenType: ErrorScreenType) {
+    ElementPreview {
+        ErrorView(
+            errorScreenType = errorScreenType,
+            onRetry = {},
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/Config.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/Config.kt
new file mode 100644
index 0000000000..b61cc82a22
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/Config.kt
@@ -0,0 +1,12 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+object Config {
+    const val VERIFICATION_CODE_LENGTH = 2
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberEvent.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberEvent.kt
new file mode 100644
index 0000000000..267b508669
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberEvent.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+sealed interface EnterNumberEvent {
+    data class UpdateNumber(val number: String) : EnterNumberEvent
+    data object Continue : EnterNumberEvent
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberNode.kt
new file mode 100644
index 0000000000..08d8cd02bd
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberNode.kt
@@ -0,0 +1,54 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+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.SessionScope
+
+interface EnterNumberNavigator {
+    fun navigateToWrongNumberError()
+}
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class EnterNumberNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenterFactory: EnterNumberPresenter.Factory,
+) : Node(buildContext, plugins = plugins), EnterNumberNavigator {
+    private val presenter = presenterFactory.create(this)
+
+    interface Callback : Plugin {
+        fun navigateToWrongNumberError()
+        fun navigateBack()
+    }
+
+    private val callback: Callback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        EnterNumberView(
+            state = state,
+            modifier = modifier,
+            onBackClick = callback::navigateBack,
+        )
+    }
+
+    override fun navigateToWrongNumberError() {
+        callback.navigateToWrongNumberError()
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenter.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenter.kt
new file mode 100644
index 0000000000..74b5b6b294
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenter.kt
@@ -0,0 +1,108 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+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.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.linknewdevice.impl.LinkNewMobileHandler
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.matrix.api.linknewdevice.CheckCodeSender
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+import io.element.android.libraries.matrix.api.logs.LoggerTags
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+private val tag = LoggerTag("EnterNumberPresenter", LoggerTags.linkNewDevice)
+
+@AssistedInject
+class EnterNumberPresenter(
+    @Assisted private val navigator: EnterNumberNavigator,
+    private val linkNewMobileHandler: LinkNewMobileHandler,
+) : Presenter<EnterNumberState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(navigator: EnterNumberNavigator): EnterNumberPresenter
+    }
+
+    @Composable
+    override fun present(): EnterNumberState {
+        val coroutineScope = rememberCoroutineScope()
+        var number by remember { mutableStateOf("") }
+        var sendingCode by remember<MutableState<AsyncAction<Unit>>> { mutableStateOf(AsyncAction.Uninitialized) }
+
+        // Observe the flow to react on ErrorType.InvalidCheckCode
+        val linkMobileStep by linkNewMobileHandler.stepFlow.collectAsState()
+
+        var checkCodeSender: CheckCodeSender? by remember { mutableStateOf(null) }
+
+        LaunchedEffect(linkMobileStep) {
+            when (val step = linkMobileStep) {
+                is LinkMobileStep.QrScanned -> {
+                    checkCodeSender = step.checkCodeSender
+                }
+                else -> Unit
+            }
+        }
+
+        fun handleEvent(event: EnterNumberEvent) {
+            when (event) {
+                is EnterNumberEvent.UpdateNumber -> {
+                    sendingCode = AsyncAction.Uninitialized
+                    // Keep only digits as a safety measure
+                    number = event.number.filter { it.isDigit() }
+                }
+                EnterNumberEvent.Continue -> coroutineScope.launch {
+                    // Get the current code sender
+                    val sender = checkCodeSender
+                    if (sender == null) {
+                        Timber.tag(tag.value).e("No check code sender available")
+                        sendingCode = AsyncAction.Failure(IllegalStateException("No check code sender available"))
+                    } else {
+                        sendingCode = AsyncAction.Loading
+                        val uByte = number.toUByte()
+                        val isValid = sender.validate(uByte)
+                        if (isValid) {
+                            sender.send(uByte)
+                                .fold(
+                                    onSuccess = {
+                                        Timber.tag(tag.value).d("Code sent successfully")
+                                        // Keep loading, do not set sendingCode to AsyncAction.Success(Unit)
+                                    },
+                                    onFailure = {
+                                        Timber.tag(tag.value).e(it, "Failed to send number code")
+                                        sendingCode = AsyncAction.Failure(it)
+                                    }
+                                )
+                        } else {
+                            // Navigate to the error state
+                            navigator.navigateToWrongNumberError()
+                        }
+                    }
+                }
+            }
+        }
+
+        return EnterNumberState(
+            number = number,
+            sendingCode = sendingCode,
+            eventSink = ::handleEvent,
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberState.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberState.kt
new file mode 100644
index 0000000000..b8f66018dd
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberState.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+import io.element.android.features.linknewdevice.impl.screens.number.model.Number
+import io.element.android.libraries.architecture.AsyncAction
+
+data class EnterNumberState(
+    val number: String,
+    val sendingCode: AsyncAction<Unit>,
+    val eventSink: (EnterNumberEvent) -> Unit,
+) {
+    val numberEntry = Number.createEmpty(Config.VERIFICATION_CODE_LENGTH).fillWith(number)
+    val isContinueButtonEnabled: Boolean
+        get() = numberEntry.isComplete() && !sendingCode.isLoading()
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberStateProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberStateProvider.kt
new file mode 100644
index 0000000000..126bfeee52
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberStateProvider.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
+
+open class EnterNumberStateProvider : PreviewParameterProvider<EnterNumberState> {
+    override val values: Sequence<EnterNumberState>
+        get() = sequenceOf(
+            aEnterNumberState(),
+            aEnterNumberState(number = "1"),
+            aEnterNumberState(number = "12"),
+            aEnterNumberState(number = "12", sendingCode = AsyncAction.Loading),
+            aEnterNumberState(number = "12", sendingCode = AsyncAction.Failure(ErrorType.InvalidCheckCode("Invalid"))),
+            aEnterNumberState(number = "12", sendingCode = AsyncAction.Failure(Exception("Failed to send code"))),
+        )
+}
+
+fun aEnterNumberState(
+    number: String = "",
+    sendingCode: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    eventSink: (EnterNumberEvent) -> Unit = {},
+) = EnterNumberState(
+    number = number,
+    sendingCode = sendingCode,
+    eventSink = eventSink,
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberView.kt
new file mode 100644
index 0000000000..92b3447615
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberView.kt
@@ -0,0 +1,125 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package io.element.android.features.linknewdevice.impl.screens.number
+
+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.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+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.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.linknewdevice.impl.R
+import io.element.android.features.linknewdevice.impl.screens.number.component.NumberTextField
+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 io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * Form to enter number:
+ * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2076-81604
+ */
+@Composable
+fun EnterNumberView(
+    state: EnterNumberState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    FlowStepPage(
+        onBackClick = onBackClick,
+        title = stringResource(R.string.screen_link_new_device_enter_number_title),
+        subTitle = stringResource(R.string.screen_link_new_device_enter_number_subtitle),
+        iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),
+        modifier = modifier,
+        buttons = {
+            Button(
+                text = stringResource(CommonStrings.action_continue),
+                onClick = { state.eventSink(EnterNumberEvent.Continue) },
+                enabled = state.isContinueButtonEnabled,
+                showProgress = state.sendingCode.isLoading(),
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    ) {
+        Column(
+            Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Spacer(modifier = Modifier.height(24.dp))
+            Text(
+                text = stringResource(R.string.screen_link_new_device_enter_number_notice),
+                textAlign = TextAlign.Center,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textPrimary,
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            NumberTextField(
+                number = state.numberEntry,
+                onValueChange = { state.eventSink(EnterNumberEvent.UpdateNumber(it)) },
+                onDone = {
+                    if (state.isContinueButtonEnabled) {
+                        state.eventSink(EnterNumberEvent.Continue)
+                    }
+                },
+            )
+            val failure = state.sendingCode.errorOrNull()
+            if (failure != null) {
+                Spacer(modifier = Modifier.height(4.dp))
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                ) {
+                    Icon(
+                        modifier = Modifier.size(14.dp),
+                        imageVector = CompoundIcons.ErrorSolid(),
+                        contentDescription = null,
+                        tint = ElementTheme.colors.iconCriticalPrimary,
+                    )
+                    val errorMessage = when (failure) {
+                        is ErrorType.InvalidCheckCode -> stringResource(R.string.screen_link_new_device_enter_number_error_numbers_do_not_match)
+                        else -> failure.message ?: stringResource(CommonStrings.error_unknown)
+                    }
+                    Text(
+                        text = errorMessage,
+                        style = ElementTheme.typography.fontBodySmRegular,
+                        color = ElementTheme.colors.textCriticalPrimary,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun EnterNumberViewPreview(
+    @PreviewParameter(EnterNumberStateProvider::class) state: EnterNumberState,
+) = ElementPreview {
+    EnterNumberView(
+        state = state,
+        onBackClick = { },
+    )
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/component/NumberTextField.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/component/NumberTextField.kt
new file mode 100644
index 0000000000..568a729ed6
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/component/NumberTextField.kt
@@ -0,0 +1,169 @@
+/*
+ * 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.linknewdevice.impl.screens.number.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+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.material3.Text
+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.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.linknewdevice.impl.screens.number.model.Digit
+import io.element.android.features.linknewdevice.impl.screens.number.model.Number
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import kotlinx.coroutines.delay
+
+@Composable
+fun NumberTextField(
+    number: Number,
+    onValueChange: (String) -> Unit,
+    onDone: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isFocused = LocalInspectionMode.current || interactionSource.collectIsFocusedAsState().value
+    BasicTextField(
+        modifier = modifier,
+        value = number.toText(),
+        onValueChange = {
+            onValueChange(it)
+        },
+        interactionSource = interactionSource,
+        maxLines = 1,
+        keyboardOptions = KeyboardOptions(
+            keyboardType = KeyboardType.Number,
+            imeAction = ImeAction.Done,
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = {
+                onDone()
+            }
+        ),
+        decorationBox = {
+            NumberRow(
+                number = number,
+                hasFocus = isFocused,
+            )
+        }
+    )
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun NumberRow(
+    number: Number,
+    hasFocus: Boolean,
+) {
+    FlowRow(
+        horizontalArrangement = Arrangement.spacedBy(12.dp, alignment = Alignment.CenterHorizontally),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        val length = number.length()
+        number.digits.forEachIndexed { index, digit ->
+            DigitView(
+                digit = digit,
+                isCurrent = index == length,
+                drawCursor = hasFocus,
+            )
+        }
+    }
+}
+
+@Composable
+private fun DigitView(
+    digit: Digit,
+    isCurrent: Boolean,
+    drawCursor: Boolean,
+) {
+    val shape = RoundedCornerShape(4.dp)
+    val appearanceModifier = when (digit) {
+        Digit.Empty -> {
+            val color = if (isCurrent) {
+                ElementTheme.colors.textPrimary
+            } else {
+                ElementTheme.colors.borderInteractiveSecondary
+            }
+            Modifier.border(1.dp, color, shape)
+        }
+        is Digit.Filled -> {
+            Modifier.background(ElementTheme.colors.bgActionSecondaryPressed, shape)
+        }
+    }
+    Box(
+        modifier = Modifier
+            .size(42.dp, 56.dp)
+            .then(appearanceModifier),
+        contentAlignment = Alignment.Center,
+    ) {
+        if (digit is Digit.Filled) {
+            Text(
+                text = digit.value.toString(),
+                style = ElementTheme.typography.fontHeadingLgBold,
+                color = ElementTheme.colors.textPrimary,
+            )
+        } else if (drawCursor && isCurrent) {
+            // Draw a blinking cursor
+            BlinkingCursor()
+        }
+    }
+}
+
+@Composable
+private fun BlinkingCursor() {
+    var isCursorVisible by remember { mutableStateOf(true) }
+    LaunchedEffect(isCursorVisible) {
+        delay(500)
+        // Toggle cursor visibility
+        isCursorVisible = !isCursorVisible
+    }
+    if (isCursorVisible) {
+        Spacer(
+            modifier = Modifier
+                .size(2.dp, 24.dp)
+                .offset(x = (-5).dp)
+                .background(ElementTheme.colors.textPrimary, RoundedCornerShape(1.dp))
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun NumberTextFieldPreview() {
+    ElementPreview {
+        val number = Number.createEmpty(4).fillWith("12")
+        NumberTextField(
+            number = number,
+            onValueChange = {},
+            onDone = {},
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/model/Digit.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/model/Digit.kt
new file mode 100644
index 0000000000..b8565ea6ca
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/model/Digit.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.linknewdevice.impl.screens.number.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed interface Digit {
+    data object Empty : Digit
+    data class Filled(val value: Char) : Digit
+
+    fun toText(): String {
+        return when (this) {
+            is Empty -> ""
+            is Filled -> value.toString()
+        }
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/model/Number.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/model/Number.kt
new file mode 100644
index 0000000000..be60f27f76
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/number/model/Number.kt
@@ -0,0 +1,56 @@
+/*
+ * 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.linknewdevice.impl.screens.number.model
+
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+
+data class Number(
+    val digits: ImmutableList<Digit>,
+) {
+    companion object {
+        fun createEmpty(size: Int): Number {
+            val digits = List(size) { Digit.Empty }
+            return Number(
+                digits = digits.toImmutableList()
+            )
+        }
+    }
+
+    val size = digits.size
+
+    /**
+     * Fill the first digits with the given text.
+     * Can't be more than the size of the NumberEntry
+     * Keep the Empty digits at the end
+     * @return the new NumberEntry
+     */
+    fun fillWith(text: String): Number {
+        val newDigits = MutableList<Digit>(size) { Digit.Empty }
+        text.forEachIndexed { index, char ->
+            if (index < size && char.isDigit()) {
+                newDigits[index] = Digit.Filled(char)
+            }
+        }
+        return copy(digits = newDigits.toImmutableList())
+    }
+
+    fun length(): Int {
+        return digits.count { it is Digit.Filled }
+    }
+
+    fun toText(): String {
+        return digits.joinToString("") {
+            it.toText()
+        }
+    }
+
+    fun isComplete(): Boolean {
+        return digits.all { it is Digit.Filled }
+    }
+}
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
new file mode 100644
index 0000000000..a884c3e97f
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeNode.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.linknewdevice.impl.screens.qrcode
+
+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 ShowQrCodeNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : Node(buildContext, plugins = plugins) {
+    class Inputs(
+        val data: String,
+    ) : NodeInputs
+
+    interface Callback : Plugin {
+        fun navigateBack()
+    }
+
+    private val inputs: Inputs = inputs<Inputs>()
+    private val callback: Callback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        ShowQrCodeView(
+            data = inputs.data,
+            modifier = modifier,
+            onBackClick = callback::navigateBack,
+        )
+    }
+}
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
new file mode 100644
index 0000000000..501415f621
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeView.kt
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package io.element.android.features.linknewdevice.impl.screens.qrcode
+
+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.size
+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.AnnotatedString
+import androidx.compose.ui.unit.dp
+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
+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.LocalBuildMeta
+import io.element.android.libraries.designsystem.utils.annotatedTextWithBold
+import io.element.android.libraries.qrcode.QrCodeImage
+import kotlinx.collections.immutable.persistentListOf
+
+/**
+ * QrCode display screen:
+ * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2027-23617
+ */
+@Composable
+fun ShowQrCodeView(
+    data: String,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val appName = LocalBuildMeta.current.applicationName
+    FlowStepPage(
+        onBackClick = onBackClick,
+        title = stringResource(R.string.screen_link_new_device_mobile_title, appName),
+        iconStyle = BigIcon.Style.Default(CompoundIcons.TakePhotoSolid()),
+        modifier = modifier,
+    ) {
+        Column(
+            Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            QrCodeImage(
+                data = data,
+                modifier = Modifier
+                    .size(220.dp)
+            )
+            Spacer(modifier = Modifier.height(32.dp))
+            NumberedListOrganism(
+                modifier = Modifier.fillMaxSize(),
+                items = persistentListOf(
+                    AnnotatedString(stringResource(R.string.screen_link_new_device_mobile_step1, appName)),
+                    annotatedTextWithBold(
+                        text = stringResource(
+                            id = R.string.screen_link_new_device_mobile_step2,
+                            stringResource(R.string.screen_link_new_device_mobile_step2_action),
+                        ),
+                        boldText = stringResource(R.string.screen_link_new_device_mobile_step2_action)
+                    ),
+                    AnnotatedString(stringResource(R.string.screen_link_new_device_mobile_step3)),
+                )
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ShowQrCodeViewPreview() = ElementPreview {
+    ShowQrCodeView(
+        data = "DATA",
+        onBackClick = { },
+    )
+}
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
new file mode 100644
index 0000000000..8ce6af90b0
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootEvent.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.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
new file mode 100644
index 0000000000..f43ffa64df
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootNode.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.linknewdevice.impl.screens.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.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.SessionScope
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class LinkNewDeviceRootNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: LinkNewDeviceRootPresenter,
+) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun onDone()
+        fun linkDesktopDevice()
+    }
+
+    private val callback: Callback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        LinkNewDeviceRootView(
+            state = state,
+            modifier = modifier,
+            onBackClick = callback::onDone,
+            onLinkDesktopDeviceClick = callback::linkDesktopDevice,
+        )
+    }
+}
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
new file mode 100644
index 0000000000..a17ed88fd3
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenter.kt
@@ -0,0 +1,85 @@
+/*
+ * 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.linknewdevice.impl.screens.root
+
+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.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
+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.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+import kotlinx.coroutines.launch
+
+@Inject
+class LinkNewDeviceRootPresenter(
+    private val matrixClient: MatrixClient,
+    private val linkNewMobileHandler: LinkNewMobileHandler,
+) : Presenter<LinkNewDeviceRootState> {
+    @Composable
+    override fun present(): LinkNewDeviceRootState {
+        val coroutineScope = rememberCoroutineScope()
+        var isSupported by remember { mutableStateOf<AsyncData<Boolean>>(AsyncData.Uninitialized) }
+        var qrCodeData by remember { mutableStateOf<AsyncData<Unit>>(AsyncData.Uninitialized) }
+
+        LaunchedEffect(Unit) {
+            matrixClient.canLinkNewDevice().fold(
+                onSuccess = { supported ->
+                    isSupported = AsyncData.Success(supported)
+                },
+                onFailure = {
+                    isSupported = AsyncData.Failure(it)
+                }
+            )
+        }
+
+        val step by linkNewMobileHandler.stepFlow.collectAsState()
+
+        LaunchedEffect(step) {
+            when (val finalStep = step) {
+                is LinkMobileStep.Uninitialized -> {
+                    qrCodeData = AsyncData.Uninitialized
+                }
+                is LinkMobileStep.QrReady -> {
+                    qrCodeData = AsyncData.Success(Unit)
+                }
+                is LinkMobileStep.Error -> {
+                    qrCodeData = AsyncData.Failure(finalStep.errorType)
+                }
+                else -> Unit
+            }
+        }
+
+        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()
+                }
+            }
+        }
+
+        return LinkNewDeviceRootState(
+            isSupported = isSupported,
+            qrCodeData = qrCodeData,
+            eventSink = ::handleEvent,
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootState.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootState.kt
new file mode 100644
index 0000000000..6cf6694b2a
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootState.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.linknewdevice.impl.screens.root
+
+import io.element.android.libraries.architecture.AsyncData
+
+data class LinkNewDeviceRootState(
+    val isSupported: AsyncData<Boolean>,
+    val qrCodeData: AsyncData<Unit>,
+    val eventSink: (LinkNewDeviceRootEvent) -> Unit,
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootStateProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootStateProvider.kt
new file mode 100644
index 0000000000..f1bb7ad455
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootStateProvider.kt
@@ -0,0 +1,40 @@
+/*
+ * 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.linknewdevice.impl.screens.root
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
+
+open class LinkNewDeviceRootStateProvider : PreviewParameterProvider<LinkNewDeviceRootState> {
+    override val values: Sequence<LinkNewDeviceRootState>
+        get() = sequenceOf(
+            aLinkNewDeviceRootState(),
+            aLinkNewDeviceRootState(isSupported = AsyncData.Success(true)),
+            aLinkNewDeviceRootState(isSupported = AsyncData.Success(false)),
+            aLinkNewDeviceRootState(isSupported = AsyncData.Failure(Exception("Should not happen"))),
+            aLinkNewDeviceRootState(
+                isSupported = AsyncData.Success(true),
+                qrCodeData = AsyncData.Loading(),
+            ),
+            aLinkNewDeviceRootState(
+                isSupported = AsyncData.Success(true),
+                qrCodeData = AsyncData.Failure(ErrorType.NotFound("The rendezvous session was not found and might have expired")),
+            ),
+        )
+}
+
+fun aLinkNewDeviceRootState(
+    isSupported: AsyncData<Boolean> = AsyncData.Uninitialized,
+    qrCodeData: AsyncData<Unit> = AsyncData.Uninitialized,
+    eventSink: (LinkNewDeviceRootEvent) -> Unit = { },
+) = LinkNewDeviceRootState(
+    isSupported = isSupported,
+    qrCodeData = qrCodeData,
+    eventSink = eventSink,
+)
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
new file mode 100644
index 0000000000..d9249d3e89
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootView.kt
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package io.element.android.features.linknewdevice.impl.screens.root
+
+import androidx.compose.foundation.layout.fillMaxWidth
+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.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewParameter
+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.architecture.AsyncData
+import io.element.android.libraries.designsystem.atomic.atoms.LoadingButtonAtom
+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.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.Button
+import io.element.android.libraries.designsystem.theme.components.IconSource
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * Device selection screen:
+ * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2027-23616
+ * Not supported screen:
+ * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2186-70004
+ */
+@Composable
+fun LinkNewDeviceRootView(
+    state: LinkNewDeviceRootState,
+    onBackClick: () -> Unit,
+    onLinkDesktopDeviceClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val (title, subtitle, iconStyle) = if (state.isSupported.dataOrNull() == false) {
+        Triple(
+            stringResource(R.string.screen_link_new_device_error_not_supported_title),
+            stringResource(R.string.screen_link_new_device_error_not_supported_subtitle),
+            BigIcon.Style.AlertSolid
+        )
+    } else {
+        Triple(
+            stringResource(R.string.screen_link_new_device_root_title),
+            null,
+            BigIcon.Style.Default(CompoundIcons.Devices())
+        )
+    }
+    FlowStepPage(
+        onBackClick = onBackClick,
+        title = title,
+        subTitle = subtitle,
+        iconStyle = iconStyle,
+        buttons = {
+            when (state.isSupported) {
+                is AsyncData.Uninitialized,
+                is AsyncData.Loading -> {
+                    LoadingButtonAtom()
+                }
+                is AsyncData.Failure -> {
+                    Text(
+                        text = stringResource(id = CommonStrings.error_unknown),
+                        color = ElementTheme.colors.textCriticalPrimary,
+                        style = ElementTheme.typography.fontBodyMdRegular,
+                        textAlign = TextAlign.Center,
+                    )
+                    Button(
+                        onClick = onBackClick,
+                        text = stringResource(CommonStrings.action_dismiss),
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+                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()),
+                                )
+                            }
+                        }
+                    } else {
+                        Button(
+                            onClick = onBackClick,
+                            text = stringResource(CommonStrings.action_dismiss),
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                    }
+                }
+            }
+        },
+        modifier = modifier,
+    )
+
+    val failure = state.qrCodeData.errorOrNull()
+    if (failure != null) {
+        ErrorDialog(
+            content = failure.message ?: stringResource(CommonStrings.error_unknown),
+            onSubmit = { state.eventSink(LinkNewDeviceRootEvent.CloseDialog) },
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun LinkNewDeviceRootViewPreview(
+    @PreviewParameter(LinkNewDeviceRootStateProvider::class) state: LinkNewDeviceRootState
+) = ElementPreview {
+    LinkNewDeviceRootView(
+        state = state,
+        onBackClick = { },
+        onLinkDesktopDeviceClick = { },
+    )
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeEvent.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeEvent.kt
new file mode 100644
index 0000000000..c17a28649c
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeEvent.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+sealed interface ScanQrCodeEvent {
+    data class QrCodeScanned(val data: ByteArray) : ScanQrCodeEvent
+    data object TryAgain : ScanQrCodeEvent
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeNode.kt
new file mode 100644
index 0000000000..ff4f88f9ae
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeNode.kt
@@ -0,0 +1,43 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+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.SessionScope
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class ScanQrCodeNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: ScanQrCodePresenter,
+) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun cancel()
+    }
+
+    private val callback: Callback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        ScanQrCodeView(
+            state = state,
+            onBackClick = callback::cancel,
+            modifier = modifier
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodePresenter.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodePresenter.kt
new file mode 100644
index 0000000000..5f0131a8df
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodePresenter.kt
@@ -0,0 +1,73 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+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.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
+import io.element.android.features.linknewdevice.impl.LinkNewDesktopHandler
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import kotlinx.coroutines.launch
+
+@Inject
+class ScanQrCodePresenter(
+    private val linkNewDesktopHandler: LinkNewDesktopHandler,
+) : Presenter<ScanQrCodeState> {
+    @Composable
+    override fun present(): ScanQrCodeState {
+        val coroutineScope = rememberCoroutineScope()
+        var scanAction: AsyncAction<Unit> by remember { mutableStateOf(AsyncAction.Loading) }
+
+        // Observe the flow to react on LinkDesktopStep.InvalidQrCode
+        val linkDesktopStep by linkNewDesktopHandler.stepFlow.collectAsState()
+
+        LaunchedEffect(Unit) {
+            linkNewDesktopHandler.createNewHandler()
+        }
+
+        LaunchedEffect(linkDesktopStep) {
+            when (val step = linkDesktopStep) {
+                is LinkDesktopStep.InvalidQrCode -> {
+                    scanAction = AsyncAction.Failure(Exception(step.error))
+                }
+                else -> Unit
+            }
+        }
+
+        fun handleEvent(event: ScanQrCodeEvent) {
+            when (event) {
+                ScanQrCodeEvent.TryAgain -> {
+                    scanAction = AsyncAction.Loading
+                }
+                is ScanQrCodeEvent.QrCodeScanned -> coroutineScope.launch {
+                    // In this case the scanning will stop and a loader will be shown
+                    scanAction = AsyncAction.Success(Unit)
+                    try {
+                        linkNewDesktopHandler.onScannedCode(event.data)
+                    } catch (e: Exception) {
+                        // Should not happen as errors are handled through the LinkDesktopStep flow
+                        scanAction = AsyncAction.Failure(e)
+                    }
+                }
+            }
+        }
+
+        return ScanQrCodeState(
+            scanAction = scanAction,
+            eventSink = ::handleEvent,
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeState.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeState.kt
new file mode 100644
index 0000000000..6cb0363836
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeState.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data class ScanQrCodeState(
+    val scanAction: AsyncAction<Unit>,
+    val eventSink: (ScanQrCodeEvent) -> Unit,
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeStateProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeStateProvider.kt
new file mode 100644
index 0000000000..40e7df8884
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeStateProvider.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
+
+open class ScanQrCodeStateProvider : PreviewParameterProvider<ScanQrCodeState> {
+    override val values: Sequence<ScanQrCodeState>
+        get() = sequenceOf(
+            aScanQrCodeState(),
+            aScanQrCodeState(scanAction = AsyncAction.Loading),
+            aScanQrCodeState(scanAction = AsyncAction.Success(Unit)),
+            aScanQrCodeState(scanAction = AsyncAction.Failure(Exception("Scan failed"))),
+        )
+}
+
+fun aScanQrCodeState(
+    scanAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    eventSink: (ScanQrCodeEvent) -> Unit = {},
+) = ScanQrCodeState(
+    scanAction = scanAction,
+    eventSink = eventSink
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeView.kt
new file mode 100644
index 0000000000..937aee08b4
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeView.kt
@@ -0,0 +1,174 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.progressSemantics
+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.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.linknewdevice.impl.R
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.modifiers.cornerBorder
+import io.element.android.libraries.designsystem.modifiers.squareSize
+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.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.qrcode.QrCodeCameraView
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun ScanQrCodeView(
+    state: ScanQrCodeState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    FlowStepPage(
+        modifier = modifier,
+        onBackClick = onBackClick,
+        iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),
+        title = stringResource(R.string.screen_link_new_device_desktop_scanning_title),
+        content = { Content(state = state) },
+        buttons = { Buttons(state = state) }
+    )
+}
+
+@Composable
+private fun Content(
+    state: ScanQrCodeState,
+) {
+    BoxWithConstraints(
+        modifier = Modifier.fillMaxWidth(),
+        contentAlignment = Alignment.Center,
+    ) {
+        val modifier = if (constraints.maxWidth > constraints.maxHeight) {
+            Modifier.fillMaxHeight()
+        } else {
+            Modifier.fillMaxWidth()
+        }.then(
+            Modifier
+                .padding(start = 20.dp, end = 20.dp, top = 50.dp, bottom = 32.dp)
+                .squareSize()
+                .cornerBorder(
+                    strokeWidth = 4.dp,
+                    color = ElementTheme.colors.textPrimary,
+                    cornerSizeDp = 42.dp,
+                )
+        )
+        Box(
+            modifier = modifier,
+            contentAlignment = Alignment.Center,
+        ) {
+            QrCodeCameraView(
+                modifier = Modifier.fillMaxSize(),
+                onScanQrCode = { state.eventSink.invoke(ScanQrCodeEvent.QrCodeScanned(it)) },
+                isScanning = state.scanAction.isLoading(),
+            )
+        }
+    }
+}
+
+@Composable
+private fun ColumnScope.Buttons(
+    state: ScanQrCodeState,
+) {
+    Column(Modifier.heightIn(min = 130.dp)) {
+        when (state.scanAction) {
+            is AsyncAction.Failure -> {
+                Button(
+                    text = stringResource(id = CommonStrings.action_try_again),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 16.dp),
+                    onClick = {
+                        state.eventSink.invoke(ScanQrCodeEvent.TryAgain)
+                    }
+                )
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(2.dp),
+                ) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.ErrorSolid(),
+                            tint = ElementTheme.colors.iconCriticalPrimary,
+                            contentDescription = null,
+                            modifier = Modifier.size(24.dp)
+                        )
+                        Spacer(modifier = Modifier.width(4.dp))
+                        Text(
+                            text = stringResource(R.string.screen_qr_code_login_invalid_scan_state_subtitle),
+                            textAlign = TextAlign.Center,
+                            color = ElementTheme.colors.textCriticalPrimary,
+                            style = ElementTheme.typography.fontBodySmMedium,
+                        )
+                    }
+                    Text(
+                        text = stringResource(R.string.screen_qr_code_login_invalid_scan_state_description),
+                        textAlign = TextAlign.Center,
+                        style = ElementTheme.typography.fontBodySmRegular,
+                        color = ElementTheme.colors.textSecondary,
+                    )
+                }
+            }
+            is AsyncAction.Success -> {
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier
+                            .progressSemantics()
+                            .size(20.dp),
+                        strokeWidth = 2.dp
+                    )
+                }
+            }
+            AsyncAction.Loading,
+            AsyncAction.Uninitialized,
+            is AsyncAction.Confirming -> Unit
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ScanQrCodeViewPreview(@PreviewParameter(ScanQrCodeStateProvider::class) state: ScanQrCodeState) = ElementPreview {
+    ScanQrCodeView(
+        state = state,
+        onBackClick = {},
+    )
+}
diff --git a/features/linknewdevice/impl/src/main/res/values-be/translations.xml b/features/linknewdevice/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..16372fa6e4
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-be/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_link_new_device_desktop_scanning_title">"Сканіраваць QR-код"</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_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_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_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">"Паспрабуйце зноў увайсці ў сістэму з дапамогай QR-кода, калі гэта была сеткавая праблема"</string>
+  <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_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_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-кода.
+
+Паспрабуйце ўвайсці ў сістэму ўручную або адсканіруйце 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>
+</resources>
diff --git a/features/deactivation/impl/src/main/res/values-eo/translations.xml b/features/linknewdevice/impl/src/main/res/values-bg/translations.xml
similarity index 50%
rename from features/deactivation/impl/src/main/res/values-eo/translations.xml
rename to features/linknewdevice/impl/src/main/res/values-bg/translations.xml
index 75c2c252e7..e8a8ea95d3 100644
--- a/features/deactivation/impl/src/main/res/values-eo/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-bg/translations.xml
@@ -1,4 +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_list_item_3">"Delete your account information from our server."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Повторен опит"</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
new file mode 100644
index 0000000000..de08f790e3
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-cs/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_link_new_device_desktop_scanning_title">"Naskenujte QR kód"</string>
+  <string name="screen_link_new_device_desktop_step3">"Naskenujte QR kód pomocí tohoto zařízení"</string>
+  <string name="screen_link_new_device_desktop_submit">"Připraveno ke skenování"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Váš poskytovatel účtu nepodporuje %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s není podporováno"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR kód není podporován"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Přihlášení bylo na druhém zařízení zrušeno."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Žádost o přihlášení zrušena"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Platnost přihlášení vypršela. Zkuste to prosím znovu."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Přihlášení nebylo dokončeno včas"</string>
+  <string name="screen_link_new_device_mobile_step2">"Vybrat %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"K novému zařízení se nepodařilo navázat bezpečné připojení. Vaše stávající zařízení jsou stále v bezpečí a nemusíte se o ně obávat."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Co teď?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Zkuste se znovu přihlásit pomocí QR kódu v případě, že se jednalo o problém se sítí"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Přihlášení odmítnuto"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Platnost přihlášení vypršela. Zkuste to prosím znovu."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Přihlášení nebylo dokončeno včas"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Vaše druhé zařízení nepodporuje přihlášení k %su pomocí QR kódu.
+
+Zkuste se přihlásit ručně nebo naskenujte QR kód pomocí jiného zařízení."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kód není podporován"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Váš poskytovatel účtu nepodporuje %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s není podporováno"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Použijte QR kód zobrazený na druhém zařízení."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Zkusit znovu"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Špatný QR kód"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..b26aed52ef
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-cy/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_link_new_device_desktop_scanning_title">"Sganiwch y cod QR"</string>
+  <string name="screen_link_new_device_desktop_step3">"Sganiwch y cod QR gyda\'r ddyfais hon"</string>
+  <string name="screen_link_new_device_desktop_submit">"Yn barod i sganio"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Nid yw darparwr eich cyfrif yn cefnogi %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s heb ei gefnogi"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"Nid yw\'r cod QR yn cael ei gefnogi"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Cafodd y mewngofnodi ei ddiddymu ar y ddyfais arall."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Cais mewngofnodi wedi\'i ddiddymu"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Mewngofnodi wedi dod i ben. Ceisiwch eto."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Heb gwblhau\'r mewngofnodi mewn pryd"</string>
+  <string name="screen_link_new_device_mobile_step2">"Dewiswch %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Nid oedd modd gwneud cysylltiad diogel â\'r ddyfais newydd. Mae eich dyfeisiau presennol yn dal yn ddiogel a does dim angen i chi boeni amdanyn nhw."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Beth nawr?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Ceisiwch fewngofnodi eto gyda chod QR rhag ofn bod hyn yn broblem rhwydwaith"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Gwrthodwyd y mewngofnodi"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Mewngofnodi wedi dod i ben. Ceisiwch eto."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Heb gwblhau\'r mewngofnodi mewn pryd"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Nid yw eich dyfais arall yn cefnogi mewngofnodi i %s gyda chod QR.
+
+Ceisiwch fewngofnodi â llaw, neu sganiwch y cod QR gyda dyfais arall."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Nid yw\'r cod QR yn cael ei gefnogi"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Nid yw darparwr eich cyfrif yn cefnogi %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s heb ei gefnogi"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Defnyddiwch y cod QR sy\'n cael ei ddangos ar y ddyfais arall."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Ceisiwch eto"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Cod QR anghywir"</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>
+</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
new file mode 100644
index 0000000000..a31175c1d5
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-da/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_link_new_device_desktop_scanning_title">"Scan QR-koden"</string>
+  <string name="screen_link_new_device_desktop_step3">"Scan QR-koden med denne enhed"</string>
+  <string name="screen_link_new_device_desktop_submit">"Klar til at scanne"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Din kontoudbyder understøtter ikke %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s understøttes ikke"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-kode understøttes ikke"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Login blev annulleret på den anden enhed."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Anmodning om login annulleret"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Login er udløbet. Prøv venligst igen."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Login blev ikke afsluttet i tide"</string>
+  <string name="screen_link_new_device_mobile_step2">"Vælg %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Der kunne ikke oprettes en sikker forbindelse til den nye enhed. Dine eksisterende enheder er stadig sikre, og du behøver ikke bekymre dig om dem."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Hvad nu?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Prøv at logge ind igen med en QR-kode, hvis dette skyldtes et netværksproblem"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Login afvist"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Login er udløbet. Prøv venligst igen."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Login blev ikke afsluttet i tide"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Din anden enhed understøtter ikke at logge ind på %s med en QR-kode.
+
+Prøv at logge ind manuelt, eller scan QR-koden med en anden enhed."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-kode understøttes ikke"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Din kontoudbyder understøtter ikke %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s understøttes ikke"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Brug den QR-kode, der bliver vist på den anden enhed."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Prøv igen"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Forkert QR-kode"</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>
+</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
new file mode 100644
index 0000000000..25343c93c2
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-de/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_link_new_device_desktop_scanning_title">"QR-Code scannen"</string>
+  <string name="screen_link_new_device_desktop_step3">"Scanne den QR-Code mit diesem Gerät"</string>
+  <string name="screen_link_new_device_desktop_submit">"Bereit zum Scannen"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Dein Kontoanbieter unterstützt %1$s nicht."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s wird nicht unterstützt"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-Code wird nicht unterstützt"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Die Anmeldung wurde auf dem anderen Gerät abgebrochen."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Anmeldeanfrage abgebrochen"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Die Anmeldung ist abgelaufen. Bitte versuche es erneut."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Die Anmeldung wurde nicht rechtzeitig abgeschlossen"</string>
+  <string name="screen_link_new_device_mobile_step2">"Wähle %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Es konnte keine sichere Verbindung zu dem neuen Gerät hergestellt werden."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Und jetzt?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Versuche, dich erneut mit einem QR-Code anzumelden, falls dies ein Netzwerkproblem war."</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Anmelden abgelehnt"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Die Anmeldung ist abgelaufen. Bitte versuche es erneut."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Die Anmeldung wurde nicht rechtzeitig abgeschlossen"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Dein anderes Gerät unterstützt die Anmeldung bei %s mit einem QR-Code nicht.
+
+Versuche, dich manuell anzumelden, oder scanne den QR-Code mit einem anderen Gerät."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-Code wird nicht unterstützt"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Dein Kontoanbieter unterstützt %1$s nicht."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s wird nicht unterstützt"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Verwende den QR-Code, der auf dem anderen Gerät angezeigt wird."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Erneut versuchen"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Falscher QR-Code"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..2133bb352c
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-el/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_link_new_device_desktop_scanning_title">"Σάρωση κωδικού QR"</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_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_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_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">"Δοκίμασε να συνδεθείς ξανά με έναν κωδικό QR σε περίπτωση που ήταν πρόβλημα του δικτύου"</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_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_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.
+
+Δοκίμασε να συνδεθείς χειροκίνητα ή σάρωσε τον κωδικό 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>
+</resources>
diff --git a/features/login/impl/src/main/res/values-eo/translations.xml b/features/linknewdevice/impl/src/main/res/values-en-rUS/translations.xml
similarity index 51%
rename from features/login/impl/src/main/res/values-eo/translations.xml
rename to features/linknewdevice/impl/src/main/res/values-en-rUS/translations.xml
index d8ecc9f5d6..6395ce9e54 100644
--- a/features/login/impl/src/main/res/values-eo/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-en-rUS/translations.xml
@@ -1,4 +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_connection_note_secure_state_description">"A secure connection could not be made to the new device. Your existing linked devices are still safe and you don\'t need to worry about them."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"If you encounter the same problem, try a different Wi-Fi network or use your mobile data instead of Wi-Fi"</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
new file mode 100644
index 0000000000..032813a2c4
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-es/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_link_new_device_desktop_scanning_title">"Escanea el código QR"</string>
+  <string name="screen_link_new_device_desktop_step3">"Escanea el código QR con este dispositivo"</string>
+  <string name="screen_link_new_device_desktop_submit">"Listo para escanear"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Tu proveedor de cuentas no es compatible con %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s no admitido"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"Código QR no admitido"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"El inicio de sesión se canceló en el otro dispositivo."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Solicitud de inicio de sesión cancelada"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"El inicio de sesión ha caducado. Inténtalo de nuevo."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"El inicio de sesión no se completó a tiempo"</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 se pudo establecer una conexión segura con el nuevo dispositivo. Tus dispositivos actuales siguen siendo seguros y no tienes que preocuparte por ellos."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"¿Y ahora qué?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Intenta iniciar sesión de nuevo con un código QR en caso de que se trate de un problema de red"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Inicio de sesión rechazado"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"El inicio de sesión ha caducado. Inténtalo de nuevo."</string>
+  <string name="screen_qr_code_login_error_expired_title">"El inicio de sesión no se completó a tiempo"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Tu otro dispositivo no admite el inicio de sesión en %s con un código QR.
+
+Intenta iniciar sesión manualmente o escanea el código QR con otro dispositivo."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Código QR no admitido"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Tu proveedor de cuentas no es compatible con %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s no admitido"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Usa el código QR que se muestra en el otro dispositivo."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Intentar de nuevo"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Código QR incorrecto"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..6aa1398e0a
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-et/translations.xml
@@ -0,0 +1,57 @@
+<?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">"Skaneeri QR-koodi"</string>
+  <string name="screen_link_new_device_desktop_step1">"Ava %1$s kas oma süle- või lauaarvutis"</string>
+  <string name="screen_link_new_device_desktop_step3">"Skaneeri QR-koodi selle seadmega"</string>
+  <string name="screen_link_new_device_desktop_submit">"Skaneerimiseks valmis"</string>
+  <string name="screen_link_new_device_desktop_title">"QR-koodi laadimiseks ava %1$s süle- või lauaarvutis"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Numbrid ei klapi"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Sisesta kahekohaline kood"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Sellega verifitseerime, et ühendus sinu teise seadmega on turvaline."</string>
+  <string name="screen_link_new_device_enter_number_title">"Sisesta teises seadmes kuvatud number"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Sinu teenusepakkuja ei toeta rakendust %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s pole toetatud"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Sinu kasutajakonto teenusepakkuja ei toeta võimalust logida sisse QR-koodi abil."</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-kood pole toetatud"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Sisselogimine katkestati teises seadmes."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Sisselogimispäring on tühistatud"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Sisselogimine aegus. Palun proovi uuesti."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Sisselogimine jäi etteantud aja jooksul tegemata"</string>
+  <string name="screen_link_new_device_mobile_step1">"Ava %1$s teises seadmes"</string>
+  <string name="screen_link_new_device_mobile_step2">"Vali %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"„Logi sisse QR-koodiga“"</string>
+  <string name="screen_link_new_device_mobile_step3">"Skaneeri siin näidatud QR-koodi teise seadmega"</string>
+  <string name="screen_link_new_device_mobile_title">"Ava %1$s teises seadmes"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Lauaarvuti"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Laadin QR-koodi…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Nutiseade"</string>
+  <string name="screen_link_new_device_root_title">"Mis tüüpi seadet soovid siduda?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Palun proovi uuesti ja veendu, et sisestasid kahekohalise koodi õigesti. Kui numbrid ikka ei klapi, võta ühendust oma kasutajakonto teenusepakkujaga."</string>
+  <string name="screen_link_new_device_wrong_number_title">"Numbrid ei klapi"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Turvalise ühenduse loomine uue seadmega ei õnnestunud. Sinu olemasolevad seadmed on jätkuvalt turvatud ja sa ei pea nende pärast muretsema."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Mida järgmiseks teeme?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Kui see juhtumisi oli võrguühenduse viga, siis proovi uuesti QR-koodiga sisse logida"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Sisselogimisest on keeldutud"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Sa ei pea enam midagi muud tegema."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Sinu muu seade on juba sisse logitud"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Sisselogimine aegus. Palun proovi uuesti."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Sisselogimine jäi etteantud aja jooksul tegemata"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Sinu teine seade ei toeta %s sisselogimist QR-koodiga.
+
+Proovi käsitsi sisselogimist või skaneeri QR-koodi mõne muu seadmega."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-kood pole toetatud"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Sinu teenusepakkuja ei toeta rakendust %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s pole toetatud"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Kasuta teises seadmes näidatavat QR-koodi"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Proovi uuesti"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Vale QR-kood"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..06cc0fd857
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-eu/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_link_new_device_desktop_scanning_title">"Eskaneatu QR kodea"</string>
+  <string name="screen_link_new_device_desktop_step3">"Eskaneatu QR kodea gailu honekin"</string>
+  <string name="screen_link_new_device_desktop_submit">"Eskaneatzeko prest"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Zure kontu-hornitzailea ez da %1$s-ekin bateragarria."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s ez da bateragarria"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR kodea ez da bateragarria"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Saioa hasteko eskaera bertan behera utzi da beste gailuan"</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Saioa hasteko eskaera bertan behera utzi da"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Saio-hasiera iraungi da. Saiatu berriro."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Saio-hasiera ez da garaiz gauzatu."</string>
+  <string name="screen_link_new_device_mobile_step2">"Hautatu %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Ezin izan da konexio segururik ezarri gailu berriarekin. Lehendik dauden gailuak seguru daude oraindik ere eta ez duzu haietaz kezkatu beharrik."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Orain zer?"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Saio-hasiera ukatu da"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Saio-hasiera iraungi da. Saiatu berriro."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Saio-hasiera ez da garaiz gauzatu."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Beste gailua ez da bateragarria QR kodeak erabiliz %s(e)n saioa hastearekin.
+
+Saiatu saioa eskuz hasten, edo eskaneatu QR kodea beste gailu batean."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kodea ez da bateragarria"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Zure kontu-hornitzailea ez da %1$s-ekin bateragarria."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s ez da bateragarria"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Erabili beste gailuan agertzen den QR kodea."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Saiatu berriro"</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>
+</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
new file mode 100644
index 0000000000..804fa653ad
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-fa/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_link_new_device_desktop_scanning_title">"پویش کد پاس"</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_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_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>
+  <string name="screen_link_new_device_error_request_timeout_title">"ورود در زمان معیّن کامل نشد"</string>
+  <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_3">"ورود دستی در صورت کار نکردنش"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_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_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_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_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">"اجازهٔ دسترسی دوربین برای پویش کد پاس"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"خطایی غیرمنتظره رخ داد. لطفاً دوباره تلاش کنید."</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
new file mode 100644
index 0000000000..3ed954a842
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-fi/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_link_new_device_desktop_scanning_title">"Skannaa QR-koodi"</string>
+  <string name="screen_link_new_device_desktop_step3">"Skannaa QR-koodi tällä laitteella"</string>
+  <string name="screen_link_new_device_desktop_submit">"Valmis skannaamaan"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Palveluntarjoajasi ei tue %1$s -sovellusta"</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s -sovellusta ei tueta"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-koodia ei tueta"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Kirjautuminen peruutettiin toisella laitteella."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Kirjautumispyyntö peruutettu"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Kirjautuminen vanhentui. Yritä uudelleen."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Kirjautumista ei suoritettu ajoissa"</string>
+  <string name="screen_link_new_device_mobile_step2">"Valitse %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Turvallista yhteyttä uuteen laitteeseen ei voitu muodostaa. Olemassa olevat laitteesi ovat edelleen turvassa, eikä sinun tarvitse huolehtia niistä."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Mitä nyt?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Yritä kirjautua sisään uudelleen QR-koodilla, jos kyseessä oli verkko-ongelma"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Kirjautuminen hylätty"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Kirjautuminen vanhentui. Yritä uudelleen."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Kirjautumista ei suoritettu ajoissa"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Toinen laitteesi ei tue kirjautumista %s -sovellukseen QR-koodilla.
+
+Yritä kirjautua sisään manuaalisesti tai skannaa QR-koodi toisella laitteella."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-koodia ei tueta"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Palveluntarjoajasi ei tue %1$s -sovellusta"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s -sovellusta ei tueta"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Käytä toisessa laitteessa näkyvää QR-koodia."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Yritä uudelleen"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Väärä QR-koodi"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..f1ffe128cc
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-fr/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_link_new_device_desktop_scanning_title">"Scannez le QR code"</string>
+  <string name="screen_link_new_device_desktop_step3">"Scanner le QR code avec cet appareil"</string>
+  <string name="screen_link_new_device_desktop_submit">"Prêt à scanner"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Votre fournisseur de compte ne supporte pas %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s n’est pas supporté"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR code non supporté"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"La connexion a été annulée sur l’autre appareil."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Demande de connexion annulée"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Connexion expirée. Veuillez essayer à nouveau."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"La connexion a pris trop de temps."</string>
+  <string name="screen_link_new_device_mobile_step2">"Choisissez %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Aucune connexion sécurisée n’a pu être établie avec la nouvelle session. Vos sessions existantes sont toujours en sécurité et vous n’avez pas à vous en soucier."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Et maintenant ?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Essayez de vous connecter à nouveau à l’aide du QR code au cas où il s’agirait d’un problème réseau"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Connexion refusée"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Connexion expirée. Veuillez essayer à nouveau."</string>
+  <string name="screen_qr_code_login_error_expired_title">"La connexion a pris trop de temps."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Votre autre appareil ne supporte pas la connexion à %s avec un QR code. Essayer de vous connecter manuellement, ou scanner le QR code avec un autre appareil."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR code non supporté"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Votre fournisseur de compte ne supporte pas %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s n’est pas supporté"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Scannez le QR code affiché sur l’autre appareil."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Essayer à nouveau"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QR code erroné"</string>
+  <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 QR code"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"Une erreur inattendue s’est produite. Veuillez réessayer."</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
new file mode 100644
index 0000000000..20c194ef93
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,57 @@
+<?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">"Skeniraj QR kod"</string>
+  <string name="screen_link_new_device_desktop_step1">"Otvorite %1$s na prijenosnom ili stolnom računalu"</string>
+  <string name="screen_link_new_device_desktop_step3">"Skenirajte QR kod ovim uređajem"</string>
+  <string name="screen_link_new_device_desktop_submit">"Spremno za skeniranje"</string>
+  <string name="screen_link_new_device_desktop_title">"Otvorite %1$s na stolnom računalu kako biste dobili QR kod"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Brojevi se ne podudaraju"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Unesite dvoznamenkasti kod"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Time ćete potvrditi da je veza s vašim drugim uređajem sigurna."</string>
+  <string name="screen_link_new_device_enter_number_title">"Unesite broj prikazan na vašem drugom uređaju"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Vaš davatelj usluga računa ne podržava %1$s ."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s nije podržan"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Vaš davatelj usluga računa ne podržava prijavu na novi uređaj pomoću QR koda."</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR kod nije podržan"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Prijava je otkazana na drugom uređaju."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Zahtjev za prijavu je otkazan"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Prijava je istekla. Pokušajte ponovno."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Prijava nije dovršena na vrijeme"</string>
+  <string name="screen_link_new_device_mobile_step1">"Otvorite %1$s na drugom uređaju"</string>
+  <string name="screen_link_new_device_mobile_step2">"Odaberite %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"“Prijavi se pomoću QR koda”"</string>
+  <string name="screen_link_new_device_mobile_step3">"Skenirajte ovdje prikazani QR kod drugim uređajem"</string>
+  <string name="screen_link_new_device_mobile_title">"Otvorite %1$s na drugom uređaju"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Stolno računalo"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Učitavanje QR koda…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Mobilni uređaj"</string>
+  <string name="screen_link_new_device_root_title">"Koju vrstu uređaja želite povezati?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Pokušajte ponovno i provjerite jeste li ispravno unijeli dvoznamenkasti kod. Ako se brojevi i dalje ne podudaraju, obratite se davatelju usluge računa."</string>
+  <string name="screen_link_new_device_wrong_number_title">"Brojevi se ne podudaraju"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Nije moguće uspostaviti sigurnu vezu s novim uređajem. Vaši postojeći uređaji i dalje su sigurni i ne morate se brinuti zbog njih."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Što sad?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Pokušajte se ponovno prijaviti pomoću QR koda u slučaju da se radilo o problemu s mrežom"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Prijava je odbijena"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Ne morate ništa drugo napraviti."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Vaš drugi uređaj već je prijavljen"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Prijava je istekla. Pokušajte ponovno."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Prijava nije dovršena na vrijeme"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Vaš drugi uređaj ne podržava prijavu na %s pomoću QR koda.
+
+Pokušajte se prijaviti ručno ili skenirajte QR kod drugim uređajem."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kod nije podržan"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Vaš davatelj usluga računa ne podržava %1$s ."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s nije podržan"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Upotrijebite QR kod prikazan na drugom uređaju."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Pokušajte ponovno"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Pogrešan QR kod"</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>
+</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
new file mode 100644
index 0000000000..b06d7e2fd6
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-hu/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_link_new_device_desktop_scanning_title">"Olvassa be a QR-kódot"</string>
+  <string name="screen_link_new_device_desktop_step3">"Olvassa be a QR-kódot ezzel az eszközzel"</string>
+  <string name="screen_link_new_device_desktop_submit">"Készen áll a beolvasásra"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"A fiókszolgáltatója nem támogatja az %1$s-et."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"Az %1$s nem támogatott"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"A QR-kód nem támogatott"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"A bejelentkezést megszakították a másik eszközön."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Bejelentkezési kérés törölve"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"A bejelentkezés lejárt. Próbálja újra."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"A bejelentkezés nem fejeződött be időben"</string>
+  <string name="screen_link_new_device_mobile_step2">"Válassza ezt: %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Nem sikerült biztonságos kapcsolatot létesíteni az új eszközzel. A meglévő eszközei továbbra is biztonságban vannak, és nem kell aggódnia miattuk."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Most mi lesz?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Próbáljon meg újra bejelentkezni egy QR-kóddal, ha ez hálózati probléma volt."</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"A bejelentkezés elutasítva"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"A bejelentkezés lejárt. Próbálja újra."</string>
+  <string name="screen_qr_code_login_error_expired_title">"A bejelentkezés nem fejeződött be időben"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"A másik eszköz nem támogatja QR-kóddal történő bejelentkezést az %sbe.
+
+Próbáljon meg kézileg bejelentkezni, vagy olvassa be a QR-kódot egy másik eszközzel."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"A QR-kód nem támogatott"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"A fiókszolgáltatója nem támogatja az %1$s-et."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"Az %1$s nem támogatott"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Használja a másik eszközön látható QR-kódot."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Próbálja újra"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Hibás QR-kód"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..20badba9ba
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-in/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_link_new_device_desktop_scanning_title">"Pindai kode QR"</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_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_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_step2">"Pilih %1$s"</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_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_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.
+
+Coba masuk secara manual, atau pindai kode QR dengan perangkat lain."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Kode QR tidak didukung"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Penyedia akun Anda tidak mendukung %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s tidak didukung"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Gunakan kode QR yang ditampilkan di perangkat lain."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Coba lagi"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Kode QR salah"</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>
+</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
new file mode 100644
index 0000000000..0cf548c19b
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-it/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_link_new_device_desktop_scanning_title">"Scansiona il codice QR"</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_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_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_step2">"Seleziona %1$s"</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_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_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.
+
+Prova ad accedere manualmente o scansiona il codice QR con un altro dispositivo."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Codice QR non supportato"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Il tuo fornitore di account non supporta %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s non supportato"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Usa il codice QR mostrato sull\'altro dispositivo."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Riprova"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Codice QR sbagliato"</string>
+  <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>
+</resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ka/translations.xml b/features/linknewdevice/impl/src/main/res/values-ka/translations.xml
new file mode 100644
index 0000000000..f378e585ce
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ka/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">"ხელახლა ცდა"</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
new file mode 100644
index 0000000000..6af49fd3cf
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ko/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_link_new_device_desktop_scanning_title">"QR 코드를 스캔하세요"</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_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_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_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">"네트워크 문제로 인해 로그인에 실패한 경우 QR 코드로 다시 로그인해 보세요."</string>
+  <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_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_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>
+</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
new file mode 100644
index 0000000000..af3559d3e8
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-nb/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_link_new_device_desktop_scanning_title">"Skann QR-koden"</string>
+  <string name="screen_link_new_device_desktop_step3">"Skann QR-koden med denne enheten"</string>
+  <string name="screen_link_new_device_desktop_submit">"Klar til å skanne"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Kontotilbyderen din støtter ikke %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s støttes ikke"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-kode støttes ikke"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Påloggingen ble kansellert på den andre enheten."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Påloggingsforespørsel kansellert"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Påloggingen er utløpt. Vennligst prøv igjen."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Påloggingen ble ikke fullført i tide"</string>
+  <string name="screen_link_new_device_mobile_step2">"Velg %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"En sikker tilkobling kunne ikke opprettes til den nye enheten. Dine eksisterende enheter er fortsatt trygge, og du trenger ikke å bekymre deg for dem."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Hva nå?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Prøv å logge på igjen med en QR-kode i tilfelle dette var et nettverksproblem"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Pålogging avslått"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Påloggingen er utløpt. Vennligst prøv igjen."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Påloggingen ble ikke fullført i tide"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Den andre enheten din støtter ikke pålogging på %s med en QR-kode.
+
+Prøv å logge på manuelt, eller skann QR-koden med en annen enhet."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-kode støttes ikke"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Kontotilbyderen din støtter ikke %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s støttes ikke"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Bruk QR-koden som vises på den andre enheten."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Prøv igjen"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Feil QR-kode"</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>
+</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
new file mode 100644
index 0000000000..407a470e48
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-nl/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_link_new_device_desktop_scanning_title">"Scan de QR-code"</string>
+  <string name="screen_link_new_device_desktop_step3">"Scan de QR-code met dit apparaat"</string>
+  <string name="screen_link_new_device_desktop_submit">"Klaar om te scannen"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Je accountprovider ondersteunt geen %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s wordt niet ondersteund"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-code wordt niet ondersteund"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"De aanmelding is geannuleerd op het andere apparaat."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Login verzoek geannuleerd"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Aanmelden is verlopen. Probeer het opnieuw."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"De aanmelding was niet op tijd voltooid"</string>
+  <string name="screen_link_new_device_mobile_step2">"Selecteer %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Er kon geen beveiligde verbinding worden gemaakt met het nieuwe apparaat. Je bestaande apparaten zijn nog steeds veilig en je hoeft je daarover geen zorgen te maken."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Wat nu?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Probeer opnieuw in te loggen met een QR-code voor het geval dit een netwerkprobleem was"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Aanmelden geweigerd"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Aanmelden is verlopen. Probeer het opnieuw."</string>
+  <string name="screen_qr_code_login_error_expired_title">"De aanmelding was niet op tijd voltooid"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Jouw andere apparaat ondersteunt geen inloggen op %s met een QR code.
+
+Probeer handmatig in te loggen, of scan de QR code met een ander apparaat."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-code wordt niet ondersteund"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Je accountprovider ondersteunt geen %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s wordt niet ondersteund"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Gebruik de QR-code die op het andere apparaat wordt weergegeven."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Probeer het opnieuw"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Verkeerde QR-code"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..4db42a2a49
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-pl/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_link_new_device_desktop_scanning_title">"Skanuj kod QR"</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_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_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_step2">"Wybierz %1$s"</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_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_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.
+
+Spróbuj zalogować się ręcznie lub zeskanuj kod QR na innym urządzeniu."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Kod QR nie jest wspierany"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Twój dostawca konta nie obsługuje %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s nie jest wspierany"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Użyj kodu QR widocznego na drugim urządzeniu."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Spróbuj ponownie"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Błędny kod QR"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..8fb178f3e5
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-pt-rBR/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_link_new_device_desktop_scanning_title">"Leia o código QR"</string>
+  <string name="screen_link_new_device_desktop_step1">"Abra o %1$s em um computador"</string>
+  <string name="screen_link_new_device_desktop_step3">"Leia o código QR com este dispositivo"</string>
+  <string name="screen_link_new_device_desktop_submit">"Pronto para ler"</string>
+  <string name="screen_link_new_device_desktop_title">"Abra o %1$s em um computador para receber o código QR"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Os números não conferem"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Digite o código de 2 dígitos"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Isso verificará que a conexão com o seu outro dispositivo é segura."</string>
+  <string name="screen_link_new_device_enter_number_title">"Digite o número exibido no outro dispositivo"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Seu provedor de conta não tem suporte ao %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s não suportado"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"O seu provedor de conta não tem suporte a autenticação de dispositivos novos com um código QR."</string>
+  <string name="screen_link_new_device_error_not_supported_title">"Código QR não suportado"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"A entrada foi cancelada no outro dispositivo."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Solicitação de entrada foi cancelada"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"O processo de entrada expirou. Tente novamente."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"A entrada não foi concluída a tempo"</string>
+  <string name="screen_link_new_device_mobile_step1">"Abra o %1$s no outro dispositivo"</string>
+  <string name="screen_link_new_device_mobile_step2">"Selecione %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"\"Entrar com código QR\""</string>
+  <string name="screen_link_new_device_mobile_step3">"Leia o código QR exibido aqui com o outro dispositivo"</string>
+  <string name="screen_link_new_device_mobile_title">"Abra o %1$s no outro dispositivo"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Computador"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Carregando código QR…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Dispositivo móvel"</string>
+  <string name="screen_link_new_device_root_title">"Que tipo de dispositivo você deseja vincular?"</string>
+  <string name="screen_link_new_device_wrong_number_title">"Os números não conferem"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Não foi possível estabelecer uma conexão segura com o novo dispositivo. Seus dispositivos existentes ainda estão seguros e você não precisa se preocupar com eles."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"E agora?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Tente entrar novamente com um código QR caso seja um problema de rede"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Entrada recusada"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"O processo de entrada expirou. Tente novamente."</string>
+  <string name="screen_qr_code_login_error_expired_title">"A entrada não foi concluída a tempo"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Seu outro dispositivo não tem suporte a entrar no %s com um código QR.
+
+Tente entrar manualmente ou ler o código QR com outro dispositivo."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Código QR não suportado"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Seu provedor de conta não tem suporte ao %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s não suportado"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Use o código QR exibido no outro dispositivo."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Tente novamente"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Código QR errado"</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>
+</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
new file mode 100644
index 0000000000..da6da08f38
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-pt/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_link_new_device_desktop_scanning_title">"Ler o código QR"</string>
+  <string name="screen_link_new_device_desktop_step3">"Lê o código QR com este dispositivo"</string>
+  <string name="screen_link_new_device_desktop_submit">"Pronto para ler"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"O teu operador de conta não suporta %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s não suportado"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"Código QR não suportado"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"O início de sessão foi cancelado no outro dispositivo."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Pedido de início de sessão cancelado"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"O início de sessão expirou. Por favor, tenta novamente."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"O início de sessão não foi concluído a tempo"</string>
+  <string name="screen_link_new_device_mobile_step2">"Seleciona %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Não foi possível estabelecer uma ligação segura com o novo dispositivo. Os teus outros dispositivos continuam seguros, não precisas de te preocupar com eles."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"E agora?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Tenta iniciar sessão novamente com um código QR, caso se trate de um problema de rede"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Início de sessão rejeitado"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"O início de sessão expirou. Por favor, tenta novamente."</string>
+  <string name="screen_qr_code_login_error_expired_title">"O início de sessão não foi concluído a tempo"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"O teu outro dispositivo não suporta o início de sessão na %s com um código QR.
+
+Tenta iniciar a sessão manualmente ou digitaliza o código QR com outro dispositivo."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Código QR não suportado"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"O teu operador de conta não suporta %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s não suportado"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Lê o código QR apresentado no outro dispositivo."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Tentar novamente"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Código QR inválido"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..f1a4f3db59
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ro/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_link_new_device_desktop_scanning_title">"Scanați codul QR"</string>
+  <string name="screen_link_new_device_desktop_step1">"Deschide %1$s pe un laptop sau un computer desktop"</string>
+  <string name="screen_link_new_device_desktop_step3">"Scanați codul QR cu acest dispozitiv"</string>
+  <string name="screen_link_new_device_desktop_submit">"Gata de scanare"</string>
+  <string name="screen_link_new_device_desktop_title">"Deschide %1$s pe un computer desktop pentru a obține codul QR"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Numerele nu se potrivesc"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Introduceți codul de 2 cifre"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Aceasta va verifica dacă conexiunea cu celălalt dispozitiv este sigură."</string>
+  <string name="screen_link_new_device_enter_number_title">"Introduceți numărul afișat pe celălalt dispozitiv"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Furnizorul dumneavoastră de cont nu acceptă %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s nu este acceptat"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Furnizorul contului dumneavoastră nu acceptă conectarea la un dispozitiv nou cu un cod QR."</string>
+  <string name="screen_link_new_device_error_not_supported_title">"Formatul codului QR nu este acceptat."</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Autentificarea a fost anulată de pe celălalt dispozitiv."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Cererea de autentificare a fost anulată"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Autentificarea a expirat. Vă rugăm să încercați din nou."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Autentificarea nu a fost finalizată la timp"</string>
+  <string name="screen_link_new_device_mobile_step1">"Deschideți %1$s pe celălalt dispozitiv"</string>
+  <string name="screen_link_new_device_mobile_step2">"Selectați %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"“Conectați-vă cu un cod QR”"</string>
+  <string name="screen_link_new_device_mobile_step3">"Scanați codul QR afișat aici cu celălalt dispozitiv."</string>
+  <string name="screen_link_new_device_mobile_title">"Deschideți %1$s pe celălalt dispozitiv"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Calculator desktop"</string>
+  <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_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>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Încercați să vă conectați din nou cu un cod QR în cazul în care a fost o problemă de rețea."</string>
+  <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_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_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.
+
+Încercați să vă autentificați manual sau să scanați codul QR cu un alt dispozitiv."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Formatul codului QR nu este acceptat."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Furnizorul dumneavoastră de cont nu acceptă %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s nu este acceptat"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Utilizați codul QR afișat pe celălalt dispozitiv."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Încercați din nou"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Cod QR greșit"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..16ed8eeb37
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ru/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_link_new_device_desktop_scanning_title">"Сканировать QR-код"</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_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_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_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">"Попробуйте снова войти в систему с помощью 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_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_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-кода.
+
+Попробуйте войти вручную или отсканируйте 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>
+</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
new file mode 100644
index 0000000000..9617df3acc
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-sk/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_link_new_device_desktop_scanning_title">"Naskenovať QR kód"</string>
+  <string name="screen_link_new_device_desktop_step3">"Naskenujte QR kód pomocou tohto zariadenia"</string>
+  <string name="screen_link_new_device_desktop_submit">"Pripravené na skenovanie"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Poskytovateľ vášho účtu nepodporuje %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s nie je podporovaný"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR kód nie je podporovaný"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Prihlásenie bolo zrušené na druhom zariadení."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Žiadosť o prihlásenie bola zrušená"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Platnosť prihlásenia vypršala. Skúste to prosím znova."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Prihlásenie nebolo včas dokončené"</string>
+  <string name="screen_link_new_device_mobile_step2">"Vyberte %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"K novému zariadeniu sa nepodarilo vytvoriť bezpečné pripojenie. Vaše existujúce zariadenia sú stále v bezpečí a nemusíte sa o ne obávať."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Čo teraz?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Skúste sa znova prihlásiť pomocou QR kódu v prípade, že ide o problém so sieťou"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Prihlásenie bolo odmietnuté"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Platnosť prihlásenia vypršala. Skúste to prosím znova."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Prihlásenie nebolo včas dokončené"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Vaše druhé zariadenie nepodporuje prihlásenie do aplikácie %s pomocou QR kódu.
+
+Skúste sa prihlásiť manuálne alebo naskenujte QR kód pomocou iného zariadenia."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kód nie je podporovaný"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Poskytovateľ vášho účtu nepodporuje %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s nie je podporovaný"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Použite QR kód zobrazený na druhom zariadení."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Skúste to znova"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Nesprávny QR kód"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..8a1bef434a
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-sv/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_link_new_device_desktop_scanning_title">"Skanna QR-koden"</string>
+  <string name="screen_link_new_device_desktop_step3">"Skanna QR-koden med den här enheten"</string>
+  <string name="screen_link_new_device_desktop_submit">"Redo att skanna"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Din kontoleverantör stöder inte %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s stöds inte"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR-kod stöds inte"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Inloggningen avbröts på den andra enheten."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Inloggningsförfrågan avbröts"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Inloggningen har löpt ut. Vänligen försök igen."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Inloggningen slutfördes inte i tid"</string>
+  <string name="screen_link_new_device_mobile_step2">"Välj %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"En säker anslutning kunde inte göras till den nya enheten. Dina befintliga enheter är fortfarande säkra och du behöver inte oroa dig för dem."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Nu då?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Pröva att logga in igen med en QR-kod ifall detta skulle vara ett nätverksproblem"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Inloggning avvisad"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Inloggningen har löpt ut. Vänligen försök igen."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Inloggningen slutfördes inte i tid"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Din andra enhet stöder inte inloggning i %s med en QR-kod.
+
+Prova att logga in manuellt eller skanna QR-koden med en annan enhet."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR-kod stöds inte"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Din kontoleverantör stöder inte %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s stöds inte"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Använd QR-koden som visas på den andra enheten."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Försök igen"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Fel QR-kod"</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>
+</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
new file mode 100644
index 0000000000..2d3bebcad8
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-tr/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_link_new_device_desktop_scanning_title">"QR kodunu tara"</string>
+  <string name="screen_link_new_device_desktop_step3">"QR kodunu bu cihazla tarayın"</string>
+  <string name="screen_link_new_device_desktop_submit">"Taramaya hazır"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Hesap sağlayıcınız %1$s desteklemiyor."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s desteklenmiyor"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR kodu desteklenmiyor"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Oturum açma işlemi diğer cihazda iptal edildi."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Oturum açma isteği iptal edildi"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Oturum açma süresi doldu. Lütfen tekrar deneyin."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Oturum açma işlemi zamanında tamamlanmadı"</string>
+  <string name="screen_link_new_device_mobile_step2">"Seç %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Yeni cihaza güvenli bir bağlantı kurulamadı. Mevcut cihazlarınız hala güvende ve onlar için endişelenmenize gerek yok."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Şimdi ne olacak?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Bunun bir ağ sorunu olması ihtimaline karşı bir QR koduyla tekrar oturum açmayı deneyin"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Oturum açma reddedildi"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Oturum açma süresi doldu. Lütfen tekrar deneyin."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Oturum açma işlemi zamanında tamamlanmadı"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Diğer cihazınız %s QR koduyla oturum açmayı desteklemiyor.
+
+Manuel olarak oturum açmayı deneyin veya QR kodunu başka bir cihazla tarayın."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kodu desteklenmiyor"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Hesap sağlayıcınız %1$s desteklemiyor."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s desteklenmiyor"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Diğer cihazda gösterilen QR kodunu kullan."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Tekrar deneyin"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Yanlış QR kodu"</string>
+  <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>
+</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
new file mode 100644
index 0000000000..e7104a914d
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-uk/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_link_new_device_desktop_scanning_title">"Зіскануйте QR-код"</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_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_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_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">"Спробуйте увійти ще раз за допомогою QR-коду, якщо це була проблема з мережею"</string>
+  <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_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_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-коду.
+
+Спробуйте ввійти вручну або відскануйте 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>
+</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
new file mode 100644
index 0000000000..54d2c2e401
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ur/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_link_new_device_desktop_scanning_title">"کیو آر رمز مسح ضوئی کریں"</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_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_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>
+  <string name="screen_link_new_device_error_request_timeout_title">"دخول وقت پر مکمل نہیں ہوا تھا"</string>
+  <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_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_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_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_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">"کیو آر رمز کو مسح ضوئی کرنے کے لئے تصویرگر تک رسائی کی اجازت دیں"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"ایک غیر متوقع نقص واقع ہوا۔ برائے مہربانی دوبارہ کوشش کریں۔"</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
new file mode 100644
index 0000000000..d2f3b7a865
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-uz/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_link_new_device_desktop_scanning_title">"QR kodni skanerlash"</string>
+  <string name="screen_link_new_device_desktop_step3">"Bu qurilma bilan QR kodni skanerlang"</string>
+  <string name="screen_link_new_device_desktop_submit">"Skanerlashga tayyor"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Hisob provayderingiz %1$s bilan ishlamaydi."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s qoʻllab-quvvatlanmaydi"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR kod qoʻllab-quvvatlanmaydi"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"Boshqa qurilmadan hisobga kirish bekor qilindi."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Tizimga kirish soʻrovi bekor qilindi"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Kirish muddati tugagan. Iltimos, qayta urinib koʻring."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"Kirish oʻz vaqtida tugallanmagan"</string>
+  <string name="screen_link_new_device_mobile_step2">"%1$sʼni tanlang"</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>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Agar bu tarmoq muammosi boʻlsa, QR kod bilan qayta kiring"</string>
+  <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_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_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.
+
+Oddiy usulda kiring yoki boshqa qurilma bilan QR kodni skanerlang."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kod qoʻllab-quvvatlanmaydi"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Hisob provayderingiz %1$s bilan ishlamaydi."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s qoʻllab-quvvatlanmaydi"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Narigi qurilmada koʻrsatilgan QR koddan foydalaning."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Qayta urinib ko\'ring"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QR kod notoʻgʻri"</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>
+</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
new file mode 100644
index 0000000000..9b3cd5ead5
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-zh-rTW/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_link_new_device_desktop_scanning_title">"掃描 QR code"</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_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_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_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">"嘗試再次使用 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_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_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。
+
+嘗試手動登入，或是使用其他裝置掃描 QR code。"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"不支援 QR code"</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 code。"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"再試一次"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"錯誤的 QR code"</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 code"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"發生意外錯誤。請再試一次。"</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
new file mode 100644
index 0000000000..99359cc695
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-zh/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_link_new_device_desktop_scanning_title">"扫描二维码"</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_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_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>
+  <string name="screen_link_new_device_error_request_timeout_title">"登录未及时完成"</string>
+  <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">"如果遇到同样的问题，请尝试使用不同的 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_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_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_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_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_unknown_error_description">"发生了意外错误。请再试一次。"</string>
+</resources>
diff --git a/features/linknewdevice/impl/src/main/res/values/localazy.xml b/features/linknewdevice/impl/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..321b168751
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values/localazy.xml
@@ -0,0 +1,57 @@
+<?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">"Scan the QR code"</string>
+  <string name="screen_link_new_device_desktop_step1">"Open %1$s on a laptop or desktop computer"</string>
+  <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_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>
+  <string name="screen_link_new_device_enter_number_title">"Enter the number shown on your other device"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"Your account provider does not support %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s not supported"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Your account provider doesn’t support signing into a new device with a QR code."</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QR code not supported"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"The sign in was cancelled on the other device."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Sign in request cancelled"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Sign in expired. Please try again."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"The sign in was not completed in time"</string>
+  <string name="screen_link_new_device_mobile_step1">"Open %1$s on the other device"</string>
+  <string name="screen_link_new_device_mobile_step2">"Select %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"“Sign in with QR code”"</string>
+  <string name="screen_link_new_device_mobile_step3">"Scan the QR code shown here with the other device"</string>
+  <string name="screen_link_new_device_mobile_title">"Open %1$s on the other device"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Desktop computer"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Loading QR code…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Mobile device"</string>
+  <string name="screen_link_new_device_root_title">"What type of device do you want to link?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Please try again and make sure that you’ve entered the 2-digit code correctly. If the numbers still don’t match then contact your account provider."</string>
+  <string name="screen_link_new_device_wrong_number_title">"The numbers don’t match"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"A secure connection could not be made to the new device. Your existing devices are still safe and you don\'t need to worry about them."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"What now?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Try signing in again with a QR code in case this was a network problem"</string>
+  <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_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>
+  <string name="screen_qr_code_login_error_declined_title">"Sign in declined"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"You don’t need to do anything else."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Your other device is already signed in"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Sign in expired. Please try again."</string>
+  <string name="screen_qr_code_login_error_expired_title">"The sign in was not completed in time"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Your other device does not support signing in to %s with a QR code.
+
+Try signing in manually, or scan the QR code with another device."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR code not supported"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Your account provider does not support %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s not supported"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Use the QR code shown on the other device."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Try again"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Wrong QR code"</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>
+</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
new file mode 100644
index 0000000000..2957a89495
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPointTest.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.linknewdevice.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.linknewdevice.api.LinkNewDeviceEntryPoint
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.node.TestParentNode
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class DefaultLinkNewDeviceEntryPointTest {
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @get:Rule
+    val mainDispatcherRule = MainDispatcherRule()
+
+    @Test
+    fun `test node creation`() = runTest {
+        val entryPoint = DefaultLinkNewDeviceEntryPoint()
+        val client = FakeMatrixClient()
+        val parentNode = TestParentNode.create { buildContext, plugins ->
+            LinkNewDeviceFlowNode(
+                buildContext = buildContext,
+                plugins = plugins,
+                sessionCoroutineScope = backgroundScope,
+                linkNewMobileHandler = LinkNewMobileHandler(client),
+                linkNewDesktopHandler = LinkNewDesktopHandler(client),
+            )
+        }
+        val callback: LinkNewDeviceEntryPoint.Callback = object : LinkNewDeviceEntryPoint.Callback {
+            override fun onDone() = lambdaError()
+        }
+        val result = entryPoint.createNode(parentNode, BuildContext.root(null), callback)
+        assertThat(result).isInstanceOf(LinkNewDeviceFlowNode::class.java)
+    }
+}
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticePresenterTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticePresenterTest.kt
new file mode 100644
index 0000000000..b6b9769b64
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticePresenterTest.kt
@@ -0,0 +1,56 @@
+/*
+ * 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.linknewdevice.impl.screens.desktop
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.permissions.test.FakePermissionsPresenter
+import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DesktopNoticePresenterTest {
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
+            awaitItem().run {
+                assertThat(cameraPermissionState.permission).isEqualTo("android.permission.POST_NOTIFICATIONS")
+                assertThat(canContinue).isFalse()
+            }
+        }
+    }
+
+    @Test
+    fun `present - Continue with camera permissions can continue`() = runTest {
+        val permissionsPresenter = FakePermissionsPresenter().apply { setPermissionGranted() }
+        val permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter)
+        val presenter = createPresenter(permissionsPresenterFactory = permissionsPresenterFactory)
+        presenter.test {
+            awaitItem().eventSink(DesktopNoticeEvent.Continue)
+            assertThat(awaitItem().canContinue).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - Continue with unknown camera permissions opens permission dialog`() = runTest {
+        val permissionsPresenter = FakePermissionsPresenter()
+        val permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter)
+        val presenter = createPresenter(permissionsPresenterFactory = permissionsPresenterFactory)
+        presenter.test {
+            awaitItem().eventSink(DesktopNoticeEvent.Continue)
+            assertThat(awaitItem().cameraPermissionState.showDialog).isTrue()
+        }
+    }
+}
+
+private fun createPresenter(
+    permissionsPresenterFactory: FakePermissionsPresenterFactory = FakePermissionsPresenterFactory(),
+) = DesktopNoticePresenter(
+    permissionsPresenterFactory = permissionsPresenterFactory,
+)
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
new file mode 100644
index 0000000000..ac0a129f49
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeViewTest.kt
@@ -0,0 +1,86 @@
+/*
+ * 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.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 io.element.android.features.linknewdevice.impl.R
+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.pressBackKey
+import org.junit.Rule
+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>()
+
+    @Test
+    fun `on back pressed - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setView(
+                state = aDesktopNoticeState(),
+                onBackClicked = callback,
+            )
+            rule.pressBackKey()
+        }
+    }
+
+    @Test
+    fun `on back button clicked - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setView(
+                state = aDesktopNoticeState(),
+                onBackClicked = callback,
+            )
+            rule.pressBack()
+        }
+    }
+
+    @Test
+    fun `when can continue - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setView(
+                state = aDesktopNoticeState(canContinue = true),
+                onReadyToScanClick = callback,
+            )
+        }
+    }
+
+    @Test
+    fun `on submit button clicked - emits the Continue event`() {
+        val eventRecorder = EventsRecorder<DesktopNoticeEvent>()
+        rule.setView(
+            state = aDesktopNoticeState(eventSink = eventRecorder),
+        )
+        rule.clickOn(R.string.screen_link_new_device_desktop_submit)
+        eventRecorder.assertSingle(DesktopNoticeEvent.Continue)
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+        state: DesktopNoticeState,
+        onBackClicked: () -> Unit = EnsureNeverCalled(),
+        onReadyToScanClick: () -> Unit = EnsureNeverCalled(),
+    ) {
+        setContent {
+            DesktopNoticeView(
+                state = state,
+                onBackClick = onBackClicked,
+                onReadyToScanClick = onReadyToScanClick,
+            )
+        }
+    }
+}
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
new file mode 100644
index 0000000000..8f44182dd4
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorViewTest.kt
@@ -0,0 +1,59 @@
+/*
+ * 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.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 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 org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ErrorViewTest {
+    @get:Rule
+    val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `on back pressed - calls the onRetry callback`() {
+        ensureCalledOnce { callback ->
+            rule.setErrorView(
+                onRetry = callback
+            )
+            rule.pressBackKey()
+        }
+    }
+
+    @Test
+    fun `on start over button clicked - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setErrorView(
+                onRetry = callback
+            )
+            rule.clickOn(CommonStrings.action_start_over)
+        }
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setErrorView(
+        onRetry: () -> Unit,
+        errorScreenType: ErrorScreenType = ErrorScreenType.UnknownError,
+    ) {
+        setContent {
+            ErrorView(
+                errorScreenType = errorScreenType,
+                onRetry = onRetry,
+            )
+        }
+    }
+}
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
new file mode 100644
index 0000000000..fe2e11e95c
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenterTest.kt
@@ -0,0 +1,191 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.linknewdevice.impl.screens.number
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.linknewdevice.impl.LinkNewMobileHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.linknewdevice.FakeCheckCodeSender
+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.lambda.value
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class EnterNumberPresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        createPresenter().test {
+            val initialState = awaitItem()
+            assertThat(initialState.number).isEmpty()
+            assertThat(initialState.sendingCode.isUninitialized()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - enter numbers`() = runTest {
+        createPresenter().test {
+            val initialState = awaitItem()
+            assertThat(initialState.number).isEmpty()
+            initialState.eventSink(EnterNumberEvent.UpdateNumber("12"))
+            val state2 = awaitItem()
+            assertThat(state2.number).isEqualTo("12")
+            // Non numeric characters are ignored
+            state2.eventSink(EnterNumberEvent.UpdateNumber("1a"))
+            val state3 = awaitItem()
+            assertThat(state3.number).isEqualTo("1")
+        }
+    }
+
+    @Test
+    fun `present - continue in wrong state generates an error`() = runTest {
+        createPresenter().test {
+            val initialState = awaitItem()
+            initialState.eventSink(EnterNumberEvent.Continue)
+            val state2 = awaitItem()
+            assertThat(state2.sendingCode.isFailure()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - continue when number is not valid invokes the navigator`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val validateResult = lambdaRecorder<UByte, Boolean> { false }
+        val checkCodeSender = FakeCheckCodeSender(
+            validateResult = validateResult,
+        )
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(linkMobileHandler) }
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        linkNewMobileHandler.createAndStartNewHandler()
+        val navigateToWrongNumberErrorLambda = lambdaRecorder<Unit> { }
+        val navigator = FakeEnterNumberNavigator(
+            navigateToWrongNumberErrorLambda = navigateToWrongNumberErrorLambda,
+        )
+        createPresenter(
+            navigator = navigator,
+            linkNewMobileHandler = linkNewMobileHandler,
+        ).test {
+            val initialState = awaitItem()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrScanned(checkCodeSender)
+            )
+            runCurrent()
+            initialState.eventSink(EnterNumberEvent.UpdateNumber("88"))
+            skipItems(1)
+            initialState.eventSink(EnterNumberEvent.Continue)
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.sendingCode.isLoading()).isTrue()
+            advanceUntilIdle()
+            validateResult.assertions().isCalledOnce().with(value(88.toUByte()))
+            navigateToWrongNumberErrorLambda.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - continue when the number is valid but sending fails`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val validateResult = lambdaRecorder<UByte, Boolean> { true }
+        val sendResult = lambdaRecorder<UByte, Result<Unit>> { Result.failure(AN_EXCEPTION) }
+        val checkCodeSender = FakeCheckCodeSender(
+            validateResult = validateResult,
+            sendResult = sendResult,
+        )
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(linkMobileHandler) }
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        linkNewMobileHandler.createAndStartNewHandler()
+        createPresenter(
+            linkNewMobileHandler = linkNewMobileHandler,
+        ).test {
+            val initialState = awaitItem()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrScanned(checkCodeSender)
+            )
+            runCurrent()
+            initialState.eventSink(EnterNumberEvent.UpdateNumber("88"))
+            skipItems(1)
+            initialState.eventSink(EnterNumberEvent.Continue)
+            skipItems(1)
+            val loadingState = awaitItem()
+            assertThat(loadingState.sendingCode.isLoading()).isTrue()
+            val finalState = awaitItem()
+            assertThat(finalState.sendingCode.isFailure()).isTrue()
+            validateResult.assertions().isCalledOnce().with(value(88.toUByte()))
+            sendResult.assertions().isCalledOnce().with(value(88.toUByte()))
+        }
+    }
+
+    @Test
+    fun `present - continue when the number is valid and sending is successful`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val validateResult = lambdaRecorder<UByte, Boolean> { true }
+        val sendResult = lambdaRecorder<UByte, Result<Unit>> { Result.success(Unit) }
+        val checkCodeSender = FakeCheckCodeSender(
+            validateResult = validateResult,
+            sendResult = sendResult,
+        )
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(linkMobileHandler) }
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        linkNewMobileHandler.createAndStartNewHandler()
+        createPresenter(
+            linkNewMobileHandler = linkNewMobileHandler,
+        ).test {
+            val initialState = awaitItem()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrScanned(checkCodeSender)
+            )
+            runCurrent()
+            initialState.eventSink(EnterNumberEvent.UpdateNumber("88"))
+            skipItems(1)
+            initialState.eventSink(EnterNumberEvent.Continue)
+            skipItems(1)
+            val loadingState = awaitItem()
+            assertThat(loadingState.sendingCode.isLoading()).isTrue()
+            expectNoEvents()
+            advanceUntilIdle()
+            validateResult.assertions().isCalledOnce().with(value(88.toUByte()))
+            sendResult.assertions().isCalledOnce().with(value(88.toUByte()))
+        }
+    }
+
+    private fun createPresenter(
+        navigator: EnterNumberNavigator = FakeEnterNumberNavigator(),
+        linkNewMobileHandler: LinkNewMobileHandler = LinkNewMobileHandler(FakeMatrixClient()),
+    ) = EnterNumberPresenter(
+        navigator = navigator,
+        linkNewMobileHandler = linkNewMobileHandler,
+    )
+}
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberStateTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberStateTest.kt
new file mode 100644
index 0000000000..e7466a1b21
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberStateTest.kt
@@ -0,0 +1,94 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.linknewdevice.impl.screens.number.model.Digit
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
+import org.junit.Test
+
+class EnterNumberStateTest {
+    @Test
+    fun `isContinueButtonEnabled is false if number is not complete`() {
+        val sut = aEnterNumberState(
+            number = "",
+            sendingCode = AsyncAction.Uninitialized,
+        )
+        assertThat(sut.copy(number = "1").isContinueButtonEnabled).isFalse()
+    }
+
+    @Test
+    fun `isContinueButtonEnabled is true if number is complete`() {
+        val sut = aEnterNumberState(
+            number = "12",
+            sendingCode = AsyncAction.Uninitialized,
+        )
+        assertThat(sut.isContinueButtonEnabled).isTrue()
+    }
+
+    @Test
+    fun `isContinueButtonEnabled is false if number is complete and sending is loading`() {
+        val sut = aEnterNumberState(
+            number = "12",
+            sendingCode = AsyncAction.Loading,
+        )
+        assertThat(sut.isContinueButtonEnabled).isFalse()
+    }
+
+    @Test
+    fun `isContinueButtonEnabled is true if number is complete and sending is not loading`() {
+        listOf(
+            AsyncAction.Uninitialized,
+            AsyncAction.Failure(AN_EXCEPTION),
+            AsyncAction.Success(Unit),
+        ).forEach { action ->
+            val sut = aEnterNumberState(
+                number = "12",
+                sendingCode = action,
+            )
+            assertThat(sut.isContinueButtonEnabled).isTrue()
+        }
+    }
+
+    @Test
+    fun `numberEntry is computed from number - case empty`() {
+        val sut = aEnterNumberState(
+            number = "",
+        )
+        assertThat(sut.numberEntry.size).isEqualTo(2)
+        assertThat(sut.numberEntry.digits).containsExactly(
+            Digit.Empty,
+            Digit.Empty,
+        )
+    }
+
+    @Test
+    fun `numberEntry is computed from number - case half filled`() {
+        val sut = aEnterNumberState(
+            number = "1",
+        )
+        assertThat(sut.numberEntry.size).isEqualTo(2)
+        assertThat(sut.numberEntry.digits).containsExactly(
+            Digit.Filled('1'),
+            Digit.Empty,
+        )
+    }
+
+    @Test
+    fun `numberEntry is computed from number - case filled`() {
+        val sut = aEnterNumberState(
+            number = "12",
+        )
+        assertThat(sut.numberEntry.size).isEqualTo(2)
+        assertThat(sut.numberEntry.digits).containsExactly(
+            Digit.Filled('1'),
+            Digit.Filled('2'),
+        )
+    }
+}
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
new file mode 100644
index 0000000000..20e1d898dd
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberViewTest.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+import androidx.activity.ComponentActivity
+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 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.pressBackKey
+import org.junit.Rule
+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>()
+
+    @Test
+    fun `on back pressed - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setView(
+                state = aEnterNumberState(),
+                onBackClicked = callback,
+            )
+            rule.pressBackKey()
+        }
+    }
+
+    @Test
+    fun `on back button clicked - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setView(
+                state = aEnterNumberState(),
+                onBackClicked = callback,
+            )
+            rule.pressBack()
+        }
+    }
+
+    @Test
+    fun `on continue button clicked - emits the Continue event`() {
+        val eventRecorder = EventsRecorder<EnterNumberEvent>()
+        rule.setView(
+            state = aEnterNumberState(
+                number = "12",
+                eventSink = eventRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_continue)
+        eventRecorder.assertSingle(EnterNumberEvent.Continue)
+    }
+
+    @Test
+    fun `when the number is not complete, continue button is disabled`() {
+        val eventRecorder = EventsRecorder<EnterNumberEvent>(expectEvents = false)
+        rule.setView(
+            state = aEnterNumberState(
+                number = "1",
+                eventSink = eventRecorder,
+            ),
+        )
+        val continueStr = rule.activity.getString(CommonStrings.action_continue)
+        rule.onNodeWithText(continueStr).assertIsNotEnabled()
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+        state: EnterNumberState,
+        onBackClicked: () -> Unit = EnsureNeverCalled(),
+    ) {
+        setContent {
+            EnterNumberView(
+                state = state,
+                onBackClick = onBackClicked,
+            )
+        }
+    }
+}
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/FakeEnterNumberNavigator.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/FakeEnterNumberNavigator.kt
new file mode 100644
index 0000000000..a96ab7fe30
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/FakeEnterNumberNavigator.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.linknewdevice.impl.screens.number
+
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeEnterNumberNavigator(
+    private val navigateToWrongNumberErrorLambda: () -> Unit = { lambdaError() },
+) : EnterNumberNavigator {
+    override fun navigateToWrongNumberError() {
+        navigateToWrongNumberErrorLambda()
+    }
+}
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
new file mode 100644
index 0000000000..c6c89ba818
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeViewTest.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.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 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 org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ShowQrCodeViewTest {
+    @get:Rule
+    val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `on back pressed - calls the expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setView(
+                onBackClick = callback
+            )
+            rule.pressBackKey()
+        }
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+        onBackClick: () -> Unit = EnsureNeverCalled(),
+    ) {
+        setContent {
+            ShowQrCodeView(
+                data = "DATA",
+                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
new file mode 100644
index 0000000000..88a68786f3
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenterTest.kt
@@ -0,0 +1,97 @@
+/*
+ * 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.linknewdevice.impl.screens.root
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.linknewdevice.impl.LinkNewMobileHandler
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
+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.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class LinkNewDeviceRootPresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            canLinkNewDeviceResult = { Result.success(true) },
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.isSupported.isUninitialized()).isTrue()
+            assertThat(awaitItem().isSupported.dataOrNull()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - new login device not supported`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            canLinkNewDeviceResult = { Result.success(false) },
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.isSupported.isUninitialized()).isTrue()
+            assertThat(awaitItem().isSupported.dataOrNull()).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - error`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            canLinkNewDeviceResult = { Result.failure(AN_EXCEPTION) },
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.isSupported.isUninitialized()).isTrue()
+            assertThat(awaitItem().isSupported.isFailure()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - link new mobile device`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val matrixClient = FakeMatrixClient(
+            canLinkNewDeviceResult = { Result.success(true) },
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(linkMobileHandler) }
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.isSupported.dataOrNull()).isTrue()
+            initialState.eventSink(LinkNewDeviceRootEvent.LinkMobileDevice)
+            val loadingState = awaitItem()
+            assertThat(loadingState.qrCodeData.isLoading()).isTrue()
+        }
+    }
+
+    private fun createPresenter(
+        matrixClient: MatrixClient = FakeMatrixClient(),
+        linkNewMobileHandler: LinkNewMobileHandler = LinkNewMobileHandler(matrixClient),
+    ) = LinkNewDeviceRootPresenter(
+        matrixClient = matrixClient,
+        linkNewMobileHandler = linkNewMobileHandler,
+    )
+}
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
new file mode 100644
index 0000000000..e352debfb0
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootViewTest.kt
@@ -0,0 +1,102 @@
+/*
+ * 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.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 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.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 org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LinkNewDeviceRootViewTest {
+    @get:Rule
+    val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `on back pressed - calls the onRetry callback`() {
+        val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            rule.setLinkNewDeviceRootView(
+                state = aLinkNewDeviceRootState(
+                    eventSink = eventRecorder,
+                ),
+                onBackClick = callback
+            )
+            rule.pressBackKey()
+        }
+    }
+
+    @Test
+    fun `link desktop button clicked - calls the expected callback`() {
+        val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            rule.setLinkNewDeviceRootView(
+                state = aLinkNewDeviceRootState(
+                    isSupported = AsyncData.Success(true),
+                    eventSink = eventRecorder,
+                ),
+                onLinkDesktopDeviceClick = callback,
+            )
+            rule.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,
+            )
+        )
+        rule.clickOn(R.string.screen_link_new_device_root_mobile_device)
+        eventRecorder.assertSingle(LinkNewDeviceRootEvent.LinkMobileDevice)
+    }
+
+    @Test
+    fun `not supported - dismiss click - invokes the expected callback`() {
+        val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            rule.setLinkNewDeviceRootView(
+                state = aLinkNewDeviceRootState(
+                    isSupported = AsyncData.Success(false),
+                    eventSink = eventRecorder,
+                ),
+                onBackClick = callback,
+            )
+            rule.clickOn(CommonStrings.action_dismiss)
+        }
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLinkNewDeviceRootView(
+        state: LinkNewDeviceRootState = aLinkNewDeviceRootState(),
+        onBackClick: () -> Unit = EnsureNeverCalled(),
+        onLinkDesktopDeviceClick: () -> Unit = EnsureNeverCalled(),
+    ) {
+        setContent {
+            LinkNewDeviceRootView(
+                state = state,
+                onBackClick = onBackClick,
+                onLinkDesktopDeviceClick = onLinkDesktopDeviceClick,
+            )
+        }
+    }
+}
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodePresenterTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodePresenterTest.kt
new file mode 100644
index 0000000000..50c3ce767b
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodePresenterTest.kt
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.linknewdevice.impl.screens.scan
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.linknewdevice.impl.LinkNewDesktopHandler
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeDecodeException
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.QR_CODE_DATA_RECIPROCATE
+import io.element.android.libraries.matrix.test.linknewdevice.FakeLinkDesktopHandler
+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.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class ScanQrCodePresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            createLinkDesktopHandlerResult = { Result.success(FakeLinkDesktopHandler()) }
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.scanAction.isLoading()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - handle scanned event - success`() = runTest {
+        val handleScannedQrCodeResult = lambdaRecorder<ByteArray, Unit> { }
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkDesktopHandlerResult = {
+                Result.success(
+                    FakeLinkDesktopHandler(
+                        handleScannedQrCodeResult = handleScannedQrCodeResult,
+                    )
+                )
+            }
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.scanAction.isLoading()).isTrue()
+            initialState.eventSink(ScanQrCodeEvent.QrCodeScanned(QR_CODE_DATA_RECIPROCATE))
+            val scannedState = awaitItem()
+            assertThat(scannedState.scanAction.isSuccess()).isTrue()
+            runCurrent()
+            handleScannedQrCodeResult.assertions().isCalledOnce().with(value(QR_CODE_DATA_RECIPROCATE))
+        }
+    }
+
+    @Test
+    fun `present - handle scanned event - failure`() = runTest {
+        val handleScannedQrCodeResult = lambdaRecorder<ByteArray, Unit> { }
+        val handler = FakeLinkDesktopHandler(
+            handleScannedQrCodeResult = handleScannedQrCodeResult,
+        )
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkDesktopHandlerResult = {
+                Result.success(handler)
+            }
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.scanAction.isLoading()).isTrue()
+            initialState.eventSink(ScanQrCodeEvent.QrCodeScanned(QR_CODE_DATA_RECIPROCATE))
+            val scannedState = awaitItem()
+            assertThat(scannedState.scanAction.isSuccess()).isTrue()
+            handler.emitStep(LinkDesktopStep.InvalidQrCode(QrCodeDecodeException.Crypto("Invalid QR Code")))
+            skipItems(1)
+            val errorState = awaitItem()
+            assertThat(errorState.scanAction.isFailure()).isTrue()
+            handleScannedQrCodeResult.assertions().isCalledOnce().with(value(QR_CODE_DATA_RECIPROCATE))
+            // Reset by trying again
+            errorState.eventSink(ScanQrCodeEvent.TryAgain)
+            val resetState = awaitItem()
+            assertThat(resetState.scanAction.isLoading()).isTrue()
+        }
+    }
+}
+
+private fun createPresenter(
+    matrixClient: MatrixClient,
+) = ScanQrCodePresenter(
+    linkNewDesktopHandler = LinkNewDesktopHandler(matrixClient),
+)
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
new file mode 100644
index 0000000000..fcc3afeb7d
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeViewTest.kt
@@ -0,0 +1,70 @@
+/*
+ * 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.linknewdevice.impl.screens.scan
+
+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.architecture.AsyncAction
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
+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.pressBackKey
+import org.junit.Rule
+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>()
+
+    @Test
+    fun `on back pressed - calls the expected callback`() {
+        val eventRecorder = EventsRecorder<ScanQrCodeEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            rule.setView(
+                state = aScanQrCodeState(
+                    eventSink = eventRecorder,
+                ),
+                onBackClick = callback
+            )
+            rule.pressBackKey()
+        }
+    }
+
+    @Test
+    fun `try again button clicked - emits the expected event`() {
+        val eventRecorder = EventsRecorder<ScanQrCodeEvent>()
+        rule.setView(
+            state = aScanQrCodeState(
+                scanAction = AsyncAction.Failure(AN_EXCEPTION),
+                eventSink = eventRecorder,
+            )
+        )
+        rule.clickOn(CommonStrings.action_try_again)
+        eventRecorder.assertSingle(ScanQrCodeEvent.TryAgain)
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+        state: ScanQrCodeState = aScanQrCodeState(),
+        onBackClick: () -> Unit = EnsureNeverCalled(),
+    ) {
+        setContent {
+            ScanQrCodeView(
+                state = state,
+                onBackClick = onBackClick,
+            )
+        }
+    }
+}
diff --git a/features/linknewdevice/test/build.gradle.kts b/features/linknewdevice/test/build.gradle.kts
new file mode 100644
index 0000000000..388612f920
--- /dev/null
+++ b/features/linknewdevice/test/build.gradle.kts
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+android {
+    namespace = "io.element.android.features.linknewdevice.test"
+}
+
+dependencies {
+    implementation(projects.features.linknewdevice.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/location/api/build.gradle.kts b/features/location/api/build.gradle.kts
index e4d5c4e886..ab85e37594 100644
--- a/features/location/api/build.gradle.kts
+++ b/features/location/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/Location.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/Location.kt
index 0d720877a1..7593867207 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/Location.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/Location.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/LocationService.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/LocationService.kt
index 847bdf3921..22049c9548 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/LocationService.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/LocationService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt
index 1528e6cb14..48816b2bb4 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,8 +19,9 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
  * Allows a user to share a location message within a room.
  */
 interface SendLocationEntryPoint : FeatureEntryPoint {
-    fun builder(timelineMode: Timeline.Mode): Builder
-    interface Builder {
-        fun build(parentNode: Node, buildContext: BuildContext): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        timelineMode: Timeline.Mode,
+    ): Node
 }
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt
index 7ae28a1e92..03693a7d68 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,14 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.architecture.NodeInputs
 
 interface ShowLocationEntryPoint : FeatureEntryPoint {
-    data class Inputs(val location: Location, val description: String?) : NodeInputs
+    data class Inputs(
+        val location: Location,
+        val description: String?,
+    ) : NodeInputs
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: Inputs,
+    ): Node
 }
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 382a65ae47..c58cadd66b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilder.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilder.kt
index eb8d0ea1b7..839cda0237 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilder.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 db75b5e30a..d119dc7eb2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt
index 40112cea4f..48c78efc3c 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6ea4e9f9de..81b80c8dc3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapUrlBuilder.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapUrlBuilder.kt
index 533ecf8d2d..6636976828 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapUrlBuilder.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapUrlBuilder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 051b2448d4..17b620eec9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/test/kotlin/io/element/android/features/location/api/LocationKtTest.kt b/features/location/api/src/test/kotlin/io/element/android/features/location/api/LocationKtTest.kt
index 6718f6614f..d1ad40176e 100644
--- a/features/location/api/src/test/kotlin/io/element/android/features/location/api/LocationKtTest.kt
+++ b/features/location/api/src/test/kotlin/io/element/android/features/location/api/LocationKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilderTest.kt b/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilderTest.kt
index ba44426a70..65c0acd88d 100644
--- a/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilderTest.kt
+++ b/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerStaticMapUrlBuilderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 dc53765836..d5c6521258 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/build.gradle.kts b/features/location/impl/build.gradle.kts
index 43f6bba0d0..bd41c7ecdf 100644
--- a/features/location/impl/build.gradle.kts
+++ b/features/location/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/AndroidManifest.xml b/features/location/impl/src/main/AndroidManifest.xml
index 662651e570..ae728c09e1 100644
--- a/features/location/impl/src/main/AndroidManifest.xml
+++ b/features/location/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/DefaultLocationService.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/DefaultLocationService.kt
index 5be8e7c093..9f2c3fa70b 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/DefaultLocationService.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/DefaultLocationService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.features.location.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.location.api.BuildConfig
 import io.element.android.features.location.api.LocationService
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLocationService : LocationService {
     override fun isServiceAvailable(): Boolean {
         return BuildConfig.MAPTILER_API_KEY.isNotEmpty()
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt
index 153adad343..d01f3e7dd2 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
index 5b925e64ae..6817f579e5 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
index 8b5d3f06a3..7aef07e32b 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt
index c879635052..0284c25a0a 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import androidx.annotation.VisibleForTesting
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.location.api.Location
 import io.element.android.libraries.androidutils.system.openAppSettingsPage
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -23,7 +23,6 @@ import timber.log.Timber
 import java.util.Locale
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidLocationActions(
     @ApplicationContext private val context: Context
 ) : LocationActions {
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt
index d4edeb8abb..cd9efbd261 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0ef520aadb..1aa2e1269d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,7 +34,7 @@ class DefaultPermissionsPresenter(
     override fun present(): PermissionsState {
         val multiplePermissionsState = rememberMultiplePermissionsState(permissions = permissions)
 
-        fun handleEvents(event: PermissionsEvents) {
+        fun handleEvent(event: PermissionsEvents) {
             when (event) {
                 PermissionsEvents.RequestPermissions -> multiplePermissionsState.launchMultiplePermissionRequest()
             }
@@ -46,7 +47,7 @@ class DefaultPermissionsPresenter(
                 else -> PermissionsState.Permissions.NoneGranted
             },
             shouldShowRationale = multiplePermissionsState.shouldShowRationale,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt
index 951742aee4..a4b5ef1228 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt
index 82e54ba977..e7062264c9 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1be342297b..91191280d0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationFloatingActionButton.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationFloatingActionButton.kt
index 7b189a6e1f..773544375f 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationFloatingActionButton.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationFloatingActionButton.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt
index c42be68bf1..56399f7e9d 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,24 +12,20 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.location.api.SendLocationEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.matrix.api.timeline.Timeline
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSendLocationEntryPoint : SendLocationEntryPoint {
-    override fun builder(timelineMode: Timeline.Mode): SendLocationEntryPoint.Builder {
-        return Builder(timelineMode)
-    }
-
-    class Builder(private val timelineMode: Timeline.Mode) : SendLocationEntryPoint.Builder {
-        override fun build(parentNode: Node, buildContext: BuildContext): Node {
-            return parentNode.createNode<SendLocationNode>(
-                buildContext = buildContext,
-                plugins = listOf(SendLocationNode.Inputs(timelineMode))
-            )
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        timelineMode: Timeline.Mode,
+    ): Node {
+        return parentNode.createNode<SendLocationNode>(
+            buildContext = buildContext,
+            plugins = listOf(SendLocationNode.Inputs(timelineMode))
+        )
     }
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationEvents.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationEvents.kt
index d8ffb3eff4..0d266eefc7 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationEvents.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationNode.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationNode.kt
index 8fff96e7b6..2184b52b44 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationNode.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt
index 9914920ac3..b753820e55 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -78,7 +79,7 @@ class SendLocationPresenter(
             }
         }
 
-        fun handleEvents(event: SendLocationEvents) {
+        fun handleEvent(event: SendLocationEvents) {
             when (event) {
                 is SendLocationEvents.SendLocation -> scope.launch {
                     sendLocation(event, mode)
@@ -103,7 +104,7 @@ class SendLocationPresenter(
             mode = mode,
             hasLocationPermission = permissionsState.isAnyGranted,
             appName = appName,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationState.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationState.kt
index fc2f1e91a8..4ca84c47a5 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationState.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationStateProvider.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationStateProvider.kt
index 858098dee9..238201cbec 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationStateProvider.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt
index d6882ced98..452a4aa8ae 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt
index d226a01ede..7d1f5f1ef4 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +12,16 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.location.api.ShowLocationEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultShowLocationEntryPoint : ShowLocationEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: ShowLocationEntryPoint.Inputs,
+    ): Node {
         return parentNode.createNode<ShowLocationNode>(buildContext, listOf(inputs))
     }
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvents.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvents.kt
index a1464aeaf9..12f368fa11 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvents.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
index d5977fa426..86d7741752 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7929843571..3dcccef886 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,7 +57,7 @@ class ShowLocationPresenter(
             }
         }
 
-        fun handleEvents(event: ShowLocationEvents) {
+        fun handleEvent(event: ShowLocationEvents) {
             when (event) {
                 ShowLocationEvents.Share -> locationActions.share(location, description)
                 is ShowLocationEvents.TrackMyLocation -> {
@@ -86,7 +87,7 @@ class ShowLocationPresenter(
             hasLocationPermission = permissionsState.isAnyGranted,
             isTrackMyLocation = isTrackMyLocation,
             appName = appName,
-            eventSink = ::handleEvents,
+            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 cee52c126b..96635d6df8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 98b700356b..7d03a1ebb2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2a6063e9f3..6bc9e27bc6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/DefaultLocationServiceTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/DefaultLocationServiceTest.kt
index fd687dd938..b0e899730b 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/DefaultLocationServiceTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/DefaultLocationServiceTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 01f4f522f6..a4352444dc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt
index 3d8ab97504..f82635e562 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt
index 488408eaf2..94dc972213 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7351dd71f4..94d909a7ef 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,7 +20,7 @@ class FakePermissionsPresenter : PermissionsPresenter {
     private var state = PermissionsState(
         permissions = PermissionsState.Permissions.NoneGranted,
         shouldShowRationale = false,
-        eventSink = ::handleEvent
+        eventSink = ::handleEvent,
     )
         set(value) {
             field = value.copy(eventSink = ::handleEvent)
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt
index 9be79c7092..a90afd5a9d 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -47,8 +48,11 @@ class DefaultSendLocationEntryPointTest {
             )
         }
         val timelineMode = Timeline.Mode.Live
-        val result = entryPoint.builder(timelineMode)
-            .build(parentNode, BuildContext.root(null))
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            timelineMode = timelineMode,
+        )
         assertThat(result).isInstanceOf(SendLocationNode::class.java)
         assertThat(result.plugins).contains(SendLocationNode.Inputs(timelineMode))
     }
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
index 4847942d67..23ab3847cd 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d31ef0c0e4..a49b887a42 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -48,8 +49,8 @@ class DefaultShowLocationEntryPointTest {
             description = "My location",
         )
         val result = entryPoint.createNode(
-            parentNode,
-            BuildContext.root(null),
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
             inputs = inputs,
         )
         assertThat(result).isInstanceOf(ShowLocationNode::class.java)
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 cc53badbb2..df22863c7c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2125fff4db..2245360bb2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/test/build.gradle.kts b/features/location/test/build.gradle.kts
index 024ae2c303..f84e8ba772 100644
--- a/features/location/test/build.gradle.kts
+++ b/features/location/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,5 +15,8 @@ android {
 }
 
 dependencies {
-    implementation(projects.features.location.api)
+    api(projects.features.location.api)
+    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/FakeLocationService.kt b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeLocationService.kt
index 69a3331ffb..f961a81c9b 100644
--- a/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeLocationService.kt
+++ b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeLocationService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeSendLocationEntryPoint.kt b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeSendLocationEntryPoint.kt
new file mode 100644
index 0000000000..2a1741e6c8
--- /dev/null
+++ b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeSendLocationEntryPoint.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.location.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.location.api.SendLocationEntryPoint
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeSendLocationEntryPoint : SendLocationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        timelineMode: Timeline.Mode,
+    ): Node = lambdaError()
+}
diff --git a/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeShowLocationEntryPoint.kt b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeShowLocationEntryPoint.kt
new file mode 100644
index 0000000000..b6a94091d9
--- /dev/null
+++ b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeShowLocationEntryPoint.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.location.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.location.api.ShowLocationEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeShowLocationEntryPoint : ShowLocationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: ShowLocationEntryPoint.Inputs,
+    ): Node = lambdaError()
+}
diff --git a/features/lockscreen/api/build.gradle.kts b/features/lockscreen/api/build.gradle.kts
index 4419b7a9fa..a09c1a4d40 100644
--- a/features/lockscreen/api/build.gradle.kts
+++ b/features/lockscreen/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt
index e9ba05ba74..aa891ada4f 100644
--- a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt
+++ b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,13 +16,14 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface LockScreenEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext, navTarget: Target): NodeBuilder
-    fun pinUnlockIntent(context: Context): Intent
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        navTarget: Target,
+        callback: Callback,
+    ): Node
 
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun pinUnlockIntent(context: Context): Intent
 
     interface Callback : Plugin {
         fun onSetupDone()
diff --git a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenLockState.kt b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenLockState.kt
index 5650122ee0..1a63ebc640 100644
--- a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenLockState.kt
+++ b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenLockState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenService.kt b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenService.kt
index 4919442e28..bd644e69e9 100644
--- a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenService.kt
+++ b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -35,12 +36,6 @@ interface LockScreenService {
     fun isPinSetup(): Flow<Boolean>
 }
 
-/**
- * Check if the app is currently locked.
- */
-val LockScreenService.isLocked: Boolean
-    get() = lockState.value == LockScreenLockState.Locked
-
 /**
  * Makes sure the secure flag is set on the activity if the pin is setup.
  * @param activity the activity to set the flag on.
diff --git a/features/lockscreen/impl/build.gradle.kts b/features/lockscreen/impl/build.gradle.kts
index 998b763804..63aec590de 100644
--- a/features/lockscreen/impl/build.gradle.kts
+++ b/features/lockscreen/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/AndroidManifest.xml b/features/lockscreen/impl/src/main/AndroidManifest.xml
index 2b4ccb4296..13b1262f27 100644
--- a/features/lockscreen/impl/src/main/AndroidManifest.xml
+++ b/features/lockscreen/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2024 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt
index 1155a6fdcd..ec8fdc6d8b 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,34 +14,30 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.lockscreen.api.LockScreenEntryPoint
 import io.element.android.features.lockscreen.impl.unlock.activity.PinUnlockActivity
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLockScreenEntryPoint : LockScreenEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext, navTarget: LockScreenEntryPoint.Target): LockScreenEntryPoint.NodeBuilder {
-        val callbacks = mutableListOf<LockScreenEntryPoint.Callback>()
-
-        return object : LockScreenEntryPoint.NodeBuilder {
-            override fun callback(callback: LockScreenEntryPoint.Callback): LockScreenEntryPoint.NodeBuilder {
-                callbacks += callback
-                return this
-            }
-
-            override fun build(): Node {
-                val inputs = LockScreenFlowNode.Inputs(
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        navTarget: LockScreenEntryPoint.Target,
+        callback: LockScreenEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<LockScreenFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                LockScreenFlowNode.Inputs(
                     when (navTarget) {
                         LockScreenEntryPoint.Target.Setup -> LockScreenFlowNode.NavTarget.Setup
                         LockScreenEntryPoint.Target.Settings -> LockScreenFlowNode.NavTarget.Settings
                     }
-                )
-                val plugins = listOf(inputs) + callbacks
-                return parentNode.createNode<LockScreenFlowNode>(buildContext, plugins)
-            }
-        }
+                ),
+                callback,
+            )
+        )
     }
 
     override fun pinUnlockIntent(context: Context): Intent {
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 c1a97dadad..7ac42feda6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.lockscreen.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.lockscreen.api.LockScreenLockState
 import io.element.android.features.lockscreen.api.LockScreenService
@@ -35,7 +35,6 @@ import kotlin.time.Duration
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLockScreenService(
     private val lockScreenConfig: LockScreenConfig,
     private val lockScreenStore: LockScreenStore,
@@ -75,15 +74,14 @@ class DefaultLockScreenService(
     }
 
     /**
-     * Makes sure to delete the pin code when the session is deleted.
+     * Makes sure to delete the pin code when the last session is deleted.
      */
     private fun observeSessionsState() {
         sessionObserver.addListener(object : SessionListener {
-            override suspend fun onSessionCreated(userId: String) = Unit
-
-            override suspend fun onSessionDeleted(userId: String) {
-                // TODO handle multi session at some point
-                pinCodeManager.deletePinCode()
+            override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
+                if (wasLastSession) {
+                    pinCodeManager.deletePinCode()
+                }
             }
         })
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenConfig.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenConfig.kt
index 923eb32c76..c246390a63 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenConfig.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenFlowNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenFlowNode.kt
index 94e2556ea2..2a84ddc0aa 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/LockScreenFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7358cf248e..a96c713ff2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 887334812e..9917845725 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricUnlockError.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricUnlockError.kt
index 91617b270a..941256f8b4 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricUnlockError.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricUnlockError.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b6b3c4115f..8bb044fd06 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,7 +25,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.lockscreen.impl.LockScreenConfig
 import io.element.android.features.lockscreen.impl.R
@@ -42,7 +42,6 @@ private const val SECRET_KEY_ALIAS = "elementx.SECRET_KEY_ALIAS_BIOMETRIC"
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultBiometricAuthenticatorManager(
     @ApplicationContext private val context: Context,
     private val lockScreenStore: LockScreenStore,
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricUnlockCallback.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricUnlockCallback.kt
index 5e83ac9688..9a7a0abd09 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricUnlockCallback.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricUnlockCallback.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ed5bb2e4ac..439c6aeaa7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 824db5339e..091432044a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.lockscreen.impl.pin
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.lockscreen.impl.storage.LockScreenStore
 import io.element.android.libraries.cryptography.api.EncryptionDecryptionService
@@ -22,7 +22,6 @@ private const val SECRET_KEY_ALIAS = "elementx.SECRET_KEY_ALIAS_PIN_CODE"
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultPinCodeManager(
     private val secretKeyRepository: SecretKeyRepository,
     private val encryptionDecryptionService: EncryptionDecryptionService,
@@ -72,7 +71,7 @@ class DefaultPinCodeManager(
                     lockScreenStore.onWrongPin()
                 }
             }
-        } catch (failure: Throwable) {
+        } catch (_: Throwable) {
             false
         }
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerCallback.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerCallback.kt
index 9daadaa5d7..c9c8b7bf4e 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerCallback.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerCallback.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c36a976f25..9282f3e7df 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinDigit.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinDigit.kt
index 0ca285321c..64200d0da3 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinDigit.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinDigit.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
index e9ee9a9903..f9cb2afcfe 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntry.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/LockScreenSettingsEvents.kt
index 19f729c94c..2d62427e02 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/LockScreenSettingsEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 01aeaabe89..0bd26729d5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -110,7 +111,7 @@ class LockScreenSettingsFlowNode(
             }
             NavTarget.Settings -> {
                 val callback = object : LockScreenSettingsNode.Callback {
-                    override fun onChangePinClick() {
+                    override fun navigateToSetupPin() {
                         backstack.push(NavTarget.SetupPin)
                     }
                 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
index 5e27b815bc..e66bc13691 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,10 +13,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -26,12 +27,10 @@ class LockScreenSettingsNode(
     private val presenter: LockScreenSettingsPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onChangePinClick()
+        fun navigateToSetupPin()
     }
 
-    private fun onChangePinClick() {
-        plugins<Callback>().forEach { it.onChangePinClick() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -39,7 +38,7 @@ class LockScreenSettingsNode(
         LockScreenSettingsView(
             state = state,
             onBackClick = this::navigateUp,
-            onChangePinClick = this::onChangePinClick,
+            onChangePinClick = callback::navigateToSetupPin,
             modifier = modifier,
         )
     }
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 6f238c964b..589794bde0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -50,7 +51,7 @@ class LockScreenSettingsPresenter(
 
         val biometricUnlock = biometricAuthenticatorManager.rememberConfirmBiometricAuthenticator()
 
-        fun handleEvents(event: LockScreenSettingsEvents) {
+        fun handleEvent(event: LockScreenSettingsEvents) {
             when (event) {
                 LockScreenSettingsEvents.CancelRemovePin -> showRemovePinConfirmation = false
                 LockScreenSettingsEvents.ConfirmRemovePin -> {
@@ -82,7 +83,7 @@ class LockScreenSettingsPresenter(
             isBiometricEnabled = isBiometricEnabled,
             showRemovePinConfirmation = showRemovePinConfirmation,
             showToggleBiometric = biometricAuthenticatorManager.isDeviceSecured,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
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 f49f2c2b26..a69d633508 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsStateProvider.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsStateProvider.kt
index 5cf7068735..43f20c1c52 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsStateProvider.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a843525d00..fe5f20da0d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/LockScreenSetupFlowNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/LockScreenSetupFlowNode.kt
index 263cc8ea54..6f47395a26 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/LockScreenSetupFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/LockScreenSetupFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import dev.zacsweers.metro.Assisted
@@ -27,6 +27,7 @@ import io.element.android.features.lockscreen.impl.setup.biometric.SetupBiometri
 import io.element.android.features.lockscreen.impl.setup.pin.SetupPinNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import kotlinx.parcelize.Parcelize
@@ -50,9 +51,7 @@ class LockScreenSetupFlowNode(
         fun onSetupDone()
     }
 
-    private fun onSetupDone() {
-        plugins<Callback>().forEach { it.onSetupDone() }
-    }
+    private val callback: Callback = callback()
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
@@ -67,7 +66,7 @@ class LockScreenSetupFlowNode(
             if (biometricAuthenticatorManager.hasAvailableAuthenticator) {
                 backstack.newRoot(NavTarget.Biometric)
             } else {
-                onSetupDone()
+                callback.onSetupDone()
             }
         }
     }
@@ -91,7 +90,7 @@ class LockScreenSetupFlowNode(
             NavTarget.Biometric -> {
                 val callback = object : SetupBiometricNode.Callback {
                     override fun onBiometricSetupDone() {
-                        onSetupDone()
+                        callback.onSetupDone()
                     }
                 }
                 createNode<SetupBiometricNode>(buildContext, plugins = listOf(callback))
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/SetupBiometricEvents.kt
index 964d6b3d38..ab8b18642e 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/SetupBiometricEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricNode.kt
index 64da1a321c..c74b9cd77f 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,10 +14,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -30,16 +31,14 @@ class SetupBiometricNode(
         fun onBiometricSetupDone()
     }
 
-    private fun onSetupDone() {
-        plugins<Callback>().forEach { it.onBiometricSetupDone() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         LaunchedEffect(state.isBiometricSetupDone) {
             if (state.isBiometricSetupDone) {
-                onSetupDone()
+                callback.onBiometricSetupDone()
             }
         }
         SetupBiometricView(
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 f1183d8541..3af2a28851 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,7 +35,7 @@ class SetupBiometricPresenter(
         val coroutineScope = rememberCoroutineScope()
         val biometricUnlock = biometricAuthenticatorManager.rememberConfirmBiometricAuthenticator()
 
-        fun handleEvents(event: SetupBiometricEvents) {
+        fun handleEvent(event: SetupBiometricEvents) {
             when (event) {
                 SetupBiometricEvents.AllowBiometric -> coroutineScope.launch {
                     biometricUnlock.setup()
@@ -52,7 +53,7 @@ class SetupBiometricPresenter(
 
         return SetupBiometricState(
             isBiometricSetupDone = isBiometricSetupDone,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
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 afe73beee0..2843c028d1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricStateProvider.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricStateProvider.kt
index 6c30fc7172..d725d2de97 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricStateProvider.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 761d48ec38..35b1ec76c0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/SetupPinEvents.kt
index a111beb984..276a94b2fc 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/SetupPinEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt
index aceb955b88..2f86ca5ec7 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 36065484c7..ac5b5bd1cc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -73,7 +74,7 @@ class SetupPinPresenter(
             }
         }
 
-        fun handleEvents(event: SetupPinEvents) {
+        fun handleEvent(event: SetupPinEvents) {
             when (event) {
                 is SetupPinEvents.OnPinEntryChanged -> {
                     // Use the fromConfirmationStep flag from ui to avoid race condition.
@@ -106,7 +107,7 @@ class SetupPinPresenter(
             isConfirmationStep = isConfirmationStep,
             setupPinFailure = setupPinFailure,
             appName = buildMeta.applicationName,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
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 ee9801b384..2d5124d440 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinStateProvider.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinStateProvider.kt
index 2c4e08c130..f50643e367 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinStateProvider.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 81bfa4c1a4..5f2320db32 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/PinValidator.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/PinValidator.kt
index a12872fab1..c84d892fbc 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/PinValidator.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/PinValidator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/SetupPinFailure.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/SetupPinFailure.kt
index cedefa3f19..94e4aa5fb2 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/SetupPinFailure.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/validation/SetupPinFailure.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d1ec05f643..c4558812de 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/LockScreenStore.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/LockScreenStore.kt
index e4321f7358..d48a30e815 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/LockScreenStore.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/LockScreenStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 dbe51d3222..6b99d90592 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.lockscreen.impl.LockScreenConfig
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
@@ -22,7 +22,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 
 @ContributesBinding(AppScope::class)
-@Inject
 class PreferencesLockScreenStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
     private val lockScreenConfig: LockScreenConfig,
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/PinUnlockEvents.kt
index e72d05fa27..bd9043859f 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/PinUnlockEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 59bccff9be..2a475814c9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fba460f6ee..459e165e00 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,10 +14,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -30,18 +31,14 @@ class PinUnlockNode(
         fun onUnlock()
     }
 
-    private fun onUnlock() {
-        plugins<Callback>().forEach {
-            it.onUnlock()
-        }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         LaunchedEffect(state.isUnlocked) {
             if (state.isUnlocked) {
-                onUnlock()
+                callback.onUnlock()
             }
         }
         PinUnlockView(
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 fc2e61d404..5429320fc7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -94,7 +95,7 @@ class PinUnlockPresenter(
             isUnlocked.value = true
         }
 
-        fun handleEvents(event: PinUnlockEvents) {
+        fun handleEvent(event: PinUnlockEvents) {
             when (event) {
                 is PinUnlockEvents.OnPinKeypadPressed -> {
                     pinEntryState.value = pinEntry.process(event.pinKeypadModel)
@@ -129,7 +130,7 @@ class PinUnlockPresenter(
             showBiometricUnlock = biometricUnlock.isActive,
             biometricUnlockResult = biometricUnlockResult,
             isUnlocked = isUnlocked.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
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 dd24fbefd7..2bbcbe335c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 54647eaad8..2beb8babe3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 baa856307c..659f8c2966 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a494bca8c6..6209c19be2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,8 +15,12 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.lifecycle.lifecycleScope
 import dev.zacsweers.metro.Inject
+import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.lockscreen.api.LockScreenLockState
 import io.element.android.features.lockscreen.api.LockScreenService
@@ -46,9 +51,13 @@ class PinUnlockActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         bindings<PinUnlockBindings>().inject(this)
         setContent {
+            val colors by remember {
+                enterpriseService.semanticColorsFlow(sessionId = null)
+            }.collectAsState(SemanticColorsLightDark.default)
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
-                enterpriseService = enterpriseService,
+                compoundLight = colors.light,
+                compoundDark = colors.dark,
                 buildMeta = buildMeta,
             ) {
                 val state = presenter.present()
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/di/PinUnlockBindings.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/di/PinUnlockBindings.kt
index 8ddb898caa..c8b65afbe0 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/di/PinUnlockBindings.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/di/PinUnlockBindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt
index 820b557423..093ad2f2b4 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,8 +21,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.Backspace
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -39,6 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.times
 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.text.toSp
@@ -205,7 +205,8 @@ private fun PinKeypadBackButton(
         onClick = onClick,
     ) {
         Icon(
-            imageVector = Icons.AutoMirrored.Filled.Backspace,
+            modifier = Modifier.size(28.dp),
+            imageVector = CompoundIcons.BackspaceSolid(),
             contentDescription = stringResource(CommonStrings.a11y_delete),
         )
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadModel.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadModel.kt
index 9f54e6bd5e..36c783951e 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadModel.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/main/res/values-hr/translations.xml b/features/lockscreen/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..1a81bcc6cb
--- /dev/null
+++ b/features/lockscreen/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,40 @@
+<?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">"biometrijska provjera autentičnosti"</string>
+  <string name="screen_app_lock_biometric_unlock">"biometrijsko otključavanje"</string>
+  <string name="screen_app_lock_biometric_unlock_title_android">"Otključavanje biometrijom"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"Potvrdi biometriju"</string>
+  <string name="screen_app_lock_forgot_pin">"Zaboravili ste PIN?"</string>
+  <string name="screen_app_lock_settings_change_pin">"Promijeni PIN kod"</string>
+  <string name="screen_app_lock_settings_enable_biometric_unlock">"Omogući biometrijsko otključavanje"</string>
+  <string name="screen_app_lock_settings_remove_pin">"Ukloni PIN"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"Jeste li sigurni da želite ukloniti PIN?"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_title">"Želite li ukloniti PIN?"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_allow_title">"Dopusti %1$s"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_skip">"Radije bih upotrijebio/la PIN"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Uštedite si malo vremena i iskoristite %1$s kako biste svaki put otključali aplikaciju"</string>
+  <string name="screen_app_lock_setup_choose_pin">"Odaberite PIN"</string>
+  <string name="screen_app_lock_setup_confirm_pin">"Potvrdite PIN"</string>
+  <string name="screen_app_lock_setup_pin_context">"Zaključajte %1$s kako biste dodatno osigurali svoje razgovore.
+
+Odaberite nešto nezaboravno. Ako zaboravite ovaj PIN, bit ćete odjavljeni iz aplikacije."</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Ovo ne možete iz sigurnosnih razloga odabrati kao svoj PIN kod"</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"Odaberite drugi PIN"</string>
+  <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>
+  <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>
+    <item quantity="other">"Imate %1$d pokušaja otključavanja"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="one">"Pogrešan PIN. Imate još %1$d pokušaj"</item>
+    <item quantity="few">"Pogrešan PIN. Imate još %1$d pokušaja"</item>
+    <item quantity="other">"Pogrešan PIN. Imate još %1$d pokušaja"</item>
+  </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>
+</resources>
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 eae4799f93..3879c46597 100644
--- a/features/lockscreen/impl/src/main/res/values-ru/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-ru/translations.xml
@@ -6,7 +6,7 @@
   <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_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>
diff --git a/features/lockscreen/impl/src/main/res/values-uz/translations.xml b/features/lockscreen/impl/src/main/res/values-uz/translations.xml
index 9981cf3bce..8cd0a57b94 100644
--- a/features/lockscreen/impl/src/main/res/values-uz/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-uz/translations.xml
@@ -3,6 +3,7 @@
   <string name="screen_app_lock_biometric_authentication">"biometrik autentifikatsiya"</string>
   <string name="screen_app_lock_biometric_unlock">"biometrik qulf ochish"</string>
   <string name="screen_app_lock_biometric_unlock_title_android">"Biometrik bilan qulfni oching"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"Biometrikni tasdiqlang"</string>
   <string name="screen_app_lock_forgot_pin">"PIN kodni unutdingizmi?"</string>
   <string name="screen_app_lock_settings_change_pin">"PIN kodni o\'zgartirish"</string>
   <string name="screen_app_lock_settings_enable_biometric_unlock">"Biometrik qulfni ochishga ruxsat bering"</string>
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 995140b87b..e99223735f 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
index 822d275063..533a7be414 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,9 +38,12 @@ class DefaultLockScreenEntryPointTest {
             override fun onSetupDone() = lambdaError()
         }
         val navTarget = LockScreenEntryPoint.Target.Setup
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null), navTarget)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            navTarget = navTarget,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(LockScreenFlowNode::class.java)
         assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Setup))
         assertThat(result.plugins).contains(callback)
@@ -58,9 +62,12 @@ class DefaultLockScreenEntryPointTest {
             override fun onSetupDone() = lambdaError()
         }
         val navTarget = LockScreenEntryPoint.Target.Settings
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null), navTarget)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            navTarget = navTarget,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(LockScreenFlowNode::class.java)
         assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Settings))
         assertThat(result.plugins).contains(callback)
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
new file mode 100644
index 0000000000..9082f20a55
--- /dev/null
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenServiceTest.kt
@@ -0,0 +1,96 @@
+/*
+ * 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.lockscreen.impl
+
+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
+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.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.sessionstorage.api.observer.SessionObserver
+import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
+import io.element.android.services.appnavstate.api.AppForegroundStateService
+import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultLockScreenServiceTest {
+    @Test
+    fun `when the pin is not mandatory and no pin is configured isSetupRequired emits false`() = runTest {
+        val sut = createDefaultLockScreenService(
+            lockScreenConfig = aLockScreenConfig(isPinMandatory = false)
+        )
+        sut.isSetupRequired().test {
+            assertThat(awaitItem()).isFalse()
+        }
+    }
+
+    @Test
+    fun `when the pin is mandatory, isSetupRequired emits true`() = runTest {
+        val lockScreenStore = InMemoryLockScreenStore()
+        val sut = createDefaultLockScreenService(
+            lockScreenConfig = aLockScreenConfig(isPinMandatory = true),
+            lockScreenStore = lockScreenStore,
+        )
+        sut.isSetupRequired().test {
+            assertThat(awaitItem()).isTrue()
+            // When the user configures the pin code, the setup is not required anymore
+            lockScreenStore.saveEncryptedPinCode("encryptedCode")
+            assertThat(awaitItem()).isFalse()
+            // Users deletes the pin code
+            lockScreenStore.deleteEncryptedPinCode()
+            assertThat(awaitItem()).isTrue()
+        }
+    }
+
+    @Test
+    fun `when the last session is deleted, the pin code is removed`() = runTest {
+        val sessionObserver = FakeSessionObserver()
+        val lockScreenStore = InMemoryLockScreenStore()
+        val sut = createDefaultLockScreenService(
+            lockScreenConfig = aLockScreenConfig(isPinMandatory = true),
+            lockScreenStore = lockScreenStore,
+            sessionObserver = sessionObserver,
+        )
+        sut.isPinSetup().test {
+            assertThat(awaitItem()).isFalse()
+            // When the user configure the pin code, the setup is not required anymore
+            lockScreenStore.saveEncryptedPinCode("encryptedCode")
+            assertThat(awaitItem()).isTrue()
+            sessionObserver.onSessionDeleted("userId", wasLastSession = false)
+            expectNoEvents()
+            sessionObserver.onSessionDeleted("userId", wasLastSession = true)
+            assertThat(awaitItem()).isFalse()
+        }
+    }
+}
+
+private fun TestScope.createDefaultLockScreenService(
+    lockScreenConfig: LockScreenConfig = aLockScreenConfig(),
+    lockScreenStore: LockScreenStore = InMemoryLockScreenStore(),
+    pinCodeManager: PinCodeManager = createDefaultPinCodeManager(
+        lockScreenStore = lockScreenStore,
+    ),
+    sessionObserver: SessionObserver = FakeSessionObserver(),
+    appForegroundStateService: AppForegroundStateService = FakeAppForegroundStateService(),
+    biometricAuthenticatorManager: BiometricAuthenticatorManager = FakeBiometricAuthenticatorManager(),
+) = DefaultLockScreenService(
+    lockScreenConfig = lockScreenConfig,
+    lockScreenStore = lockScreenStore,
+    pinCodeManager = pinCodeManager,
+    coroutineScope = backgroundScope,
+    sessionObserver = sessionObserver,
+    appForegroundStateService = appForegroundStateService,
+    biometricAuthenticatorManager = biometricAuthenticatorManager,
+)
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 5e35f22e05..073bdc799d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6e98abd80c..9e9b892582 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/LockScreenConfig.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/LockScreenConfig.kt
index 675102140d..23fccb6584 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/LockScreenConfig.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/LockScreenConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/PinCodeManager.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/PinCodeManager.kt
index 5f983daace..89bd760a5f 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/PinCodeManager.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/fixtures/PinCodeManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerTest.kt
index ed942c45b9..dbc9c18c90 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManagerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,19 +11,18 @@ package io.element.android.features.lockscreen.impl.pin
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 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.EncryptionDecryptionService
+import io.element.android.libraries.cryptography.api.SecretKeyRepository
 import io.element.android.libraries.cryptography.impl.AESEncryptionDecryptionService
 import io.element.android.libraries.cryptography.test.SimpleSecretKeyRepository
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class DefaultPinCodeManagerTest {
-    private val lockScreenStore = InMemoryLockScreenStore()
-    private val secretKeyRepository = SimpleSecretKeyRepository()
-    private val encryptionDecryptionService = AESEncryptionDecryptionService()
-    private val pinCodeManager = DefaultPinCodeManager(secretKeyRepository, encryptionDecryptionService, lockScreenStore)
-
     @Test
     fun `given a pin code when create and delete assert no pin code left`() = runTest {
+        val pinCodeManager = createDefaultPinCodeManager()
         pinCodeManager.hasPinCode().test {
             assertThat(awaitItem()).isFalse()
             pinCodeManager.createPinCode("1234")
@@ -34,6 +34,7 @@ class DefaultPinCodeManagerTest {
 
     @Test
     fun `given a pin code when create and verify with the same pin succeed`() = runTest {
+        val pinCodeManager = createDefaultPinCodeManager()
         val pinCode = "1234"
         pinCodeManager.createPinCode(pinCode)
         assertThat(pinCodeManager.verifyPinCode(pinCode)).isTrue()
@@ -41,7 +42,18 @@ class DefaultPinCodeManagerTest {
 
     @Test
     fun `given a pin code when create and verify with a different pin fails`() = runTest {
+        val pinCodeManager = createDefaultPinCodeManager()
         pinCodeManager.createPinCode("1234")
         assertThat(pinCodeManager.verifyPinCode("1235")).isFalse()
     }
 }
+
+fun createDefaultPinCodeManager(
+    lockScreenStore: LockScreenStore = InMemoryLockScreenStore(),
+    secretKeyRepository: SecretKeyRepository = SimpleSecretKeyRepository(),
+    encryptionDecryptionService: EncryptionDecryptionService = AESEncryptionDecryptionService(),
+) = DefaultPinCodeManager(
+    lockScreenStore = lockScreenStore,
+    secretKeyRepository = secretKeyRepository,
+    encryptionDecryptionService = encryptionDecryptionService,
+)
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryAssertions.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryAssertions.kt
index b704e24e0d..9a863a0478 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryAssertions.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryAssertions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryTest.kt
index 2c59f843bc..8c2e5ba4bc 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/model/PinEntryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a4a197b533..61acf71cdd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 45af2682e1..ef3e94f27f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7efb6619f1..3f87c1dccf 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1d1b381fef..6a1d32e879 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5fdf1342ea..f5bfb11818 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateTest.kt
index 389ebf83c7..34244b3374 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e51b007312..1ecb79bd67 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/lockscreen/test/build.gradle.kts b/features/lockscreen/test/build.gradle.kts
index 80f46e82c6..5c314dbb87 100644
--- a/features/lockscreen/test/build.gradle.kts
+++ b/features/lockscreen/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,6 +15,8 @@ android {
 }
 
 dependencies {
-    implementation(libs.coroutines.core)
     api(projects.features.lockscreen.api)
+    implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
 }
diff --git a/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenEntryPoint.kt b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenEntryPoint.kt
new file mode 100644
index 0000000000..1bfcbaf45b
--- /dev/null
+++ b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenEntryPoint.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.lockscreen.test
+
+import android.content.Context
+import android.content.Intent
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.lockscreen.api.LockScreenEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeLockScreenEntryPoint : LockScreenEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        navTarget: LockScreenEntryPoint.Target,
+        callback: LockScreenEntryPoint.Callback,
+    ): Node = lambdaError()
+
+    override fun pinUnlockIntent(context: Context): Intent = lambdaError()
+}
diff --git a/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenService.kt b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenService.kt
index 7d2fd60c16..a75b3b1614 100644
--- a/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenService.kt
+++ b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/api/build.gradle.kts b/features/login/api/build.gradle.kts
index 869e7ad25a..2a4e3ecb7c 100644
--- a/features/login/api/build.gradle.kts
+++ b/features/login/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
index b3ef99ee19..830a63b8f1 100644
--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
+++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,14 +20,14 @@ interface LoginEntryPoint : FeatureEntryPoint {
     )
 
     interface Callback : Plugin {
-        fun onReportProblem()
+        fun navigateToBugReport()
+        fun onDone()
     }
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 }
diff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginIntentResolver.kt b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginIntentResolver.kt
index 67eb284944..79cfc35fbd 100644
--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginIntentResolver.kt
+++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginIntentResolver.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginParams.kt b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginParams.kt
index 84dcac40a6..2a83a06915 100644
--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginParams.kt
+++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginParams.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/api/src/main/kotlin/io/element/android/features/login/api/accesscontrol/AccountProviderAccessControl.kt b/features/login/api/src/main/kotlin/io/element/android/features/login/api/accesscontrol/AccountProviderAccessControl.kt
index 3b182fd4df..fc804c14ff 100644
--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/accesscontrol/AccountProviderAccessControl.kt
+++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/accesscontrol/AccountProviderAccessControl.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/build.gradle.kts b/features/login/impl/build.gradle.kts
index 690fe13578..071408b2f5 100644
--- a/features/login/impl/build.gradle.kts
+++ b/features/login/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/AndroidManifest.xml b/features/login/impl/src/main/AndroidManifest.xml
index 44281caee1..453cf05132 100644
--- a/features/login/impl/src/main/AndroidManifest.xml
+++ b/features/login/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt
index 7da2bdf758..1f0fe44f35 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,36 +10,28 @@ package io.element.android.features.login.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLoginEntryPoint : LoginEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LoginEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : LoginEntryPoint.NodeBuilder {
-            override fun params(params: LoginEntryPoint.Params): LoginEntryPoint.NodeBuilder {
-                plugins += LoginFlowNode.Params(
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: LoginEntryPoint.Params,
+        callback: LoginEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<LoginFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                LoginFlowNode.Params(
                     accountProvider = params.accountProvider,
                     loginHint = params.loginHint,
-                )
-                return this
-            }
-
-            override fun callback(callback: LoginEntryPoint.Callback): LoginEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<LoginFlowNode>(buildContext, plugins)
-            }
-        }
+                ),
+                callback,
+            )
+        )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolver.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolver.kt
index 4851a9ab7c..26f0f1737e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolver.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolver.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,12 +11,10 @@ package io.element.android.features.login.impl
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.login.api.LoginIntentResolver
 import io.element.android.features.login.api.LoginParams
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLoginIntentResolver : LoginIntentResolver {
     override fun parse(uriString: String): LoginParams? {
         val uri = uriString.toUri()
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 4b83190f5d..a19bb12d86 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,6 @@ 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
@@ -41,11 +41,14 @@ import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTa
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
+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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
@@ -57,6 +60,8 @@ class LoginFlowNode(
     @Assisted plugins: List<Plugin>,
     private val accountProviderDataSource: AccountProviderDataSource,
     private val oidcActionFlow: OidcActionFlow,
+    @AppCoroutineScope
+    private val appCoroutineScope: CoroutineScope,
 ) : BaseFlowNode<LoginFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.OnBoarding,
@@ -70,6 +75,7 @@ class LoginFlowNode(
         val loginHint: String?,
     ) : NodeInputs
 
+    private val callback: LoginEntryPoint.Callback = callback()
     private var activity: Activity? = null
     private var darkTheme: Boolean = false
 
@@ -126,13 +132,13 @@ class LoginFlowNode(
         return when (navTarget) {
             NavTarget.OnBoarding -> {
                 val callback = object : OnBoardingNode.Callback {
-                    override fun onSignUp() {
+                    override fun navigateToSignUpFlow() {
                         backstack.push(
                             NavTarget.ConfirmAccountProvider(isAccountCreation = true)
                         )
                     }
 
-                    override fun onSignIn(mustChooseAccountProvider: Boolean) {
+                    override fun navigateToSignInFlow(mustChooseAccountProvider: Boolean) {
                         backstack.push(
                             if (mustChooseAccountProvider) {
                                 NavTarget.ChooseAccountProvider
@@ -142,25 +148,29 @@ class LoginFlowNode(
                         )
                     }
 
-                    override fun onSignInWithQrCode() {
+                    override fun navigateToQrCode() {
                         backstack.push(NavTarget.QrCode)
                     }
 
-                    override fun onReportProblem() {
-                        plugins<LoginEntryPoint.Callback>().forEach { it.onReportProblem() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                     }
 
-                    override fun onOidcDetails(oidcDetails: OidcDetails) {
+                    override fun navigateToOidc(oidcDetails: OidcDetails) {
                         navigateToMas(oidcDetails)
                     }
 
-                    override fun onCreateAccountContinue(url: String) {
+                    override fun navigateToCreateAccount(url: String) {
                         backstack.push(NavTarget.CreateAccount(url))
                     }
 
-                    override fun onLoginPasswordNeeded() {
+                    override fun navigateToLoginPassword() {
                         backstack.push(NavTarget.LoginPassword)
                     }
+
+                    override fun onDone() {
+                        callback.onDone()
+                    }
                 }
                 val params = inputs<Params>()
                 val inputs = OnBoardingNode.Params(
@@ -171,15 +181,15 @@ class LoginFlowNode(
             }
             NavTarget.ChooseAccountProvider -> {
                 val callback = object : ChooseAccountProviderNode.Callback {
-                    override fun onOidcDetails(oidcDetails: OidcDetails) {
+                    override fun navigateToOidc(oidcDetails: OidcDetails) {
                         navigateToMas(oidcDetails)
                     }
 
-                    override fun onCreateAccountContinue(url: String) {
+                    override fun navigateToCreateAccount(url: String) {
                         backstack.push(NavTarget.CreateAccount(url))
                     }
 
-                    override fun onLoginPasswordNeeded() {
+                    override fun navigateToLoginPassword() {
                         backstack.push(NavTarget.LoginPassword)
                     }
                 }
@@ -193,19 +203,19 @@ class LoginFlowNode(
                     isAccountCreation = navTarget.isAccountCreation,
                 )
                 val callback = object : ConfirmAccountProviderNode.Callback {
-                    override fun onOidcDetails(oidcDetails: OidcDetails) {
+                    override fun navigateToOidc(oidcDetails: OidcDetails) {
                         navigateToMas(oidcDetails)
                     }
 
-                    override fun onCreateAccountContinue(url: String) {
+                    override fun navigateToCreateAccount(url: String) {
                         backstack.push(NavTarget.CreateAccount(url))
                     }
 
-                    override fun onLoginPasswordNeeded() {
+                    override fun navigateToLoginPassword() {
                         backstack.push(NavTarget.LoginPassword)
                     }
 
-                    override fun onChangeAccountProvider() {
+                    override fun navigateToChangeAccountProvider() {
                         backstack.push(NavTarget.ChangeAccountProvider)
                     }
                 }
@@ -221,7 +231,7 @@ class LoginFlowNode(
                         backstack.singleTop(confirmAccountProvider)
                     }
 
-                    override fun onOtherClick() {
+                    override fun navigateToSearchAccountProvider() {
                         backstack.push(NavTarget.SearchAccountProvider)
                     }
                 }
@@ -267,7 +277,9 @@ class LoginFlowNode(
         DisposableEffect(Unit) {
             onDispose {
                 activity = null
-                accountProviderDataSource.reset()
+                appCoroutineScope.launch {
+                    accountProviderDataSource.reset()
+                }
             }
         }
         BackstackView()
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControl.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControl.kt
index fb739008a7..db56047e15 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControl.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControl.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.login.impl.accesscontrol
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.login.api.accesscontrol.AccountProviderAccessControl
 import io.element.android.features.login.impl.changeserver.AccountProviderAccessException
@@ -17,7 +17,6 @@ import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.wellknown.api.WellknownRetriever
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAccountProviderAccessControl(
     private val enterpriseService: EnterpriseService,
     private val wellknownRetriever: WellknownRetriever,
@@ -41,7 +40,7 @@ class DefaultAccountProviderAccessControl(
             // Ensure that Element Pro is not required for this account provider
             val wellKnown = wellknownRetriever.getElementWellKnown(
                 baseUrl = accountProviderUrl.ensureProtocol(),
-            )
+            ).dataOrNull()
             if (wellKnown?.enforceElementPro == true) {
                 throw AccountProviderAccessException.NeedElementProException(
                     unauthorisedAccountProviderTitle = title,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt
index 0fcef6bedf..7ca467da7d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,5 +14,4 @@ data class AccountProvider(
     val subtitle: String? = null,
     val isPublic: Boolean = false,
     val isMatrixOrg: Boolean = false,
-    val isValid: Boolean = false,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt
index b14dd75b10..931959d4ea 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,28 +22,34 @@ import kotlinx.coroutines.flow.asStateFlow
 class AccountProviderDataSource(
     enterpriseService: EnterpriseService,
 ) {
-    private val defaultAccountProvider =
-        (enterpriseService.defaultHomeserverList().firstOrNull { it != EnterpriseService.ANY_ACCOUNT_PROVIDER } ?: AuthenticationConfig.MATRIX_ORG_URL)
-            .let { url ->
-                AccountProvider(
-                    url = url,
-                    subtitle = null,
-                    isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
-                    isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
-                )
-            }
-
-    private val accountProvider: MutableStateFlow<AccountProvider> = MutableStateFlow(
-        defaultAccountProvider
+    private val defaultAccountProvider = createAccountProvider(
+        url = enterpriseService.defaultHomeserverList()
+            .firstOrNull { it != EnterpriseService.ANY_ACCOUNT_PROVIDER }
+            ?: AuthenticationConfig.MATRIX_ORG_URL
     )
 
+    private val accountProvider: MutableStateFlow<AccountProvider> = MutableStateFlow(defaultAccountProvider)
+
     val flow: StateFlow<AccountProvider> = accountProvider.asStateFlow()
 
-    fun reset() {
-        accountProvider.tryEmit(defaultAccountProvider)
+    suspend fun reset() {
+        accountProvider.emit(defaultAccountProvider)
     }
 
-    fun userSelection(data: AccountProvider) {
-        accountProvider.tryEmit(data)
+    suspend fun setUrl(url: String) {
+        setAccountProvider(createAccountProvider(url))
+    }
+
+    suspend fun setAccountProvider(data: AccountProvider) {
+        accountProvider.emit(data)
+    }
+
+    private fun createAccountProvider(url: String): AccountProvider {
+        return AccountProvider(
+            url = url,
+            subtitle = null,
+            isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
+            isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
+        )
     }
 }
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 92fda4cf14..fd5c7b8019 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderProvider.kt
index a5f0fd7d3b..745939233f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,7 @@ open class AccountProviderProvider : PreviewParameterProvider<AccountProvider> {
         get() = sequenceOf(
             anAccountProvider(),
             anAccountProvider().copy(subtitle = null),
-            anAccountProvider().copy(subtitle = null, title = "invalid", isValid = false),
+            anAccountProvider().copy(subtitle = null, title = "invalid"),
             anAccountProvider().copy(subtitle = null, title = "Other", isPublic = false, isMatrixOrg = false),
             // Add other state here
         )
@@ -26,11 +27,9 @@ fun anAccountProvider(
     subtitle: String? = "Matrix.org is an open network for secure, decentralized communication.",
     isPublic: Boolean = true,
     isMatrixOrg: Boolean = true,
-    isValid: Boolean = true,
 ) = AccountProvider(
     url = url,
     subtitle = subtitle,
     isPublic = isPublic,
     isMatrixOrg = isMatrixOrg,
-    isValid = isValid,
 )
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 b61f0283a7..5130bf1ad8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/AccountProviderAccessException.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/AccountProviderAccessException.kt
index 5c48f346fe..88ec3bfe8e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/AccountProviderAccessException.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/AccountProviderAccessException.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 231fe04ba0..27e6128dd0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4df9eb12d5..4a4fb3ca41 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -38,7 +39,7 @@ class ChangeServerPresenter(
             mutableStateOf(AsyncData.Uninitialized)
         }
 
-        fun handleEvents(event: ChangeServerEvents) {
+        fun handleEvent(event: ChangeServerEvents) {
             when (event) {
                 is ChangeServerEvents.ChangeServer -> localCoroutineScope.changeServer(event.accountProvider, changeServerAction)
                 ChangeServerEvents.ClearError -> changeServerAction.value = AsyncData.Uninitialized
@@ -47,7 +48,7 @@ class ChangeServerPresenter(
 
         return ChangeServerState(
             changeServerAction = changeServerAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -60,11 +61,12 @@ class ChangeServerPresenter(
                 title = data.title,
                 accountProviderUrl = data.url,
             )
-            authenticationService.setHomeserver(data.url).map {
-                authenticationService.getHomeserverDetails().value!!
-                // Valid, remember user choice
-                accountProviderDataSource.userSelection(data)
-            }.getOrThrow()
+            val details = authenticationService.setHomeserver(data.url).getOrThrow()
+            if (!details.isSupported) {
+                throw ChangeServerError.UnsupportedServer
+            }
+            // Homeserver is valid, remember user choice
+            accountProviderDataSource.setAccountProvider(data)
         }.runCatchingUpdatingState(changeServerAction, errorTransform = ChangeServerError::from)
     }
 }
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 fb5b79474e..eea3ad78cd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a97ff2dda1..1a94bb5631 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,13 +11,12 @@ 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.ui.strings.CommonStrings
 
 open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerState> {
     override val values: Sequence<ChangeServerState>
         get() = sequenceOf(
             aChangeServerState(),
-            aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.Error(CommonStrings.error_unknown))),
+            aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.Error(null))),
             aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.SlidingSyncAlert)),
             aChangeServerState(
                 changeServerAction = AsyncData.Failure(
@@ -34,6 +34,11 @@ open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerStat
                     ),
                 )
             ),
+            aChangeServerState(
+                changeServerAction = AsyncData.Failure(
+                    ChangeServerError.UnsupportedServer
+                )
+            ),
         )
 }
 
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 ae2997c157..d6b9c1709b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,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.ui.strings.CommonStrings
 
 @Composable
 fun ChangeServerView(
@@ -39,10 +41,26 @@ fun ChangeServerView(
     when (state.changeServerAction) {
         is AsyncData.Failure -> {
             when (val error = state.changeServerAction.error as? ChangeServerError) {
+                ChangeServerError.InvalidServer ->
+                    ErrorDialog(
+                        modifier = modifier,
+                        content = stringResource(R.string.screen_change_server_error_invalid_homeserver),
+                        onSubmit = {
+                            eventSink.invoke(ChangeServerEvents.ClearError)
+                        }
+                    )
+                ChangeServerError.UnsupportedServer ->
+                    ErrorDialog(
+                        modifier = modifier,
+                        content = stringResource(R.string.screen_login_error_unsupported_authentication),
+                        onSubmit = {
+                            eventSink.invoke(ChangeServerEvents.ClearError)
+                        }
+                    )
                 is ChangeServerError.Error -> {
                     ErrorDialog(
                         modifier = modifier,
-                        content = error.message(),
+                        content = error.messageStr ?: stringResource(CommonStrings.error_unknown),
                         onSubmit = {
                             eventSink.invoke(ChangeServerEvents.ClearError)
                         }
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 40bb58a96e..4523e6f45e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginBindings.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginBindings.kt
index c3c189f2c8..050dc0c8c6 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginBindings.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginBindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt
index 12400f97ec..6500820629 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginGraph.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginScope.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginScope.kt
index c4aaf4f1b3..a3538c8cd3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginScope.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/QrCodeLoginScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
index be526ccb0d..60ffd2af87 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5079e2a715..2f4af14237 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
@@ -1,30 +1,20 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.error
 
-import androidx.annotation.StringRes
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.res.stringResource
-import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.changeserver.AccountProviderAccessException
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
-import io.element.android.libraries.ui.strings.CommonStrings
 
 sealed class ChangeServerError : Exception() {
     data class Error(
-        @StringRes val messageId: Int? = null,
         val messageStr: String? = null,
-    ) : ChangeServerError() {
-        @Composable
-        @ReadOnlyComposable
-        fun message(): String = messageStr ?: stringResource(messageId ?: CommonStrings.error_unknown)
-    }
+    ) : ChangeServerError()
 
     data class NeedElementPro(
         val unauthorisedAccountProviderTitle: String,
@@ -37,11 +27,23 @@ sealed class ChangeServerError : Exception() {
     ) : ChangeServerError()
 
     data object SlidingSyncAlert : ChangeServerError()
+    data object InvalidServer : ChangeServerError()
+    data object UnsupportedServer : ChangeServerError()
 
     companion object {
         fun from(error: Throwable): ChangeServerError = when (error) {
-            is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
-            is AuthenticationException.Oidc -> Error(messageStr = error.message)
+            is ChangeServerError -> error
+            is AuthenticationException -> {
+                when (error) {
+                    is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
+                    is AuthenticationException.InvalidServerName,
+                    is AuthenticationException.ServerUnreachable -> InvalidServer
+                    // 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 AccountProviderAccessException.NeedElementProException -> NeedElementPro(
                 unauthorisedAccountProviderTitle = error.unauthorisedAccountProviderTitle,
                 applicationId = error.applicationId,
@@ -50,7 +52,7 @@ sealed class ChangeServerError : Exception() {
                 unauthorisedAccountProviderTitle = error.unauthorisedAccountProviderTitle,
                 authorisedAccountProviderTitles = error.authorisedAccountProviderTitles,
             )
-            else -> Error(messageId = R.string.screen_change_server_error_invalid_homeserver)
+            else -> Error(messageStr = error.message)
         }
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt
index 333347851a..59fb42fe0c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerErrorProvider.kt
@@ -1,21 +1,19 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.error
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.login.impl.R
 
 class ChangeServerErrorProvider : PreviewParameterProvider<ChangeServerError> {
     override val values: Sequence<ChangeServerError>
         get() = sequenceOf(
-            ChangeServerError.Error(
-                messageId = R.string.screen_change_server_error_invalid_homeserver,
-            ),
+            ChangeServerError.InvalidServer,
             ChangeServerError.Error(
                 messageStr = "An error description",
             ),
@@ -28,5 +26,6 @@ class ChangeServerErrorProvider : PreviewParameterProvider<ChangeServerError> {
                 authorisedAccountProviderTitles = listOf("provider.org", "provider.io"),
             ),
             ChangeServerError.SlidingSyncAlert,
+            ChangeServerError.UnsupportedServer,
         )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ErrorFormatter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ErrorFormatter.kt
index 16bdf9b5e6..66ca0d9752 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ErrorFormatter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ErrorFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 82ee87c372..a62919e705 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,8 +26,6 @@ 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
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 
 /**
  * This class is responsible for managing the login flow, including handling OIDC actions and
@@ -58,15 +57,13 @@ class LoginHelper(
         loginModeState.value = AsyncData.Uninitialized
     }
 
-    fun submit(
-        coroutineScope: CoroutineScope,
+    suspend fun submit(
         isAccountCreation: Boolean,
         homeserverUrl: String,
         loginHint: String?,
-    ) = coroutineScope.launch {
+    ) {
         suspend {
-            authenticationService.setHomeserver(homeserverUrl).map {
-                val matrixHomeServerDetails = authenticationService.getHomeserverDetails().value!!
+            authenticationService.setHomeserver(homeserverUrl).map { matrixHomeServerDetails ->
                 if (matrixHomeServerDetails.supportsOidcLogin) {
                     // Retrieve the details right now
                     val oidcPrompt = if (isAccountCreation) OidcPrompt.Create else OidcPrompt.Login
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
index 571b018297..08e604ef20 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c3fe5eac47..f88e34bf4a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -41,9 +42,20 @@ fun LoginModeView(
             when (val error = loginMode.error) {
                 is ChangeServerError -> {
                     when (error) {
+                        ChangeServerError.InvalidServer ->
+                            ErrorDialog(
+                                content = stringResource(R.string.screen_change_server_error_invalid_homeserver),
+                                onSubmit = onClearError,
+                            )
+                        is ChangeServerError.UnsupportedServer -> {
+                            ErrorDialog(
+                                content = stringResource(R.string.screen_login_error_unsupported_authentication),
+                                onSubmit = onClearError,
+                            )
+                        }
                         is ChangeServerError.Error -> {
                             ErrorDialog(
-                                content = error.message(),
+                                content = error.messageStr ?: stringResource(CommonStrings.error_unknown),
                                 onSubmit = onClearError,
                             )
                         }
@@ -91,7 +103,7 @@ fun LoginModeView(
                 }
                 is AuthenticationException.AccountAlreadyLoggedIn -> {
                     ErrorDialog(
-                        content = stringResource(CommonStrings.error_account_already_logged_in, error.message.orEmpty()),
+                        content = stringResource(CommonStrings.error_account_already_logged_in, error.userId),
                         onSubmit = onClearError,
                     )
                 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeViewErrorProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeViewErrorProvider.kt
index dd0a7f353c..513d0a8a04 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeViewErrorProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeViewErrorProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManager.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManager.kt
index 42bada93a0..a25d810c25 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManager.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManager.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.qrcode
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.login.impl.di.QrCodeLoginScope
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.StateFlow
 
 @SingleIn(QrCodeLoginScope::class)
 @ContributesBinding(QrCodeLoginScope::class)
-@Inject
 class DefaultQrCodeLoginManager(
     private val authenticationService: MatrixAuthenticationService,
 ) : QrCodeLoginManager {
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 22dcb9da9c..7dad95741b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -147,11 +148,11 @@ class QrCodeLoginFlowNode(
         return when (navTarget) {
             is NavTarget.Initial -> {
                 val callback = object : QrCodeIntroNode.Callback {
-                    override fun onCancelClicked() {
+                    override fun cancel() {
                         navigateUp()
                     }
 
-                    override fun onContinue() {
+                    override fun navigateToQrCodeScan() {
                         backstack.push(NavTarget.QrCodeScan)
                     }
                 }
@@ -159,11 +160,11 @@ class QrCodeLoginFlowNode(
             }
             is NavTarget.QrCodeScan -> {
                 val callback = object : QrCodeScanNode.Callback {
-                    override fun onScannedCode(qrCodeLoginData: MatrixQrCodeLoginData) {
+                    override fun handleScannedCode(qrCodeLoginData: MatrixQrCodeLoginData) {
                         lifecycleScope.startAuthentication(qrCodeLoginData)
                     }
 
-                    override fun onCancelClicked() {
+                    override fun cancel() {
                         backstack.pop()
                     }
                 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginManager.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginManager.kt
index f1ae224f56..5f75403443 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginManager.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt
index 0b4b088938..d9994deb9a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,4 @@ package io.element.android.features.login.impl.resolver
 data class HomeserverData(
     // The computed homeserver url, for which a wellknown file has been retrieved, or just a valid Url
     val homeserverUrl: String,
-    // True if a wellknown file has been found and is valid. If false, it means that the [homeserverUrl] is valid
-    val isWellknownValid: Boolean,
 )
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 5612a56d5e..1c4ef8cd09 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
@@ -1,26 +1,24 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.resolver
 
 import dev.zacsweers.metro.Inject
-import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.parallelMap
-import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.core.uri.isValidUrl
-import io.element.android.libraries.wellknown.api.WellKnown
-import io.element.android.libraries.wellknown.api.WellknownRetriever
+import io.element.android.libraries.matrix.api.auth.HomeServerLoginCompatibilityChecker
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeout
+import timber.log.Timber
 import java.util.Collections
 
 /**
@@ -29,7 +27,7 @@ import java.util.Collections
 @Inject
 class HomeserverResolver(
     private val dispatchers: CoroutineDispatchers,
-    private val wellknownRetriever: WellknownRetriever,
+    private val homeServerLoginCompatibilityChecker: HomeServerLoginCompatibilityChecker,
 ) {
     fun resolve(userInput: String): Flow<List<HomeserverData>> = flow {
         val flowContext = currentCoroutineContext()
@@ -41,36 +39,24 @@ class HomeserverResolver(
         // Run all the requests in parallel
         withContext(dispatchers.io) {
             list.parallelMap { url ->
-                val wellKnown = tryOrNull {
-                    withTimeout(5000) {
-                        wellknownRetriever.getWellKnown(url)
-                    }
-                }
-                val isValid = wellKnown?.isValid().orFalse()
+                val isValid = 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) {
-                    // Emit the list as soon as possible
-                    currentList.add(
-                        HomeserverData(
-                            homeserverUrl = url,
-                            isWellknownValid = true,
-                        )
-                    )
+                    currentList.add(HomeserverData(homeserverUrl = url))
                     withContext(flowContext) {
                         emit(currentList.toList())
                     }
                 }
             }
         }
-        // If list is empty, and the user has entered an URL, do not block the user.
-        if (currentList.isEmpty() && trimmedUserInput.isValidUrl()) {
-            emit(
-                listOf(
-                    HomeserverData(
-                        homeserverUrl = trimmedUserInput,
-                        isWellknownValid = false,
-                    )
-                )
-            )
+        // If list is empty, and candidateBase is a valid an URL, do not block the user.
+        // A unsupported homeserver / homeserver not found error will be displayed if the user continues
+        if (currentList.isEmpty() && candidateBase.isValidUrl()) {
+            emit(listOf(HomeserverData(homeserverUrl = candidateBase)))
         }
     }
 
@@ -88,7 +74,3 @@ class HomeserverResolver(
         }
     }
 }
-
-private fun WellKnown.isValid(): Boolean {
-    return homeServer?.baseURL?.isNotBlank().orFalse()
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
index a0587211c0..018a25dc89 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.callback
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -29,16 +30,10 @@ class ChangeAccountProviderNode(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onDone()
-        fun onOtherClick()
+        fun navigateToSearchAccountProvider()
     }
 
-    private fun onDone() {
-        plugins<Callback>().forEach { it.onDone() }
-    }
-
-    private fun onOtherClick() {
-        plugins<Callback>().forEach { it.onOtherClick() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -49,8 +44,8 @@ class ChangeAccountProviderNode(
             modifier = modifier,
             onBackClick = ::navigateUp,
             onLearnMoreClick = { openLearnMorePage(context) },
-            onSuccess = ::onDone,
-            onOtherProviderClick = ::onOtherClick,
+            onSuccess = callback::onDone,
+            onOtherProviderClick = callback::navigateToSearchAccountProvider,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
index 3c725106c8..41605352ef 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,7 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.changeserver.ChangeServerState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.uri.ensureProtocol
+import kotlinx.collections.immutable.toImmutableList
 
 @Inject
 class ChangeAccountProviderPresenter(
@@ -36,9 +38,9 @@ class ChangeAccountProviderPresenter(
                         subtitle = null,
                         isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
                         isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
-                        isValid = true,
                     )
                 }
+                .toImmutableList()
         }
 
         val canSearchForAccountProviders = remember {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt
index e8e1f21cd8..3068a1cb57 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,10 +10,10 @@ package io.element.android.features.login.impl.screens.changeaccountprovider
 
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.changeserver.ChangeServerState
+import kotlinx.collections.immutable.ImmutableList
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class ChangeAccountProviderState(
-    val accountProviders: List<AccountProvider>,
+    val accountProviders: ImmutableList<AccountProvider>,
     val canSearchForAccountProviders: Boolean,
     val changeServerState: ChangeServerState,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt
index 435eee7f89..5cec1961a4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ 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.changeserver.ChangeServerState
 import io.element.android.features.login.impl.changeserver.aChangeServerState
+import kotlinx.collections.immutable.toImmutableList
 
 open class ChangeAccountProviderStateProvider : PreviewParameterProvider<ChangeAccountProviderState> {
     override val values: Sequence<ChangeAccountProviderState>
@@ -29,7 +31,7 @@ fun aChangeAccountProviderState(
     canSearchForAccountProviders: Boolean = true,
     changeServerState: ChangeServerState = aChangeServerState(),
 ) = ChangeAccountProviderState(
-    accountProviders = accountProviders,
+    accountProviders = accountProviders.toImmutableList(),
     canSearchForAccountProviders = canSearchForAccountProviders,
     changeServerState = changeServerState,
 )
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 c4542dfb0d..4f6c87ac73 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt
index 76c86d18c2..f60cc3e9da 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 128d235c93..5dc6ebbd6b 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.callback
 import io.element.android.libraries.matrix.api.auth.OidcDetails
 
 @ContributesNode(AppScope::class)
@@ -29,22 +30,12 @@ class ChooseAccountProviderNode(
     private val presenter: ChooseAccountProviderPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onLoginPasswordNeeded()
-        fun onOidcDetails(oidcDetails: OidcDetails)
-        fun onCreateAccountContinue(url: String)
+        fun navigateToLoginPassword()
+        fun navigateToOidc(oidcDetails: OidcDetails)
+        fun navigateToCreateAccount(url: String)
     }
 
-    private fun onOidcDetails(oidcDetails: OidcDetails) {
-        plugins<Callback>().forEach { it.onOidcDetails(oidcDetails) }
-    }
-
-    private fun onLoginPasswordNeeded() {
-        plugins<Callback>().forEach { it.onLoginPasswordNeeded() }
-    }
-
-    private fun onCreateAccountContinue(url: String) {
-        plugins<Callback>().forEach { it.onCreateAccountContinue(url) }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -54,10 +45,10 @@ class ChooseAccountProviderNode(
             state = state,
             modifier = modifier,
             onBackClick = ::navigateUp,
-            onOidcDetails = ::onOidcDetails,
-            onNeedLoginPassword = ::onLoginPasswordNeeded,
+            onOidcDetails = callback::navigateToOidc,
+            onNeedLoginPassword = callback::navigateToLoginPassword,
             onLearnMoreClick = { openLearnMorePage(context) },
-            onCreateAccountContinue = ::onCreateAccountContinue,
+            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 d259454f18..87010a4a30 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,6 +22,8 @@ import io.element.android.features.login.impl.login.LoginHelper
 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(
@@ -36,10 +39,9 @@ class ChooseAccountProviderPresenter(
 
         fun handleEvent(event: ChooseAccountProviderEvents) {
             when (event) {
-                ChooseAccountProviderEvents.Continue -> {
+                ChooseAccountProviderEvents.Continue -> localCoroutineScope.launch {
                     selectedAccountProvider?.let {
                         loginHelper.submit(
-                            coroutineScope = localCoroutineScope,
                             isAccountCreation = false,
                             homeserverUrl = it.url,
                             loginHint = null,
@@ -66,9 +68,9 @@ class ChooseAccountProviderPresenter(
                         subtitle = null,
                         isPublic = url == AuthenticationConfig.MATRIX_ORG_URL,
                         isMatrixOrg = url == AuthenticationConfig.MATRIX_ORG_URL,
-                        isValid = true,
                     )
                 }
+                .toImmutableList()
         }
 
         return ChooseAccountProviderState(
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 3591334047..e34fbccb41 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,10 +11,10 @@ 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.libraries.architecture.AsyncData
+import kotlinx.collections.immutable.ImmutableList
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class ChooseAccountProviderState(
-    val accountProviders: List<AccountProvider>,
+    val accountProviders: ImmutableList<AccountProvider>,
     val selectedAccountProvider: AccountProvider?,
     val loginMode: AsyncData<LoginMode>,
     val eventSink: (ChooseAccountProviderEvents) -> Unit,
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 b921fee330..93bd665011 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ 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.libraries.architecture.AsyncData
+import kotlinx.collections.immutable.toImmutableList
 
 open class ChooseAccountProviderStateProvider : PreviewParameterProvider<ChooseAccountProviderState> {
     private val server1 = anAccountProvider(
@@ -70,7 +72,7 @@ fun aChooseAccountProviderState(
     loginMode: AsyncData<LoginMode> = AsyncData.Uninitialized,
     eventSink: (ChooseAccountProviderEvents) -> Unit = {},
 ) = ChooseAccountProviderState(
-    accountProviders = accountProviders,
+    accountProviders = accountProviders.toImmutableList(),
     selectedAccountProvider = selectedAccountProvider,
     loginMode = loginMode,
     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 760e39ce85..cdb80304a7 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
index 8fe5a6c814..d66606b22c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0d50d21a18..e3643afbf2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,13 +14,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.OidcDetails
 
@@ -42,27 +43,13 @@ class ConfirmAccountProviderNode(
     )
 
     interface Callback : Plugin {
-        fun onLoginPasswordNeeded()
-        fun onOidcDetails(oidcDetails: OidcDetails)
-        fun onCreateAccountContinue(url: String)
-        fun onChangeAccountProvider()
+        fun navigateToLoginPassword()
+        fun navigateToOidc(oidcDetails: OidcDetails)
+        fun navigateToCreateAccount(url: String)
+        fun navigateToChangeAccountProvider()
     }
 
-    private fun onOidcDetails(data: OidcDetails) {
-        plugins<Callback>().forEach { it.onOidcDetails(data) }
-    }
-
-    private fun onLoginPasswordNeeded() {
-        plugins<Callback>().forEach { it.onLoginPasswordNeeded() }
-    }
-
-    private fun onCreateAccountContinue(url: String) {
-        plugins<Callback>().forEach { it.onCreateAccountContinue(url) }
-    }
-
-    private fun onChangeAccountProvider() {
-        plugins<Callback>().forEach { it.onChangeAccountProvider() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -71,10 +58,10 @@ class ConfirmAccountProviderNode(
         ConfirmAccountProviderView(
             state = state,
             modifier = modifier,
-            onOidcDetails = ::onOidcDetails,
-            onNeedLoginPassword = ::onLoginPasswordNeeded,
-            onCreateAccountContinue = ::onCreateAccountContinue,
-            onChange = ::onChangeAccountProvider,
+            onOidcDetails = callback::navigateToOidc,
+            onNeedLoginPassword = callback::navigateToLoginPassword,
+            onCreateAccountContinue = callback::navigateToCreateAccount,
+            onChange = callback::navigateToChangeAccountProvider,
             onLearnMoreClick = { openLearnMorePage(context) },
         )
     }
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 d485755afb..c38da7b11c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,7 @@ 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.libraries.architecture.Presenter
+import kotlinx.coroutines.launch
 
 @AssistedInject
 class ConfirmAccountProviderPresenter(
@@ -40,11 +42,10 @@ class ConfirmAccountProviderPresenter(
 
         val loginMode by loginHelper.collectLoginMode()
 
-        fun handleEvents(event: ConfirmAccountProviderEvents) {
+        fun handleEvent(event: ConfirmAccountProviderEvents) {
             when (event) {
-                ConfirmAccountProviderEvents.Continue -> {
+                ConfirmAccountProviderEvents.Continue -> localCoroutineScope.launch {
                     loginHelper.submit(
-                        coroutineScope = localCoroutineScope,
                         isAccountCreation = params.isAccountCreation,
                         homeserverUrl = accountProvider.url,
                         loginHint = null,
@@ -58,7 +59,7 @@ class ConfirmAccountProviderPresenter(
             accountProvider = accountProvider,
             isAccountCreation = params.isAccountCreation,
             loginMode = loginMode,
-            eventSink = ::handleEvents
+            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 d0da9ab85e..b29b610b3e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.login.LoginMode
 import io.element.android.libraries.architecture.AsyncData
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class ConfirmAccountProviderState(
     val accountProvider: AccountProvider,
     val isAccountCreation: Boolean,
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 90d34571e9..f3a48a86b4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8ecfbb5628..a175ab556d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt
index 019a0d4e1f..f91eea25ce 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/AccountCreationNotSupported.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt
index e16c6d8f9a..a51557347e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt
index 44e4bde551..e1972e5a0f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
index a3aec0eb81..bf7af111f4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,24 +19,18 @@ import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeout
-import kotlin.time.Duration.Companion.seconds
 
 @AssistedInject
 class CreateAccountPresenter(
     @Assisted private val url: String,
     private val authenticationService: MatrixAuthenticationService,
-    private val clientProvider: MatrixClientProvider,
     private val messageParser: MessageParser,
     private val buildMeta: BuildMeta,
 ) : Presenter<CreateAccountState> {
@@ -50,7 +45,7 @@ class CreateAccountPresenter(
         val pageProgress: MutableState<Int> = remember { mutableIntStateOf(0) }
         val createAction: MutableState<AsyncAction<SessionId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        fun handleEvents(event: CreateAccountEvents) {
+        fun handleEvent(event: CreateAccountEvents) {
             when (event) {
                 is CreateAccountEvents.SetPageProgress -> {
                     pageProgress.value = event.progress
@@ -68,7 +63,7 @@ class CreateAccountPresenter(
             pageProgress = pageProgress.value,
             isDebugBuild = buildMeta.isDebuggable,
             createAction = createAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -79,12 +74,6 @@ class CreateAccountPresenter(
         }.flatMap { externalSession ->
             authenticationService.importCreatedSession(externalSession)
         }.onSuccess { sessionId ->
-            tryOrNull {
-                // Wait until the session is verified
-                val client = clientProvider.getOrRestore(sessionId).getOrThrow()
-                val sessionVerificationService = client.sessionVerificationService
-                withTimeout(10.seconds) { sessionVerificationService.sessionVerifiedStatus.first { it.isVerified() } }
-            }
             loggedInState.value = AsyncAction.Success(sessionId)
         }.onFailure { failure ->
             loggedInState.value = AsyncAction.Failure(failure)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt
index 13ffd11ed5..de7efe573e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt
index e2e7ac3251..976ceae70d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt
index 2ad96edf75..051188627a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt
index 8450aef1d3..d7954373bc 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MessageParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,10 +10,9 @@ package io.element.android.features.login.impl.screens.createaccount
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
+import io.element.android.libraries.androidutils.json.JsonProvider
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
-import kotlinx.serialization.json.Json
 
 interface MessageParser {
     /**
@@ -23,13 +23,12 @@ interface MessageParser {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMessageParser(
     private val accountProviderDataSource: AccountProviderDataSource,
+    private val json: JsonProvider,
 ) : MessageParser {
     override fun parse(message: String): ExternalSession {
-        val parser = Json { ignoreUnknownKeys = true }
-        val response = parser.decodeFromString(MobileRegistrationResponse.serializer(), message)
+        val response = json().decodeFromString(MobileRegistrationResponse.serializer(), message)
         val userId = response.userId ?: error("No user ID in response")
         val homeServer = response.homeServer ?: accountProviderDataSource.flow.value.url
         val accessToken = response.accessToken ?: error("No access token in response")
@@ -40,7 +39,6 @@ class DefaultMessageParser(
             accessToken = accessToken,
             deviceId = deviceId,
             refreshToken = null,
-            slidingSyncProxy = null
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt
index 96f07585d6..5e78b1bd37 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/MobileRegistrationResponse.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
index 02e872090e..20d503522b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/createaccount/WebViewMessageInterceptor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
index e5fb57347e..25a003b531 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ce3d2a84fa..c6ce16141d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 80a5711d52..b1ddc6e5b8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -41,7 +42,7 @@ class LoginPasswordPresenter(
         }
         val accountProvider by accountProviderDataSource.flow.collectAsState()
 
-        fun handleEvents(event: LoginPasswordEvents) {
+        fun handleEvent(event: LoginPasswordEvents) {
             when (event) {
                 is LoginPasswordEvents.SetLogin -> updateFormState(formState) {
                     copy(login = event.login)
@@ -60,7 +61,7 @@ class LoginPasswordPresenter(
             accountProvider = accountProvider,
             formState = formState.value,
             loginAction = loginAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt
index 18bac19633..d8adc7351f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt
index af6c07146e..2183790365 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5cb0c23d9c..d3641ea749 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt
index 5e0cc054fc..6101b21ded 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt
index 73ac06bbe2..a1a0266f34 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingLogoResIdProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 
 fun interface OnBoardingLogoResIdProvider {
@@ -19,7 +19,6 @@ fun interface OnBoardingLogoResIdProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOnBoardingLogoResIdProvider(
     @ApplicationContext private val context: Context,
 ) : OnBoardingLogoResIdProvider {
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 3652a3df8d..1ded677c13 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,13 +14,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.OidcDetails
 
@@ -34,13 +35,14 @@ class OnBoardingNode(
     plugins = plugins
 ) {
     interface Callback : Plugin {
-        fun onSignUp()
-        fun onSignIn(mustChooseAccountProvider: Boolean)
-        fun onSignInWithQrCode()
-        fun onReportProblem()
-        fun onLoginPasswordNeeded()
-        fun onOidcDetails(oidcDetails: OidcDetails)
-        fun onCreateAccountContinue(url: String)
+        fun navigateToSignUpFlow()
+        fun navigateToSignInFlow(mustChooseAccountProvider: Boolean)
+        fun navigateToQrCode()
+        fun navigateToBugReport()
+        fun navigateToLoginPassword()
+        fun navigateToOidc(oidcDetails: OidcDetails)
+        fun navigateToCreateAccount(url: String)
+        fun onDone()
     }
 
     data class Params(
@@ -48,40 +50,13 @@ class OnBoardingNode(
         val loginHint: String?,
     ) : NodeInputs
 
+    private val callback: Callback = callback()
     private val params = inputs<Params>()
 
     private val presenter = presenterFactory.create(
         params = params,
     )
 
-    private fun onSignIn(mustChooseAccountProvider: Boolean) {
-        plugins<Callback>().forEach { it.onSignIn(mustChooseAccountProvider) }
-    }
-
-    private fun onSignUp() {
-        plugins<Callback>().forEach { it.onSignUp() }
-    }
-
-    private fun onSignInWithQrCode() {
-        plugins<Callback>().forEach { it.onSignInWithQrCode() }
-    }
-
-    private fun onReportProblem() {
-        plugins<Callback>().forEach { it.onReportProblem() }
-    }
-
-    private fun onOidcDetails(data: OidcDetails) {
-        plugins<Callback>().forEach { it.onOidcDetails(data) }
-    }
-
-    private fun onLoginPasswordNeeded() {
-        plugins<Callback>().forEach { it.onLoginPasswordNeeded() }
-    }
-
-    private fun onCreateAccountContinue(url: String) {
-        plugins<Callback>().forEach { it.onCreateAccountContinue(url) }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
@@ -89,15 +64,15 @@ class OnBoardingNode(
         OnBoardingView(
             state = state,
             modifier = modifier,
-            onSignIn = ::onSignIn,
-            onCreateAccount = ::onSignUp,
-            onSignInWithQrCode = ::onSignInWithQrCode,
-            onReportProblem = ::onReportProblem,
-            onOidcDetails = ::onOidcDetails,
-            onNeedLoginPassword = ::onLoginPasswordNeeded,
+            onSignIn = callback::navigateToSignInFlow,
+            onCreateAccount = callback::navigateToSignUpFlow,
+            onSignInWithQrCode = callback::navigateToQrCode,
+            onReportProblem = callback::navigateToBugReport,
+            onOidcDetails = callback::navigateToOidc,
+            onNeedLoginPassword = callback::navigateToLoginPassword,
             onLearnMoreClick = { openLearnMorePage(context) },
-            onCreateAccountContinue = ::onCreateAccountContinue,
-            onBackClick = ::navigateUp,
+            onCreateAccountContinue = callback::navigateToCreateAccount,
+            onBackClick = callback::onDone,
         )
     }
 }
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 e7e20aa70d..4d83c45a44 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,12 +24,14 @@ import io.element.android.appconfig.OnBoardingConfig
 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.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.ui.utils.MultipleTapToUnlock
+import kotlinx.coroutines.launch
 
 @AssistedInject
 class OnBoardingPresenter(
@@ -40,6 +43,7 @@ class OnBoardingPresenter(
     private val loginHelper: LoginHelper,
     private val onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider,
     private val sessionStore: SessionStore,
+    private val accountProviderDataSource: AccountProviderDataSource,
 ) : Presenter<OnBoardingState> {
     @AssistedFactory
     interface Factory {
@@ -90,19 +94,22 @@ class OnBoardingPresenter(
         }
         val isAddingAccount by produceState(initialValue = false) {
             // We are adding an account if there is at least one session already stored
-            value = sessionStore.getAllSessions().isNotEmpty()
+            value = sessionStore.numberOfSessions() > 0
         }
 
         val loginMode by loginHelper.collectLoginMode()
 
         fun handleEvent(event: OnBoardingEvents) {
             when (event) {
-                is OnBoardingEvents.OnSignIn -> loginHelper.submit(
-                    coroutineScope = localCoroutineScope,
-                    isAccountCreation = false,
-                    homeserverUrl = event.defaultAccountProvider,
-                    loginHint = params.loginHint?.takeIf { forcedAccountProvider == null },
-                )
+                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 },
+                    )
+                }
                 OnBoardingEvents.ClearError -> loginHelper.clearError()
                 OnBoardingEvents.OnVersionClick -> {
                     if (canReportBug) {
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 ae5bb79eb5..db6c3573f9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2eb9bfb301..d7db27ca0b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fbc4dc6d09..977c6de71c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt
index 8b8d5b2dd5..b3b5ee8031 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.login.impl.di.QrCodeLoginScope
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 
 @ContributesNode(QrCodeLoginScope::class)
@@ -29,17 +30,14 @@ class QrCodeConfirmationNode(
         fun onCancel()
     }
 
+    private val callback: Callback = callback()
     private val step = inputs<QrCodeConfirmationStep>()
 
-    private fun onCancel() {
-        plugins<Callback>().forEach { it.onCancel() }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         QrCodeConfirmationView(
             step = step,
-            onCancel = ::onCancel,
+            onCancel = callback::onCancel,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt
index c285a5631e..6aacebe6b4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStep.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt
index ea0e180284..17864f68a1 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationStepProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt
index 99bb11662e..8de93bcb0f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt
index 7b46c2e45c..4dc1e48e51 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.login.impl.di.QrCodeLoginScope
 import io.element.android.features.login.impl.qrcode.QrCodeErrorScreenType
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.core.meta.BuildMeta
 
@@ -32,10 +33,7 @@ class QrCodeErrorNode(
         fun onRetry()
     }
 
-    private fun onRetry() {
-        plugins<Callback>().forEach { it.onRetry() }
-    }
-
+    private val callback: Callback = callback()
     private val qrCodeErrorScreenType = inputs<QrCodeErrorScreenType>()
 
     @Composable
@@ -44,7 +42,7 @@ class QrCodeErrorNode(
             modifier = modifier,
             errorScreenType = qrCodeErrorScreenType,
             appName = buildMeta.productionApplicationName,
-            onRetry = ::onRetry,
+            onRetry = callback::onRetry,
         )
     }
 }
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 6f3731bd75..d2ec6ce192 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt
index f567569d80..11abd63683 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
index c86dc6096a..5ff5f09d53 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.login.impl.di.QrCodeLoginScope
+import io.element.android.libraries.architecture.callback
 
 @ContributesNode(QrCodeLoginScope::class)
 @AssistedInject
@@ -26,25 +27,19 @@ class QrCodeIntroNode(
     private val presenter: QrCodeIntroPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onCancelClicked()
-        fun onContinue()
+        fun cancel()
+        fun navigateToQrCodeScan()
     }
 
-    private fun onCancelClicked() {
-        plugins<Callback>().forEach { it.onCancelClicked() }
-    }
-
-    private fun onContinue() {
-        plugins<Callback>().forEach { it.onContinue() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         QrCodeIntroView(
             state = state,
-            onBackClick = ::onCancelClicked,
-            onContinue = ::onContinue,
+            onBackClick = callback::cancel,
+            onContinue = callback::navigateToQrCodeScan,
             modifier = modifier
         )
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
index b90e2a6aeb..13888fe23f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 
 @Inject
@@ -39,13 +40,13 @@ class QrCodeIntroPresenter(
             }
         }
 
-        fun handleEvents(event: QrCodeIntroEvents) {
+        fun handleEvent(event: QrCodeIntroEvents) {
             when (event) {
                 QrCodeIntroEvents.Continue -> if (cameraPermissionState.permissionGranted) {
                     canContinue = true
                 } else {
                     pendingPermissionRequest = true
-                    cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
+                    cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
                 }
             }
         }
@@ -55,7 +56,7 @@ class QrCodeIntroPresenter(
             desktopAppName = buildMeta.desktopApplicationName,
             cameraPermissionState = cameraPermissionState,
             canContinue = canContinue,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
index e2f878603f..d20a3f58d9 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
index fa3faa50a0..22c7fd67f6 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
index 3125c0fcca..767dc49999 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt
index 574604903e..f5804aceb0 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
index f6b52522b5..987221eb94 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.login.impl.di.QrCodeLoginScope
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 
 @ContributesNode(QrCodeLoginScope::class)
@@ -27,25 +28,19 @@ class QrCodeScanNode(
     private val presenter: QrCodeScanPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onScannedCode(qrCodeLoginData: MatrixQrCodeLoginData)
-        fun onCancelClicked()
+        fun handleScannedCode(qrCodeLoginData: MatrixQrCodeLoginData)
+        fun cancel()
     }
 
-    private fun onQrCodeDataReady(qrCodeLoginData: MatrixQrCodeLoginData) {
-        plugins<Callback>().forEach { it.onScannedCode(qrCodeLoginData) }
-    }
-
-    private fun onCancelClicked() {
-        plugins<Callback>().forEach { it.onCancelClicked() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         QrCodeScanView(
             state = state,
-            onQrCodeDataReady = ::onQrCodeDataReady,
-            onBackClick = ::onCancelClicked,
+            onQrCodeDataReady = callback::handleScannedCode,
+            onBackClick = callback::cancel,
             modifier = modifier
         )
     }
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 ed612f2ac3..2f93d5b214 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -53,7 +54,7 @@ class QrCodeScanPresenter(
             authenticationAction.value = AsyncAction.Failure(it)
         }
 
-        fun handleEvents(event: QrCodeScanEvents) {
+        fun handleEvent(event: QrCodeScanEvents) {
             when (event) {
                 QrCodeScanEvents.TryAgain -> {
                     isScanning = true
@@ -69,7 +70,7 @@ class QrCodeScanPresenter(
         return QrCodeScanState(
             isScanning = isScanning,
             authenticationAction = authenticationAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt
index fb72767a3d..0e64bfc6a6 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt
index dd0c09344e..0d467efb71 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt
index c4892e9c3e..6fa3d1b0c7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -105,7 +106,7 @@ private fun Content(
             QrCodeCameraView(
                 modifier = Modifier.fillMaxSize(),
                 onScanQrCode = { state.eventSink.invoke(QrCodeScanEvents.QrCodeScanned(it)) },
-                renderPreview = state.isScanning,
+                isScanning = state.isScanning,
             )
         }
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt
index 4fafe494bb..8816de3946 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
index dc6084032e..ddbcc4c847 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.callback
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -31,9 +32,7 @@ class SearchAccountProviderNode(
         fun onDone()
     }
 
-    private fun onDone() {
-        plugins<Callback>().forEach { it.onDone() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -44,7 +43,7 @@ class SearchAccountProviderNode(
             modifier = modifier,
             onBackClick = ::navigateUp,
             onLearnMoreClick = { openLearnMorePage(context) },
-            onSuccess = ::onDone,
+            onSuccess = callback::onDone,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt
index 0aa06ca632..2efe4501c6 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -45,7 +46,7 @@ class SearchAccountProviderPresenter(
             onUserInput(userInput, data)
         }
 
-        fun handleEvents(event: SearchAccountProviderEvents) {
+        fun handleEvent(event: SearchAccountProviderEvents) {
             when (event) {
                 is SearchAccountProviderEvents.UserInput -> {
                     userInput = event.input
@@ -57,14 +58,14 @@ class SearchAccountProviderPresenter(
             userInput = userInput,
             userInputResult = data.value,
             changeServerState = changeServerState,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
     private fun CoroutineScope.onUserInput(userInput: String, data: MutableState<AsyncData<List<HomeserverData>>>) = launch {
         data.value = AsyncData.Uninitialized
         // Debounce
-        delay(300)
+        delay(500)
         data.value = AsyncData.Loading()
         homeserverResolver.resolve(userInput).collect {
             data.value = AsyncData.Success(it)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt
index 4fb0a08141..dc02a997a6 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import io.element.android.features.login.impl.changeserver.ChangeServerState
 import io.element.android.features.login.impl.resolver.HomeserverData
 import io.element.android.libraries.architecture.AsyncData
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class SearchAccountProviderState(
     val userInput: String,
     val userInputResult: AsyncData<List<HomeserverData>>,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
index fb0e0f5c5a..2a8512c38a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,18 +35,14 @@ fun aSearchAccountProviderState(
 
 fun aHomeserverDataList(): List<HomeserverData> {
     return listOf(
-        aHomeserverData(isWellknownValid = true),
-        aHomeserverData(homeserverUrl = "https://no.sliding.sync", isWellknownValid = true),
-        aHomeserverData(homeserverUrl = "https://invalid", isWellknownValid = false),
+        aHomeserverData(homeserverUrl = AuthenticationConfig.MATRIX_ORG_URL),
+        aHomeserverData(homeserverUrl = "https://no.sliding.sync"),
+        aHomeserverData(homeserverUrl = "https://invalid"),
     )
 }
 
 fun aHomeserverData(
     homeserverUrl: String = AuthenticationConfig.MATRIX_ORG_URL,
-    isWellknownValid: Boolean = true,
 ): HomeserverData {
-    return HomeserverData(
-        homeserverUrl = homeserverUrl,
-        isWellknownValid = isWellknownValid,
-    )
+    return HomeserverData(homeserverUrl = homeserverUrl)
 }
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 13bfd9e38e..55c2c28f5b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -192,7 +193,6 @@ private fun HomeserverData.toAccountProvider(): AccountProvider {
         // There is no need to know for other servers right now
         isPublic = isMatrixOrg,
         isMatrixOrg = isMatrixOrg,
-        isValid = isWellknownValid,
     )
 }
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt
index 36ee64c600..06fbf12f4d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/util/Util.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
index f72af823f2..df08cf468b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/web/WebClientUrlForAuthenticationRetriever.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.login.impl.web
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AuthenticationConfig
 import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
 import io.element.android.libraries.wellknown.api.WellknownRetriever
@@ -21,7 +21,6 @@ interface WebClientUrlForAuthenticationRetriever {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultWebClientUrlForAuthenticationRetriever(
     private val wellknownRetriever: WellknownRetriever,
 ) : WebClientUrlForAuthenticationRetriever {
@@ -30,7 +29,7 @@ class DefaultWebClientUrlForAuthenticationRetriever(
             Timber.w("Temporary account creation flow is only supported on matrix.org")
             throw AccountCreationNotSupported()
         }
-        val wellknown = wellknownRetriever.getElementWellKnown(homeServerUrl)
+        val wellknown = wellknownRetriever.getElementWellKnown(homeServerUrl).dataOrNull()
             ?: throw AccountCreationNotSupported()
         val registrationHelperUrl = wellknown.registrationHelperUrl
         return if (registrationHelperUrl != null) {
diff --git a/features/login/impl/src/main/res/raw/keep.xml b/features/login/impl/src/main/res/raw/keep.xml
index 478b6d4016..b013056445 100644
--- a/features/login/impl/src/main/res/raw/keep.xml
+++ b/features/login/impl/src/main/res/raw/keep.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2025 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <!--
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 3e3e6add37..0a1a99383d 100644
--- a/features/login/impl/src/main/res/values-et/translations.xml
+++ b/features/login/impl/src/main/res/values-et/translations.xml
@@ -60,6 +60,8 @@
   <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>
   <string name="screen_qr_code_login_error_declined_title">"Sisselogimisest on keeldutud"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Sa ei pea enam midagi muud tegema."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Sinu muu seade on juba sisse logitud"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Sisselogimine aegus. Palun proovi uuesti."</string>
   <string name="screen_qr_code_login_error_expired_title">"Sisselogimine jäi etteantud aja jooksul tegemata"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Sinu teine seade ei toeta %s sisselogimist QR-koodiga.
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 eab8d6ca36..ef7062a88a 100644
--- a/features/login/impl/src/main/res/values-fa/translations.xml
+++ b/features/login/impl/src/main/res/values-fa/translations.xml
@@ -13,6 +13,7 @@
   <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">"پلی گپگل"</string>
   <string name="screen_change_server_error_invalid_homeserver">"ما نتوانستیم به این کارساز خانگی برسیم. لطفاً بررسی کنید که URL کارساز اصلی را به درستی وارد کرده اید. اگر URL صحیح است، برای کمک بیشتر با مدیر کارساز خانگی خود تماس بگیرید."</string>
   <string name="screen_change_server_form_header">"نشانی کارساز خانگی"</string>
   <string name="screen_change_server_form_notice">"ورود نشانی دامنه."</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 946fec802e..3410e56ece 100644
--- a/features/login/impl/src/main/res/values-fr/translations.xml
+++ b/features/login/impl/src/main/res/values-fr/translations.xml
@@ -48,7 +48,7 @@
   <string name="screen_qr_code_login_connecting_subtitle">"Établissement d’une connexion sécurisée"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Aucune connexion sécurisée n’a pu être établie avec la nouvelle session. Vos sessions existantes sont toujours en sécurité et vous n’avez pas à vous en soucier."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Et maintenant ?"</string>
-  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Essayez de vous connecter à nouveau à l’aide du code QR au cas où il s’agirait d’un problème réseau"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Essayez de vous connecter à nouveau à l’aide du QR code au cas où il s’agirait d’un problème réseau"</string>
   <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>
@@ -62,8 +62,8 @@
   <string name="screen_qr_code_login_error_declined_title">"Connexion refusée"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Connexion expirée. Veuillez essayer à nouveau."</string>
   <string name="screen_qr_code_login_error_expired_title">"La connexion a pris trop de temps."</string>
-  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Votre autre appareil ne supporte pas la connexion à %s avec un code QR. Essayer de vous connecter manuellement, ou scanner le code QR avec un autre appareil."</string>
-  <string name="screen_qr_code_login_error_linking_not_suported_title">"Code QR non supporté"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Votre autre appareil ne supporte pas la connexion à %s avec un QR code. Essayer de vous connecter manuellement, ou scanner le QR code avec un autre appareil."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR code non supporté"</string>
   <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Votre fournisseur de compte ne supporte pas %1$s."</string>
   <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s n’est pas supporté"</string>
   <string name="screen_qr_code_login_initial_state_button_title">"Prêt à scanner"</string>
@@ -71,7 +71,7 @@
   <string name="screen_qr_code_login_initial_state_item_2">"Cliquez sur votre image de profil"</string>
   <string name="screen_qr_code_login_initial_state_item_3">"Choisissez %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_3_action">"“Associer une nouvelle session”"</string>
-  <string name="screen_qr_code_login_initial_state_item_4">"Scanner le code QR avec cet appareil"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Scanner le QR code avec cet appareil"</string>
   <string name="screen_qr_code_login_initial_state_subtitle">"Disponible uniquement si votre fournisseur de compte le supporte."</string>
   <string name="screen_qr_code_login_initial_state_title">"Ouvrez %1$s sur un autre appareil pour obtenir le QR code"</string>
   <string name="screen_qr_code_login_invalid_scan_state_description">"Scannez le QR code affiché sur l’autre appareil."</string>
@@ -79,7 +79,7 @@
   <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QR code erroné"</string>
   <string name="screen_qr_code_login_no_camera_permission_button">"Accéder aux paramètres de l’appareil photo"</string>
   <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_no_camera_permission_state_title">"Autoriser l’usage de la caméra pour scanner le QR code"</string>
   <string name="screen_qr_code_login_scanning_state_title">"Scannez le QR code"</string>
   <string name="screen_qr_code_login_start_over_button">"Recommencer"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Une erreur inattendue s’est produite. Veuillez réessayer."</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
new file mode 100644
index 0000000000..ced196f87e
--- /dev/null
+++ b/features/login/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_account_provider_change">"Promijeni davatelja usluga računa"</string>
+  <string name="screen_account_provider_form_hint">"Adresa matičnog poslužitelja"</string>
+  <string name="screen_account_provider_form_notice">"Unesite pojam za pretraživanje ili adresu domene."</string>
+  <string name="screen_account_provider_form_subtitle">"Potražite tvrtku, zajednicu ili privatni poslužitelj."</string>
+  <string name="screen_account_provider_form_title">"Pronađite davatelja usluga računa"</string>
+  <string name="screen_account_provider_signin_subtitle">"Ovdje će se čuvati vaši razgovori – baš kao što biste koristili davatelja usluga e-pošte za čuvanje svojih e-poruka."</string>
+  <string name="screen_account_provider_signin_title">"Prijavit ćete se na %s"</string>
+  <string name="screen_account_provider_signup_subtitle">"Ovdje će se čuvati vaši razgovori – baš kao što biste koristili davatelja usluga e-pošte za čuvanje svojih e-poruka."</string>
+  <string name="screen_account_provider_signup_title">"Izradit ćete račun na %s"</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org velik je, besplatni poslužitelj na javnoj Matrixovoj mreži koji pruža sigurnu, decentraliziranu komunikaciju, a kojim upravlja zaklada Matrix.org."</string>
+  <string name="screen_change_account_provider_other">"Ostalo"</string>
+  <string name="screen_change_account_provider_subtitle">"Koristite drugog davatelja računa, kao što je vlastiti privatni poslužitelj ili poslovni račun."</string>
+  <string name="screen_change_account_provider_title">"Promijeni davatelja usluga računa"</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">"Potrebna je aplikacija Element Pro na %1$s. Molimo vas da je preuzmete iz trgovine."</string>
+  <string name="screen_change_server_error_element_pro_required_title">"Potreban je Element Pro"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"Nismo mogli pristupiti ovom matičnom poslužitelju. Provjerite jeste li ispravno unijeli URL matičnog poslužitelja. Ako je URL ispravan, obratite se administratoru matičnog poslužitelja za daljnju pomoć."</string>
+  <string name="screen_change_server_error_invalid_well_known">"Poslužitelj nije dostupan zbog problema u .well-known datoteci:
+%1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Odabrani davatelj usluga računa ne podržava sliding sync. Za korištenje je potrebna nadogradnja poslužitelja %1$ssliding sync."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%1$s nije dopušteno povezivanje s %2$s."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"Ova je aplikacija konfigurirana tako da dopušta: %1$s."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"Davatelj usluga računa %1$s nije dopušten."</string>
+  <string name="screen_change_server_form_header">"URL matičnog poslužitelja"</string>
+  <string name="screen_change_server_form_notice">"Unesite adresu domene."</string>
+  <string name="screen_change_server_subtitle">"Koja je adresa vašeg poslužitelja?"</string>
+  <string name="screen_change_server_title">"Odaberite svoj poslužitelj"</string>
+  <string name="screen_create_account_title">"Izradi račun"</string>
+  <string name="screen_login_error_deactivated_account">"Ovaj je račun deaktiviran."</string>
+  <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_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_onboarding_app_version">"Inačica %1$s"</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_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>
+  <string name="screen_qr_code_login_connecting_subtitle">"Uspostavljanje sigurne veze"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Nije moguće uspostaviti sigurnu vezu s novim uređajem. Vaši postojeći uređaji i dalje su sigurni i ne morate se brinuti zbog njih."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Što sad?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Pokušajte se ponovno prijaviti pomoću QR koda u slučaju da se radilo o problemu s mrežom"</string>
+  <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_device_not_signed_in_scan_state_description">"Prijavite se na drugi uređaj i pokušajte ponovno ili upotrijebite drugi uređaj na kojem ste već prijavljeni."</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_subtitle">"Niste prijavljeni na drugom uređaju"</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>
+  <string name="screen_qr_code_login_error_declined_title">"Prijava je odbijena"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Ne morate ništa drugo napraviti."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Vaš drugi uređaj već je prijavljen"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Prijava je istekla. Pokušajte ponovno."</string>
+  <string name="screen_qr_code_login_error_expired_title">"Prijava nije dovršena na vrijeme"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Vaš drugi uređaj ne podržava prijavu na %s pomoću QR koda.
+
+Pokušajte se prijaviti ručno ili skenirajte QR kod drugim uređajem."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QR kod nije podržan"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Vaš davatelj usluga računa ne podržava %1$s ."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s nije podržan"</string>
+  <string name="screen_qr_code_login_initial_state_button_title">"Spremno za skeniranje"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Otvorite %1$s na stolnom uređaju"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Kliknite na svoj avatar"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Odaberite %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“Poveži novi uređaj”"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Skenirajte QR kod ovim uređajem"</string>
+  <string name="screen_qr_code_login_initial_state_subtitle">"Dostupno samo ako vaš davatelj usluge računa to podržava."</string>
+  <string name="screen_qr_code_login_initial_state_title">"Otvorite %1$s na drugom uređaju kako biste dobili QR kod"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Upotrijebite QR kod prikazan na drugom uređaju."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Pokušajte ponovno"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Pogrešan QR kod"</string>
+  <string name="screen_qr_code_login_no_camera_permission_button">"Idi na postavke kamere"</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_scanning_state_title">"Skeniraj QR kod"</string>
+  <string name="screen_qr_code_login_start_over_button">"Kreni ispočetka"</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>
+  <string name="screen_qr_code_login_verify_code_subtitle">"Davatelj usluge računa može zatražiti sljedeći kod za potvrdu prijave."</string>
+  <string name="screen_qr_code_login_verify_code_title">"Vaš verifikacijski kod"</string>
+  <string name="screen_server_confirmation_change_server">"Promijeni davatelja usluga računa"</string>
+  <string name="screen_server_confirmation_message_login_element_dot_io">"Privatni poslužitelj za zaposlenike aplikacije Element."</string>
+  <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix je otvorena mreža za sigurnu, decentraliziranu komunikaciju."</string>
+  <string name="screen_server_confirmation_message_register">"Ovdje će se čuvati vaši razgovori – baš kao što biste koristili davatelja usluga e-pošte za čuvanje svojih e-poruka."</string>
+  <string name="screen_server_confirmation_title_login">"Prijavit ćete se na poslužitelj %1$s"</string>
+  <string name="screen_server_confirmation_title_picker_mode">"Odaberite davatelja usluga računa"</string>
+  <string name="screen_server_confirmation_title_register">"Izradit ćete račun na poslužitelju %1$s"</string>
+</resources>
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 84c8c5307b..0c7810abe7 100644
--- a/features/login/impl/src/main/res/values-pl/translations.xml
+++ b/features/login/impl/src/main/res/values-pl/translations.xml
@@ -13,6 +13,7 @@
   <string name="screen_change_account_provider_other">"Inne"</string>
   <string name="screen_change_account_provider_subtitle">"Użyj innego dostawcy konta, takiego jak własny serwer lub konta służbowego."</string>
   <string name="screen_change_account_provider_title">"Zmień dostawcę konta"</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">"Wymagana jest aplikacja Element Pro na %1$s. Znajdziesz ją w sklepie z aplikacjami."</string>
   <string name="screen_change_server_error_element_pro_required_title">"Wymagany jest Element Pro"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Nie mogliśmy połączyć się z tym serwerem domowym. Sprawdź, czy adres URL serwera został wprowadzony poprawnie. Jeśli adres URL jest poprawny, skontaktuj się z administratorem serwera w celu uzyskania dalszej pomocy."</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 373081f3c3..9c6c297b20 100644
--- a/features/login/impl/src/main/res/values-uz/translations.xml
+++ b/features/login/impl/src/main/res/values-uz/translations.xml
@@ -13,9 +13,17 @@
   <string name="screen_change_account_provider_other">"Boshqa"</string>
   <string name="screen_change_account_provider_subtitle">"Shaxsiy serveringiz yoki ishchi hisob qaydnomangiz kabi boshqa hisob provayderidan foydalaning."</string>
   <string name="screen_change_account_provider_title">"Hisob provayderini o\'zgartiring"</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 da Element Pro ilovasi talab qilinadi. Iltimos, do‘kondan yuklab oling."</string>
+  <string name="screen_change_server_error_element_pro_required_title">"Element Pro talab qilinadi"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Bu uy serveriga kira olmadik. Iltimos, uy serverining URL manzilini to\'ri kiritganingizni tekshiring. Agar URL toʻgʻri boʻlsa, qoʻshimcha yordam olish uchun uy serveri administratoriga murojaat qiling."</string>
   <string name="screen_change_server_error_invalid_well_known">".well-known faylidagi muammo tufayli server mavjud emas: %1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Tanlangan hisob provayderi siljitish sinxronizatsiyasini qo‘llab-quvvatlamaydi. %1$s ishlatish uchun serverni yangilash zarur."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%1$s uchun %2$s bilan ulanishga ruxsat berilmagan."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"Bu ilova quyidagilarga ruxsat berish uchun sozlangan: %1$s ."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"Hisob provayderi %1$s ga ruxsat berilmagan."</string>
   <string name="screen_change_server_form_header">"Uy serverining URL manzili"</string>
+  <string name="screen_change_server_form_notice">"Domen manzilini kiriting."</string>
   <string name="screen_change_server_subtitle">"Serveringizning manzili nima?"</string>
   <string name="screen_change_server_title">"Serveringizni tanlang"</string>
   <string name="screen_create_account_title">"Hisob yaratish"</string>
@@ -28,6 +36,7 @@
   <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_onboarding_app_version">"%1$s versiya"</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>
@@ -83,5 +92,6 @@ Oddiy usulda kiring yoki boshqa qurilma bilan QR kodni skanerlang."</string>
   <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix xavfsiz, markazlashmagan aloqa uchun ochiq tarmoqdir."</string>
   <string name="screen_server_confirmation_message_register">"Bu sizning suhbatlaringiz yashaydigan joy - xuddi siz elektron pochta xabarlaringizni saqlash uchun elektron pochta provayderidan foydalanganingiz kabi."</string>
   <string name="screen_server_confirmation_title_login">"Siz tizimga kirmoqchisiz%1$s"</string>
+  <string name="screen_server_confirmation_title_picker_mode">"Hisob provayderini tanlang"</string>
   <string name="screen_server_confirmation_title_register">"Hisob yaratmoqchisiz%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 9b235558c8..832c3b7f71 100644
--- a/features/login/impl/src/main/res/values/localazy.xml
+++ b/features/login/impl/src/main/res/values/localazy.xml
@@ -60,6 +60,8 @@
   <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>
   <string name="screen_qr_code_login_error_declined_title">"Sign in declined"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"You don’t need to do anything else."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Your other device is already signed in"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Sign in expired. Please try again."</string>
   <string name="screen_qr_code_login_error_expired_title">"The sign in was not completed in time"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Your other device does not support signing in to %s with a QR code.
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 c10d22c51a..953693b40d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,7 @@ import io.element.android.features.login.impl.accountprovider.AccountProviderDat
 import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
+import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
@@ -28,7 +30,7 @@ class DefaultLoginEntryPointTest {
     val mainDispatcherRule = MainDispatcherRule()
 
     @Test
-    fun `test node builder`() {
+    fun `test node builder`() = runTest {
         val entryPoint = DefaultLoginEntryPoint()
         val parentNode = TestParentNode.create { buildContext, plugins ->
             LoginFlowNode(
@@ -36,19 +38,23 @@ class DefaultLoginEntryPointTest {
                 plugins = plugins,
                 accountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
                 oidcActionFlow = FakeOidcActionFlow(),
+                appCoroutineScope = backgroundScope,
             )
         }
         val callback = object : LoginEntryPoint.Callback {
-            override fun onReportProblem() = lambdaError()
+            override fun navigateToBugReport() = lambdaError()
+            override fun onDone() = lambdaError()
         }
         val params = LoginEntryPoint.Params(
             accountProvider = "ac",
             loginHint = "lh",
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(LoginFlowNode::class.java)
         assertThat(result.plugins).contains(LoginFlowNode.Params(params.accountProvider, params.loginHint))
         assertThat(result.plugins).contains(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 c22074f8d8..21b3cca600 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControlTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControlTest.kt
index f559c57bf0..e3cf1c0ea7 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControlTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accesscontrol/DefaultAccountProviderAccessControlTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER
 import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_2
 import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_URL
 import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertThrows
 import org.junit.Test
@@ -155,7 +157,13 @@ class DefaultAccountProviderAccessControlTest {
             defaultHomeserverListResult = { allowedAccountProviders },
         ),
         wellknownRetriever = FakeWellknownRetriever(
-            getElementWellKnownResult = { elementWellKnown },
+            getElementWellKnownResult = {
+                if (elementWellKnown == null) {
+                    WellknownRetrieverResult.NotFound
+                } else {
+                    WellknownRetrieverResult.Success(elementWellKnown)
+                }
+            },
         ),
     )
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSourceTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSourceTest.kt
index 3d84a1da41..f86df13335 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSourceTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSourceTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,7 +34,6 @@ class AccountProviderDataSourceTest {
                     subtitle = null,
                     isPublic = true,
                     isMatrixOrg = true,
-                    isValid = false,
                 )
             )
         }
@@ -55,7 +55,6 @@ class AccountProviderDataSourceTest {
                     subtitle = null,
                     isPublic = true,
                     isMatrixOrg = true,
-                    isValid = false,
                 )
             )
         }
@@ -77,7 +76,6 @@ class AccountProviderDataSourceTest {
                     subtitle = null,
                     isPublic = true,
                     isMatrixOrg = true,
-                    isValid = false,
                 )
             )
         }
@@ -89,7 +87,30 @@ class AccountProviderDataSourceTest {
         sut.flow.test {
             val initialState = awaitItem()
             assertThat(initialState.url).isEqualTo(AuthenticationConfig.MATRIX_ORG_URL)
-            sut.userSelection(AccountProvider(url = "https://example.com"))
+            sut.setAccountProvider(AccountProvider(url = "https://example.com"))
+            val changedState = awaitItem()
+            assertThat(changedState).isEqualTo(
+                AccountProvider(
+                    url = "https://example.com",
+                    title = "example.com",
+                    subtitle = null,
+                    isPublic = false,
+                    isMatrixOrg = false,
+                )
+            )
+            sut.reset()
+            val resetState = awaitItem()
+            assertThat(resetState.url).isEqualTo(AuthenticationConfig.MATRIX_ORG_URL)
+        }
+    }
+
+    @Test
+    fun `present - set url and reset`() = runTest {
+        val sut = AccountProviderDataSource(FakeEnterpriseService())
+        sut.flow.test {
+            val initialState = awaitItem()
+            assertThat(initialState.url).isEqualTo(AuthenticationConfig.MATRIX_ORG_URL)
+            sut.setUrl(url = "https://example.com")
             val changedState = awaitItem()
             assertThat(changedState).isEqualTo(
                 AccountProvider(
@@ -98,7 +119,6 @@ class AccountProviderDataSourceTest {
                     subtitle = null,
                     isPublic = false,
                     isMatrixOrg = false,
-                    isValid = false,
                 )
             )
             sut.reset()
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 620df9bba4..1fb5d37627 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,11 +19,13 @@ import io.element.android.features.wellknown.test.FakeWellknownRetriever
 import io.element.android.features.wellknown.test.anElementWellKnown
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.uri.ensureProtocol
-import io.element.android.libraries.matrix.test.A_HOMESERVER
+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.wellknown.api.ElementWellKnown
 import io.element.android.libraries.wellknown.api.WellknownRetriever
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -45,7 +48,11 @@ class ChangeServerPresenterTest {
 
     @Test
     fun `present - change server ok`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         createPresenter(
             authenticationService = authenticationService,
             enterpriseService = FakeEnterpriseService(
@@ -54,7 +61,6 @@ class ChangeServerPresenterTest {
         ).test {
             val initialState = awaitItem()
             assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized)
-            authenticationService.givenHomeserver(A_HOMESERVER)
             initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL)))
             val loadingState = awaitItem()
             assertThat(loadingState.changeServerAction).isInstanceOf(AsyncData.Loading::class.java)
@@ -65,10 +71,16 @@ class ChangeServerPresenterTest {
 
     @Test
     fun `present - change server error`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
         createPresenter(
             enterpriseService = FakeEnterpriseService(
                 isAllowedToConnectToHomeserverResult = { true },
             ),
+            authenticationService = authenticationService,
         ).test {
             val initialState = awaitItem()
             assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized)
@@ -84,6 +96,32 @@ class ChangeServerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - change server unsupported server`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
+        createPresenter(
+            enterpriseService = FakeEnterpriseService(
+                isAllowedToConnectToHomeserverResult = { true },
+            ),
+            authenticationService = authenticationService,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized)
+            initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL)))
+            val loadingState = awaitItem()
+            assertThat(loadingState.changeServerAction).isInstanceOf(AsyncData.Loading::class.java)
+            val failureState = awaitItem()
+            assertThat(failureState.changeServerAction).isInstanceOf(AsyncData.Failure::class.java)
+            assertThat(failureState.changeServerAction.errorOrNull()).isEqualTo(
+                ChangeServerError.UnsupportedServer
+            )
+        }
+    }
+
     @Test
     fun `present - change server not allowed error`() = runTest {
         val isAllowedToConnectToHomeserverResult = lambdaRecorder<String, Boolean> { false }
@@ -114,9 +152,11 @@ class ChangeServerPresenterTest {
 
     @Test
     fun `present - change server element pro required error`() = runTest {
-        val getElementWellKnownResult = lambdaRecorder<String, ElementWellKnown> {
-            anElementWellKnown(
-                enforceElementPro = true,
+        val getElementWellKnownResult = lambdaRecorder<String, WellknownRetrieverResult<ElementWellKnown>> {
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    enforceElementPro = true,
+                )
             )
         }
         createPresenter(
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt
index 5a2ca177e9..155d4f67a3 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/di/FakeQrCodeLoginGraph.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt
index 2741bbd62a..dd504f9d5c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManagerTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManagerTest.kt
index 4d7c39ab44..166e47ffc0 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManagerTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/DefaultQrCodeLoginManagerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/FakeQrCodeLoginManager.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/FakeQrCodeLoginManager.kt
index b67dc7e83f..976c313df7 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/FakeQrCodeLoginManager.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/FakeQrCodeLoginManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 da2cc8a139..ee99d1170e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
index 89abc6ddef..7d81f05c0c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
@@ -1,15 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeaccountprovider
 
-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.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
@@ -18,6 +16,7 @@ import io.element.android.features.login.impl.changeserver.aChangeServerState
 import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER
 import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_2
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -34,9 +33,7 @@ class ChangeAccountProviderPresenterTest {
                 defaultHomeserverListResult = { emptyList() }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.accountProviders).isEqualTo(
                 listOf(
@@ -46,7 +43,6 @@ class ChangeAccountProviderPresenterTest {
                         subtitle = null,
                         isPublic = true,
                         isMatrixOrg = true,
-                        isValid = true,
                     )
                 )
             )
@@ -64,9 +60,7 @@ class ChangeAccountProviderPresenterTest {
                 }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.accountProviders).isEqualTo(
                 listOf(
@@ -76,7 +70,6 @@ class ChangeAccountProviderPresenterTest {
                         subtitle = null,
                         isPublic = true,
                         isMatrixOrg = true,
-                        isValid = true,
                     ),
                     AccountProvider(
                         url = "https://element.io",
@@ -84,7 +77,6 @@ class ChangeAccountProviderPresenterTest {
                         subtitle = null,
                         isPublic = false,
                         isMatrixOrg = false,
-                        isValid = true,
                     )
                 )
             )
@@ -102,9 +94,7 @@ class ChangeAccountProviderPresenterTest {
                 }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.accountProviders).isEqualTo(
                 listOf(
@@ -114,7 +104,6 @@ class ChangeAccountProviderPresenterTest {
                         subtitle = null,
                         isPublic = true,
                         isMatrixOrg = true,
-                        isValid = true,
                     )
                 )
             )
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 5bad8a3638..7461a7db55 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,14 +38,12 @@ class ChooseAccountProviderPresenterTest {
             subtitle = null,
             isPublic = false,
             isMatrixOrg = false,
-            isValid = true,
         )
         val accountProvider2 = AccountProvider(
             url = ACCOUNT_PROVIDER_FROM_CONFIG_2.ensureProtocol(),
             subtitle = null,
             isPublic = false,
             isMatrixOrg = false,
-            isValid = true,
         )
     }
 
@@ -97,7 +96,11 @@ class ChooseAccountProviderPresenterTest {
 
     @Test
     fun `present - select account provider and continue - error then clear error`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
         val presenter = createPresenter(
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG_1, ACCOUNT_PROVIDER_FROM_CONFIG_2) },
@@ -113,7 +116,6 @@ class ChooseAccountProviderPresenterTest {
             }
             awaitItem().also {
                 assertThat(it.selectedAccountProvider).isEqualTo(accountProvider1)
-                authenticationService.givenChangeServerError(AN_EXCEPTION)
                 it.eventSink(ChooseAccountProviderEvents.Continue)
                 skipItems(1) // Loading
 
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 1acac2713a..ba1eff39e8 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a044874eed..f7ff5d384d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3978d3be6e..6372841250 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
@@ -1,15 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.confirmaccountprovider
 
-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.appconfig.AuthenticationConfig
 import io.element.android.features.enterprise.test.FakeEnterpriseService
@@ -22,13 +20,13 @@ import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationR
 import io.element.android.libraries.architecture.AsyncData
 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.A_HOMESERVER
-import io.element.android.libraries.matrix.test.A_HOMESERVER_OIDC
 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.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -40,9 +38,7 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - initial test`() = runTest {
         val presenter = createConfirmAccountProviderPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.isAccountCreation).isFalse()
             assertThat(initialState.submitEnabled).isTrue()
@@ -53,14 +49,15 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - continue password login`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsPasswordLogin = true))
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -75,14 +72,15 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - continue oidc`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -97,16 +95,17 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - cancel with failure`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -125,16 +124,17 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - cancel with success`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -152,16 +152,17 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - cancel to unblock`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -175,16 +176,17 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - success with failure`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -205,16 +207,17 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - success with success`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
         )
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
@@ -232,15 +235,16 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - submit fails`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            authenticationService.givenChangeServerError(RuntimeException())
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
             val failureState = awaitItem()
@@ -251,17 +255,18 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - clear error`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
 
             // Submit will return an error
-            authenticationService.givenChangeServerError(AN_EXCEPTION)
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
 
             skipItems(1) // Loading
@@ -279,8 +284,11 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - confirm account creation without oidc and without url generates an error`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             params = ConfirmAccountProviderPresenter.Params(isAccountCreation = true),
             matrixAuthenticationService = authenticationService,
@@ -288,9 +296,7 @@ class ConfirmAccountProviderPresenterTest {
                 throw AccountCreationNotSupported()
             },
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
@@ -306,15 +312,16 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - confirm account creation with oidc is successful`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             params = ConfirmAccountProviderPresenter.Params(isAccountCreation = true),
             matrixAuthenticationService = authenticationService,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
@@ -327,16 +334,17 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - confirm account creation with oidc and url continues with oidc`() = runTest {
         val aUrl = "aUrl"
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER_OIDC)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             params = ConfirmAccountProviderPresenter.Params(isAccountCreation = true),
             matrixAuthenticationService = authenticationService,
             webClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever { aUrl },
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
@@ -349,16 +357,17 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - confirm account creation without oidc and with url continuing with url`() = runTest {
         val aUrl = "aUrl"
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
         val presenter = createConfirmAccountProviderPresenter(
             params = ConfirmAccountProviderPresenter.Params(isAccountCreation = true),
             matrixAuthenticationService = authenticationService,
             webClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever { aUrl },
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt
index 8d70173d11..c70a5c9a9a 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/CreateAccountPresenterTest.kt
@@ -1,15 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.createaccount
 
-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.architecture.AsyncAction
 import io.element.android.libraries.core.meta.BuildMeta
@@ -18,14 +16,13 @@ import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 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.FakeMatrixClient
-import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
 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.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -37,9 +34,7 @@ class CreateAccountPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.url).isEqualTo("aUrl")
             assertThat(initialState.pageProgress).isEqualTo(0)
@@ -51,9 +46,7 @@ class CreateAccountPresenterTest {
     @Test
     fun `present - set up progress update the state`() = runTest {
         val presenter = createPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(CreateAccountEvents.SetPageProgress(33))
             assertThat(awaitItem().pageProgress).isEqualTo(33)
@@ -65,9 +58,7 @@ class CreateAccountPresenterTest {
         val presenter = createPresenter(
             messageParser = FakeMessageParser { error("An error") }
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(CreateAccountEvents.OnMessageReceived(""))
             assertThat(awaitItem().createAction).isInstanceOf(AsyncAction.Failure::class.java)
@@ -77,9 +68,7 @@ class CreateAccountPresenterTest {
     @Test
     fun `present - receiving a message containing isTrusted is ignored`() = runTest {
         val presenter = createPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(CreateAccountEvents.OnMessageReceived("isTrusted"))
         }
@@ -89,18 +78,13 @@ class CreateAccountPresenterTest {
     fun `present - receiving a message able to be parsed change the state to success`() = runTest {
         val lambda = lambdaRecorder<String, ExternalSession> { _ -> anExternalSession() }
         val sessionVerificationService = FakeSessionVerificationService()
-        val client = FakeMatrixClient(sessionVerificationService = sessionVerificationService)
-        val clientProvider = FakeMatrixClientProvider(getClient = { Result.success(client) })
         val presenter = createPresenter(
             authenticationService = FakeMatrixAuthenticationService(
                 importCreatedSessionLambda = { Result.success(A_SESSION_ID) }
             ),
             messageParser = FakeMessageParser(lambda),
-            clientProvider = clientProvider,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(CreateAccountEvents.OnMessageReceived("aMessage"))
             assertThat(awaitItem().createAction.isLoading()).isTrue()
@@ -118,9 +102,7 @@ class CreateAccountPresenterTest {
             ),
             messageParser = FakeMessageParser { anExternalSession() }
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(CreateAccountEvents.OnMessageReceived(""))
             assertThat(awaitItem().createAction.isLoading()).isTrue()
@@ -133,12 +115,10 @@ class CreateAccountPresenterTest {
         authenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
         messageParser: MessageParser = FakeMessageParser(),
         buildMeta: BuildMeta = aBuildMeta(),
-        clientProvider: FakeMatrixClientProvider = FakeMatrixClientProvider(),
     ) = CreateAccountPresenter(
         url = url,
         authenticationService = authenticationService,
         messageParser = messageParser,
         buildMeta = buildMeta,
-        clientProvider = clientProvider,
     )
 }
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/DefaultMessageParserTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/DefaultMessageParserTest.kt
index a1fbbc0fe2..680fda2838 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/DefaultMessageParserTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/DefaultMessageParserTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.appconfig.AuthenticationConfig
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 import kotlinx.serialization.SerializationException
 import org.junit.Assert.assertThrows
@@ -68,7 +70,8 @@ class DefaultMessageParserTest {
 
     private fun createDefaultMessageParser(): DefaultMessageParser {
         return DefaultMessageParser(
-            AccountProviderDataSource(FakeEnterpriseService())
+            accountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
+            json = DefaultJsonProvider(),
         )
     }
 }
@@ -81,5 +84,4 @@ internal fun anExternalSession(
     accessToken = "access_token",
     deviceId = "device_id",
     refreshToken = null,
-    slidingSyncProxy = null
 )
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/FakeMessageParser.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/FakeMessageParser.kt
index dcfe4047fb..62d6dd7dd4 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/FakeMessageParser.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/createaccount/FakeMessageParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 af158ec0da..92099180ec 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,11 +15,11 @@ import io.element.android.features.login.impl.accountprovider.AccountProviderDat
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
-import io.element.android.libraries.matrix.test.A_HOMESERVER
 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.auth.FakeMatrixAuthenticationService
+import io.element.android.libraries.matrix.test.auth.aMatrixHomeServerDetails
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
@@ -42,8 +43,11 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - enter login and password`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
         createLoginPasswordPresenter(
             authenticationService = authenticationService,
         ).test {
@@ -61,8 +65,11 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - submit`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
         createLoginPasswordPresenter(
             authenticationService = authenticationService,
         ).test {
@@ -81,8 +88,11 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - submit with error`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
         createLoginPasswordPresenter(
             authenticationService = authenticationService,
         ).test {
@@ -102,8 +112,11 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - clear error`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
-        authenticationService.givenHomeserver(A_HOMESERVER)
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.success(aMatrixHomeServerDetails())
+            },
+        )
         createLoginPasswordPresenter(
             authenticationService = authenticationService,
         ).test {
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 99deb8b7bb..26da50da63 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7727583468..6e67925444 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 16f6c649fa..1d434997ca 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
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.appconfig.AuthenticationConfig
 import io.element.android.appconfig.OnBoardingConfig
 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.web.FakeWebClientUrlForAuthenticationRetriever
 import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationRetriever
@@ -24,6 +27,7 @@ import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_2
 import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_3
 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.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
@@ -36,6 +40,7 @@ import io.element.android.libraries.wellknown.api.WellknownRetriever
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -214,7 +219,12 @@ class OnBoardingPresenterTest {
 
     @Test
     fun `present - default account provider - login and clear error`() = runTest {
-        val authenticationService = FakeMatrixAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
+        val accountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService())
         val presenter = createPresenter(
             params = OnBoardingNode.Params(
                 accountProvider = A_HOMESERVER_URL,
@@ -226,15 +236,17 @@ class OnBoardingPresenterTest {
             loginHelper = createLoginHelper(
                 authenticationService = authenticationService,
             ),
+            accountProviderDataSource = accountProviderDataSource,
         )
         presenter.test {
             skipItems(3)
             awaitItem().also {
                 assertThat(it.defaultAccountProvider).isEqualTo(A_HOMESERVER_URL)
-                authenticationService.givenChangeServerError(AN_EXCEPTION)
-                it.eventSink(OnBoardingEvents.OnSignIn(A_HOMESERVER_URL))
+                assertThat(accountProviderDataSource.flow.first().url).isEqualTo(AuthenticationConfig.MATRIX_ORG_URL)
+                it.eventSink(OnBoardingEvents.OnSignIn(A_HOMESERVER_URL_2))
                 skipItems(1) // Loading
-
+                // Account data source has been updated
+                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)
@@ -257,6 +269,7 @@ private fun createPresenter(
     loginHelper: LoginHelper = createLoginHelper(),
     onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider = OnBoardingLogoResIdProvider { null },
     sessionStore: SessionStore = InMemorySessionStore(),
+    accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
 ) = OnBoardingPresenter(
     params = params,
     buildMeta = buildMeta,
@@ -269,6 +282,7 @@ private fun createPresenter(
     loginHelper = loginHelper,
     onBoardingLogoResIdProvider = onBoardingLogoResIdProvider,
     sessionStore = sessionStore,
+    accountProviderDataSource = accountProviderDataSource,
 )
 
 fun createLoginHelper(
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 2f27e2fb2d..c8dcd978c6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4764e55278..a0469a684e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1debde3042..c7b6a5e3d6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt
index 83686b56c6..aabcf12e25 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroPresenterTest.kt
@@ -1,20 +1,19 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.qrcode.intro
 
-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.core.meta.BuildMeta
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.permissions.test.FakePermissionsPresenter
 import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -22,9 +21,7 @@ class QrCodeIntroPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createQrCodeIntroPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().run {
                 assertThat(appName).isEqualTo("AppName")
                 assertThat(desktopAppName).isEqualTo("DesktopAppName")
@@ -39,9 +36,7 @@ class QrCodeIntroPresenterTest {
         val permissionsPresenter = FakePermissionsPresenter().apply { setPermissionGranted() }
         val permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter)
         val presenter = createQrCodeIntroPresenter(permissionsPresenterFactory = permissionsPresenterFactory)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(QrCodeIntroEvents.Continue)
             assertThat(awaitItem().canContinue).isTrue()
         }
@@ -52,9 +47,7 @@ class QrCodeIntroPresenterTest {
         val permissionsPresenter = FakePermissionsPresenter()
         val permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter)
         val presenter = createQrCodeIntroPresenter(permissionsPresenterFactory = permissionsPresenterFactory)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(QrCodeIntroEvents.Continue)
             assertThat(awaitItem().cameraPermissionState.showDialog).isTrue()
         }
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 47740aa65b..cec67e5011 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a4d594399f..65a0713f64 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
@@ -1,15 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.qrcode.scan
 
-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.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
@@ -34,9 +32,7 @@ class QrCodeScanPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createQrCodeScanPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().run {
                 assertThat(isScanning).isTrue()
                 assertThat(authenticationAction.isUninitialized()).isTrue()
@@ -114,9 +110,7 @@ class QrCodeScanPresenterTest {
             parseQrCodeLoginDataResult = { Result.failure(Exception("Failed to parse QR code")) }
         )
         val presenter = createQrCodeScanPresenter(qrCodeLoginDataFactory = qrCodeLoginDataFactory)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(QrCodeScanEvents.QrCodeScanned(byteArrayOf()))
             assertThat(awaitItem().isScanning).isFalse()
@@ -140,9 +134,7 @@ class QrCodeScanPresenterTest {
         }
         qrCodeLoginManager.resetAction = resetAction
         val presenter = createQrCodeScanPresenter(qrCodeLoginDataFactory = qrCodeLoginDataFactory, qrCodeLoginManager = qrCodeLoginManager)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Skip initial item
             skipItems(1)
 
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 7fce4f7524..454dc79067 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b679c92ee1..87afb77474 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
@@ -1,26 +1,22 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.searchaccountprovider
 
-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.login.impl.changeserver.aChangeServerState
 import io.element.android.features.login.impl.resolver.HomeserverResolver
-import io.element.android.features.wellknown.test.FakeWellknownRetriever
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
-import io.element.android.libraries.wellknown.api.WellKnown
-import io.element.android.libraries.wellknown.api.WellKnownBaseConfig
+import io.element.android.libraries.matrix.test.auth.FakeHomeServerLoginCompatibilityChecker
 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.test.runTest
 import org.junit.Rule
@@ -32,14 +28,12 @@ class SearchAccountProviderPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
-        val fakeWellknownRetriever = FakeWellknownRetriever()
+        val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = { Result.success(true) })
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
             changeServerPresenter = { aChangeServerState() }
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.userInput).isEmpty()
             assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized)
@@ -47,35 +41,13 @@ class SearchAccountProviderPresenterTest {
     }
 
     @Test
-    fun `present - enter text no result`() = runTest {
-        val fakeWellknownRetriever = FakeWellknownRetriever()
+    fun `present - error while checking login compatibility`() = runTest {
+        val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = { Result.failure(IllegalStateException("Oops")) })
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
             changeServerPresenter = { aChangeServerState() }
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            initialState.eventSink.invoke(SearchAccountProviderEvents.UserInput("test"))
-            val withInputState = awaitItem()
-            assertThat(withInputState.userInput).isEqualTo("test")
-            assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized)
-            assertThat(awaitItem().userInputResult).isInstanceOf(AsyncData.Loading::class.java)
-            assertThat(awaitItem().userInputResult).isEqualTo(AsyncData.Uninitialized)
-        }
-    }
-
-    @Test
-    fun `present - enter valid url no wellknown`() = runTest {
-        val fakeWellknownRetriever = FakeWellknownRetriever()
-        val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
-            changeServerPresenter = { aChangeServerState() }
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(SearchAccountProviderEvents.UserInput("https://test.org"))
             val withInputState = awaitItem()
@@ -85,7 +57,31 @@ class SearchAccountProviderPresenterTest {
             assertThat(awaitItem().userInputResult).isEqualTo(
                 AsyncData.Success(
                     listOf(
-                        aHomeserverData(homeserverUrl = "https://test.org", isWellknownValid = false)
+                        aHomeserverData(homeserverUrl = "https://test.org")
+                    )
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - enter text no result`() = runTest {
+        val fakeWellknownRetriever = FakeHomeServerLoginCompatibilityChecker(checkResult = { Result.success(false) })
+        val presenter = SearchAccountProviderPresenter(
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
+            changeServerPresenter = { aChangeServerState() }
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(SearchAccountProviderEvents.UserInput("test"))
+            val withInputState = awaitItem()
+            assertThat(withInputState.userInput).isEqualTo("test")
+            assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized)
+            assertThat(awaitItem().userInputResult).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(awaitItem().userInputResult).isEqualTo(
+                AsyncData.Success(
+                    listOf(
+                        aHomeserverData(homeserverUrl = "https://test"),
                     )
                 )
             )
@@ -94,25 +90,21 @@ class SearchAccountProviderPresenterTest {
 
     @Test
     fun `present - enter text one result with wellknown`() = runTest {
-        val getWellKnownResult = lambdaRecorder<String, WellKnown> {
+        val checkResult = lambdaRecorder<String, Result<Boolean>> {
             when (it) {
-                "https://test.org" -> error("not found")
-                "https://test.com" -> error("not found")
-                "https://test.io" -> aWellKnown()
-                "https://test" -> error("not found")
+                "https://test.org" -> Result.success(false)
+                "https://test.com" -> Result.success(false)
+                "https://test.io" -> Result.success(true)
+                "https://test" -> Result.success(false)
                 else -> error("should not happen")
             }
         }
-        val fakeWellknownRetriever = FakeWellknownRetriever(
-            getWellKnownResult = getWellKnownResult,
-        )
+        val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = checkResult)
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
             changeServerPresenter = { aChangeServerState() }
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(SearchAccountProviderEvents.UserInput("test"))
             val withInputState = awaitItem()
@@ -126,7 +118,7 @@ class SearchAccountProviderPresenterTest {
                     )
                 )
             )
-            getWellKnownResult.assertions().isCalledExactly(4)
+            checkResult.assertions().isCalledExactly(4)
                 .withSequence(
                     listOf(value("https://test.org")),
                     listOf(value("https://test.com")),
@@ -138,25 +130,21 @@ class SearchAccountProviderPresenterTest {
 
     @Test
     fun `present - enter text two results with wellknown`() = runTest {
-        val getWellKnownResult = lambdaRecorder<String, WellKnown> {
+        val checkResult = lambdaRecorder<String, Result<Boolean>> {
             when (it) {
-                "https://test.org" -> aWellKnown()
-                "https://test.com" -> error("not found")
-                "https://test.io" -> aWellKnown()
-                "https://test" -> error("not found")
+                "https://test.org" -> Result.success(true)
+                "https://test.com" -> Result.success(false)
+                "https://test.io" -> Result.success(true)
+                "https://test" -> Result.success(false)
                 else -> error("should not happen")
             }
         }
-        val fakeWellknownRetriever = FakeWellknownRetriever(
-            getWellKnownResult = getWellKnownResult,
-        )
+        val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = checkResult)
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
             changeServerPresenter = { aChangeServerState() }
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(SearchAccountProviderEvents.UserInput("test"))
             val withInputState = awaitItem()
@@ -178,7 +166,7 @@ class SearchAccountProviderPresenterTest {
                     )
                 )
             )
-            getWellKnownResult.assertions().isCalledExactly(4)
+            checkResult.assertions().isCalledExactly(4)
                 .withSequence(
                     listOf(value("https://test.org")),
                     listOf(value("https://test.com")),
@@ -187,15 +175,4 @@ class SearchAccountProviderPresenterTest {
                 )
         }
     }
-
-    private fun aWellKnown(): WellKnown {
-        return WellKnown(
-            homeServer = WellKnownBaseConfig(
-                baseURL = A_HOMESERVER_URL
-            ),
-            identityServer = WellKnownBaseConfig(
-                baseURL = A_HOMESERVER_URL
-            ),
-        )
-    }
 }
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/web/FakeWebClientUrlForAuthenticationRetriever.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/web/FakeWebClientUrlForAuthenticationRetriever.kt
index bc99401bed..f52af0adf3 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/web/FakeWebClientUrlForAuthenticationRetriever.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/web/FakeWebClientUrlForAuthenticationRetriever.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/test/build.gradle.kts b/features/login/test/build.gradle.kts
index d786420def..7073648dd2 100644
--- a/features/login/test/build.gradle.kts
+++ b/features/login/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/login/test/src/main/kotlin/io/element/android/features/login/test/FakeLoginIntentResolver.kt b/features/login/test/src/main/kotlin/io/element/android/features/login/test/FakeLoginIntentResolver.kt
index bcdbb81621..7912a36291 100644
--- a/features/login/test/src/main/kotlin/io/element/android/features/login/test/FakeLoginIntentResolver.kt
+++ b/features/login/test/src/main/kotlin/io/element/android/features/login/test/FakeLoginIntentResolver.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/api/build.gradle.kts b/features/logout/api/build.gradle.kts
index ae3110e1f6..4453d37931 100644
--- a/features/logout/api/build.gradle.kts
+++ b/features/logout/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt
index 17f67813ca..df8477b221 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,14 +14,13 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface LogoutEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onChangeRecoveryKeyClick()
+        fun navigateToSecureBackup()
     }
 }
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutUseCase.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutUseCase.kt
index 3d980fe44b..f3091b022a 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutUseCase.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutEvents.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutEvents.kt
index 547fe5c1e0..cc16dfdaf1 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutEvents.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutState.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutState.kt
index 4e040b30bd..31e0fdcd5f 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutState.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutStateProvider.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutStateProvider.kt
index 993ad3cf0c..feaf21ef4a 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutStateProvider.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutView.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutView.kt
index 08a7047c1c..7841b85a5a 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutView.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/build.gradle.kts b/features/logout/impl/build.gradle.kts
index 215c273913..8de7718980 100644
--- a/features/logout/impl/build.gradle.kts
+++ b/features/logout/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,10 +35,12 @@ dependencies {
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.dateformatter.api)
+    implementation(projects.libraries.workmanager.api)
     api(projects.features.logout.api)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.libraries.workmanager.test)
 }
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPoint.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPoint.kt
index 47d4771ed9..d730c1d573 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPoint.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.features.logout.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.logout.api.LogoutEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLogoutEntryPoint : LogoutEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LogoutEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : LogoutEntryPoint.NodeBuilder {
-            override fun callback(callback: LogoutEntryPoint.Callback): LogoutEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<LogoutNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: LogoutEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<LogoutNode>(buildContext, listOf(callback))
     }
 }
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCase.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCase.kt
index 52e295ba3e..df139c1086 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCase.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.logout.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.logout.api.LogoutUseCase
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -17,7 +17,6 @@ import io.element.android.libraries.sessionstorage.api.SessionStore
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLogoutUseCase(
     private val sessionStore: SessionStore,
     private val matrixClientProvider: MatrixClientProvider,
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutEvents.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutEvents.kt
index 1a9cba8b74..0822444bea 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutEvents.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
index d554dbe8f0..1e9b984e52 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.logout.api.LogoutEntryPoint
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -26,16 +27,14 @@ class LogoutNode(
     @Assisted plugins: List<Plugin>,
     private val presenter: LogoutPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private fun onChangeRecoveryKeyClick() {
-        plugins<LogoutEntryPoint.Callback>().forEach { it.onChangeRecoveryKeyClick() }
-    }
+    private val callback: LogoutEntryPoint.Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         LogoutView(
             state = state,
-            onChangeRecoveryKeyClick = ::onChangeRecoveryKeyClick,
+            onChangeRecoveryKeyClick = callback::navigateToSecureBackup,
             onBackClick = ::navigateUp,
             modifier = modifier,
         )
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt
index a98e300661..8176ed3d28 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,6 +27,7 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.encryption.BackupState
 import io.element.android.libraries.matrix.api.encryption.BackupUploadState
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -34,6 +36,7 @@ import kotlinx.coroutines.launch
 class LogoutPresenter(
     private val matrixClient: MatrixClient,
     private val encryptionService: EncryptionService,
+    private val workManagerScheduler: WorkManagerScheduler,
 ) : Presenter<LogoutState> {
     @Composable
     override fun present(): LogoutState {
@@ -71,7 +74,7 @@ class LogoutPresenter(
             }
         }
 
-        fun handleEvents(event: LogoutEvents) {
+        fun handleEvent(event: LogoutEvents) {
             when (event) {
                 is LogoutEvents.Logout -> {
                     if (logoutAction.value.isConfirming() || event.ignoreSdkError) {
@@ -94,7 +97,7 @@ class LogoutPresenter(
             backupUploadState = backupUploadState,
             waitingForALongTime = waitingForALongTime,
             logoutAction = logoutAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -109,6 +112,9 @@ class LogoutPresenter(
         ignoreSdkError: Boolean,
     ) = launch {
         suspend {
+            // Cancel any pending work (e.g. notification sync)
+            workManagerScheduler.cancel(matrixClient.sessionId)
+
             matrixClient.logout(userInitiated = true, ignoreSdkError)
         }.runCatchingUpdatingState(logoutAction)
     }
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt
index 584d7a0ac9..9240edc61d 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt
index a55a9afb96..a3b59860b5 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
index 321879b009..9700e54f5c 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/di/LogoutModule.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/di/LogoutModule.kt
index fae2871e4f..9b38fde22e 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/di/LogoutModule.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/di/LogoutModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
index 2cd7989cf1..7fb483a447 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.logout.impl.direct
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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.DirectLogoutStateProvider
@@ -21,7 +21,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultDirectLogoutView : DirectLogoutView {
     @Composable
     override fun Render(state: DirectLogoutState) {
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenter.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenter.kt
index 1e74aa2bc7..8d8cc9141e 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenter.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -47,7 +48,7 @@ class DirectLogoutPresenter(
 
         val isLastDevice by encryptionService.isLastDevice.collectAsState()
 
-        fun handleEvents(event: DirectLogoutEvents) {
+        fun handleEvent(event: DirectLogoutEvents) {
             when (event) {
                 is DirectLogoutEvents.Logout -> {
                     if (logoutAction.value.isConfirming() || event.ignoreSdkError) {
@@ -66,7 +67,7 @@ class DirectLogoutPresenter(
             canDoDirectSignOut = !isLastDevice &&
                 !backupUploadState.isBackingUp(),
             logoutAction = logoutAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/tools/Extensions.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/tools/Extensions.kt
index d70d74eef5..3721417a87 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/tools/Extensions.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/tools/Extensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
index 4b8e23ab4e..0222a991db 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt
index 36efd9da75..d19a2872e7 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/main/res/values-eo/translations.xml b/features/logout/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index 5ba5aa6e48..0000000000
--- a/features/logout/impl/src/main/res/values-eo/translations.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_key_backup_offline_subtitle">"Your messages were still being backed up when you went offline. Reconnect so that your messages can be backed up before signing out."</string>
-  <string name="screen_signout_key_backup_offline_title">"Your messages are still being backed up"</string>
-  <string name="screen_signout_key_backup_ongoing_title">"Your messages are still being backed up"</string>
-  <string name="screen_signout_recovery_disabled_title">"Backup not set up"</string>
-  <string name="screen_signout_save_recovery_key_title">"Have you saved your backup password?"</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 4bf6be1b89..8dfaad8580 100644
--- a/features/logout/impl/src/main/res/values-fa/translations.xml
+++ b/features/logout/impl/src/main/res/values-fa/translations.xml
@@ -4,12 +4,15 @@
   <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/main/res/values-hr/translations.xml b/features/logout/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..331eca04c4
--- /dev/null
+++ b/features/logout/impl/src/main/res/values-hr/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">"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_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_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_save_recovery_key_title">"Jeste li spremili svoj ključ za oporavak?"</string>
+</resources>
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPointTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPointTest.kt
index 01d1bfc6ca..8f2490b6ad 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPointTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -32,11 +33,13 @@ class DefaultLogoutEntryPointTest {
             )
         }
         val callback = object : LogoutEntryPoint.Callback {
-            override fun onChangeRecoveryKeyClick() = lambdaError()
+            override fun navigateToSecureBackup() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(LogoutNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCaseTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCaseTest.kt
index a17e7285de..e6707a2ded 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCaseTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutUseCaseTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt
index 34406aa098..236b013837 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,6 +15,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncAction
 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.BackupState
 import io.element.android.libraries.matrix.api.encryption.BackupUploadState
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
@@ -21,7 +23,9 @@ import io.element.android.libraries.matrix.api.encryption.RecoveryState
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
+import io.element.android.libraries.workmanager.test.FakeWorkManagerScheduler
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
@@ -145,7 +149,9 @@ class LogoutPresenterTest {
 
     @Test
     fun `present - logout then confirm`() = runTest {
-        val presenter = createLogoutPresenter()
+        val cancelWorkManagerJobsLambda = lambdaRecorder<SessionId, Unit> {}
+        val workManagerScheduler = FakeWorkManagerScheduler(cancelLambda = cancelWorkManagerJobsLambda)
+        val presenter = createLogoutPresenter(workManagerScheduler = workManagerScheduler)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -158,6 +164,8 @@ class LogoutPresenterTest {
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.logoutAction).isInstanceOf(AsyncAction.Success::class.java)
+
+            cancelWorkManagerJobsLambda.assertions().isCalledOnce()
         }
     }
 
@@ -230,7 +238,9 @@ class LogoutPresenterTest {
 internal fun createLogoutPresenter(
     matrixClient: MatrixClient = FakeMatrixClient(),
     encryptionService: EncryptionService = FakeEncryptionService(),
+    workManagerScheduler: FakeWorkManagerScheduler = FakeWorkManagerScheduler(cancelLambda = {}),
 ): LogoutPresenter = LogoutPresenter(
     matrixClient = matrixClient,
     encryptionService = encryptionService,
+    workManagerScheduler = workManagerScheduler,
 )
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 00e294f7d1..84ca038d7b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3581f682fa..8eae534740 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenterTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenterTest.kt
index d5dff82c5c..835ed4e94e 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenterTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/logout/test/build.gradle.kts b/features/logout/test/build.gradle.kts
index e7647a85db..f61ed10d79 100644
--- a/features/logout/test/build.gradle.kts
+++ b/features/logout/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,7 @@ android {
 
 dependencies {
     implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
     implementation(projects.tests.testutils)
     api(projects.features.logout.api)
 }
diff --git a/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutEntryPoint.kt b/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutEntryPoint.kt
new file mode 100644
index 0000000000..c5c4172297
--- /dev/null
+++ b/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutEntryPoint.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.logout.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.logout.api.LogoutEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeLogoutEntryPoint : LogoutEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: LogoutEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutUseCase.kt b/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutUseCase.kt
index dd3ded4ef9..9b111721b8 100644
--- a/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutUseCase.kt
+++ b/features/logout/test/src/main/kotlin/io/element/android/features/logout/test/FakeLogoutUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/api/build.gradle.kts b/features/messages/api/build.gradle.kts
index a6a2edcf6d..029ef624e0 100644
--- a/features/messages/api/build.gradle.kts
+++ b/features/messages/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessageComposerContext.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessageComposerContext.kt
index d1e4b1429e..534af8a5f9 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessageComposerContext.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessageComposerContext.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 706e292dbb..a23e337d2a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,7 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.architecture.NodeInputs
 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.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import kotlinx.parcelize.Parcelize
@@ -22,26 +24,32 @@ import kotlinx.parcelize.Parcelize
 interface MessagesEntryPoint : FeatureEntryPoint {
     sealed interface InitialTarget : Parcelable {
         @Parcelize
-        data class Messages(val focusedEventId: EventId?) : InitialTarget
+        data class Messages(
+            val focusedEventId: EventId?,
+        ) : InitialTarget
 
         @Parcelize
         data object PinnedMessages : InitialTarget
     }
 
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
-
     interface Callback : Plugin {
-        fun onRoomDetailsClick()
-        fun onUserDataClick(userId: UserId)
-        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
-        fun onForwardedToSingleRoom(roomId: RoomId)
+        fun navigateToRoomDetails()
+        fun navigateToRoomMemberDetails(userId: UserId)
+        fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
+        fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean)
+        fun navigateToRoom(roomId: RoomId)
     }
 
     data class Params(val initialTarget: InitialTarget) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
+
+    interface NodeProxy {
+        suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?)
+    }
 }
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/PinnedEventsTimelineProvider.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/PinnedEventsTimelineProvider.kt
new file mode 100644
index 0000000000..849b97479e
--- /dev/null
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/pinned/PinnedEventsTimelineProvider.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.api.pinned
+
+import io.element.android.libraries.matrix.api.timeline.TimelineProvider
+
+interface PinnedEventsTimelineProvider : TimelineProvider
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/HtmlConverterProvider.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/HtmlConverterProvider.kt
index 607283792f..f44c996cac 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/HtmlConverterProvider.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/HtmlConverterProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvents.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvent.kt
similarity index 69%
rename from features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvents.kt
rename to features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvent.kt
index 9586fd0bf7..ef5fe93d08 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvents.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,17 +12,17 @@ import androidx.lifecycle.Lifecycle
 import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
 
-sealed interface VoiceMessageComposerEvents {
+sealed interface VoiceMessageComposerEvent {
     data class RecorderEvent(
         val recorderEvent: VoiceMessageRecorderEvent
-    ) : VoiceMessageComposerEvents
+    ) : VoiceMessageComposerEvent
     data class PlayerEvent(
         val playerEvent: VoiceMessagePlayerEvent,
-    ) : VoiceMessageComposerEvents
-    data object SendVoiceMessage : VoiceMessageComposerEvents
-    data object DeleteVoiceMessage : VoiceMessageComposerEvents
-    data object AcceptPermissionRationale : VoiceMessageComposerEvents
-    data object DismissPermissionsRationale : VoiceMessageComposerEvents
-    data class LifecycleEvent(val event: Lifecycle.Event) : VoiceMessageComposerEvents
-    data object DismissSendFailureDialog : VoiceMessageComposerEvents
+    ) : VoiceMessageComposerEvent
+    data object SendVoiceMessage : VoiceMessageComposerEvent
+    data object DeleteVoiceMessage : VoiceMessageComposerEvent
+    data object AcceptPermissionRationale : VoiceMessageComposerEvent
+    data object DismissPermissionsRationale : VoiceMessageComposerEvent
+    data class LifecycleEvent(val event: Lifecycle.Event) : VoiceMessageComposerEvent
+    data object DismissSendFailureDialog : VoiceMessageComposerEvent
 }
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerPresenter.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerPresenter.kt
index 0e464e93b8..848f9fe82d 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerPresenter.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt
index e78a2b5611..f324bb7612 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,5 +17,5 @@ data class VoiceMessageComposerState(
     val showPermissionRationaleDialog: Boolean,
     val showSendFailureDialog: Boolean,
     val keepScreenOn: Boolean,
-    val eventSink: (VoiceMessageComposerEvents) -> Unit,
+    val eventSink: (VoiceMessageComposerEvent) -> Unit,
 )
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerStateProvider.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerStateProvider.kt
index b418b08726..7b264a3ddb 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerStateProvider.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/timeline/voicemessages/composer/VoiceMessageComposerStateProvider.kt
@@ -1,22 +1,22 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api.timeline.voicemessages.composer
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.libraries.designsystem.components.media.createFakeWaveform
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 import io.element.android.libraries.textcomposer.model.VoiceMessageState
-import kotlinx.collections.immutable.toImmutableList
 import kotlin.time.Duration.Companion.seconds
 
 open class VoiceMessageComposerStateProvider : PreviewParameterProvider<VoiceMessageComposerState> {
     override val values: Sequence<VoiceMessageComposerState>
         get() = sequenceOf(
-            aVoiceMessageComposerState(voiceMessageState = VoiceMessageState.Recording(duration = 61.seconds, levels = aWaveformLevels)),
+            aVoiceMessageComposerState(voiceMessageState = VoiceMessageState.Recording(duration = 61.seconds, levels = WaveFormSamples.allRangeWaveForm)),
         )
 }
 
@@ -39,7 +39,5 @@ fun aVoiceMessagePreviewState() = VoiceMessageState.Preview(
     showCursor = false,
     playbackProgress = 0f,
     time = 10.seconds,
-    waveform = createFakeWaveform(),
+    waveform = WaveFormSamples.realisticWaveForm,
 )
-
-internal var aWaveformLevels = List(100) { it.toFloat() / 100 }.toImmutableList()
diff --git a/features/messages/impl/build.gradle.kts b/features/messages/impl/build.gradle.kts
index d05ede00ab..eb8aff66ed 100644
--- a/features/messages/impl/build.gradle.kts
+++ b/features/messages/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,6 +29,8 @@ dependencies {
     api(projects.features.messages.api)
     implementation(projects.appconfig)
     implementation(projects.features.call.api)
+    implementation(projects.features.enterprise.api)
+    implementation(projects.features.forward.api)
     implementation(projects.features.location.api)
     implementation(projects.features.poll.api)
     implementation(projects.features.roomcall.api)
@@ -36,6 +39,7 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.textcomposer.impl)
     implementation(projects.libraries.uiStrings)
@@ -47,6 +51,7 @@ dependencies {
     implementation(projects.libraries.mediaupload.api)
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.recentemojis.api)
     implementation(projects.libraries.roomselect.api)
     implementation(projects.libraries.voiceplayer.api)
     implementation(projects.libraries.voicerecorder.api)
@@ -56,12 +61,14 @@ dependencies {
     implementation(projects.libraries.testtags)
     implementation(projects.features.networkmonitor.api)
     implementation(projects.services.analytics.compose)
+    implementation(projects.services.appnavstate.api)
     implementation(projects.services.toolbox.api)
     implementation(libs.coil.compose)
     implementation(libs.datetime)
     implementation(libs.jsoup)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.constraintlayout.compose)
+    implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.ui)
     implementation(libs.sigpwned.emoji4j)
@@ -75,12 +82,16 @@ dependencies {
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.dateformatter.test)
     testImplementation(projects.libraries.push.test)
+    testImplementation(projects.features.call.test)
+    testImplementation(projects.features.forward.test)
+    testImplementation(projects.features.knockrequests.test)
     testImplementation(projects.features.location.test)
     testImplementation(projects.features.networkmonitor.test)
     testImplementation(projects.features.messages.test)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.toolbox.test)
     testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.mediaupload.impl)
     testImplementation(projects.libraries.mediaupload.test)
     testImplementation(projects.libraries.mediapickers.test)
     testImplementation(projects.libraries.permissions.test)
@@ -91,4 +102,5 @@ dependencies {
     testImplementation(projects.libraries.testtags)
     testImplementation(projects.features.poll.test)
     testImplementation(projects.libraries.eventformatter.test)
+    testImplementation(projects.libraries.recentemojis.test)
 }
diff --git a/features/messages/impl/src/main/AndroidManifest.xml b/features/messages/impl/src/main/AndroidManifest.xml
index 4aec7e11d9..ed135aef7a 100644
--- a/features/messages/impl/src/main/AndroidManifest.xml
+++ b/features/messages/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt
index b27bcab3b8..0293a400a8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,36 +10,20 @@ package io.element.android.features.messages.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.messages.api.MessagesEntryPoint
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultMessagesEntryPoint : MessagesEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MessagesEntryPoint.NodeBuilder {
-        val nodeFactories = parentNode.bindings<NodeFactoriesBindings>().nodeFactories()
-        val plugins = ArrayList<Plugin>()
-
-        return object : MessagesEntryPoint.NodeBuilder {
-            override fun params(params: MessagesEntryPoint.Params): MessagesEntryPoint.NodeBuilder {
-                plugins += MessagesEntryPoint.Params(params.initialTarget)
-                return this
-            }
-
-            override fun callback(callback: MessagesEntryPoint.Callback): MessagesEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return nodeFactories[MessagesFlowNode::class]!!.create(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: MessagesEntryPoint.Params,
+        callback: MessagesEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<MessagesFlowNode>(buildContext, listOf(params, callback))
     }
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt
index 2e035b6299..2419d76038 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,6 +19,7 @@ sealed interface MessagesEvents {
     data class InviteDialogDismissed(val action: InviteDialogAction) : MessagesEvents
     data class OnUserClicked(val user: MatrixUser) : MessagesEvents
     data object Dismiss : MessagesEvents
+    data object MarkAsFullyReadAndExit : MessagesEvents
 }
 
 enum class InviteDialogAction {
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 82aafcf545..f0b88e1956 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,8 +17,8 @@ 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
@@ -25,6 +26,7 @@ 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.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.Location
 import io.element.android.features.location.api.LocationService
@@ -33,8 +35,7 @@ import io.element.android.features.location.api.ShowLocationEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewNode
-import io.element.android.features.messages.impl.forward.ForwardMessagesNode
-import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider
+import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimelineProvider
 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
@@ -53,6 +54,7 @@ import io.element.android.features.poll.api.create.CreatePollEntryPoint
 import io.element.android.features.poll.api.create.CreatePollMode
 import io.element.android.libraries.architecture.BackstackWithOverlayBox
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.overlay.Overlay
 import io.element.android.libraries.architecture.overlay.operation.hide
@@ -86,10 +88,12 @@ import io.element.android.libraries.textcomposer.mentions.MentionSpanUpdater
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
+import kotlin.time.Duration.Companion.milliseconds
 
 @ContributesNode(RoomScope::class)
 @AssistedInject
@@ -103,6 +107,7 @@ class MessagesFlowNode(
     private val createPollEntryPoint: CreatePollEntryPoint,
     private val elementCallEntryPoint: ElementCallEntryPoint,
     private val mediaViewerEntryPoint: MediaViewerEntryPoint,
+    private val forwardEntryPoint: ForwardEntryPoint,
     private val analyticsService: AnalyticsService,
     private val locationService: LocationService,
     private val room: BaseRoom,
@@ -110,7 +115,7 @@ class MessagesFlowNode(
     private val roomNamesCache: RoomNamesCache,
     private val mentionSpanUpdater: MentionSpanUpdater,
     private val mentionSpanTheme: MentionSpanTheme,
-    private val pinnedEventsTimelineProvider: PinnedEventsTimelineProvider,
+    private val pinnedEventsTimelineProvider: DefaultPinnedEventsTimelineProvider,
     private val timelineController: TimelineController,
     private val knockRequestsListEntryPoint: KnockRequestsListEntryPoint,
     private val dateFormatter: DateFormatter,
@@ -124,8 +129,8 @@ class MessagesFlowNode(
         savedStateMap = buildContext.savedStateMap,
     ),
     buildContext = buildContext,
-    plugins = plugins
-) {
+    plugins = plugins,
+), MessagesEntryPoint.NodeProxy {
     sealed interface NavTarget : Parcelable {
         @Parcelize
         data class Messages(val focusedEventId: EventId?) : NavTarget
@@ -149,7 +154,10 @@ class MessagesFlowNode(
         data class EventDebugInfo(val eventId: EventId?, val debugInfo: TimelineItemDebugInfo) : NavTarget
 
         @Parcelize
-        data class ForwardEvent(val eventId: EventId, val fromPinnedEvents: Boolean) : NavTarget
+        data class ForwardEvent(
+            val eventId: EventId,
+            val fromPinnedEvents: Boolean,
+        ) : NavTarget
 
         @Parcelize
         data class ReportMessage(val eventId: EventId, val senderId: UserId) : NavTarget
@@ -170,10 +178,10 @@ class MessagesFlowNode(
         data object KnockRequestsList : NavTarget
 
         @Parcelize
-        data class OpenThread(val threadRootId: ThreadId, val focusedEventId: EventId?) : NavTarget
+        data class Thread(val threadRootId: ThreadId, val focusedEventId: EventId?) : NavTarget
     }
 
-    private val callbacks = plugins<MessagesEntryPoint.Callback>()
+    private val callback: MessagesEntryPoint.Callback = callback()
 
     override fun onBuilt() {
         super.onBuilt()
@@ -211,18 +219,18 @@ class MessagesFlowNode(
         return when (navTarget) {
             is NavTarget.Messages -> {
                 val callback = object : MessagesNode.Callback {
-                    override fun onRoomDetailsClick() {
-                        callbacks.forEach { it.onRoomDetailsClick() }
+                    override fun navigateToRoomDetails() {
+                        callback.navigateToRoomDetails()
                     }
 
-                    override fun onEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
+                    override fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
                         return processEventClick(
                             timelineMode = timelineMode,
                             event = event,
                         )
                     }
 
-                    override fun onPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
+                    override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
                         backstack.push(
                             NavTarget.AttachmentPreview(
                                 attachment = attachments.first(),
@@ -232,39 +240,39 @@ class MessagesFlowNode(
                         )
                     }
 
-                    override fun onUserDataClick(userId: UserId) {
-                        callbacks.forEach { it.onUserDataClick(userId) }
+                    override fun navigateToRoomMemberDetails(userId: UserId) {
+                        callback.navigateToRoomMemberDetails(userId)
                     }
 
-                    override fun onPermalinkClick(data: PermalinkData) {
-                        callbacks.forEach { it.onPermalinkClick(data, pushToBackstack = true) }
+                    override fun handlePermalinkClick(data: PermalinkData) {
+                        callback.handlePermalinkClick(data, pushToBackstack = true)
                     }
 
-                    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+                    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
                         backstack.push(NavTarget.EventDebugInfo(eventId, debugInfo))
                     }
 
-                    override fun onForwardEventClick(eventId: EventId) {
+                    override fun forwardEvent(eventId: EventId) {
                         backstack.push(NavTarget.ForwardEvent(eventId, fromPinnedEvents = false))
                     }
 
-                    override fun onReportMessage(eventId: EventId, senderId: UserId) {
+                    override fun navigateToReportMessage(eventId: EventId, senderId: UserId) {
                         backstack.push(NavTarget.ReportMessage(eventId, senderId))
                     }
 
-                    override fun onSendLocationClick() {
+                    override fun navigateToSendLocation() {
                         backstack.push(NavTarget.SendLocation(Timeline.Mode.Live))
                     }
 
-                    override fun onCreatePollClick() {
+                    override fun navigateToCreatePoll() {
                         backstack.push(NavTarget.CreatePoll(Timeline.Mode.Live))
                     }
 
-                    override fun onEditPollClick(eventId: EventId) {
+                    override fun navigateToEditPoll(eventId: EventId) {
                         backstack.push(NavTarget.EditPoll(Timeline.Mode.Live, eventId))
                     }
 
-                    override fun onJoinCallClick(roomId: RoomId) {
+                    override fun navigateToRoomCall(roomId: RoomId) {
                         val callType = CallType.RoomCall(
                             sessionId = sessionId,
                             roomId = roomId,
@@ -273,16 +281,16 @@ class MessagesFlowNode(
                         elementCallEntryPoint.startCall(callType)
                     }
 
-                    override fun onViewAllPinnedEvents() {
+                    override fun navigateToPinnedMessagesList() {
                         backstack.push(NavTarget.PinnedMessagesList)
                     }
 
-                    override fun onViewKnockRequests() {
+                    override fun navigateToKnockRequestsList() {
                         backstack.push(NavTarget.KnockRequestsList)
                     }
 
-                    override fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) {
-                        backstack.push(NavTarget.OpenThread(threadRootId, focusedEventId))
+                    override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
+                        backstack.push(NavTarget.Thread(threadRootId, focusedEventId))
                     }
                 }
                 val inputs = MessagesNode.Inputs(focusedEventId = navTarget.focusedEventId)
@@ -302,14 +310,21 @@ class MessagesFlowNode(
                         overlay.hide()
                     }
 
-                    override fun onViewInTimeline(eventId: EventId) {
-                        viewInTimeline(eventId)
+                    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.nodeBuilder(this, buildContext)
-                    .params(params)
-                    .callback(callback)
-                    .build()
+                mediaViewerEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback
+                )
             }
             is NavTarget.AttachmentPreview -> {
                 val inputs = AttachmentsPreviewNode.Inputs(
@@ -321,7 +336,11 @@ class MessagesFlowNode(
             }
             is NavTarget.LocationViewer -> {
                 val inputs = ShowLocationEntryPoint.Inputs(navTarget.location, navTarget.description)
-                showLocationEntryPoint.createNode(this, buildContext, inputs)
+                showLocationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inputs = inputs,
+                )
             }
             is NavTarget.EventDebugInfo -> {
                 val inputs = EventDebugInfoNode.Inputs(navTarget.eventId, navTarget.debugInfo)
@@ -333,69 +352,79 @@ class MessagesFlowNode(
                 } else {
                     timelineController
                 }
-                val inputs = ForwardMessagesNode.Inputs(navTarget.eventId, timelineProvider)
-                val callback = object : ForwardMessagesNode.Callback {
-                    override fun onForwardedToSingleRoom(roomId: RoomId) {
-                        callbacks.forEach { it.onForwardedToSingleRoom(roomId) }
+                val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider)
+                val callback = object : ForwardEntryPoint.Callback {
+                    override fun onDone(roomIds: List<RoomId>) {
+                        backstack.pop()
+                        roomIds.singleOrNull()?.let { roomId ->
+                            callback.navigateToRoom(roomId)
+                        }
                     }
                 }
-                createNode<ForwardMessagesNode>(buildContext, listOf(inputs, callback))
+                forwardEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
             }
             is NavTarget.ReportMessage -> {
                 val inputs = ReportMessageNode.Inputs(navTarget.eventId, navTarget.senderId)
                 createNode<ReportMessageNode>(buildContext, listOf(inputs))
             }
             is NavTarget.SendLocation -> {
-                sendLocationEntryPoint
-                    .builder(navTarget.timelineMode)
-                    .build(this, buildContext)
+                sendLocationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    timelineMode = navTarget.timelineMode,
+                )
             }
             is NavTarget.CreatePoll -> {
-                createPollEntryPoint.nodeBuilder(this, buildContext)
-                    .params(
-                        CreatePollEntryPoint.Params(
-                            timelineMode = navTarget.timelineMode,
-                            mode = CreatePollMode.NewPoll
-                        )
-                    )
-                    .build()
+                createPollEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = CreatePollEntryPoint.Params(
+                        timelineMode = navTarget.timelineMode,
+                        mode = CreatePollMode.NewPoll
+                    ),
+                )
             }
             is NavTarget.EditPoll -> {
-                createPollEntryPoint.nodeBuilder(this, buildContext)
-                    .params(
-                        CreatePollEntryPoint.Params(
-                            timelineMode = navTarget.timelineMode,
-                            mode = CreatePollMode.EditPoll(eventId = navTarget.eventId)
-                        )
-                    )
-                    .build()
+                createPollEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = CreatePollEntryPoint.Params(
+                        timelineMode = navTarget.timelineMode,
+                        mode = CreatePollMode.EditPoll(eventId = navTarget.eventId)
+                    ),
+                )
             }
             NavTarget.PinnedMessagesList -> {
                 val callback = object : PinnedMessagesListNode.Callback {
-                    override fun onEventClick(event: TimelineItem.Event) {
+                    override fun handleEventClick(event: TimelineItem.Event) {
                         processEventClick(
                             timelineMode = Timeline.Mode.PinnedEvents,
                             event = event,
                         )
                     }
 
-                    override fun onUserDataClick(userId: UserId) {
-                        callbacks.forEach { it.onUserDataClick(userId) }
+                    override fun navigateToRoomMemberDetails(userId: UserId) {
+                        callback.navigateToRoomMemberDetails(userId)
                     }
 
-                    override fun onViewInTimelineClick(eventId: EventId) {
-                        viewInTimeline(eventId)
+                    override fun viewInTimeline(eventId: EventId) {
+                        this@MessagesFlowNode.viewInTimeline(eventId)
                     }
 
-                    override fun onRoomPermalinkClick(data: PermalinkData.RoomLink) {
-                        callbacks.forEach { it.onPermalinkClick(data, pushToBackstack = !room.matches(data.roomIdOrAlias)) }
+                    override fun handlePermalinkClick(data: PermalinkData.RoomLink) {
+                        callback.handlePermalinkClick(data, pushToBackstack = !room.matches(data.roomIdOrAlias))
                     }
 
-                    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+                    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
                         backstack.push(NavTarget.EventDebugInfo(eventId, debugInfo))
                     }
 
-                    override fun onForwardEventClick(eventId: EventId) {
+                    override fun handleForwardEventClick(eventId: EventId) {
                         backstack.push(NavTarget.ForwardEvent(eventId = eventId, fromPinnedEvents = true))
                     }
                 }
@@ -404,20 +433,20 @@ class MessagesFlowNode(
             NavTarget.KnockRequestsList -> {
                 knockRequestsListEntryPoint.createNode(this, buildContext)
             }
-            is NavTarget.OpenThread -> {
+            is NavTarget.Thread -> {
                 val inputs = ThreadedMessagesNode.Inputs(
                     threadRootEventId = navTarget.threadRootId,
                     focusedEventId = navTarget.focusedEventId,
                 )
                 val callback = object : ThreadedMessagesNode.Callback {
-                    override fun onEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
+                    override fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
                         return processEventClick(
                             timelineMode = timelineMode,
                             event = event,
                         )
                     }
 
-                    override fun onPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
+                    override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
                         backstack.push(
                             NavTarget.AttachmentPreview(
                                 attachment = attachments.first(),
@@ -427,39 +456,39 @@ class MessagesFlowNode(
                         )
                     }
 
-                    override fun onUserDataClick(userId: UserId) {
-                        callbacks.forEach { it.onUserDataClick(userId) }
+                    override fun navigateToRoomMemberDetails(userId: UserId) {
+                        callback.navigateToRoomMemberDetails(userId)
                     }
 
-                    override fun onPermalinkClick(data: PermalinkData) {
-                        callbacks.forEach { it.onPermalinkClick(data, pushToBackstack = true) }
+                    override fun handlePermalinkClick(data: PermalinkData) {
+                        callback.handlePermalinkClick(data, pushToBackstack = true)
                     }
 
-                    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+                    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
                         backstack.push(NavTarget.EventDebugInfo(eventId, debugInfo))
                     }
 
-                    override fun onForwardEventClick(eventId: EventId) {
+                    override fun handleForwardEventClick(eventId: EventId) {
                         backstack.push(NavTarget.ForwardEvent(eventId, fromPinnedEvents = false))
                     }
 
-                    override fun onReportMessage(eventId: EventId, senderId: UserId) {
+                    override fun navigateToReportMessage(eventId: EventId, senderId: UserId) {
                         backstack.push(NavTarget.ReportMessage(eventId, senderId))
                     }
 
-                    override fun onSendLocationClick() {
+                    override fun navigateToSendLocation() {
                         backstack.push(NavTarget.SendLocation(Timeline.Mode.Thread(navTarget.threadRootId)))
                     }
 
-                    override fun onCreatePollClick() {
+                    override fun navigateToCreatePoll() {
                         backstack.push(NavTarget.CreatePoll(Timeline.Mode.Thread(navTarget.threadRootId)))
                     }
 
-                    override fun onEditPollClick(eventId: EventId) {
+                    override fun navigateToEditPoll(eventId: EventId) {
                         backstack.push(NavTarget.EditPoll(Timeline.Mode.Thread(navTarget.threadRootId), eventId))
                     }
 
-                    override fun onJoinCallClick(roomId: RoomId) {
+                    override fun navigateToRoomCall(roomId: RoomId) {
                         val callType = CallType.RoomCall(
                             sessionId = sessionId,
                             roomId = roomId,
@@ -468,8 +497,8 @@ class MessagesFlowNode(
                         elementCallEntryPoint.startCall(callType)
                     }
 
-                    override fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) {
-                        backstack.push(NavTarget.OpenThread(threadRootId, focusedEventId))
+                    override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
+                        backstack.push(NavTarget.Thread(threadRootId, focusedEventId))
                     }
                 }
                 createNode<ThreadedMessagesNode>(buildContext, listOf(inputs, callback))
@@ -482,7 +511,7 @@ class MessagesFlowNode(
             roomIdOrAlias = room.roomId.toRoomIdOrAlias(),
             eventId = eventId,
         )
-        callbacks.forEach { it.onPermalinkClick(permalinkData, pushToBackstack = false) }
+        callback.handlePermalinkClick(permalinkData, pushToBackstack = false)
     }
 
     private fun processEventClick(
@@ -583,6 +612,16 @@ class MessagesFlowNode(
         )
     }
 
+    override suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?) {
+        // Wait until we have the UI for the main timeline attached
+        waitForChildAttached<MessagesNode>()
+        // Give some time for the items in the main timeline to be received, otherwise loading the focused thread root id won't work
+        // (look at TimelineItemIndexer and firstProcessLatch for more info)
+        delay(10.milliseconds)
+        // Then push the new threads screen on top
+        backstack.push(NavTarget.Thread(threadId, focusedEventId))
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         mentionSpanTheme.updateStyles()
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 fc417fc029..2ec5c0bcbf 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,11 +17,12 @@ import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugIn
 import kotlinx.collections.immutable.ImmutableList
 
 interface MessagesNavigator {
-    fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-    fun onForwardEventClick(eventId: EventId)
-    fun onReportContentClick(eventId: EventId, senderId: UserId)
-    fun onEditPollClick(eventId: EventId)
-    fun onPreviewAttachment(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
-    fun onNavigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>)
-    fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?)
+    fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+    fun forwardEvent(eventId: EventId)
+    fun navigateToReportMessage(eventId: EventId, senderId: UserId)
+    fun navigateToEditPoll(eventId: EventId)
+    fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
+    fun navigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>)
+    fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
+    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 d4283d19d5..0692a98745 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.features.messages.impl
 
 import android.app.Activity
 import android.content.Context
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -23,7 +25,6 @@ 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.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
@@ -32,7 +33,7 @@ import io.element.android.features.knockrequests.api.banner.KnockRequestsBannerR
 import io.element.android.features.messages.impl.actionlist.ActionListPresenter
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemActionPostProcessor
 import io.element.android.features.messages.impl.attachments.Attachment
-import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvent
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.TimelineEvents
@@ -47,8 +48,8 @@ import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTa
 import io.element.android.libraries.androidutils.system.openUrlInExternalApp
 import io.element.android.libraries.androidutils.system.toast
 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.core.bool.orFalse
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -67,7 +68,9 @@ 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.ui.strings.CommonStrings
+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
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -92,13 +95,12 @@ class MessagesNode(
     private val knockRequestsBannerRenderer: KnockRequestsBannerRenderer,
     private val roomMemberModerationRenderer: RoomMemberModerationRenderer,
 ) : Node(buildContext, plugins = plugins), MessagesNavigator {
-    private val callbacks = plugins<Callback>()
-
     data class Inputs(
         val focusedEventId: EventId?,
     ) : NodeInputs
 
     private val inputs = inputs<Inputs>()
+    private val callback: Callback = callback()
 
     private val timelineController = TimelineController(room, room.liveTimeline)
     private val presenter = presenterFactory.create(
@@ -113,21 +115,21 @@ class MessagesNode(
     )
 
     interface Callback : Plugin {
-        fun onEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean
-        fun onPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
-        fun onUserDataClick(userId: UserId)
-        fun onPermalinkClick(data: PermalinkData)
-        fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-        fun onForwardEventClick(eventId: EventId)
-        fun onReportMessage(eventId: EventId, senderId: UserId)
-        fun onSendLocationClick()
-        fun onCreatePollClick()
-        fun onEditPollClick(eventId: EventId)
-        fun onJoinCallClick(roomId: RoomId)
-        fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?)
-        fun onRoomDetailsClick()
-        fun onViewAllPinnedEvents()
-        fun onViewKnockRequests()
+        fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean
+        fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
+        fun navigateToRoomMemberDetails(userId: UserId)
+        fun handlePermalinkClick(data: PermalinkData)
+        fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+        fun forwardEvent(eventId: EventId)
+        fun navigateToReportMessage(eventId: EventId, senderId: UserId)
+        fun navigateToSendLocation()
+        fun navigateToCreatePoll()
+        fun navigateToEditPoll(eventId: EventId)
+        fun navigateToRoomCall(roomId: RoomId)
+        fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
+        fun navigateToRoomDetails()
+        fun navigateToPinnedMessagesList()
+        fun navigateToKnockRequestsList()
     }
 
     override fun onBuilt() {
@@ -136,38 +138,15 @@ class MessagesNode(
             onCreate = {
                 sessionCoroutineScope.launch { analyticsService.capture(room.toAnalyticsViewRoom()) }
             },
+            onResume = {
+                analyticsService.finishLongRunningTransaction(LoadMessagesUi)
+            },
             onDestroy = {
                 mediaPlayer.close()
             }
         )
     }
 
-    private fun onRoomDetailsClick() {
-        callbacks.forEach { it.onRoomDetailsClick() }
-    }
-
-    private fun onViewAllPinnedMessagesClick() {
-        callbacks.forEach { it.onViewAllPinnedEvents() }
-    }
-
-    private fun onViewKnockRequestsClick() {
-        callbacks.forEach { it.onViewKnockRequests() }
-    }
-
-    private fun onEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
-        // Note: cannot use `callbacks.all { it.onEventClick(event) }` because:
-        // - if callbacks is empty, it will return true and we want to return false.
-        // - if a callback returns false, the other callback will not be invoked.
-        return callbacks.takeIf { it.isNotEmpty() }
-            ?.map { it.onEventClick(timelineMode, event) }
-            ?.all { it }
-            .orFalse()
-    }
-
-    private fun onUserDataClick(userId: UserId) {
-        callbacks.forEach { it.onUserDataClick(userId) }
-    }
-
     private fun onLinkClick(
         activity: Activity,
         darkTheme: Boolean,
@@ -179,7 +158,7 @@ class MessagesNode(
             is PermalinkData.UserLink -> {
                 // Open the room member profile, it will fallback to
                 // the user profile if the user is not in the room
-                callbacks.forEach { it.onUserDataClick(permalink.userId) }
+                callback.navigateToRoomMemberDetails(permalink.userId)
             }
             is PermalinkData.RoomLink -> {
                 handleRoomLinkClick(permalink, eventSink)
@@ -210,59 +189,49 @@ class MessagesNode(
                 displaySameRoomToast()
             }
         } else {
-            callbacks.forEach { it.onPermalinkClick(roomLink) }
+            callback.handlePermalinkClick(roomLink)
         }
     }
 
-    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
-        callbacks.forEach { it.onShowEventDebugInfoClick(eventId, debugInfo) }
+    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+        callback.navigateToEventDebugInfo(eventId, debugInfo)
     }
 
-    override fun onForwardEventClick(eventId: EventId) {
-        callbacks.forEach { it.onForwardEventClick(eventId) }
+    override fun forwardEvent(eventId: EventId) {
+        callback.forwardEvent(eventId)
     }
 
-    override fun onReportContentClick(eventId: EventId, senderId: UserId) {
-        callbacks.forEach { it.onReportMessage(eventId, senderId) }
+    override fun navigateToReportMessage(eventId: EventId, senderId: UserId) {
+        callback.navigateToReportMessage(eventId, senderId)
     }
 
-    override fun onEditPollClick(eventId: EventId) {
-        callbacks.forEach { it.onEditPollClick(eventId) }
+    override fun navigateToEditPoll(eventId: EventId) {
+        callback.navigateToEditPoll(eventId)
     }
 
-    override fun onPreviewAttachment(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
-        callbacks.forEach { it.onPreviewAttachments(attachments, inReplyToEventId) }
+    override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
+        callback.navigateToPreviewAttachments(attachments, inReplyToEventId)
     }
 
-    override fun onNavigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>) {
+    override fun navigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>) {
         if (roomId == room.roomId) {
             displaySameRoomToast()
         } else {
             val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias(), eventId, viaParameters = serverNames.toImmutableList())
-            callbacks.forEach { it.onPermalinkClick(permalinkData) }
+            callback.handlePermalinkClick(permalinkData)
         }
     }
 
-    override fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) {
-        callbacks.forEach { it.onOpenThread(threadRootId, focusedEventId) }
-    }
-
-    private fun onSendLocationClick() {
-        callbacks.forEach { it.onSendLocationClick() }
-    }
-
-    private fun onCreatePollClick() {
-        callbacks.forEach { it.onCreatePollClick() }
-    }
-
-    private fun onJoinCallClick() {
-        callbacks.forEach { it.onJoinCallClick(room.roomId) }
+    override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
+        callback.navigateToThread(threadRootId, focusedEventId)
     }
 
     private fun displaySameRoomToast() {
         context.toast(CommonStrings.screen_room_permalink_same_room_android)
     }
 
+    override fun close() = navigateUp()
+
     @Composable
     override fun View(modifier: Modifier) {
         val activity = requireNotNull(LocalActivity.current)
@@ -271,29 +240,34 @@ class MessagesNode(
             LocalTimelineItemPresenterFactories provides timelineItemPresenterFactories,
         ) {
             val state = presenter.present()
+
+            BackHandler {
+                state.eventSink(MessagesEvents.MarkAsFullyReadAndExit)
+            }
+
             OnLifecycleEvent { _, event ->
                 when (event) {
-                    Lifecycle.Event.ON_PAUSE -> state.composerState.eventSink(MessageComposerEvents.SaveDraft)
+                    Lifecycle.Event.ON_PAUSE -> state.composerState.eventSink(MessageComposerEvent.SaveDraft)
                     else -> Unit
                 }
             }
             MessagesView(
                 state = state,
-                onBackClick = this::navigateUp,
-                onRoomDetailsClick = this::onRoomDetailsClick,
+                onBackClick = { state.eventSink(MessagesEvents.MarkAsFullyReadAndExit) },
+                onRoomDetailsClick = callback::navigateToRoomDetails,
                 onEventContentClick = { isLive, event ->
                     if (isLive) {
-                        onEventClick(timelineController.mainTimelineMode(), event)
+                        callback.handleEventClick(timelineController.mainTimelineMode(), event)
                     } else {
                         val detachedTimelineMode = timelineController.detachedTimelineMode()
                         if (detachedTimelineMode != null) {
-                            onEventClick(detachedTimelineMode, event)
+                            callback.handleEventClick(detachedTimelineMode, event)
                         } else {
                             false
                         }
                     }
                 },
-                onUserDataClick = this::onUserDataClick,
+                onUserDataClick = callback::navigateToRoomMemberDetails,
                 onLinkClick = { url, customTab ->
                     onLinkClick(
                         activity = activity,
@@ -303,15 +277,15 @@ class MessagesNode(
                         customTab = customTab,
                     )
                 },
-                onSendLocationClick = this::onSendLocationClick,
-                onCreatePollClick = this::onCreatePollClick,
-                onJoinCallClick = this::onJoinCallClick,
-                onViewAllPinnedMessagesClick = this::onViewAllPinnedMessagesClick,
+                onSendLocationClick = callback::navigateToSendLocation,
+                onCreatePollClick = callback::navigateToCreatePoll,
+                onJoinCallClick = { callback.navigateToRoomCall(room.roomId) },
+                onViewAllPinnedMessagesClick = callback::navigateToPinnedMessagesList,
                 modifier = modifier,
                 knockRequestsBannerView = {
                     knockRequestsBannerRenderer.View(
                         modifier = Modifier,
-                        onViewRequestsClick = this::onViewKnockRequestsClick
+                        onViewRequestsClick = callback::navigateToKnockRequestsList,
                     )
                 },
             )
@@ -319,7 +293,7 @@ class MessagesNode(
                 state = state.roomMemberModerationState,
                 onSelectAction = { action, target ->
                     when (action) {
-                        is ModerationAction.DisplayProfile -> onUserDataClick(target.userId)
+                        is ModerationAction.DisplayProfile -> callback.navigateToRoomMemberDetails(target.userId)
                         else -> state.roomMemberModerationState.eventSink(RoomMemberModerationEvents.ProcessAction(action, target))
                     }
                 },
@@ -329,12 +303,11 @@ class MessagesNode(
             var focusedEventId by rememberSaveable {
                 mutableStateOf(inputs.focusedEventId)
             }
-            LaunchedEffect(Unit) {
-                focusedEventId?.also { eventId ->
-                    state.timelineState.eventSink(TimelineEvents.FocusOnEvent(eventId))
+            LaunchedEffect(focusedEventId) {
+                if (focusedEventId != null) {
+                    state.timelineState.eventSink(TimelineEvents.FocusOnEvent(focusedEventId!!))
+                    focusedEventId = null
                 }
-                // Reset the focused event id to null to avoid refocusing when restoring node.
-                focusedEventId = null
             }
         }
     }
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 5bf92ef6f6..8a5f3cf423 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-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.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -31,11 +30,13 @@ import io.element.android.features.messages.api.timeline.HtmlConverterProvider
 import io.element.android.features.messages.impl.actionlist.ActionListEvents
 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.historyvisible.HistoryVisibleState
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeState
 import io.element.android.features.messages.impl.link.LinkState
-import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvent
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
 import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerState
+import io.element.android.features.messages.impl.timeline.MarkAsFullyRead
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.TimelineEvents
 import io.element.android.features.messages.impl.timeline.TimelineState
@@ -65,27 +66,23 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 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.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.toThreadId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
-import io.element.android.libraries.matrix.api.recentemojis.AddRecentEmoji
 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.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.isDm
-import io.element.android.libraries.matrix.api.room.powerlevels.canPinUnpin
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
-import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage
-import io.element.android.libraries.matrix.api.sync.SyncService
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 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.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
@@ -94,6 +91,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
 
 @AssistedInject
 class MessagesPresenter(
@@ -104,6 +102,7 @@ class MessagesPresenter(
     @Assisted private val timelinePresenter: Presenter<TimelineState>,
     private val timelineProtectionPresenter: Presenter<TimelineProtectionState>,
     private val identityChangeStatePresenter: Presenter<IdentityChangeState>,
+    private val historyVisibleStatePresenter: Presenter<HistoryVisibleState>,
     private val linkPresenter: Presenter<LinkState>,
     @Assisted private val actionListPresenter: Presenter<ActionListState>,
     private val customReactionPresenter: Presenter<CustomReactionState>,
@@ -112,7 +111,6 @@ class MessagesPresenter(
     private val pinnedMessagesBannerPresenter: Presenter<PinnedMessagesBannerState>,
     private val roomCallStatePresenter: Presenter<RoomCallState>,
     private val roomMemberModerationPresenter: Presenter<RoomMemberModerationState>,
-    private val syncService: SyncService,
     private val snackbarDispatcher: SnackbarDispatcher,
     private val dispatchers: CoroutineDispatchers,
     private val clipboardHelper: ClipboardHelper,
@@ -124,6 +122,8 @@ class MessagesPresenter(
     private val encryptionService: EncryptionService,
     private val featureFlagService: FeatureFlagService,
     private val addRecentEmoji: AddRecentEmoji,
+    private val markAsFullyRead: MarkAsFullyRead,
+    @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
 ) : Presenter<MessagesState> {
     @AssistedFactory
     interface Factory {
@@ -140,10 +140,13 @@ class MessagesPresenter(
         timelineMode = timelineController.mainTimelineMode()
     )
 
+    private val markingAsReadAndExiting = AtomicBoolean(false)
+
     @Composable
     override fun present(): MessagesState {
         htmlConverterProvider.Update()
 
+        val coroutineScope = rememberCoroutineScope()
         val roomInfo by room.roomInfoFlow.collectAsState()
         val localCoroutineScope = rememberCoroutineScope()
         val composerState = composerPresenter.present()
@@ -151,6 +154,7 @@ class MessagesPresenter(
         val timelineState = timelinePresenter.present()
         val timelineProtectionState = timelineProtectionPresenter.present()
         val identityChangeState = identityChangeStatePresenter.present()
+        val historyVisibleState = historyVisibleStatePresenter.present()
         val actionListState = actionListPresenter.present()
         val linkState = linkPresenter.present()
         val customReactionState = customReactionPresenter.present()
@@ -160,7 +164,9 @@ class MessagesPresenter(
         val roomCallState = roomCallStatePresenter.present()
         val roomMemberModerationState = roomMemberModerationPresenter.present()
 
-        val userEventPermissions by userEventPermissions(roomInfo)
+        val userEventPermissions by room.permissionsAsState(UserEventPermissions.DEFAULT) { perms ->
+            perms.userEventPermissions()
+        }
 
         val roomAvatar by remember {
             derivedStateOf { roomInfo.avatarData() }
@@ -193,7 +199,6 @@ class MessagesPresenter(
                 showReinvitePrompt = !hasDismissedInviteDialog && composerHasFocus && roomInfo.isDm && roomInfo.activeMembersCount == 1L
             }
         }
-        val isOnline by syncService.isOnline.collectAsState()
 
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
 
@@ -216,7 +221,7 @@ class MessagesPresenter(
             onPauseOrDispose {}
         }
 
-        fun handleEvents(event: MessagesEvents) {
+        fun handleEvent(event: MessagesEvents) {
             when (event) {
                 is MessagesEvents.HandleAction -> {
                     localCoroutineScope.handleTimelineAction(
@@ -242,6 +247,22 @@ class MessagesPresenter(
                 is MessagesEvents.OnUserClicked -> {
                     roomMemberModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(event.user))
                 }
+                is MessagesEvents.MarkAsFullyReadAndExit -> coroutineScope.launch {
+                    if (!markingAsReadAndExiting.getAndSet(true)) {
+                        val latestEventId = room.liveTimeline.getLatestEventId().getOrElse {
+                            Timber.w(it, "Failed to get latest event id to mark as fully read")
+                            navigator.close()
+                            return@launch
+                        }
+                        latestEventId?.let { eventId ->
+                            sessionCoroutineScope.launch {
+                                markAsFullyRead(room.roomId, eventId)
+                            }
+                        }
+                        navigator.close()
+                        markingAsReadAndExiting.set(false)
+                    }
+                }
             }
         }
 
@@ -250,50 +271,32 @@ class MessagesPresenter(
             roomName = roomInfo.name,
             roomAvatar = roomAvatar,
             heroes = heroes,
-            composerState = composerState,
             userEventPermissions = userEventPermissions,
+            composerState = composerState,
             voiceMessageComposerState = voiceMessageComposerState,
             timelineState = timelineState,
             timelineProtectionState = timelineProtectionState,
             identityChangeState = identityChangeState,
+            historyVisibleState = historyVisibleState,
             linkState = linkState,
             actionListState = actionListState,
             customReactionState = customReactionState,
             reactionSummaryState = reactionSummaryState,
             readReceiptBottomSheetState = readReceiptBottomSheetState,
-            hasNetworkConnection = isOnline,
             snackbarMessage = snackbarMessage,
-            showReinvitePrompt = showReinvitePrompt,
             inviteProgress = inviteProgress.value,
+            showReinvitePrompt = showReinvitePrompt,
             enableTextFormatting = MessageComposerConfig.ENABLE_RICH_TEXT_EDITING,
-            appName = buildMeta.applicationName,
             roomCallState = roomCallState,
+            appName = buildMeta.applicationName,
             pinnedMessagesBannerState = pinnedMessagesBannerState,
             dmUserVerificationState = dmUserVerificationState,
             roomMemberModerationState = roomMemberModerationState,
             successorRoom = roomInfo.successorRoom,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
-    @Composable
-    private fun userEventPermissions(roomInfo: RoomInfo): State<UserEventPermissions> {
-        val key = if (roomInfo.privilegedCreatorRole && roomInfo.creators.contains(room.sessionId)) {
-            Long.MAX_VALUE
-        } else {
-            roomInfo.roomPowerLevels?.hashCode() ?: 0L
-        }
-        return produceState(UserEventPermissions.DEFAULT, key1 = key) {
-            value = UserEventPermissions(
-                canSendMessage = room.canSendMessage(type = MessageEventType.RoomMessage).getOrElse { true },
-                canSendReaction = room.canSendMessage(type = MessageEventType.Reaction).getOrElse { true },
-                canRedactOwn = room.canRedactOwn().getOrElse { false },
-                canRedactOther = room.canRedactOther().getOrElse { false },
-                canPinUnpin = room.canPinUnpin().getOrElse { false },
-            )
-        }
-    }
-
     private fun RoomInfo.avatarData(): AvatarData {
         return AvatarData(
             id = id.value,
@@ -336,7 +339,7 @@ class MessagesPresenter(
                         is TimelineItemThreadInfo.ThreadResponse -> targetEvent.threadInfo.threadRootId
                         is TimelineItemThreadInfo.ThreadRoot, null -> targetEvent.eventId?.toThreadId()
                     } ?: return@launch
-                    navigator.onOpenThread(threadId, null)
+                    navigator.navigateToThread(threadId, null)
                 } else {
                     handleActionReply(targetEvent, composerState, timelineProtectionState)
                 }
@@ -444,7 +447,7 @@ class MessagesPresenter(
         when (targetEvent.content) {
             is TimelineItemPollContent -> {
                 if (targetEvent.eventId == null) return
-                navigator.onEditPollClick(targetEvent.eventId)
+                navigator.navigateToEditPoll(targetEvent.eventId)
             }
             else -> {
                 val composerMode = MessageComposerMode.Edit(
@@ -458,7 +461,7 @@ class MessagesPresenter(
                     }.orEmpty(),
                 )
                 composerState.eventSink(
-                    MessageComposerEvents.SetMode(composerMode)
+                    MessageComposerEvent.SetMode(composerMode)
                 )
             }
         }
@@ -473,7 +476,7 @@ class MessagesPresenter(
             content = "",
         )
         composerState.eventSink(
-            MessageComposerEvents.SetMode(composerMode)
+            MessageComposerEvent.SetMode(composerMode)
         )
     }
 
@@ -486,7 +489,7 @@ class MessagesPresenter(
             content = (targetEvent.content as? TimelineItemEventContentWithAttachment)?.caption.orEmpty(),
         )
         composerState.eventSink(
-            MessageComposerEvents.SetMode(composerMode)
+            MessageComposerEvent.SetMode(composerMode)
         )
     }
 
@@ -503,23 +506,23 @@ class MessagesPresenter(
                 hideImage = timelineProtectionState.hideMediaContent(targetEvent.eventId),
             )
             composerState.eventSink(
-                MessageComposerEvents.SetMode(composerMode)
+                MessageComposerEvent.SetMode(composerMode)
             )
         }
     }
 
     private fun handleShowDebugInfoAction(event: TimelineItem.Event) {
-        navigator.onShowEventDebugInfoClick(event.eventId, event.debugInfo)
+        navigator.navigateToEventDebugInfo(event.eventId, event.debugInfo)
     }
 
     private fun handleForwardAction(event: TimelineItem.Event) {
         if (event.eventId == null) return
-        navigator.onForwardEventClick(event.eventId)
+        navigator.forwardEvent(event.eventId)
     }
 
     private fun handleReportAction(event: TimelineItem.Event) {
         if (event.eventId == null) return
-        navigator.onReportContentClick(event.eventId, event.senderId)
+        navigator.navigateToReportMessage(event.eventId, event.senderId)
     }
 
     private fun handleEndPollAction(
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 3d05da5a3c..b9d86a6597 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
@@ -1,15 +1,16 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.features.messages.impl.actionlist.ActionListState
+import io.element.android.features.messages.impl.crypto.historyvisible.HistoryVisibleState
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeState
 import io.element.android.features.messages.impl.link.LinkState
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
@@ -29,7 +30,6 @@ import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
 import kotlinx.collections.immutable.ImmutableList
 
-@Immutable
 data class MessagesState(
     val roomId: RoomId,
     val roomName: String?,
@@ -41,12 +41,12 @@ data class MessagesState(
     val timelineState: TimelineState,
     val timelineProtectionState: TimelineProtectionState,
     val identityChangeState: IdentityChangeState,
+    val historyVisibleState: HistoryVisibleState,
     val linkState: LinkState,
     val actionListState: ActionListState,
     val customReactionState: CustomReactionState,
     val reactionSummaryState: ReactionSummaryState,
     val readReceiptBottomSheetState: ReadReceiptBottomSheetState,
-    val hasNetworkConnection: Boolean,
     val snackbarMessage: SnackbarMessage?,
     val inviteProgress: AsyncData<Unit>,
     val showReinvitePrompt: Boolean,
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 54b9dc659e..cec9f68b45 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,10 @@ import io.element.android.features.messages.api.timeline.voicemessages.composer.
 import io.element.android.features.messages.api.timeline.voicemessages.composer.aVoiceMessagePreviewState
 import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.anActionListState
+import io.element.android.features.messages.impl.crypto.historyvisible.HistoryVisibleState
+import io.element.android.features.messages.impl.crypto.historyvisible.aHistoryVisibleState
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeState
+import io.element.android.features.messages.impl.crypto.identity.aRoomMemberIdentityStateChange
 import io.element.android.features.messages.impl.crypto.identity.anIdentityChangeState
 import io.element.android.features.messages.impl.link.LinkState
 import io.element.android.features.messages.impl.link.aLinkState
@@ -37,6 +41,7 @@ import io.element.android.features.messages.impl.timeline.protection.aTimelinePr
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.features.roomcall.api.aStandByCallState
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
+import io.element.android.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -47,6 +52,7 @@ 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.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
@@ -56,7 +62,6 @@ open class MessagesStateProvider : PreviewParameterProvider<MessagesState> {
     override val values: Sequence<MessagesState>
         get() = sequenceOf(
             aMessagesState(),
-            aMessagesState(hasNetworkConnection = false),
             aMessagesState(composerState = aMessageComposerState(showAttachmentSourcePicker = true)),
             aMessagesState(userEventPermissions = aUserEventPermissions(canSendMessage = false)),
             aMessagesState(showReinvitePrompt = true),
@@ -83,6 +88,19 @@ open class MessagesStateProvider : PreviewParameterProvider<MessagesState> {
                     timelineItems = aTimelineItemList(aTimelineItemTextContent()),
                 )
             ),
+            aMessagesState(
+                composerState = aMessageComposerState(textEditorState = aTextEditorStateMarkdown()),
+                identityChangeState = anIdentityChangeState(listOf(aRoomMemberIdentityStateChange()))
+            ),
+            aMessagesState(
+                composerState = aMessageComposerState(textEditorState = aTextEditorStateMarkdown()),
+                historyVisibleState = aHistoryVisibleState(showAlert = true)
+            ),
+            aMessagesState(
+                composerState = aMessageComposerState(textEditorState = aTextEditorStateMarkdown()),
+                identityChangeState = anIdentityChangeState(listOf(aRoomMemberIdentityStateChange())),
+                historyVisibleState = aHistoryVisibleState(showAlert = true)
+            )
         )
 }
 
@@ -103,12 +121,12 @@ fun aMessagesState(
     ),
     timelineProtectionState: TimelineProtectionState = aTimelineProtectionState(),
     identityChangeState: IdentityChangeState = anIdentityChangeState(),
+    historyVisibleState: HistoryVisibleState = aHistoryVisibleState(),
     linkState: LinkState = aLinkState(),
     readReceiptBottomSheetState: ReadReceiptBottomSheetState = aReadReceiptBottomSheetState(),
     actionListState: ActionListState = anActionListState(),
     customReactionState: CustomReactionState = aCustomReactionState(),
     reactionSummaryState: ReactionSummaryState = aReactionSummaryState(),
-    hasNetworkConnection: Boolean = true,
     showReinvitePrompt: Boolean = false,
     roomCallState: RoomCallState = aStandByCallState(),
     pinnedMessagesBannerState: PinnedMessagesBannerState = aLoadedPinnedMessagesBannerState(),
@@ -126,13 +144,13 @@ fun aMessagesState(
     voiceMessageComposerState = voiceMessageComposerState,
     timelineProtectionState = timelineProtectionState,
     identityChangeState = identityChangeState,
+    historyVisibleState = historyVisibleState,
     linkState = linkState,
     timelineState = timelineState,
     readReceiptBottomSheetState = readReceiptBottomSheetState,
     actionListState = actionListState,
     customReactionState = customReactionState,
     reactionSummaryState = reactionSummaryState,
-    hasNetworkConnection = hasNetworkConnection,
     snackbarMessage = null,
     inviteProgress = AsyncData.Uninitialized,
     showReinvitePrompt = showReinvitePrompt,
@@ -147,11 +165,9 @@ fun aMessagesState(
 )
 
 fun aRoomMemberModerationState(
-    canKick: Boolean = false,
-    canBan: Boolean = false,
+    permissions: RoomMemberModerationPermissions = RoomMemberModerationPermissions.DEFAULT,
 ) = object : RoomMemberModerationState {
-    override val canKick: Boolean = canKick
-    override val canBan: Boolean = canBan
+    override val permissions: RoomMemberModerationPermissions = permissions
     override val eventSink: (RoomMemberModerationEvents) -> Unit = {}
 }
 
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 07fc178721..5479836bb3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,10 +28,16 @@ import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.MaterialTheme
 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.setValue
 import androidx.compose.ui.Alignment
 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.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
@@ -42,16 +49,17 @@ 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.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.impl.actionlist.ActionListEvents
 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.crypto.historyvisible.HistoryVisibleStateView
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeStateView
 import io.element.android.features.messages.impl.link.LinkEvents
 import io.element.android.features.messages.impl.link.LinkView
 import io.element.android.features.messages.impl.messagecomposer.AttachmentsBottomSheet
 import io.element.android.features.messages.impl.messagecomposer.DisabledComposerView
-import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvent
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerView
 import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsPickerView
 import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerState
@@ -71,7 +79,6 @@ 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.networkmonitor.api.ui.ConnectivityIndicatorView
 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
@@ -81,6 +88,7 @@ import io.element.android.libraries.designsystem.components.rememberExpandableBo
 import io.element.android.libraries.designsystem.preview.ElementPreview
 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.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -119,7 +127,7 @@ fun MessagesView(
     knockRequestsBannerView: @Composable () -> Unit,
 ) {
     OnLifecycleEvent { _, event ->
-        state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.LifecycleEvent(event))
+        state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.LifecycleEvent(event))
     }
 
     KeepScreenOn(state.voiceMessageComposerState.keepScreenOn)
@@ -128,6 +136,8 @@ fun MessagesView(
 
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
 
+    var maxComposerHeightPx by remember { mutableIntStateOf(120) }
+
     // This is needed because the composer is inside an AndroidView that can't be affected by the FocusManager in Compose
     val localView = LocalView.current
 
@@ -178,34 +188,37 @@ fun MessagesView(
         modifier = modifier
             .fillMaxSize()
             .imePadding()
-            .systemBarsPadding(),
+            .systemBarsPadding()
+            .onSizeChanged { size ->
+                // Let the composer takes at max half of the available height.
+                // The value will be different if the soft keyboard is displayed
+                // or not.
+                maxComposerHeightPx = (size.height * 0.5f).toInt()
+            },
         content = {
             Scaffold(
                 contentWindowInsets = WindowInsets.statusBars,
                 topBar = {
-                    Column {
-                        ConnectivityIndicatorView(isOnline = state.hasNetworkConnection)
-                        if (state.timelineState.timelineMode is Timeline.Mode.Thread) {
-                            ThreadTopBar(
-                                roomName = state.roomName,
-                                roomAvatarData = state.roomAvatar,
-                                heroes = state.heroes,
-                                isTombstoned = state.isTombstoned,
-                                onBackClick = onBackClick,
-                            )
-                        } else {
-                            MessagesViewTopBar(
-                                roomName = state.roomName,
-                                roomAvatar = state.roomAvatar,
-                                isTombstoned = state.isTombstoned,
-                                heroes = state.heroes,
-                                roomCallState = state.roomCallState,
-                                dmUserIdentityState = state.dmUserVerificationState,
-                                onBackClick = { hidingKeyboard { onBackClick() } },
-                                onRoomDetailsClick = { hidingKeyboard { onRoomDetailsClick() } },
-                                onJoinCallClick = onJoinCallClick,
-                            )
-                        }
+                    if (state.timelineState.timelineMode is Timeline.Mode.Thread) {
+                        ThreadTopBar(
+                            roomName = state.roomName,
+                            roomAvatarData = state.roomAvatar,
+                            heroes = state.heroes,
+                            isTombstoned = state.isTombstoned,
+                            onBackClick = onBackClick,
+                        )
+                    } else {
+                        MessagesViewTopBar(
+                            roomName = state.roomName,
+                            roomAvatar = state.roomAvatar,
+                            isTombstoned = state.isTombstoned,
+                            heroes = state.heroes,
+                            roomCallState = state.roomCallState,
+                            dmUserIdentityState = state.dmUserVerificationState,
+                            onBackClick = { hidingKeyboard { onBackClick() } },
+                            onRoomDetailsClick = { hidingKeyboard { onRoomDetailsClick() } },
+                            onJoinCallClick = onJoinCallClick,
+                        )
                     }
                 },
                 content = { padding ->
@@ -259,7 +272,7 @@ fun MessagesView(
                             roomAvatarData = state.roomAvatar,
                             suggestions = state.composerState.suggestions,
                             onSelectSuggestion = {
-                                state.composerState.eventSink(MessageComposerEvents.InsertSuggestion(it))
+                                state.composerState.eventSink(MessageComposerEvent.InsertSuggestion(it))
                             }
                         )
                     }
@@ -281,14 +294,13 @@ fun MessagesView(
                 },
             )
         },
-        sheetDragHandle = if (state.composerState.showTextFormatting) {
-            @Composable { toggleAction ->
+        sheetDragHandle = @Composable { toggleAction ->
+            if (state.composerState.showTextFormatting) {
                 val expandA11yLabel = stringResource(CommonStrings.a11y_expand_message_text_field)
                 val collapseA11yLabel = stringResource(CommonStrings.a11y_collapse_message_text_field)
                 BottomSheetDragHandle(
                     modifier = Modifier.semantics {
                         role = Role.Button
-
                         // Accessibility action to toggle the bottom sheet state
                         val label = when (expandableState.position) {
                             ExpandableBottomSheetLayoutState.Position.COLLAPSED, ExpandableBottomSheetLayoutState.Position.DRAGGING -> expandA11yLabel
@@ -300,9 +312,14 @@ fun MessagesView(
                         }
                     }
                 )
+            } else {
+                LaunchedEffect(Unit) {
+                    // Ensure that the bottom sheet is collapsed
+                    if (expandableState.position == ExpandableBottomSheetLayoutState.Position.EXPANDED) {
+                        toggleAction()
+                    }
+                }
             }
-        } else {
-            @Composable {}
         },
         isSwipeGestureEnabled = state.composerState.showTextFormatting,
         state = expandableState,
@@ -311,7 +328,7 @@ fun MessagesView(
         } else {
             RectangleShape
         },
-        maxBottomSheetContentHeight = 360.dp,
+        maxBottomSheetContentHeight = maxComposerHeightPx.toDp(),
     )
 
     ActionListView(
@@ -397,17 +414,17 @@ private fun MessagesViewContent(
         if (state.voiceMessageComposerState.showPermissionRationaleDialog) {
             VoiceMessagePermissionRationaleDialog(
                 onContinue = {
-                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.AcceptPermissionRationale)
+                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.AcceptPermissionRationale)
                 },
                 onDismiss = {
-                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.DismissPermissionsRationale)
+                    state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.DismissPermissionsRationale)
                 },
                 appName = state.appName
             )
         }
         if (state.voiceMessageComposerState.showSendFailureDialog) {
             VoiceMessageSendingFailedDialog(
-                onDismiss = { state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvents.DismissSendFailureDialog) },
+                onDismiss = { state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.DismissSendFailureDialog) },
             )
         }
 
@@ -470,10 +487,17 @@ private fun MessagesViewComposerBottomSheetContents(
                 // 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) {
-                    IdentityChangeStateView(
-                        state = state.identityChangeState,
-                        onLinkClick = onLinkClick,
-                    )
+                    if (state.identityChangeState.roomMemberIdentityStateChanges.isNotEmpty()) {
+                        IdentityChangeStateView(
+                            state = state.identityChangeState,
+                            onLinkClick = onLinkClick,
+                        )
+                    } else {
+                        HistoryVisibleStateView(
+                            state = state.historyVisibleState,
+                            onLinkClick = onLinkClick,
+                        )
+                    }
                 }
                 val verificationViolation = state.identityChangeState.roomMemberIdentityStateChanges.firstOrNull {
                     it.identityState == IdentityState.VerificationViolation
@@ -526,7 +550,6 @@ private fun SuccessorRoomBanner(
         content = stringResource(R.string.screen_room_timeline_tombstoned_room_message).toAnnotatedString(),
         onSubmitClick = { onRoomSuccessorClick(roomSuccessor.roomId) },
         modifier = modifier,
-        isCritical = false,
         submitText = stringResource(R.string.screen_room_timeline_tombstoned_room_action)
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/UserEventPermissions.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/UserEventPermissions.kt
index b60f7eeb75..349c8e58dc 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/UserEventPermissions.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/UserEventPermissions.kt
@@ -1,12 +1,16 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+
 /**
  * Represents the permissions a user has in a room.
  * It's dependent of the user's power level in the room.
@@ -28,3 +32,13 @@ data class UserEventPermissions(
         )
     }
 }
+
+fun RoomPermissions.userEventPermissions(): UserEventPermissions {
+    return UserEventPermissions(
+        canRedactOwn = canOwnUserRedactOwn(),
+        canRedactOther = canOwnUserRedactOther(),
+        canSendMessage = canOwnUserSendMessage(MessageEventType.RoomMessage),
+        canSendReaction = canOwnUserSendMessage(MessageEventType.Reaction),
+        canPinUnpin = canOwnUserPinUnpin()
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListEvents.kt
index 2052df77f1..415a80a48b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 25da8c2749..36166409b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -43,10 +44,10 @@ 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.core.EventId
-import io.element.android.libraries.matrix.api.recentemojis.GetRecentEmojis
 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
@@ -87,6 +88,8 @@ class DefaultActionListPresenter(
 
     private val comparator = TimelineItemActionComparator()
 
+    private val suggestedEmojis = persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
+
     @Composable
     override fun present(): ActionListState {
         val localCoroutineScope = rememberCoroutineScope()
@@ -104,7 +107,7 @@ class DefaultActionListPresenter(
 
         val isThreadsEnabled = featureFlagService.isFeatureEnabledFlow(FeatureFlags.Threads).collectAsState(false)
 
-        fun handleEvents(event: ActionListEvents) {
+        fun handleEvent(event: ActionListEvents) {
             when (event) {
                 ActionListEvents.Clear -> target.value = ActionListState.Target.None
                 is ActionListEvents.ComputeForMessage -> localCoroutineScope.computeForMessage(
@@ -120,7 +123,7 @@ class DefaultActionListPresenter(
 
         return ActionListState(
             target = target.value,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
@@ -146,6 +149,7 @@ class DefaultActionListPresenter(
         val displayEmojiReactions = usersEventPermissions.canSendReaction && timelineItem.content.canReact()
 
         if (actions.isNotEmpty() || displayEmojiReactions || verifiedUserSendFailure != VerifiedUserSendFailure.None) {
+            val recentEmojis = getRecentEmojis().getOrNull()?.toImmutableList() ?: persistentListOf()
             target.value = ActionListState.Target.Success(
                 event = timelineItem,
                 sentTimeFull = dateFormatter.format(
@@ -156,7 +160,10 @@ class DefaultActionListPresenter(
                 displayEmojiReactions = displayEmojiReactions,
                 verifiedUserSendFailure = verifiedUserSendFailure,
                 actions = actions.toImmutableList(),
-                recentEmojis = getRecentEmojis().getOrNull()?.toImmutableList() ?: persistentListOf()
+                // Merge suggested and recent emojis, removing duplicates and returning at most 100
+                recentEmojis = (suggestedEmojis + recentEmojis).distinct()
+                    .take(100)
+                    .toImmutableList()
             )
         } else {
             target.value = ActionListState.Target.None
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt
index 7524a737ff..c0554aaf0c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import kotlinx.collections.immutable.ImmutableList
 
-@Immutable
 data class ActionListState(
     val target: Target,
     val eventSink: (ActionListEvents) -> Unit,
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 eeab4aa3a0..e57e5bdc1e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,6 +28,8 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
 open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
+    private val suggestedEmojis = persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
+
     override val values: Sequence<ActionListState>
         get() {
             val reactionsState = aTimelineItemReactions(1, isHighlighted = true)
@@ -42,7 +45,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         displayEmojiReactions = true,
                         verifiedUserSendFailure = VerifiedUserSendFailure.None,
                         actions = aTimelineItemActionList(),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -58,7 +61,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         actions = aTimelineItemActionList(
                             copyAction = TimelineItemAction.CopyCaption,
                         ),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -73,7 +76,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         actions = aTimelineItemActionList(
                             copyAction = TimelineItemAction.CopyCaption,
                         ),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -88,7 +91,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         actions = aTimelineItemActionList(
                             copyAction = null,
                         ),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -103,7 +106,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         actions = aTimelineItemActionList(
                             copyAction = TimelineItemAction.CopyCaption,
                         ),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -118,7 +121,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         actions = aTimelineItemActionList(
                             copyAction = null,
                         ),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -131,7 +134,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         displayEmojiReactions = true,
                         verifiedUserSendFailure = VerifiedUserSendFailure.None,
                         actions = aTimelineItemActionList(),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -144,7 +147,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         displayEmojiReactions = false,
                         verifiedUserSendFailure = VerifiedUserSendFailure.None,
                         actions = aTimelineItemActionList(),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     ),
                 ),
                 anActionListState(
@@ -157,7 +160,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         displayEmojiReactions = false,
                         verifiedUserSendFailure = VerifiedUserSendFailure.None,
                         actions = aTimelineItemPollActionList(),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     ),
                 ),
                 anActionListState(
@@ -170,7 +173,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         displayEmojiReactions = true,
                         verifiedUserSendFailure = VerifiedUserSendFailure.None,
                         actions = aTimelineItemActionList(),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
                 anActionListState(
@@ -180,7 +183,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                         displayEmojiReactions = true,
                         verifiedUserSendFailure = anUnsignedDeviceSendFailure(),
                         actions = aTimelineItemActionList(),
-                        recentEmojis = persistentListOf(),
+                        recentEmojis = suggestedEmojis,
                     )
                 ),
             )
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 a891e9d587..704f79a4f5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -97,8 +98,6 @@ 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
 import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -345,7 +344,6 @@ private fun MessageSummary(
 }
 
 private val emojiRippleRadius = 24.dp
-private val suggestedEmojis = persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
 
 @Composable
 private fun EmojiReactionsRow(
@@ -360,12 +358,6 @@ private fun EmojiReactionsRow(
     ) {
         val backgroundColor = ElementTheme.colors.bgCanvasDefault
 
-        val emojis = remember(recentEmojis) {
-            (suggestedEmojis + recentEmojis.filter { it !in suggestedEmojis })
-                .take(100)
-                .toImmutableList()
-        }
-
         LazyRow(
             modifier = Modifier
                 .weight(1f, fill = true)
@@ -388,7 +380,7 @@ private fun EmojiReactionsRow(
             contentPadding = PaddingValues(horizontal = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
-            items(emojis) { emoji ->
+            items(recentEmojis) { emoji ->
                 val isHighlighted = highlightedEmojis.contains(emoji)
                 EmojiButton(
                     modifier = Modifier
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt
index ab02e6caea..25e75beb99 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,9 @@ package io.element.android.features.messages.impl.actionlist.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.compose.runtime.Immutable
 import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.ui.strings.CommonStrings
 
-@Immutable
 enum class TimelineItemAction(
     @StringRes val titleRes: Int,
     @DrawableRes val icon: Int,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt
index 5033b172bf..0a0d9b17af 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionPostProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionPostProcessor.kt
index c2cc605b74..421a68f12f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionPostProcessor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionPostProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9913b8395f..d989b34ab3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt
index e679a43da7..d8e29de92e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt
@@ -1,15 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.runtime.Immutable
-
-@Immutable
 sealed interface AttachmentsPreviewEvents {
     data object SendAttachment : AttachmentsPreviewEvents
     data object CancelAndDismiss : AttachmentsPreviewEvents
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 1df9969f72..451398d7d3 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
@@ -1,13 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -15,12 +19,15 @@ 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.compound.colors.SemanticColorsLightDark
 import io.element.android.compound.theme.ForcedDarkElementTheme
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.RoomScope
 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
 
@@ -31,6 +38,8 @@ class AttachmentsPreviewNode(
     @Assisted plugins: List<Plugin>,
     presenterFactory: AttachmentsPreviewPresenter.Factory,
     private val localMediaRenderer: LocalMediaRenderer,
+    private val sessionId: SessionId,
+    private val enterpriseService: EnterpriseService,
 ) : Node(buildContext, plugins = plugins) {
     data class Inputs(
         val attachment: Attachment,
@@ -53,7 +62,12 @@ class AttachmentsPreviewNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        ForcedDarkElementTheme {
+        val colors by remember {
+            enterpriseService.semanticColorsFlow(sessionId = sessionId)
+        }.collectAsState(SemanticColorsLightDark.default)
+        ForcedDarkElementTheme(
+            colors = colors,
+        ) {
             val state = presenter.present()
             AttachmentsPreviewView(
                 state = state,
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 34a4f12fe5..f7641ec21b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -36,7 +37,8 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
-import io.element.android.libraries.mediaupload.api.MediaSender
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
+import io.element.android.libraries.mediaupload.api.MediaSenderFactory
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
 import io.element.android.libraries.mediaupload.api.allFiles
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
@@ -55,12 +57,13 @@ class AttachmentsPreviewPresenter(
     @Assisted private val onDoneListener: OnDoneListener,
     @Assisted private val timelineMode: Timeline.Mode,
     @Assisted private val inReplyToEventId: EventId?,
-    mediaSenderFactory: MediaSender.Factory,
+    mediaSenderFactory: MediaSenderFactory,
     private val permalinkBuilder: PermalinkBuilder,
     private val temporaryUriDeleter: TemporaryUriDeleter,
     private val mediaOptimizationSelectorPresenterFactory: MediaOptimizationSelectorPresenter.Factory,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
     private val dispatchers: CoroutineDispatchers,
+    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
 ) : Presenter<AttachmentsPreviewState> {
     @AssistedFactory
     interface Factory {
@@ -106,13 +109,9 @@ class AttachmentsPreviewPresenter(
             // 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) {
-                val mediaOptimizationConfig = MediaOptimizationConfig(
-                    compressImages = mediaOptimizationSelectorState.isImageOptimizationEnabled == true,
-                    videoCompressionPreset = mediaOptimizationSelectorState.selectedVideoPreset ?: VideoCompressionPreset.STANDARD,
-                )
                 preprocessMediaJob = preProcessAttachment(
                     attachment = attachment,
-                    mediaOptimizationConfig = mediaOptimizationConfig,
+                    mediaOptimizationConfig = mediaOptimizationConfigProvider.get(),
                     displayProgress = false,
                     sendActionState = sendActionState,
                 )
@@ -141,8 +140,8 @@ class AttachmentsPreviewPresenter(
             }
         }
 
-        fun handleEvents(attachmentsPreviewEvents: AttachmentsPreviewEvents) {
-            when (attachmentsPreviewEvents) {
+        fun handleEvent(event: AttachmentsPreviewEvents) {
+            when (event) {
                 is AttachmentsPreviewEvents.SendAttachment -> {
                     ongoingSendAttachmentJob.value = coroutineScope.launch {
                         // If the media optimization selector is displayed, we need to wait for the user to select the options
@@ -230,7 +229,7 @@ class AttachmentsPreviewPresenter(
             textEditorState = textEditorState,
             mediaOptimizationSelectorState = mediaOptimizationSelectorState,
             displayFileTooLargeError = displayFileTooLargeError,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
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 96ff83a8a7..42d01a4f21 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ac7034efe7..70d7ab006e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -94,7 +95,7 @@ fun aMediaUploadInfo(
 )
 
 fun aMediaOptimisationSelectorState(
-    maxUploadSize: Long = 100,
+    maxUploadSize: Long = 100 * 1024 * 1024,
     videoSizeEstimations: AsyncData<ImmutableList<VideoUploadEstimation>> = AsyncData.Success(persistentListOf()),
     isImageOptimizationEnabled: Boolean = true,
     selectedVideoPreset: VideoCompressionPreset = VideoCompressionPreset.STANDARD,
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 0a94d225dd..8f55957e32 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -230,7 +231,7 @@ private fun ImageOptimizationSelector(state: MediaOptimizationSelectorState) {
             Text(
                 modifier = Modifier.weight(1f).align(Alignment.CenterVertically),
                 text = stringResource(R.string.screen_media_upload_preview_optimize_image_quality_title),
-                style = ElementTheme.materialTypography.bodyLarge,
+                style = ElementTheme.typography.fontBodyLgRegular,
             )
             Switch(
                 modifier = Modifier.height(32.dp),
@@ -336,7 +337,7 @@ private fun VideoQualitySelectorDialog(
                     supportingContent = {
                         Text(
                             text = preset.subtitle(),
-                            style = ElementTheme.materialTypography.bodyMedium,
+                            style = ElementTheme.typography.fontBodyMdRegular,
                             color = ElementTheme.colors.textSecondary,
                         )
                     },
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/OnDoneListener.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/OnDoneListener.kt
index 5b5fab6d8a..948370fc89 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/OnDoneListener.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/OnDoneListener.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/error/ErrorFormatter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/error/ErrorFormatter.kt
index 51507667ba..89b14fefb7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/error/ErrorFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/error/ErrorFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b62b4116e6..c81c306f90 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,13 +25,12 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.mediaupload.api.MaxUploadSizeProvider
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
 import io.element.android.libraries.mediaupload.api.compressorHelper
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
-import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.flow.first
 import timber.log.Timber
 import kotlin.math.roundToLong
 
@@ -38,8 +38,8 @@ import kotlin.math.roundToLong
 class DefaultMediaOptimizationSelectorPresenter(
     @Assisted private val localMedia: LocalMedia,
     private val maxUploadSizeProvider: MaxUploadSizeProvider,
-    private val sessionPreferencesStore: SessionPreferencesStore,
     private val featureFlagService: FeatureFlagService,
+    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
     mediaExtractorFactory: VideoMetadataExtractor.Factory,
 ) : MediaOptimizationSelectorPresenter {
     @ContributesBinding(SessionScope::class)
@@ -123,11 +123,12 @@ class DefaultMediaOptimizationSelectorPresenter(
         var selectedVideoOptimizationPreset by remember { mutableStateOf<AsyncData<VideoCompressionPreset>>(AsyncData.Loading()) }
 
         LaunchedEffect(videoSizeEstimations.dataOrNull()) {
-            selectedImageOptimization = AsyncData.Success(sessionPreferencesStore.doesOptimizeImages().first())
+            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 = sessionPreferencesStore.getVideoCompressionPreset().first(),
+                defaultVideoPreset = mediaOptimizationConfig.videoCompressionPreset,
                 videoSizeEstimations = videoSizeEstimations,
             )
         }
@@ -172,7 +173,7 @@ class DefaultMediaOptimizationSelectorPresenter(
             selectedVideoPreset = selectedVideoOptimizationPreset.dataOrNull(),
             displayMediaSelectorViews = displayMediaSelectorViews,
             displayVideoPresetSelectorDialog = displayVideoPresetSelectorDialog,
-            eventSink = { handleEvent(it) },
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorEvent.kt
index 3f6beaa750..ec1c3b82fe 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorEvent.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5efa9964ff..80cdfd9467 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 24e76f0f0b..29e51d39af 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a63668acaa..a6945b5ebe 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleAcknowledgementRepository.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleAcknowledgementRepository.kt
new file mode 100644
index 0000000000..1fa992fc3e
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleAcknowledgementRepository.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.crypto.historyvisible
+
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.androidutils.hash.hash
+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.Flow
+import kotlinx.coroutines.flow.map
+
+interface HistoryVisibleAcknowledgementRepository {
+    fun hasAcknowledged(roomId: RoomId): Flow<Boolean>
+    suspend fun setAcknowledged(roomId: RoomId, value: Boolean)
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultHistoryVisibleAcknowledgementRepository(
+    sessionId: SessionId,
+    preferenceDataStoreFactory: PreferenceDataStoreFactory,
+) : HistoryVisibleAcknowledgementRepository {
+    val store =
+        sessionId.value.hash().take(16).let { hash ->
+            preferenceDataStoreFactory.create("elementx_historyvisible_$hash")
+        }
+
+    override fun hasAcknowledged(roomId: RoomId): Flow<Boolean> {
+        return store.data.map { prefs ->
+            val acknowledged = prefs[booleanPreferencesKey(roomId.value)] ?: false
+            acknowledged
+        }
+    }
+
+    override suspend fun setAcknowledged(roomId: RoomId, value: Boolean) {
+        store.edit { prefs ->
+            prefs[booleanPreferencesKey(roomId.value)] = value
+        }
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleEvent.kt
new file mode 100644
index 0000000000..775d9c00d4
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleEvent.kt
@@ -0,0 +1,12 @@
+/*
+ * 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.crypto.historyvisible
+
+sealed interface HistoryVisibleEvent {
+    data object Acknowledge : HistoryVisibleEvent
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleState.kt
new file mode 100644
index 0000000000..3f980eb086
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleState.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.crypto.historyvisible
+
+data class HistoryVisibleState(
+    val showAlert: Boolean,
+    val eventSink: (HistoryVisibleEvent) -> Unit,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenter.kt
new file mode 100644
index 0000000000..e79681cd5c
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenter.kt
@@ -0,0 +1,64 @@
+/*
+ * 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.crypto.historyvisible
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+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.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+@Inject
+class HistoryVisibleStatePresenter(
+    private val featureFlagService: FeatureFlagService,
+    private val repository: HistoryVisibleAcknowledgementRepository,
+    private val room: JoinedRoom,
+) : Presenter<HistoryVisibleState> {
+    @Composable
+    override fun present(): HistoryVisibleState {
+        val isFeatureEnabled by featureFlagService.isFeatureEnabledFlow(FeatureFlags.EnableKeyShareOnInvite).collectAsState(initial = false)
+        val roomInfo by room.roomInfoFlow.collectAsState()
+        // Implicitly assume the alert is initially acknowledged to avoid flashes in UI.
+        val acknowledged by repository.hasAcknowledged(room.roomId).collectAsState(initial = true)
+        val isHistoryVisible = roomInfo.historyVisibility == RoomHistoryVisibility.Shared || roomInfo.historyVisibility == RoomHistoryVisibility.WorldReadable
+
+        val coroutineScope = rememberCoroutineScope()
+
+        LaunchedEffect(isHistoryVisible, acknowledged) {
+            if (!isHistoryVisible && acknowledged) {
+                // Clear the dismissed flag, if it is set to ensure that if a room is changed public -> private -> public,
+                // we show the banner again when it is set back to public.
+                repository.setAcknowledged(room.roomId, false)
+            }
+        }
+
+        fun handleEvent(event: HistoryVisibleEvent) {
+            when (event) {
+                is HistoryVisibleEvent.Acknowledge -> coroutineScope.setAcknowledged(room.roomId, true)
+            }
+        }
+
+        return HistoryVisibleState(
+            showAlert = isFeatureEnabled && isHistoryVisible && roomInfo.isEncrypted == true && !acknowledged,
+            eventSink = ::handleEvent,
+        )
+    }
+
+    private fun CoroutineScope.setAcknowledged(roomId: RoomId, value: Boolean) = launch {
+        repository.setAcknowledged(roomId, value)
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStateProvider.kt
new file mode 100644
index 0000000000..752abdc76b
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStateProvider.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.crypto.historyvisible
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+
+class HistoryVisibleStateProvider : PreviewParameterProvider<HistoryVisibleState> {
+    override val values: Sequence<HistoryVisibleState>
+    get() = sequenceOf(
+            aHistoryVisibleState(showAlert = true),
+        )
+}
+
+internal fun aHistoryVisibleState(
+    showAlert: Boolean = false,
+    eventSink: (HistoryVisibleEvent) -> Unit = {},
+) = HistoryVisibleState(
+    showAlert,
+    eventSink = eventSink,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStateView.kt
new file mode 100644
index 0000000000..d0655f695d
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStateView.kt
@@ -0,0 +1,55 @@
+/*
+ * 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.crypto.historyvisible
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import io.element.android.appconfig.LearnMoreConfig
+import io.element.android.libraries.designsystem.atomic.molecules.ComposerAlertLevel
+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.text.stringWithLink
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun HistoryVisibleStateView(
+    state: HistoryVisibleState,
+    onLinkClick: (String, Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    if (!state.showAlert) {
+        return
+    }
+    ComposerAlertMolecule(
+        modifier = modifier,
+        avatar = null,
+        showIcon = true,
+        level = ComposerAlertLevel.Info,
+        content = stringWithLink(
+            textRes = CommonStrings.crypto_history_visible,
+            url = LearnMoreConfig.HISTORY_VISIBLE_URL,
+            onLinkClick = { url -> onLinkClick(url, true) },
+        ),
+        submitText = stringResource(CommonStrings.action_dismiss),
+        onSubmitClick = { state.eventSink(HistoryVisibleEvent.Acknowledge) },
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun HistoryVisibleStateViewPreview(
+    @PreviewParameter(HistoryVisibleStateProvider::class) state: HistoryVisibleState,
+) = ElementPreview {
+    HistoryVisibleStateView(
+        state = state,
+        onLinkClick = { _, _ -> },
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/MessagesViewWithHistoryVisiblePreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/MessagesViewWithHistoryVisiblePreview.kt
new file mode 100644
index 0000000000..07cf5170d3
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/MessagesViewWithHistoryVisiblePreview.kt
@@ -0,0 +1,42 @@
+/*
+ * 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.crypto.historyvisible
+
+import androidx.compose.runtime.Composable
+import io.element.android.features.messages.impl.MessagesView
+import io.element.android.features.messages.impl.aMessagesState
+import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.textcomposer.model.aTextEditorStateMarkdown
+
+@PreviewsDayNight
+@Composable
+internal fun MessagesViewWithHistoryVisiblePreview() = ElementPreview {
+    MessagesView(
+        state = aMessagesState(
+            composerState = aMessageComposerState(
+                textEditorState = aTextEditorStateMarkdown(
+                    initialText = "",
+                    initialFocus = false,
+                )
+            ),
+            historyVisibleState = aHistoryVisibleState(showAlert = true),
+        ),
+        onBackClick = {},
+        onRoomDetailsClick = {},
+        onEventContentClick = { _, _ -> false },
+        onUserDataClick = {},
+        onLinkClick = { _, _ -> },
+        onSendLocationClick = {},
+        onCreatePollClick = {},
+        onJoinCallClick = {},
+        onViewAllPinnedMessagesClick = {},
+        knockRequestsBannerView = {}
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeEvent.kt
index 149789d97d..d11f5f90f2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeState.kt
index 0ff989fe70..25344bf844 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
index 85675d784e..dcf9056905 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 858231ebd5..47d1947766 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
index 0f55985740..92352732b0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,6 +20,7 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.appconfig.LearnMoreConfig
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.atomic.molecules.ComposerAlertLevel
 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
@@ -113,7 +115,7 @@ private fun ViolationAlert(
         },
         submitText = stringResource(submitTextId),
         onSubmitClick = onSubmitClick,
-        isCritical = isCritical,
+        level = if (isCritical) ComposerAlertLevel.Critical else ComposerAlertLevel.Default,
     )
 }
 
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 cdd91e86e4..b434656f7a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailure.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailure.kt
index 4c458922f7..0204617f08 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailure.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailure.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt
index 09f85805c8..65184d94ee 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureEvents.kt
index f2b7523f50..242dc58453 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt
index 54aa26e6ab..720e6762f7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -47,7 +48,7 @@ class ResolveVerifiedUserSendFailurePresenter(
         }
         val coroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: ResolveVerifiedUserSendFailureEvents) {
+        fun handleEvent(event: ResolveVerifiedUserSendFailureEvents) {
             when (event) {
                 is ResolveVerifiedUserSendFailureEvents.ComputeForMessage -> {
                     val sendState = event.messageEvent.localSendState as? LocalEventSendState.Failed.VerifiedUser
@@ -92,7 +93,7 @@ class ResolveVerifiedUserSendFailurePresenter(
             verifiedUserSendFailure = verifiedUserSendFailure,
             resolveAction = resolveAction.value,
             retryAction = retryAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureState.kt
index ead95f17f1..dfe9ac36de 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 47a29be2dd..251f0e6564 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b6b9762c44..3f881e7bb9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureIterator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureIterator.kt
index 0e9f3c0b32..db82606887 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureIterator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureIterator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt
index 166ce212dd..c669606b2c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesBindsModule.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesBindsModule.kt
index 50f9606273..a88dbb1b49 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesBindsModule.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesBindsModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,8 @@ package io.element.android.features.messages.impl.di
 import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.Binds
 import dev.zacsweers.metro.ContributesTo
+import io.element.android.features.messages.impl.crypto.historyvisible.HistoryVisibleState
+import io.element.android.features.messages.impl.crypto.historyvisible.HistoryVisibleStatePresenter
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeState
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeStatePresenter
 import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailurePresenter
@@ -60,4 +63,7 @@ interface MessagesBindsModule {
 
     @Binds
     fun bindIdentityChangeStatePresenter(presenter: IdentityChangeStatePresenter): Presenter<IdentityChangeState>
+
+    @Binds
+    fun bindHistoryVisibleStatePresenter(presenter: HistoryVisibleStatePresenter): Presenter<HistoryVisibleState>
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesProvidesModule.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesProvidesModule.kt
index d353ae2c09..856a14cdb0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesProvidesModule.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/di/MessagesProvidesModule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftService.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftService.kt
index 489e5bd046..765fa69172 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftService.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt
index c460acb065..0e8d70791c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/ComposerDraftStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/DefaultComposerDraftService.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/DefaultComposerDraftService.kt
index a0cb3877cb..5ac81a3b7f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/DefaultComposerDraftService.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/DefaultComposerDraftService.kt
@@ -1,21 +1,20 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.draft
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.RoomScope
 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.room.draft.ComposerDraft
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultComposerDraftService(
     private val volatileComposerDraftStore: VolatileComposerDraftStore,
     private val matrixComposerDraftStore: MatrixComposerDraftStore,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
index 6ce82b6522..e10585171a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt
index 138763bd13..0dd6e334d3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/ConfirmingLinkClick.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/ConfirmingLinkClick.kt
index 612b8a231b..88106db62a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/ConfirmingLinkClick.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/ConfirmingLinkClick.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkChecker.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkChecker.kt
index eec953f4cd..1a8456b439 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkChecker.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkChecker.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.messages.impl.link
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.extensions.containsRtLOverride
 import io.element.android.wysiwyg.link.Link
@@ -20,7 +20,6 @@ interface LinkChecker {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLinkChecker : LinkChecker {
     override fun isSafe(link: Link): Boolean {
         return if (link.url.containsRtLOverride()) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkEvents.kt
index 717b68f57f..ce817bf642 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkPresenter.kt
index 9c4694bafa..b6886652d5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,16 +25,16 @@ class LinkPresenter(
     override fun present(): LinkState {
         val linkClick: MutableState<AsyncAction<Link>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        fun handleEvents(linkEvents: LinkEvents) {
-            when (linkEvents) {
+        fun handleEvent(event: LinkEvents) {
+            when (event) {
                 is LinkEvents.OnLinkClick -> {
                     linkClick.value = AsyncAction.Loading
-                    val result = linkChecker.isSafe(linkEvents.link)
+                    val result = linkChecker.isSafe(event.link)
                     if (result) {
-                        linkClick.value = AsyncAction.Success(linkEvents.link)
+                        linkClick.value = AsyncAction.Success(event.link)
                     } else {
                         // Confirm first
-                        linkClick.value = ConfirmingLinkClick(linkEvents.link)
+                        linkClick.value = ConfirmingLinkClick(event.link)
                     }
                 }
                 LinkEvents.Confirm -> {
@@ -48,7 +49,7 @@ class LinkPresenter(
         }
         return LinkState(
             linkClick = linkClick.value,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkState.kt
index 0986378096..c06d23ef9a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkStateProvider.kt
index 478f8bf322..8388cbea52 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkView.kt
index 53306c8e99..1a7558de05 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/link/LinkView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fe40b21499..1fdb61f484 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -63,7 +64,7 @@ internal fun AttachmentsBottomSheet(
     // Send 'DismissAttachmentMenu' event when the bottomsheet was just hidden
     LaunchedEffect(isVisible) {
         if (!isVisible) {
-            state.eventSink(MessageComposerEvents.DismissAttachmentMenu)
+            state.eventSink(MessageComposerEvent.DismissAttachmentMenu)
         }
     }
 
@@ -98,25 +99,25 @@ private fun AttachmentSourcePickerMenu(
             .imePadding()
     ) {
         ListItem(
-            modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.PhotoFromCamera) },
+            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,
         )
         ListItem(
-            modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.VideoFromCamera) },
+            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,
         )
         ListItem(
-            modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery) },
+            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,
         )
         ListItem(
-            modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.FromFiles) },
+            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,
@@ -124,7 +125,7 @@ private fun AttachmentSourcePickerMenu(
         if (state.canShareLocation) {
             ListItem(
                 modifier = Modifier.clickable {
-                    state.eventSink(MessageComposerEvents.PickAttachmentSource.Location)
+                    state.eventSink(MessageComposerEvent.PickAttachmentSource.Location)
                     onSendLocationClick()
                 },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.LocationPin())),
@@ -134,7 +135,7 @@ private fun AttachmentSourcePickerMenu(
         }
         ListItem(
             modifier = Modifier.clickable {
-                state.eventSink(MessageComposerEvents.PickAttachmentSource.Poll)
+                state.eventSink(MessageComposerEvent.PickAttachmentSource.Poll)
                 onCreatePollClick()
             },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Polls())),
@@ -143,7 +144,7 @@ private fun AttachmentSourcePickerMenu(
         )
         if (enableTextFormatting) {
             ListItem(
-                modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.ToggleTextFormatting(enabled = true)) },
+                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,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultMessageComposerContext.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultMessageComposerContext.kt
index b895572c43..495731b41e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultMessageComposerContext.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultMessageComposerContext.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.messages.api.MessageComposerContext
 import io.element.android.libraries.di.RoomScope
@@ -19,7 +19,6 @@ import io.element.android.libraries.textcomposer.model.MessageComposerMode
 
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultMessageComposerContext : MessageComposerContext {
     override var composerMode: MessageComposerMode by mutableStateOf(MessageComposerMode.Normal)
         internal set
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DisabledComposerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DisabledComposerView.kt
index 02d009d2ce..c6429048c5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DisabledComposerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/DisabledComposerView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt
similarity index 65%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvents.kt
rename to features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt
index bcbd575c73..ae82c60f2a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt
@@ -1,28 +1,27 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.messagecomposer
 
 import android.net.Uri
-import androidx.compose.runtime.Immutable
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.textcomposer.model.Suggestion
 
-@Immutable
-sealed interface MessageComposerEvents {
-    data object ToggleFullScreenState : MessageComposerEvents
-    data object SendMessage : MessageComposerEvents
-    data class SendUri(val uri: Uri) : MessageComposerEvents
-    data object CloseSpecialMode : MessageComposerEvents
-    data class SetMode(val composerMode: MessageComposerMode) : MessageComposerEvents
-    data object AddAttachment : MessageComposerEvents
-    data object DismissAttachmentMenu : MessageComposerEvents
-    sealed interface PickAttachmentSource : MessageComposerEvents {
+sealed interface MessageComposerEvent {
+    data object ToggleFullScreenState : MessageComposerEvent
+    data object SendMessage : MessageComposerEvent
+    data class SendUri(val uri: Uri) : MessageComposerEvent
+    data object CloseSpecialMode : MessageComposerEvent
+    data class SetMode(val composerMode: MessageComposerMode) : MessageComposerEvent
+    data object AddAttachment : MessageComposerEvent
+    data object DismissAttachmentMenu : MessageComposerEvent
+    sealed interface PickAttachmentSource : MessageComposerEvent {
         data object FromGallery : PickAttachmentSource
         data object FromFiles : PickAttachmentSource
         data object PhotoFromCamera : PickAttachmentSource
@@ -30,10 +29,11 @@ sealed interface MessageComposerEvents {
         data object Location : PickAttachmentSource
         data object Poll : PickAttachmentSource
     }
-    data class ToggleTextFormatting(val enabled: Boolean) : MessageComposerEvents
-    data class Error(val error: Throwable) : MessageComposerEvents
-    data class TypingNotice(val isTyping: Boolean) : MessageComposerEvents
-    data class SuggestionReceived(val suggestion: Suggestion?) : MessageComposerEvents
-    data class InsertSuggestion(val resolvedSuggestion: ResolvedSuggestion) : MessageComposerEvents
-    data object SaveDraft : MessageComposerEvents
+
+    data class ToggleTextFormatting(val enabled: Boolean) : MessageComposerEvent
+    data class Error(val error: Throwable) : MessageComposerEvent
+    data class TypingNotice(val isTyping: Boolean) : MessageComposerEvent
+    data class SuggestionReceived(val suggestion: Suggestion?) : MessageComposerEvent
+    data class InsertSuggestion(val resolvedSuggestion: ResolvedSuggestion) : MessageComposerEvent
+    data object SaveDraft : 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 9505f0d758..fd803109c7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -54,15 +55,16 @@ 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.toEventOrTransactionId
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 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
-import io.element.android.libraries.mediaupload.api.MediaSender
+import io.element.android.libraries.mediaupload.api.MediaSenderFactory
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
-import io.element.android.libraries.permissions.api.PermissionsEvents
+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
@@ -97,6 +99,7 @@ import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 import io.element.android.libraries.core.mimetype.MimeTypes.Any as AnyMimeTypes
 
+@Suppress("LargeClass")
 @AssistedInject
 class MessageComposerPresenter(
     @Assisted private val navigator: MessagesNavigator,
@@ -106,7 +109,7 @@ class MessageComposerPresenter(
     private val mediaPickerProvider: PickerProvider,
     private val sessionPreferencesStore: SessionPreferencesStore,
     private val localMediaFactory: LocalMediaFactory,
-    private val mediaSenderFactory: MediaSender.Factory,
+    mediaSenderFactory: MediaSenderFactory,
     private val snackbarDispatcher: SnackbarDispatcher,
     private val analyticsService: AnalyticsService,
     private val locationService: LocationService,
@@ -131,7 +134,7 @@ class MessageComposerPresenter(
     private val mediaSender = mediaSenderFactory.create(timelineMode = timelineController.mainTimelineMode())
 
     private val cameraPermissionPresenter = permissionsPresenterFactory.create(Manifest.permission.CAMERA)
-    private var pendingEvent: MessageComposerEvents? = null
+    private var pendingEvent: MessageComposerEvent? = null
     private val suggestionSearchTrigger = MutableStateFlow<Suggestion?>(null)
 
     // Used to disable some UI related elements in tests
@@ -185,8 +188,8 @@ class MessageComposerPresenter(
         LaunchedEffect(cameraPermissionState.permissionGranted) {
             if (cameraPermissionState.permissionGranted) {
                 when (pendingEvent) {
-                    is MessageComposerEvents.PickAttachmentSource.PhotoFromCamera -> cameraPhotoPicker.launch()
-                    is MessageComposerEvents.PickAttachmentSource.VideoFromCamera -> cameraVideoPicker.launch()
+                    is MessageComposerEvent.PickAttachmentSource.PhotoFromCamera -> cameraPhotoPicker.launch()
+                    is MessageComposerEvent.PickAttachmentSource.VideoFromCamera -> cameraVideoPicker.launch()
                     else -> Unit
                 }
                 pendingEvent = null
@@ -227,10 +230,10 @@ class MessageComposerPresenter(
             }
         }
 
-        fun handleEvents(event: MessageComposerEvents) {
+        fun handleEvent(event: MessageComposerEvent) {
             when (event) {
-                MessageComposerEvents.ToggleFullScreenState -> isFullScreen.value = !isFullScreen.value
-                MessageComposerEvents.CloseSpecialMode -> {
+                MessageComposerEvent.ToggleFullScreenState -> isFullScreen.value = !isFullScreen.value
+                MessageComposerEvent.CloseSpecialMode -> {
                     if (messageComposerContext.composerMode.isEditing) {
                         localCoroutineScope.launch {
                             resetComposer(markdownTextEditorState, richTextEditorState, fromEdit = true)
@@ -239,13 +242,13 @@ class MessageComposerPresenter(
                         messageComposerContext.composerMode = MessageComposerMode.Normal
                     }
                 }
-                is MessageComposerEvents.SendMessage -> {
+                is MessageComposerEvent.SendMessage -> {
                     sessionCoroutineScope.sendMessage(
                         markdownTextEditorState = markdownTextEditorState,
                         richTextEditorState = richTextEditorState,
                     )
                 }
-                is MessageComposerEvents.SendUri -> {
+                is MessageComposerEvent.SendUri -> {
                     val inReplyToEventId = (messageComposerContext.composerMode as? MessageComposerMode.Reply)?.eventId
                     sessionCoroutineScope.sendAttachment(
                         attachment = Attachment.Media(
@@ -262,65 +265,65 @@ class MessageComposerPresenter(
                     // Reset composer since the attachment has been sent
                     messageComposerContext.composerMode = MessageComposerMode.Normal
                 }
-                is MessageComposerEvents.SetMode -> {
+                is MessageComposerEvent.SetMode -> {
                     localCoroutineScope.setMode(event.composerMode, markdownTextEditorState, richTextEditorState)
                 }
-                MessageComposerEvents.AddAttachment -> localCoroutineScope.launch {
+                MessageComposerEvent.AddAttachment -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = true
                 }
-                MessageComposerEvents.DismissAttachmentMenu -> showAttachmentSourcePicker = false
-                MessageComposerEvents.PickAttachmentSource.FromGallery -> localCoroutineScope.launch {
+                MessageComposerEvent.DismissAttachmentMenu -> showAttachmentSourcePicker = false
+                MessageComposerEvent.PickAttachmentSource.FromGallery -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
                     galleryMediaPicker.launch()
                 }
-                MessageComposerEvents.PickAttachmentSource.FromFiles -> localCoroutineScope.launch {
+                MessageComposerEvent.PickAttachmentSource.FromFiles -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
                     filesPicker.launch()
                 }
-                MessageComposerEvents.PickAttachmentSource.PhotoFromCamera -> localCoroutineScope.launch {
+                MessageComposerEvent.PickAttachmentSource.PhotoFromCamera -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
                     if (cameraPermissionState.permissionGranted) {
                         cameraPhotoPicker.launch()
                     } else {
                         pendingEvent = event
-                        cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
+                        cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
                     }
                 }
-                MessageComposerEvents.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch {
+                MessageComposerEvent.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
                     if (cameraPermissionState.permissionGranted) {
                         cameraVideoPicker.launch()
                     } else {
                         pendingEvent = event
-                        cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
+                        cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
                     }
                 }
-                MessageComposerEvents.PickAttachmentSource.Location -> {
+                MessageComposerEvent.PickAttachmentSource.Location -> {
                     showAttachmentSourcePicker = false
                     // Navigation to the location picker screen is done at the view layer
                 }
-                MessageComposerEvents.PickAttachmentSource.Poll -> {
+                MessageComposerEvent.PickAttachmentSource.Poll -> {
                     showAttachmentSourcePicker = false
                     // Navigation to the create poll screen is done at the view layer
                 }
-                is MessageComposerEvents.ToggleTextFormatting -> {
+                is MessageComposerEvent.ToggleTextFormatting -> {
                     showAttachmentSourcePicker = false
                     localCoroutineScope.toggleTextFormatting(event.enabled, markdownTextEditorState, richTextEditorState)
                 }
-                is MessageComposerEvents.Error -> {
+                is MessageComposerEvent.Error -> {
                     analyticsService.trackError(event.error)
                 }
-                is MessageComposerEvents.TypingNotice -> {
+                is MessageComposerEvent.TypingNotice -> {
                     if (sendTypingNotifications) {
                         localCoroutineScope.launch {
                             room.typingNotice(event.isTyping)
                         }
                     }
                 }
-                is MessageComposerEvents.SuggestionReceived -> {
+                is MessageComposerEvent.SuggestionReceived -> {
                     suggestionSearchTrigger.value = event.suggestion
                 }
-                is MessageComposerEvents.InsertSuggestion -> {
+                is MessageComposerEvent.InsertSuggestion -> {
                     localCoroutineScope.launch {
                         if (showTextFormatting) {
                             when (val suggestion = event.resolvedSuggestion) {
@@ -347,7 +350,7 @@ class MessageComposerPresenter(
                         }
                     }
                 }
-                MessageComposerEvents.SaveDraft -> {
+                MessageComposerEvent.SaveDraft -> {
                     val draft = createDraftFromState(markdownTextEditorState, richTextEditorState)
                     sessionCoroutineScope.updateDraft(draft, isVolatile = false)
                 }
@@ -382,7 +385,7 @@ class MessageComposerPresenter(
             suggestions = suggestions.toImmutableList(),
             resolveMentionDisplay = resolveMentionDisplay,
             resolveAtRoomMentionDisplay = resolveAtRoomMentionDisplay,
-            eventSink = { handleEvents(it) },
+            eventSink = ::handleEvent,
         )
     }
 
@@ -395,7 +398,9 @@ class MessageComposerPresenter(
             val currentUserId = room.sessionId
 
             suspend fun canSendRoomMention(): Boolean {
-                val userCanSendAtRoom = room.canUserTriggerRoomNotification(currentUserId).getOrDefault(false)
+                val userCanSendAtRoom = room.roomPermissions().use(false) { perms ->
+                    perms.canOwnUserTriggerRoomNotification()
+                }
                 return !room.isDm() && userCanSendAtRoom
             }
 
@@ -528,7 +533,7 @@ class MessageComposerPresenter(
         )
         val mediaAttachment = Attachment.Media(localMedia)
         val inReplyToEventId = (messageComposerContext.composerMode as? MessageComposerMode.Reply)?.eventId
-        navigator.onPreviewAttachment(persistentListOf(mediaAttachment), inReplyToEventId)
+        navigator.navigateToPreviewAttachments(persistentListOf(mediaAttachment), inReplyToEventId)
 
         // Reset composer since the attachment will be sent in a separate flow
         messageComposerContext.composerMode = MessageComposerMode.Normal
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 6eadc14260..424e8c07b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,5 +26,5 @@ data class MessageComposerState(
     val suggestions: ImmutableList<ResolvedSuggestion>,
     val resolveMentionDisplay: (String, String) -> TextDisplay,
     val resolveAtRoomMentionDisplay: () -> TextDisplay,
-    val eventSink: (MessageComposerEvents) -> 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 36e2c69f96..a06bf30dad 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,7 +32,7 @@ fun aMessageComposerState(
     showAttachmentSourcePicker: Boolean = false,
     canShareLocation: Boolean = true,
     suggestions: ImmutableList<ResolvedSuggestion> = persistentListOf(),
-    eventSink: (MessageComposerEvents) -> Unit = {},
+    eventSink: (MessageComposerEvent) -> Unit = {},
 ) = MessageComposerState(
     textEditorState = textEditorState,
     isFullScreen = isFullScreen,
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 7206d2571b..4b346e0c15 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 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
@@ -37,36 +38,36 @@ internal fun MessageComposerView(
 ) {
     val view = LocalView.current
     fun sendMessage() {
-        state.eventSink(MessageComposerEvents.SendMessage)
+        state.eventSink(MessageComposerEvent.SendMessage)
     }
 
     fun sendUri(uri: Uri) {
-        state.eventSink(MessageComposerEvents.SendUri(uri))
+        state.eventSink(MessageComposerEvent.SendUri(uri))
     }
 
     fun onAddAttachment() {
-        state.eventSink(MessageComposerEvents.AddAttachment)
+        state.eventSink(MessageComposerEvent.AddAttachment)
     }
 
     fun onCloseSpecialMode() {
-        state.eventSink(MessageComposerEvents.CloseSpecialMode)
+        state.eventSink(MessageComposerEvent.CloseSpecialMode)
     }
 
     fun onDismissTextFormatting() {
         view.clearFocus()
-        state.eventSink(MessageComposerEvents.ToggleTextFormatting(enabled = false))
+        state.eventSink(MessageComposerEvent.ToggleTextFormatting(enabled = false))
     }
 
     fun onSuggestionReceived(suggestion: Suggestion?) {
-        state.eventSink(MessageComposerEvents.SuggestionReceived(suggestion))
+        state.eventSink(MessageComposerEvent.SuggestionReceived(suggestion))
     }
 
     fun onError(error: Throwable) {
-        state.eventSink(MessageComposerEvents.Error(error))
+        state.eventSink(MessageComposerEvent.Error(error))
     }
 
     fun onTyping(typing: Boolean) {
-        state.eventSink(MessageComposerEvents.TypingNotice(typing))
+        state.eventSink(MessageComposerEvent.TypingNotice(typing))
     }
 
     val coroutineScope = rememberCoroutineScope()
@@ -77,19 +78,19 @@ internal fun MessageComposerView(
     }
 
     val onVoiceRecorderEvent = { press: VoiceMessageRecorderEvent ->
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.RecorderEvent(press))
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.RecorderEvent(press))
     }
 
     val onSendVoiceMessage = {
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
     }
 
     val onDeleteVoiceMessage = {
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.DeleteVoiceMessage)
     }
 
     val onVoicePlayerEvent = { event: VoiceMessagePlayerEvent ->
-        voiceMessageState.eventSink(VoiceMessageComposerEvents.PlayerEvent(event))
+        voiceMessageState.eventSink(VoiceMessageComposerEvent.PlayerEvent(event))
     }
 
     TextComposer(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/RichTextEditorStateFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/RichTextEditorStateFactory.kt
index c22325a9a5..79fc6e7bbc 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/RichTextEditorStateFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/RichTextEditorStateFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.messages.impl.messagecomposer
 import androidx.compose.runtime.Composable
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.wysiwyg.compose.RichTextEditorState
 import io.element.android.wysiwyg.compose.rememberRichTextEditorState
 
@@ -20,7 +20,6 @@ interface RichTextEditorStateFactory {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRichTextEditorStateFactory : RichTextEditorStateFactory {
     @Composable
     override fun remember(): RichTextEditorState {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/RoomAliasSuggestionsDataSource.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/RoomAliasSuggestionsDataSource.kt
index 5b3a1edf1e..d1ba363488 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/RoomAliasSuggestionsDataSource.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/RoomAliasSuggestionsDataSource.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.messagecomposer.suggestions
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -28,7 +28,6 @@ interface RoomAliasSuggestionsDataSource {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultRoomAliasSuggestionsDataSource(
     private val roomListService: RoomListService,
 ) : RoomAliasSuggestionsDataSource {
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 0f0480f404..e9e38e1730 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4f008705a5..789a027cf7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -69,6 +70,7 @@ class SuggestionsProcessor {
                     }
             }
             SuggestionType.Command,
+            SuggestionType.Emoji,
             is SuggestionType.Custom -> {
                 // Clear suggestions
                 emptyList()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/DefaultPinnedEventsTimelineProvider.kt
similarity index 90%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt
rename to features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/DefaultPinnedEventsTimelineProvider.kt
index 811516e022..ee3167712b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/DefaultPinnedEventsTimelineProvider.kt
@@ -1,14 +1,16 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.pinned
 
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
+import io.element.android.features.messages.api.pinned.PinnedEventsTimelineProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.mapState
@@ -17,7 +19,6 @@ 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.sync.SyncService
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.api.timeline.TimelineProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -29,12 +30,12 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 
 @SingleIn(RoomScope::class)
-@Inject
-class PinnedEventsTimelineProvider(
+@ContributesBinding(RoomScope::class)
+class DefaultPinnedEventsTimelineProvider(
     private val room: JoinedRoom,
     private val syncService: SyncService,
     private val dispatchers: CoroutineDispatchers,
-) : TimelineProvider {
+) : PinnedEventsTimelineProvider {
     private val _timelineStateFlow: MutableStateFlow<AsyncData<Timeline>> =
         MutableStateFlow(AsyncData.Uninitialized)
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt
index 92525724b7..d4926404fe 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItem.kt
index 0f1bfe97fc..7e7904edde 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItemFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItemFactory.kt
index c6e177d87a..d1d53b36b4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItemFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerItemFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt
index 5833da56dc..eada4b06d7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,7 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
-import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider
+import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimelineProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.room.BaseRoom
@@ -35,7 +36,7 @@ import kotlinx.coroutines.flow.onEach
 class PinnedMessagesBannerPresenter(
     private val room: BaseRoom,
     private val itemFactory: PinnedMessagesBannerItemFactory,
-    private val pinnedEventsTimelineProvider: PinnedEventsTimelineProvider,
+    private val pinnedEventsTimelineProvider: DefaultPinnedEventsTimelineProvider,
 ) : Presenter<PinnedMessagesBannerState> {
     private val pinnedItems = mutableStateOf<AsyncData<ImmutableList<PinnedMessagesBannerItem>>>(AsyncData.Uninitialized)
 
@@ -70,7 +71,7 @@ class PinnedMessagesBannerPresenter(
             expectedPinnedMessagesCount = expectedPinnedMessagesCount,
             pinnedItems = pinnedItems.value,
             currentPinnedMessageIndex = currentPinnedMessageIndex,
-            eventSink = ::handleEvent
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt
index 785de15954..0ed43376ff 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt
index 702f675d63..ad7713e6f3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 194cc433f4..ee44f7b95d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvents.kt
index 2e116d358f..4a3dcf6146 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d33ad54eed..a3728cb9f4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 
 interface PinnedMessagesListNavigator {
-    fun onViewInTimelineClick(eventId: EventId)
-    fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-    fun onForwardEventClick(eventId: EventId)
+    fun viewInTimeline(eventId: EventId)
+    fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+    fun forwardEvent(eventId: EventId)
 }
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 8ba776c520..292a77ba6a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,10 +15,10 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
 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.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
@@ -27,6 +28,7 @@ import io.element.android.features.messages.impl.timeline.di.TimelineItemPresent
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.androidutils.system.copyToClipboard
 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.UserId
@@ -34,7 +36,6 @@ 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.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @ContributesNode(RoomScope::class)
@@ -48,14 +49,15 @@ class PinnedMessagesListNode(
     private val permalinkParser: PermalinkParser,
 ) : Node(buildContext, plugins = plugins), PinnedMessagesListNavigator {
     interface Callback : Plugin {
-        fun onEventClick(event: TimelineItem.Event)
-        fun onUserDataClick(userId: UserId)
-        fun onViewInTimelineClick(eventId: EventId)
-        fun onRoomPermalinkClick(data: PermalinkData.RoomLink)
-        fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-        fun onForwardEventClick(eventId: EventId)
+        fun handleEventClick(event: TimelineItem.Event)
+        fun navigateToRoomMemberDetails(userId: UserId)
+        fun viewInTimeline(eventId: EventId)
+        fun handlePermalinkClick(data: PermalinkData.RoomLink)
+        fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+        fun handleForwardEventClick(eventId: EventId)
     }
 
+    private val callback: Callback = callback()
     private val presenter = presenterFactory.create(
         navigator = this,
         actionListPresenter = actionListPresenterFactory.create(
@@ -63,25 +65,16 @@ class PinnedMessagesListNode(
             timelineMode = Timeline.Mode.PinnedEvents,
         )
     )
-    private val callbacks = plugins<Callback>()
-
-    private fun onEventClick(event: TimelineItem.Event) {
-        return callbacks.forEach { it.onEventClick(event) }
-    }
-
-    private fun onUserDataClick(user: MatrixUser) {
-        callbacks.forEach { it.onUserDataClick(user.userId) }
-    }
 
     private fun onLinkClick(context: Context, url: String) {
         when (val permalink = permalinkParser.parse(url)) {
             is PermalinkData.UserLink -> {
                 // Open the room member profile, it will fallback to
                 // the user profile if the user is not in the room
-                callbacks.forEach { it.onUserDataClick(permalink.userId) }
+                callback.navigateToRoomMemberDetails(permalink.userId)
             }
             is PermalinkData.RoomLink -> {
-                callbacks.forEach { it.onRoomPermalinkClick(permalink) }
+                callback.handlePermalinkClick(permalink)
             }
             is PermalinkData.FallbackLink,
             is PermalinkData.RoomEmailInviteLink -> {
@@ -90,16 +83,16 @@ class PinnedMessagesListNode(
         }
     }
 
-    override fun onViewInTimelineClick(eventId: EventId) {
-        callbacks.forEach { it.onViewInTimelineClick(eventId) }
+    override fun viewInTimeline(eventId: EventId) {
+        callback.viewInTimeline(eventId)
     }
 
-    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
-        callbacks.forEach { it.onShowEventDebugInfoClick(eventId, debugInfo) }
+    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+        callback.navigateToEventDebugInfo(eventId, debugInfo)
     }
 
-    override fun onForwardEventClick(eventId: EventId) {
-        callbacks.forEach { it.onForwardEventClick(eventId) }
+    override fun forwardEvent(eventId: EventId) {
+        callback.handleForwardEventClick(eventId)
     }
 
     @Composable
@@ -108,21 +101,22 @@ class PinnedMessagesListNode(
             LocalTimelineItemPresenterFactories provides timelineItemPresenterFactories,
         ) {
             val context = LocalContext.current
+            val toastMessage = stringResource(CommonStrings.common_copied_to_clipboard)
             val view = LocalView.current
             val state = presenter.present()
             PinnedMessagesListView(
                 state = state,
                 onBackClick = ::navigateUp,
-                onEventClick = ::onEventClick,
-                onUserDataClick = ::onUserDataClick,
+                onEventClick = callback::handleEventClick,
+                onUserDataClick = { callback.navigateToRoomMemberDetails(it.userId) },
                 onLinkClick = { link -> onLinkClick(context, link.url) },
                 onLinkLongClick = {
                     view.performHapticFeedback(
                         HapticFeedbackConstants.LONG_PRESS
                     )
                     context.copyToClipboard(
-                        it.url,
-                        context.getString(CommonStrings.common_copied_to_clipboard)
+                        text = it.url,
+                        toastMessage = toastMessage,
                     )
                 },
                 modifier = modifier
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 0c7fb8948a..b2d2caa7f9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,10 @@ package io.element.android.features.messages.impl.pinned.list
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-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.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
@@ -22,17 +22,19 @@ import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.Interaction
 import im.vector.app.features.analytics.plan.PinUnpinAction
+import io.element.android.features.messages.api.timeline.HtmlConverterProvider
 import io.element.android.features.messages.impl.UserEventPermissions
 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.link.LinkState
-import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider
+import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimelineProvider
 import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactoryConfig
 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.typing.TypingNotificationState
+import io.element.android.features.messages.impl.userEventPermissions
 import io.element.android.features.roomcall.api.aStandByCallState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -42,11 +44,9 @@ 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.powerlevels.canPinUnpin
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
+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.ui.room.isDmAsState
 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
@@ -66,7 +66,7 @@ class PinnedMessagesListPresenter(
     @Assisted private val navigator: PinnedMessagesListNavigator,
     private val room: JoinedRoom,
     timelineItemsFactoryCreator: TimelineItemsFactory.Creator,
-    private val timelineProvider: PinnedEventsTimelineProvider,
+    private val timelineProvider: DefaultPinnedEventsTimelineProvider,
     private val timelineProtectionPresenter: Presenter<TimelineProtectionState>,
     private val linkPresenter: Presenter<LinkState>,
     private val snackbarDispatcher: SnackbarDispatcher,
@@ -75,6 +75,7 @@ class PinnedMessagesListPresenter(
     private val sessionCoroutineScope: CoroutineScope,
     private val analyticsService: AnalyticsService,
     private val featureFlagService: FeatureFlagService,
+    private val htmlConverterProvider: HtmlConverterProvider,
 ) : Presenter<PinnedMessagesListState> {
     @AssistedFactory
     interface Factory {
@@ -93,31 +94,34 @@ class PinnedMessagesListPresenter(
 
     @Composable
     override fun present(): PinnedMessagesListState {
-        val isDm by room.isDmAsState()
-
-        val timelineRoomInfo = remember(isDm) {
-            TimelineRoomInfo(
-                isDm = isDm,
-                name = room.info().name,
-                // We don't need to compute those values
-                userHasPermissionToSendMessage = false,
-                userHasPermissionToSendReaction = false,
-                // We do not care about the call state here.
-                roomCallState = aStandByCallState(),
-                // don't compute this value or the pin icon will be shown
-                pinnedEventIds = emptyList(),
-                typingNotificationState = TypingNotificationState(
-                    renderTypingNotifications = false,
-                    typingMembers = persistentListOf(),
-                    reserveSpace = false,
-                ),
-                predecessorRoom = room.predecessorRoom(),
-            )
+        htmlConverterProvider.Update()
+        val roomInfo by room.roomInfoFlow.collectAsState()
+        val timelineRoomInfo by remember {
+            derivedStateOf {
+                TimelineRoomInfo(
+                    isDm = roomInfo.isDm,
+                    name = roomInfo.name,
+                    // We don't need to compute those values
+                    userHasPermissionToSendMessage = false,
+                    userHasPermissionToSendReaction = false,
+                    // We do not care about the call state here.
+                    roomCallState = aStandByCallState(),
+                    // don't compute this value or the pin icon will be shown
+                    pinnedEventIds = persistentListOf(),
+                    typingNotificationState = TypingNotificationState(
+                        renderTypingNotifications = false,
+                        typingMembers = persistentListOf(),
+                        reserveSpace = false,
+                    ),
+                    predecessorRoom = room.predecessorRoom(),
+                )
+            }
         }
         val timelineProtectionState = timelineProtectionPresenter.present()
         val linkState = linkPresenter.present()
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
-        val userEventPermissions by userEventPermissions(syncUpdateFlow.value)
+        val userEventPermissions by room.permissionsAsState(UserEventPermissions.DEFAULT) { perms ->
+            perms.userEventPermissions()
+        }
 
         val displayThreadSummaries by featureFlagService.isFeatureEnabledFlow(FeatureFlags.Threads).collectAsState(false)
 
@@ -130,7 +134,7 @@ class PinnedMessagesListPresenter(
             }
         )
 
-        fun handleEvents(event: PinnedMessagesListEvents) {
+        fun handleEvent(event: PinnedMessagesListEvents) {
             when (event) {
                 is PinnedMessagesListEvents.HandleAction -> sessionCoroutineScope.handleTimelineAction(event.action, event.event)
             }
@@ -143,7 +147,7 @@ class PinnedMessagesListPresenter(
             displayThreadSummaries = displayThreadSummaries,
             userEventPermissions = userEventPermissions,
             timelineItems = pinnedMessageItems,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -153,18 +157,18 @@ class PinnedMessagesListPresenter(
     ) = launch {
         when (action) {
             TimelineItemAction.ViewSource -> {
-                navigator.onShowEventDebugInfoClick(targetEvent.eventId, targetEvent.debugInfo)
+                navigator.navigateToEventDebugInfo(targetEvent.eventId, targetEvent.debugInfo)
             }
             TimelineItemAction.Forward -> {
                 targetEvent.eventId?.let { eventId ->
-                    navigator.onForwardEventClick(eventId)
+                    navigator.forwardEvent(eventId)
                 }
             }
             TimelineItemAction.Unpin -> handleUnpinAction(targetEvent)
             TimelineItemAction.ViewInTimeline -> {
                 targetEvent.eventId?.let { eventId ->
                     analyticsService.captureInteraction(Interaction.Name.PinnedMessageListViewTimeline)
-                    navigator.onViewInTimelineClick(eventId)
+                    navigator.viewInTimeline(eventId)
                 }
             }
             else -> Unit
@@ -188,19 +192,6 @@ class PinnedMessagesListPresenter(
         }
     }
 
-    @Composable
-    private fun userEventPermissions(updateKey: Long): State<UserEventPermissions> {
-        return produceState(UserEventPermissions.DEFAULT, key1 = updateKey) {
-            value = UserEventPermissions(
-                canSendMessage = false,
-                canSendReaction = false,
-                canRedactOwn = room.canRedactOwn().getOrElse { false },
-                canRedactOther = room.canRedactOther().getOrElse { false },
-                canPinUnpin = room.canPinUnpin().getOrElse { false },
-            )
-        }
-    }
-
     @Composable
     private fun PinnedMessagesListEffect(onItemsChange: (AsyncData<ImmutableList<TimelineItem>>) -> Unit) {
         val updatedOnItemsChange by rememberUpdatedState(onItemsChange)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListState.kt
index 8d71899134..c62d293ce8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListStateProvider.kt
index 70b457b90c..a3ed06c53f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt
index df73186aa4..a7d03fac8f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0abfc4d75a..18175f12c9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageEvents.kt
index 7dbbc8fe3b..966b83d61b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt
index e40de20824..9a19e82137 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt
index 90b6585718..5dee4f5b79 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -53,7 +54,7 @@ class ReportMessagePresenter(
         var blockUser by rememberSaveable { mutableStateOf(false) }
         var result: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        fun handleEvents(event: ReportMessageEvents) {
+        fun handleEvent(event: ReportMessageEvents) {
             when (event) {
                 is ReportMessageEvents.UpdateReason -> reason = event.reason
                 ReportMessageEvents.ToggleBlockUser -> blockUser = !blockUser
@@ -66,7 +67,7 @@ class ReportMessagePresenter(
             reason = reason,
             blockUser = blockUser,
             result = result.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageState.kt
index 895d938560..38eee9d746 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageStateProvider.kt
index cb3b553497..0e2b4b0c50 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
index d3d9e1e37a..a2c398776f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f732def95f..10922ca5e7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,7 +23,6 @@ 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.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
@@ -33,7 +33,7 @@ import io.element.android.features.messages.impl.MessagesView
 import io.element.android.features.messages.impl.actionlist.ActionListPresenter
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemActionPostProcessor
 import io.element.android.features.messages.impl.attachments.Attachment
-import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvent
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerPresenter
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.TimelineEvents
@@ -44,8 +44,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
 import io.element.android.libraries.androidutils.system.openUrlInExternalApp
 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.core.bool.orFalse
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
@@ -64,6 +64,7 @@ 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.services.analytics.api.AnalyticsService
+import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -85,15 +86,15 @@ class ThreadedMessagesNode(
     private val timelineItemPresenterFactories: TimelineItemPresenterFactories,
     private val mediaPlayer: MediaPlayer,
     private val permalinkParser: PermalinkParser,
+    private val appNavigationStateService: AppNavigationStateService,
 ) : Node(buildContext, plugins = plugins), MessagesNavigator {
-    private val callbacks = plugins<Callback>()
-
     data class Inputs(
         val threadRootEventId: ThreadId,
         val focusedEventId: EventId?,
     ) : NodeInputs
 
     private val inputs = inputs<Inputs>()
+    private val callback: Callback = callback()
 
     // TODO use a loading state node to preload this instead of using `runBlocking`
     private val threadedTimeline = runBlocking { room.createTimeline(CreateTimelineParams.Threaded(threadRootEventId = inputs.threadRootEventId)).getOrThrow() }
@@ -111,18 +112,18 @@ class ThreadedMessagesNode(
     )
 
     interface Callback : Plugin {
-        fun onEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean
-        fun onPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
-        fun onUserDataClick(userId: UserId)
-        fun onPermalinkClick(data: PermalinkData)
-        fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-        fun onForwardEventClick(eventId: EventId)
-        fun onReportMessage(eventId: EventId, senderId: UserId)
-        fun onSendLocationClick()
-        fun onCreatePollClick()
-        fun onEditPollClick(eventId: EventId)
-        fun onJoinCallClick(roomId: RoomId)
-        fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?)
+        fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean
+        fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
+        fun navigateToRoomMemberDetails(userId: UserId)
+        fun handlePermalinkClick(data: PermalinkData)
+        fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+        fun handleForwardEventClick(eventId: EventId)
+        fun navigateToReportMessage(eventId: EventId, senderId: UserId)
+        fun navigateToSendLocation()
+        fun navigateToCreatePoll()
+        fun navigateToEditPoll(eventId: EventId)
+        fun navigateToRoomCall(roomId: RoomId)
+        fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
     }
 
     override fun onBuilt() {
@@ -131,26 +132,18 @@ class ThreadedMessagesNode(
             onCreate = {
                 sessionCoroutineScope.launch { analyticsService.capture(room.toAnalyticsViewRoom()) }
             },
+            onStart = {
+                appNavigationStateService.onNavigateToThread(id, inputs.threadRootEventId)
+            },
+            onStop = {
+                appNavigationStateService.onLeavingThread(id)
+            },
             onDestroy = {
                 mediaPlayer.close()
             }
         )
     }
 
-    private fun onEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
-        // Note: cannot use `callbacks.all { it.onEventClick(event) }` because:
-        // - if callbacks is empty, it will return true and we want to return false.
-        // - if a callback returns false, the other callback will not be invoked.
-        return callbacks.takeIf { it.isNotEmpty() }
-            ?.map { it.onEventClick(timelineMode, event) }
-            ?.all { it }
-            .orFalse()
-    }
-
-    private fun onUserDataClick(userId: UserId) {
-        callbacks.forEach { it.onUserDataClick(userId) }
-    }
-
     private fun onLinkClick(
         activity: Activity,
         darkTheme: Boolean,
@@ -162,7 +155,7 @@ class ThreadedMessagesNode(
             is PermalinkData.UserLink -> {
                 // Open the room member profile, it will fallback to
                 // the user profile if the user is not in the room
-                callbacks.forEach { it.onUserDataClick(permalink.userId) }
+                callback.navigateToRoomMemberDetails(permalink.userId)
             }
             is PermalinkData.RoomLink -> {
                 handleRoomLinkClick(permalink, eventSink)
@@ -196,50 +189,40 @@ class ThreadedMessagesNode(
                 navigateUp()
             }
         } else {
-            callbacks.forEach { it.onPermalinkClick(roomLink) }
+            callback.handlePermalinkClick(roomLink)
         }
     }
 
-    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
-        callbacks.forEach { it.onShowEventDebugInfoClick(eventId, debugInfo) }
+    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+        callback.navigateToEventDebugInfo(eventId, debugInfo)
     }
 
-    override fun onForwardEventClick(eventId: EventId) {
-        callbacks.forEach { it.onForwardEventClick(eventId) }
+    override fun forwardEvent(eventId: EventId) {
+        callback.handleForwardEventClick(eventId)
     }
 
-    override fun onReportContentClick(eventId: EventId, senderId: UserId) {
-        callbacks.forEach { it.onReportMessage(eventId, senderId) }
+    override fun navigateToReportMessage(eventId: EventId, senderId: UserId) {
+        callback.navigateToReportMessage(eventId, senderId)
     }
 
-    override fun onEditPollClick(eventId: EventId) {
-        callbacks.forEach { it.onEditPollClick(eventId) }
+    override fun navigateToEditPoll(eventId: EventId) {
+        callback.navigateToEditPoll(eventId)
     }
 
-    override fun onPreviewAttachment(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
-        callbacks.forEach { it.onPreviewAttachments(attachments, inReplyToEventId) }
+    override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
+        callback.navigateToPreviewAttachments(attachments, inReplyToEventId)
     }
 
-    override fun onNavigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>) {
+    override fun navigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>) {
         val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias(), eventId, viaParameters = serverNames.toImmutableList())
-        callbacks.forEach { it.onPermalinkClick(permalinkData) }
+        callback.handlePermalinkClick(permalinkData)
     }
 
-    override fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) {
-        callbacks.forEach { it.onOpenThread(threadRootId, focusedEventId) }
+    override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
+        callback.navigateToThread(threadRootId, focusedEventId)
     }
 
-    private fun onSendLocationClick() {
-        callbacks.forEach { it.onSendLocationClick() }
-    }
-
-    private fun onCreatePollClick() {
-        callbacks.forEach { it.onCreatePollClick() }
-    }
-
-    private fun onJoinCallClick() {
-        callbacks.forEach { it.onJoinCallClick(room.roomId) }
-    }
+    override fun close() = navigateUp()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -251,7 +234,7 @@ class ThreadedMessagesNode(
             val state = presenter.present()
             OnLifecycleEvent { _, event ->
                 when (event) {
-                    Lifecycle.Event.ON_PAUSE -> state.composerState.eventSink(MessageComposerEvents.SaveDraft)
+                    Lifecycle.Event.ON_PAUSE -> state.composerState.eventSink(MessageComposerEvent.SaveDraft)
                     else -> Unit
                 }
             }
@@ -261,17 +244,17 @@ class ThreadedMessagesNode(
                 onRoomDetailsClick = {},
                 onEventContentClick = { isLive, event ->
                     if (isLive) {
-                        onEventClick(timelineController.mainTimelineMode(), event)
+                        callback.handleEventClick(timelineController.mainTimelineMode(), event)
                     } else {
                         val detachedTimelineMode = timelineController.detachedTimelineMode()
                         if (detachedTimelineMode != null) {
-                            onEventClick(detachedTimelineMode, event)
+                            callback.handleEventClick(detachedTimelineMode, event)
                         } else {
                             false
                         }
                     }
                 },
-                onUserDataClick = this::onUserDataClick,
+                onUserDataClick = callback::navigateToRoomMemberDetails,
                 onLinkClick = { url, customTab ->
                     onLinkClick(
                         activity = activity,
@@ -281,9 +264,9 @@ class ThreadedMessagesNode(
                         customTab = customTab,
                     )
                 },
-                onSendLocationClick = this::onSendLocationClick,
-                onCreatePollClick = this::onCreatePollClick,
-                onJoinCallClick = this::onJoinCallClick,
+                onSendLocationClick = callback::navigateToSendLocation,
+                onCreatePollClick = callback::navigateToCreatePoll,
+                onJoinCallClick = { callback.navigateToRoomCall(room.roomId) },
                 onViewAllPinnedMessagesClick = {},
                 modifier = modifier,
                 knockRequestsBannerView = {},
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProvider.kt
index 54c4e55deb..fbf5b9dea0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.messages.api.timeline.HtmlConverterProvider
 import io.element.android.libraries.core.bool.orFalse
@@ -29,7 +29,6 @@ import uniffi.wysiwyg_composer.newMentionDetector
 
 @ContributesBinding(RoomScope::class)
 @SingleIn(RoomScope::class)
-@Inject
 class DefaultHtmlConverterProvider(
     private val mentionSpanProvider: MentionSpanProvider,
 ) : HtmlConverterProvider {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt
index 6fe1cd687c..7fe17059be 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt
@@ -1,38 +1,34 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+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.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.timeline.ReceiptType
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 interface MarkAsFullyRead {
-    operator fun invoke(roomId: RoomId)
+    suspend operator fun invoke(roomId: RoomId, eventId: EventId): Result<Unit>
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultMarkAsFullyRead(
     private val matrixClient: MatrixClient,
+    private val coroutineDispatchers: CoroutineDispatchers,
 ) : MarkAsFullyRead {
-    override fun invoke(roomId: RoomId) {
-        matrixClient.sessionCoroutineScope.launch {
-            matrixClient.getRoom(roomId)?.use { room ->
-                room.markAsRead(receiptType = ReceiptType.FULLY_READ)
-                    .onFailure {
-                        Timber.e("Failed to mark room $roomId as fully read", it)
-                    }
-            }
+    override suspend fun invoke(roomId: RoomId, eventId: EventId): Result<Unit> = withContext(coroutineDispatchers.io) {
+        matrixClient.markRoomAsFullyRead(roomId, eventId).onFailure {
+            Timber.e(it, "Failed to mark room $roomId as fully read for event $eventId")
         }
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt
index 779ebe984a..e41ac7bee7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import dev.zacsweers.metro.binding
 import io.element.android.features.messages.impl.timeline.di.LiveTimeline
@@ -44,7 +44,6 @@ import java.util.Optional
  */
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class, binding = binding<TimelineProvider>())
-@Inject
 class TimelineController(
     private val room: JoinedRoom,
     @LiveTimeline private val liveTimeline: Timeline,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt
index 0fe4394fa6..262c4f9522 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexer.kt
index 36b64be0ce..b6129085e6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexer.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f03a1e8903..5bafaf3e88 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
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
@@ -24,6 +24,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 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.ResolveVerifiedUserSendFailureEvents
 import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailureState
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory
@@ -32,12 +33,12 @@ 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.TimelineItemTypingNotificationModel
 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
 import io.element.android.features.poll.api.actions.EndPollAction
 import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
@@ -46,20 +47,26 @@ 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.MessageEventType
 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
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
-import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.DisplayFirstTimelineItems
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.NotificationTapOpensTimeline
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.OpenRoom
+import io.element.android.services.analytics.api.AnalyticsService
+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.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
@@ -85,9 +92,11 @@ class TimelinePresenter(
     private val resolveVerifiedUserSendFailurePresenter: Presenter<ResolveVerifiedUserSendFailureState>,
     private val typingNotificationPresenter: Presenter<TypingNotificationState>,
     private val roomCallStatePresenter: Presenter<RoomCallState>,
-    private val markAsFullyRead: MarkAsFullyRead,
     private val featureFlagService: FeatureFlagService,
+    private val analyticsService: AnalyticsService,
 ) : Presenter<TimelineState> {
+    private val tag = "TimelinePresenter"
+
     @AssistedFactory
     interface Factory {
         fun create(
@@ -104,23 +113,23 @@ class TimelinePresenter(
     )
     private var timelineItems by mutableStateOf<ImmutableList<TimelineItem>>(persistentListOf())
 
+    private val focusRequestState: MutableState<FocusRequestState> = mutableStateOf(FocusRequestState.None)
+
     @Composable
     override fun present(): TimelineState {
+        LaunchedEffect(Unit) {
+            val parent = analyticsService.getLongRunningTransaction(OpenRoom)
+            analyticsService.startLongRunningTransaction(DisplayFirstTimelineItems, parent)
+        }
+
         val localScope = rememberCoroutineScope()
 
         val timelineMode = remember { timelineController.mainTimelineMode() }
 
-        var focusRequestState: FocusRequestState by remember { mutableStateOf(FocusRequestState.None) }
-
         val lastReadReceiptId = rememberSaveable { mutableStateOf<EventId?>(null) }
 
         val roomInfo by room.roomInfoFlow.collectAsState()
 
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
-
-        val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.RoomMessage, updateKey = syncUpdateFlow.value)
-        val userHasPermissionToSendReaction by room.canSendMessageAsState(type = MessageEventType.Reaction, updateKey = syncUpdateFlow.value)
-
         val prevMostRecentItemId = rememberSaveable { mutableStateOf<UniqueId?>(null) }
 
         val newEventState = remember { mutableStateOf(NewEventState.None) }
@@ -141,7 +150,7 @@ class TimelinePresenter(
             value = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
         }
 
-        fun handleEvents(event: TimelineEvents) {
+        fun handleEvent(event: TimelineEvents) {
             when (event) {
                 is TimelineEvents.LoadMore -> {
                     if (event.direction == Timeline.PaginationDirection.FORWARDS && timelineMode is Timeline.Mode.Thread) {
@@ -157,7 +166,7 @@ class TimelinePresenter(
                         if (event.firstIndex == 0) {
                             newEventState.value = NewEventState.None
                         }
-                        Timber.d("## sendReadReceiptIfNeeded firstVisibleIndex: ${event.firstIndex}")
+                        Timber.tag(tag).d("## sendReadReceiptIfNeeded firstVisibleIndex: ${event.firstIndex}")
                         sessionCoroutineScope.sendReadReceiptIfNeeded(
                             firstVisibleIndex = event.firstIndex,
                             timelineItems = timelineItems,
@@ -186,16 +195,22 @@ class TimelinePresenter(
                     }
                 }
                 is TimelineEvents.EditPoll -> {
-                    navigator.onEditPollClick(event.pollStartId)
-                }
-                is TimelineEvents.FocusOnEvent -> {
-                    focusRequestState = FocusRequestState.Requested(event.eventId, event.debounce)
+                    navigator.navigateToEditPoll(event.pollStartId)
                 }
+                is TimelineEvents.FocusOnEvent -> sessionCoroutineScope.launch {
+                    focusRequestState.value = FocusRequestState.Requested(event.eventId, event.debounce)
+                    delay(event.debounce)
+                    Timber.tag(tag).d("Started focus on ${event.eventId}")
+                    focusOnEvent(event.eventId, focusRequestState)
+                }.start()
                 is TimelineEvents.OnFocusEventRender -> {
-                    focusRequestState = focusRequestState.onFocusEventRender()
+                    // If there was a pending 'notification tap opens timeline' transaction, finish it now we're focused in the required event
+                    analyticsService.finishLongRunningTransaction(NotificationTapOpensTimeline)
+
+                    focusRequestState.value = focusRequestState.value.onFocusEventRender()
                 }
                 is TimelineEvents.ClearFocusRequestState -> {
-                    focusRequestState = FocusRequestState.None
+                    focusRequestState.value = FocusRequestState.None
                 }
                 is TimelineEvents.JumpToLive -> {
                     timelineController.focusOnLive()
@@ -208,10 +223,10 @@ class TimelinePresenter(
                 is TimelineEvents.NavigateToPredecessorOrSuccessorRoom -> {
                     // Navigate to the predecessor or successor room
                     val serverNames = calculateServerNamesForRoom(room)
-                    navigator.onNavigateToRoom(event.roomId, null, serverNames)
+                    navigator.navigateToRoom(event.roomId, null, serverNames)
                 }
                 is TimelineEvents.OpenThread -> {
-                    navigator.onOpenThread(
+                    navigator.navigateToThread(
                         threadRootId = event.threadRootEventId,
                         focusedEventId = event.focusedEvent,
                     )
@@ -219,107 +234,64 @@ class TimelinePresenter(
             }
         }
 
-        DisposableEffect(Unit) {
-            onDispose {
-                markAsFullyRead(room.roomId)
-            }
-        }
-
         LaunchedEffect(Unit) {
             timelineItemsFactory.timelineItems
                 .onEach { newTimelineItems ->
                     timelineItemIndexer.process(newTimelineItems)
                     timelineItems = newTimelineItems
+
+                    analyticsService.run {
+                        finishLongRunningTransaction(DisplayFirstTimelineItems)
+                        finishLongRunningTransaction(OpenRoom)
+                    }
                 }
                 .launchIn(this)
 
             combine(timelineController.timelineItems(), room.membersStateFlow) { items, membersState ->
+                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()
                 )
+                transaction?.finish()
                 items
             }
                 .onEach(redactedVoiceMessageManager::onEachMatrixTimelineItem)
+                .flowOn(dispatchers.computation)
                 .launchIn(this)
         }
 
-        LaunchedEffect(focusRequestState) {
-            Timber.d("## focusRequestState: $focusRequestState")
-            when (val currentFocusRequestState = focusRequestState) {
-                is FocusRequestState.Requested -> {
-                    delay(currentFocusRequestState.debounce)
-                    if (timelineItemIndexer.isKnown(currentFocusRequestState.eventId)) {
-                        val index = timelineItemIndexer.indexOf(currentFocusRequestState.eventId)
-                        focusRequestState = FocusRequestState.Success(eventId = currentFocusRequestState.eventId, index = index)
-                    } else {
-                        focusRequestState = FocusRequestState.Loading(eventId = currentFocusRequestState.eventId)
-                    }
-                }
-                is FocusRequestState.Loading -> {
-                    val eventId = currentFocusRequestState.eventId
-                    val threadId = room.threadRootIdForEvent(eventId).getOrElse {
-                        focusRequestState = FocusRequestState.Failure(it)
-                        return@LaunchedEffect
-                    }
-
-                    if (timelineController.mainTimelineMode() is Timeline.Mode.Thread && threadId == null) {
-                        // We are in a thread timeline, and the event isn't part of a thread, we need to navigate back to the room
-                        focusRequestState = FocusRequestState.None
-                        navigator.onNavigateToRoom(room.roomId, eventId, calculateServerNamesForRoom(room))
-                    } else {
-                        timelineController.focusOnEvent(eventId, threadId)
-                            .onSuccess { result ->
-                                when (result) {
-                                    is EventFocusResult.FocusedOnLive -> {
-                                        focusRequestState = FocusRequestState.Success(eventId = eventId)
-                                    }
-                                    is EventFocusResult.IsInThread -> {
-                                        val currentThreadId = (timelineController.mainTimelineMode() as? Timeline.Mode.Thread)?.threadRootId
-                                        if (currentThreadId == result.threadId) {
-                                            // It's the same thread, we just focus on the event
-                                            focusRequestState = FocusRequestState.Success(eventId = eventId)
-                                        } else {
-                                            focusRequestState = FocusRequestState.Success(eventId = result.threadId.asEventId())
-                                            // It's part of a thread we're not in, let's open it in another timeline
-                                            navigator.onOpenThread(result.threadId, eventId)
-                                        }
-                                    }
-                                }
-                            }
-                            .onFailure {
-                                focusRequestState = FocusRequestState.Failure(it)
-                            }
-                    }
-                }
-                else -> Unit
-            }
-        }
-
         LaunchedEffect(timelineItems.size) {
             computeNewItemState(timelineItems, prevMostRecentItemId, newEventState)
         }
 
-        LaunchedEffect(timelineItems.size, focusRequestState) {
-            val currentFocusRequestState = focusRequestState
+        LaunchedEffect(timelineItems.size, focusRequestState.value) {
+            val currentFocusRequestState = focusRequestState.value
             if (currentFocusRequestState is FocusRequestState.Success && !currentFocusRequestState.rendered) {
                 val eventId = currentFocusRequestState.eventId
                 if (timelineItemIndexer.isKnown(eventId)) {
                     val index = timelineItemIndexer.indexOf(eventId)
-                    focusRequestState = FocusRequestState.Success(eventId = eventId, index = index)
+                    focusRequestState.value = FocusRequestState.Success(eventId = eventId, index = index)
+                } else {
+                    Timber.w("Unknown timeline item for focused item, can't render focus")
                 }
             }
         }
 
         val typingNotificationState = typingNotificationPresenter.present()
         val roomCallState = roomCallStatePresenter.present()
+        val userEventPermissions by room.permissionsAsState(UserEventPermissions.DEFAULT) { perms ->
+            perms.userEventPermissions()
+        }
         val timelineRoomInfo by remember(typingNotificationState, roomCallState, roomInfo) {
             derivedStateOf {
                 TimelineRoomInfo(
                     name = roomInfo.name,
-                    isDm = roomInfo.isDm.orFalse(),
-                    userHasPermissionToSendMessage = userHasPermissionToSendMessage,
-                    userHasPermissionToSendReaction = userHasPermissionToSendReaction,
+                    isDm = roomInfo.isDm,
+                    userHasPermissionToSendMessage = userEventPermissions.canSendMessage,
+                    userHasPermissionToSendReaction = userEventPermissions.canSendReaction,
                     roomCallState = roomCallState,
                     pinnedEventIds = roomInfo.pinnedEventIds,
                     typingNotificationState = typingNotificationState,
@@ -327,6 +299,11 @@ class TimelinePresenter(
                 )
             }
         }
+
+        LaunchedEffect(focusRequestState.value) {
+            Timber.tag(tag).d("Timeline: $timelineMode | focus state: ${focusRequestState.value}")
+        }
+
         return TimelineState(
             timelineItems = timelineItems,
             timelineMode = timelineMode,
@@ -334,14 +311,63 @@ class TimelinePresenter(
             renderReadReceipts = renderReadReceipts,
             newEventState = newEventState.value,
             isLive = isLive,
-            focusRequestState = focusRequestState,
+            focusRequestState = focusRequestState.value,
             messageShield = messageShield.value,
             resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
             displayThreadSummaries = displayThreadSummaries,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
+    private suspend fun focusOnEvent(
+        eventId: EventId,
+        focusRequestState: MutableState<FocusRequestState>,
+    ) {
+        if (timelineItemIndexer.isKnown(eventId)) {
+            val index = timelineItemIndexer.indexOf(eventId)
+            focusRequestState.value = FocusRequestState.Success(eventId = eventId, index = index)
+            return
+        }
+
+        Timber.tag(tag).d("Event $eventId not found in the loaded timeline, loading a focused timeline")
+        focusRequestState.value = FocusRequestState.Loading(eventId = eventId)
+
+        val threadId = room.threadRootIdForEvent(eventId).getOrElse {
+            focusRequestState.value = FocusRequestState.Failure(it)
+            return
+        }
+
+        if (timelineController.mainTimelineMode() is Timeline.Mode.Thread && threadId == null) {
+            // We are in a thread timeline, and the event isn't part of a thread, we need to navigate back to the room
+            focusRequestState.value = FocusRequestState.None
+            navigator.navigateToRoom(room.roomId, eventId, calculateServerNamesForRoom(room))
+        } else {
+            Timber.tag(tag).d("Focusing on event $eventId - thread $threadId")
+            timelineController.focusOnEvent(eventId, threadId)
+                .onSuccess { result ->
+                    when (result) {
+                        is EventFocusResult.FocusedOnLive -> {
+                            focusRequestState.value = FocusRequestState.Success(eventId = eventId)
+                        }
+                        is EventFocusResult.IsInThread -> {
+                            val currentThreadId = (timelineController.mainTimelineMode() as? Timeline.Mode.Thread)?.threadRootId
+                            if (currentThreadId == result.threadId) {
+                                // It's the same thread, we just focus on the event
+                                focusRequestState.value = FocusRequestState.Success(eventId = eventId)
+                            } else {
+                                focusRequestState.value = FocusRequestState.Success(eventId = result.threadId.asEventId())
+                                // It's part of a thread we're not in, let's open it in another timeline
+                                navigator.navigateToThread(result.threadId, eventId)
+                            }
+                        }
+                    }
+                }
+                .onFailure {
+                    focusRequestState.value = FocusRequestState.Failure(it)
+                }
+        }
+    }
+
     /**
      * This method compute the hasNewItem state passed as a [MutableState] each time the timeline items size changes.
      * Basically, if we got new timeline event from sync or local, either from us or another user, we update the state so we tell we have new items.
@@ -368,9 +394,8 @@ class TimelinePresenter(
             newMostRecentItemId != prevMostRecentItemIdValue
 
         if (hasNewEvent) {
-            val newMostRecentEvent = newMostRecentItem
             // Scroll to bottom if the new event is from me, even if sent from another device
-            val fromMe = newMostRecentEvent?.isMine == true
+            val fromMe = newMostRecentItem.isMine
             newEventState.value = if (fromMe) {
                 NewEventState.FromMe
             } else {
@@ -388,13 +413,17 @@ class TimelinePresenter(
     ) = launch(dispatchers.computation) {
         // If we are at the bottom of timeline, we mark the room as read.
         if (firstVisibleIndex == 0) {
-            room.markAsRead(receiptType = readReceiptType)
+            timelineController.invokeOnCurrentTimeline {
+                markAsRead(receiptType = readReceiptType)
+            }
         } else {
             // Get last valid EventId seen by the user, as the first index might refer to a Virtual item
             val eventId = getLastEventIdBeforeOrAt(firstVisibleIndex, timelineItems)
             if (eventId != null && eventId != lastReadReceiptId.value) {
                 lastReadReceiptId.value = eventId
-                room.liveTimeline.sendReadReceipt(eventId = eventId, receiptType = readReceiptType)
+                timelineController.invokeOnCurrentTimeline {
+                    sendReadReceipt(eventId = eventId, receiptType = readReceiptType)
+                }
             }
         }
     }
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 bd1c58c9d7..3ec168fd47 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,7 +22,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import kotlinx.collections.immutable.ImmutableList
 import kotlin.time.Duration
 
-@Immutable
 data class TimelineState(
     val timelineItems: ImmutableList<TimelineItem>,
     val timelineRoomInfo: TimelineRoomInfo,
@@ -72,14 +72,13 @@ sealed interface FocusRequestState {
     }
 }
 
-@Immutable
 data class TimelineRoomInfo(
     val isDm: Boolean,
     val name: String?,
     val userHasPermissionToSendMessage: Boolean,
     val userHasPermissionToSendReaction: Boolean,
     val roomCallState: RoomCallState,
-    val pinnedEventIds: List<EventId>,
+    val pinnedEventIds: ImmutableList<EventId>,
     val typingNotificationState: TypingNotificationState,
     val predecessorRoom: PredecessorRoom?,
 )
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 0cc61b4e4c..b5f9e328dc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -259,7 +260,7 @@ internal fun aTimelineRoomInfo(
     userHasPermissionToSendMessage = userHasPermissionToSendMessage,
     userHasPermissionToSendReaction = true,
     roomCallState = aStandByCallState(),
-    pinnedEventIds = pinnedEventIds,
+    pinnedEventIds = pinnedEventIds.toImmutableList(),
     typingNotificationState = typingNotificationState,
     predecessorRoom = predecessorRoom,
 )
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 0d729020dd..73a15b797f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -122,6 +123,7 @@ fun TimelineView(
     }
 
     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()
@@ -135,8 +137,8 @@ fun TimelineView(
             HapticFeedbackConstants.LONG_PRESS
         )
         context.copyToClipboard(
-            link.url,
-            context.getString(CommonStrings.common_copied_to_clipboard)
+            text = link.url,
+            toastMessage = toastMessage,
         )
     }
 
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 37ca90fd90..5f9c3d0364 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/a11y/Reactions.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/a11y/Reactions.kt
index 9da0168b38..cd71250153 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/a11y/Reactions.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/a11y/Reactions.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0ac882a95f..6be00fc14a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt
index 4bbccabc53..73e6c1873a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/CallMenuItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 cf132a6c1a..f7c3627b2a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1dbe5d3a24..8923b0c963 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9d7d4caac5..401fd7eec8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt
index 82eeb77177..3c4643793b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageStateEventContainer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt
index c2673c0d84..dc8e171298 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt
index 1eb09ca93f..56fa2d9f39 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d8af3c1736..40369595ea 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 aaebfb4957..c921135b96 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventForTimestampViewProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventForTimestampViewProvider.kt
index 96d139bfba..3689c84875 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventForTimestampViewProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventForTimestampViewProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1503bf236b..1f40e94a9b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -102,7 +103,7 @@ 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.ProfileTimelineDetails
+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
@@ -541,7 +542,7 @@ private fun TimelineItemEventRowContent(
 @Composable
 private fun MessageSenderInformation(
     senderId: UserId,
-    senderProfile: ProfileTimelineDetails,
+    senderProfile: ProfileDetails,
     senderAvatar: AvatarData,
     onClick: () -> Unit,
     modifier: Modifier = Modifier
@@ -843,7 +844,7 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
                                     type = TextMessageType("This is the latest message in the thread", null)
                                 ),
                                 senderId = UserId("@user:id"),
-                                senderProfile = ProfileTimelineDetails.Ready(
+                                senderProfile = ProfileDetails.Ready(
                                     displayName = "Alice",
                                     avatarUrl = null,
                                     displayNameAmbiguous = false,
@@ -876,7 +877,7 @@ internal fun ThreadSummaryViewPreview() {
                         type = TextMessageType(body, null)
                     ),
                     senderId = UserId("@user:id"),
-                    senderProfile = ProfileTimelineDetails.Ready(
+                    senderProfile = ProfileDetails.Ready(
                         displayName = "Alice",
                         avatarUrl = null,
                         displayNameAmbiguous = true,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowDisambiguatedPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowDisambiguatedPreview.kt
index fc56d7c453..4b6223fd97 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowDisambiguatedPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowDisambiguatedPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowForDirectRoomPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowForDirectRoomPreview.kt
index d5af740baa..86afd9d4b7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowForDirectRoomPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowForDirectRoomPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowLongSenderNamePreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowLongSenderNamePreview.kt
index a444b6f019..e40ab16aa5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowLongSenderNamePreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowLongSenderNamePreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowShieldPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowShieldPreview.kt
index b7f1564d8c..4478854788 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowShieldPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowShieldPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowTimestampPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowTimestampPreview.kt
index 0555670e46..c588b1d071 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowTimestampPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowTimestampPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 baa74890b3..49328ac025 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithManyReactionsPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithManyReactionsPreview.kt
index 9dd3bfb713..9b9080e130 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithManyReactionsPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithManyReactionsPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d97e5d8952..f46ba780f3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyInformativePreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyInformativePreview.kt
index 8315d54f30..cdc60a9e7e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyInformativePreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyInformativePreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyOtherPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyOtherPreview.kt
index 07f9f1073a..3071fe114a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyOtherPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyOtherPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt
index 7cc1843466..7ddcadfe3c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventTimestampBelowPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventTimestampBelowPreview.kt
index 1f78ce4a5c..975073cc46 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventTimestampBelowPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventTimestampBelowPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1a597fbda6..66f2459491 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt
index 390d264353..b7cefb8862 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsLayout.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
index 07811b532d..9698227891 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 119a235cf8..4a0a6f70b8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,12 +38,11 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 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
-import io.element.android.libraries.designsystem.modifiers.subtleColorStops
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toPx
-import io.element.android.libraries.designsystem.theme.LocalBuildMeta
 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
@@ -220,19 +220,14 @@ internal fun TimelineItemRow(
 @Composable
 private fun Modifier.focusedEvent(
     focusedEventOffset: Dp,
-    isEnterpriseBuild: Boolean = LocalBuildMeta.current.isEnterpriseBuild,
 ): Modifier {
-    val highlightedLineColor = if (isEnterpriseBuild) {
-        ElementTheme.colors.textActionAccent
-    } else {
-        ElementTheme.colors.borderAccentSubtle
-    }
-    val gradientColors = subtleColorStops(isEnterpriseBuild)
+    val highlightedLineColor = ElementTheme.colors.borderAccentSubtle
+    val gradientColors = gradientSubtleColors()
     val verticalOffset = focusedEventOffset.toPx()
     val verticalRatio = 0.7f
     return drawWithCache {
         val brush = Brush.verticalGradient(
-            colorStops = gradientColors,
+            colors = gradientColors,
             endY = size.height * verticalRatio,
         )
         onDrawBehind {
@@ -261,18 +256,3 @@ internal fun FocusedEventPreview() = ElementPreview {
             .focusedEvent(0.dp),
     )
 }
-
-@PreviewsDayNight
-@Composable
-internal fun FocusedEventEnterprisePreview() = ElementPreview {
-    Box(
-        modifier = Modifier
-            .padding(16.dp)
-            .fillMaxWidth()
-            .height(160.dp)
-            .focusedEvent(
-                focusedEventOffset = 0.dp,
-                isEnterpriseBuild = true,
-            ),
-    )
-}
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 84fbd2920a..e796e93311 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt
index 7c0309aac4..be94512c2c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7cdaddbbf8..605db65da3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d0c848e393..0226eea7b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionEvents.kt
index 0abe892921..b73d1295c4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ba13c461e4..4ccfc3f883 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,10 +18,10 @@ 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.matrix.api.recentemojis.GetRecentEmojis
+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 kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.launch
 
@@ -41,7 +42,7 @@ class CustomReactionPresenter(
         fun handleShowCustomReactionSheet(event: TimelineItem.Event) {
             target.value = CustomReactionState.Target.Loading(event)
             localCoroutineScope.launch {
-                recentEmojis = getRecentEmojis().getOrNull().orEmpty().toImmutableList()
+                recentEmojis = getRecentEmojis().getOrNull() ?: persistentListOf()
                 target.value = CustomReactionState.Target.Success(
                     event = event,
                     emojibaseStore = emojibaseProvider.emojibaseStore
@@ -53,7 +54,7 @@ class CustomReactionPresenter(
             target.value = CustomReactionState.Target.None
         }
 
-        fun handleEvents(event: CustomReactionEvents) {
+        fun handleEvent(event: CustomReactionEvents) {
             when (event) {
                 is CustomReactionEvents.ShowCustomReactionSheet -> handleShowCustomReactionSheet(event.event)
                 is CustomReactionEvents.DismissCustomReactionSheet -> handleDismissCustomReactionSheet()
@@ -71,7 +72,7 @@ class CustomReactionPresenter(
             target = target.value,
             selectedEmoji = selectedEmoji,
             recentEmojis = recentEmojis,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 }
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 9a9a985e62..1d3e3e820e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 360cb9756e..629eaa72ab 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
index b2e176c7a1..0f967cc41d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt
index 83b21df092..70d962ff49 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvents.kt
index 53fa6b7b7a..d0c4907b82 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index ce9600b1f7..aed568420a 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -90,7 +91,7 @@ class EmojiPickerPresenter(
         }
 
         val isInPreview = LocalInspectionMode.current
-        fun handleEvents(event: EmojiPickerEvents) {
+        fun handleEvent(event: EmojiPickerEvents) {
             when (event) {
                 // For some reason, in preview mode the SearchBar emits this event with an `isActive = true` value automatically
                 is EmojiPickerEvents.ToggleSearchActive -> if (!isInPreview) {
@@ -106,7 +107,7 @@ class EmojiPickerPresenter(
             searchQuery = searchQuery,
             isSearchActive = isSearchActive,
             searchResults = emojiResults,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
index 595349a503..b050c346a5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
@@ -1,18 +1,22 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.annotation.StringRes
+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 kotlinx.collections.immutable.ImmutableList
 
+// Emoji is unstable (because from an external library?), so we annotate with @Immutable
+@Immutable
 data class EmojiPickerState(
     val categories: ImmutableList<EmojiCategory>,
     val allEmojis: ImmutableList<Emoji>,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt
index f248efe893..e26941e172 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAspectRatioBox.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAspectRatioBox.kt
index c9ea1b43ff..f25957e07f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAspectRatioBox.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAspectRatioBox.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 dc40fd77fa..061886cef7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d25d6aa457..d691575993 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
index 97eefd44ee..48b3acfbb8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8660d82e7c..73cd1ad8b8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 86218b8e25..293e1c8f45 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 df5b3e0cbb..a8cbb89e96 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt
index 74594210b0..41a950ee5e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLegacyCallInviteView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLegacyCallInviteView.kt
index c2fa1edfa0..d20892a47c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLegacyCallInviteView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLegacyCallInviteView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d792b51984..9ebe35a51b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
index b7aba57b77..ba72c067f0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt
index 62ecef2447..e32de7f4ae 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt
index 334a7463f7..4eaf932396 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStateView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1ad75fb933..104e420d51 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d496b94f3b..0449ef26f0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt
index 08358d5a14..fbbefca207 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 87e895f76c..f5e760736e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f231988f90..1010075803 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 22825b532c..0c13214a7d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 36f3204f89..04974dfbc5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryEvents.kt
index a57aa2ac17..987b61e505 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt
index 4354ef5b25..a95fe57bc7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -36,7 +37,7 @@ class ReactionSummaryPresenter(
         }
         val targetWithAvatars = populateSenderAvatars(members = membersState.roomMembers().orEmpty().toImmutableList(), summary = target.value)
 
-        fun handleEvents(event: ReactionSummaryEvents) {
+        fun handleEvent(event: ReactionSummaryEvents) {
             when (event) {
                 is ReactionSummaryEvents.ShowReactionSummary -> target.value = ReactionSummaryState.Summary(
                     reactions = event.reactions.toImmutableList(),
@@ -48,7 +49,7 @@ class ReactionSummaryPresenter(
         }
         return ReactionSummaryState(
             target = targetWithAvatars.value,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryState.kt
index ab2c3d1359..cf5342f853 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryStateProvider.kt
index be22f6867a..82974c8908 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d3dc63c031..944fd9a195 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewState.kt
index ea0ab96225..2d3f2307b9 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateForTimelineItemEventRowProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateForTimelineItemEventRowProvider.kt
index d32de08178..c5140c4c03 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateForTimelineItemEventRowProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateForTimelineItemEventRowProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateProvider.kt
index 1295abdacc..64a7cf34ff 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/ReadReceiptViewStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2d783c394c..b03aaf01c1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7894fe7e02..57c46a6326 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt
index f76a18b1a1..04723d0214 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt
index 33316a134a..e1264b77e7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -36,7 +37,7 @@ class ReadReceiptBottomSheetPresenter : Presenter<ReadReceiptBottomSheetState> {
 
         return ReadReceiptBottomSheetState(
             selectedEvent = selectedEvent,
-            eventSink = { handleEvent(it) },
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt
index c143887584..7ec4107f8f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.receipt.bottomsheet
 
-import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 
-@Immutable
 data class ReadReceiptBottomSheetState(
     val selectedEvent: TimelineItem.Event?,
     val eventSink: (ReadReceiptBottomSheetEvents) -> Unit,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetStateProvider.kt
index 18532f903c..ff297a4f8d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt
index 08fe34b724..30befea07d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemDaySeparatorView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
index b666f6ad56..bb9ab2a414 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a3cab8610f..f812b40e61 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -45,7 +46,6 @@ fun TimelineItemRoomBeginningView(
                 avatar = null,
                 content = stringResource(R.string.screen_room_timeline_upgraded_room_message).toAnnotatedString(),
                 onSubmitClick = { onPredecessorRoomClick(predecessorRoom.roomId) },
-                isCritical = false,
                 submitText = stringResource(R.string.screen_room_timeline_upgraded_room_action)
             )
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineLoadingMoreIndicator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineLoadingMoreIndicator.kt
index 2454b807ef..571c884b1f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineLoadingMoreIndicator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineLoadingMoreIndicator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt
index d9e85c2eb2..6288f3f159 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
index cd22006804..3b0448ddb3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -111,7 +112,7 @@ fun EventDebugInfoView(
 private fun prettyJSON(maybeJSON: String): String {
     return try {
         JSONObject(maybeJSON).toString(2)
-    } catch (e: JSONException) {
+    } catch (_: JSONException) {
         // Prefer not pretty-printing over crashing if the data is not actually JSON
         maybeJSON
     }
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 85812b64a3..7c36521fc0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LiveTimeline.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LiveTimeline.kt
index 6fe88272af..ff7a1703f1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LiveTimeline.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LiveTimeline.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LocalTimelineItemPresenterFactories.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LocalTimelineItemPresenterFactories.kt
index 66588e8446..beef7a893c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LocalTimelineItemPresenterFactories.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/LocalTimelineItemPresenterFactories.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemEventContentKey.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemEventContentKey.kt
index e315da06f2..49b10a4a88 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemEventContentKey.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemEventContentKey.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactories.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactories.kt
index 7df549223e..1063157bef 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactories.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactories.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactory.kt
index ccb5bec542..7d8cd20f04 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/TimelineItemPresenterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/diff/TimelineItemsCacheInvalidator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/diff/TimelineItemsCacheInvalidator.kt
index 7321c7eba2..7cc6d2376c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/diff/TimelineItemsCacheInvalidator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/diff/TimelineItemsCacheInvalidator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 029373d42b..7b369fe6b7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactoryConfig.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactoryConfig.kt
index d23c421a56..50124eb50f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactoryConfig.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactoryConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4f1c9ba90a..31cf689ef8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,7 +25,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInv
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
@@ -62,7 +63,7 @@ class TimelineItemContentFactory(
         eventId: EventId?,
         isEditable: Boolean,
         sender: UserId,
-        senderProfile: ProfileTimelineDetails,
+        senderProfile: ProfileDetails,
     ): TimelineItemEventContent {
         val isOutgoing = sessionId == sender
         return when (itemContent) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt
index ae7e49c80d..c0c3310eac 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseMessageFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt
index 38edb21b55..a7075d127a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFailedToParseStateFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 53dae43dfd..3d8467729a 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
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.factories.event
 
 import android.text.style.URLSpan
-import androidx.core.text.buildSpannedString
 import androidx.core.text.getSpans
 import androidx.core.text.toSpannable
 import dev.zacsweers.metro.Inject
@@ -34,11 +34,9 @@ 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.FormattedBody
 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
-import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
 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.StickerMessageType
@@ -49,6 +47,7 @@ import io.element.android.libraries.matrix.ui.messages.toHtmlDocument
 import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import org.jsoup.nodes.Document
 import kotlin.time.Duration
 
 @Inject
@@ -59,7 +58,7 @@ class TimelineItemContentMessageFactory(
     private val permalinkParser: PermalinkParser,
     private val textPillificationHelper: TextPillificationHelper,
 ) {
-    suspend fun create(
+    fun create(
         content: MessageContent,
         senderDisambiguatedDisplayName: String,
         eventId: EventId?,
@@ -67,26 +66,29 @@ class TimelineItemContentMessageFactory(
         return when (val messageType = content.type) {
             is EmoteMessageType -> {
                 val emoteBody = "* $senderDisambiguatedDisplayName ${messageType.body.trimEnd()}"
-                val formattedBody = parseHtml(messageType.formatted, prefix = "* $senderDisambiguatedDisplayName") ?: textPillificationHelper.pillify(
-                    emoteBody
-                ).safeLinkify()
+                val dom = messageType.formatted?.toHtmlDocument(
+                    permalinkParser = permalinkParser,
+                    prefix = "* $senderDisambiguatedDisplayName",
+                )
+                val formattedBody = dom?.let(::parseHtml)
+                    ?: textPillificationHelper.pillify(emoteBody).safeLinkify()
                 TimelineItemEmoteContent(
                     body = emoteBody,
-                    htmlDocument = messageType.formatted?.toHtmlDocument(
-                        permalinkParser = permalinkParser,
-                        prefix = "* $senderDisambiguatedDisplayName",
-                    ),
+                    htmlDocument = dom,
                     formattedBody = formattedBody,
                     isEdited = content.isEdited,
                 )
             }
             is ImageMessageType -> {
+                val dom = messageType.formattedCaption?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.caption?.withLinks()
                 val aspectRatio = aspectRatioOf(messageType.info?.width, messageType.info?.height)
                 TimelineItemImageContent(
                     filename = messageType.filename,
                     fileSize = messageType.info?.size ?: 0,
                     caption = messageType.caption?.trimEnd(),
-                    formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),
+                    formattedCaption = formattedCaption,
                     isEdited = content.isEdited,
                     mediaSource = messageType.source,
                     thumbnailSource = messageType.info?.thumbnailSource,
@@ -102,12 +104,15 @@ class TimelineItemContentMessageFactory(
                 )
             }
             is StickerMessageType -> {
+                val dom = messageType.formattedCaption?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.caption?.withLinks()
                 val aspectRatio = aspectRatioOf(messageType.info?.width, messageType.info?.height)
                 TimelineItemStickerContent(
                     filename = messageType.filename,
                     fileSize = messageType.info?.size ?: 0,
                     caption = messageType.caption?.trimEnd(),
-                    formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),
+                    formattedCaption = formattedCaption,
                     isEdited = content.isEdited,
                     mediaSource = messageType.source,
                     thumbnailSource = messageType.info?.thumbnailSource,
@@ -139,12 +144,15 @@ class TimelineItemContentMessageFactory(
                 }
             }
             is VideoMessageType -> {
+                val dom = messageType.formattedCaption?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.caption?.withLinks()
                 val aspectRatio = aspectRatioOf(messageType.info?.width, messageType.info?.height)
                 TimelineItemVideoContent(
                     filename = messageType.filename,
                     fileSize = messageType.info?.size ?: 0,
                     caption = messageType.caption?.trimEnd(),
-                    formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),
+                    formattedCaption = formattedCaption,
                     isEdited = content.isEdited,
                     thumbnailSource = messageType.info?.thumbnailSource,
                     mediaSource = messageType.source,
@@ -161,11 +169,14 @@ class TimelineItemContentMessageFactory(
                 )
             }
             is AudioMessageType -> {
+                val dom = messageType.formattedCaption?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.caption?.withLinks()
                 TimelineItemAudioContent(
                     filename = messageType.filename,
                     fileSize = messageType.info?.size ?: 0,
                     caption = messageType.caption?.trimEnd(),
-                    formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),
+                    formattedCaption = formattedCaption,
                     isEdited = content.isEdited,
                     mediaSource = messageType.source,
                     duration = messageType.info?.duration ?: Duration.ZERO,
@@ -175,12 +186,15 @@ class TimelineItemContentMessageFactory(
                 )
             }
             is VoiceMessageType -> {
+                val dom = messageType.formattedCaption?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.caption?.withLinks()
                 TimelineItemVoiceContent(
                     eventId = eventId,
                     filename = messageType.filename,
                     fileSize = messageType.info?.size ?: 0,
                     caption = messageType.caption?.trimEnd(),
-                    formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),
+                    formattedCaption = formattedCaption,
                     isEdited = content.isEdited,
                     mediaSource = messageType.source,
                     duration = messageType.info?.duration ?: Duration.ZERO,
@@ -191,12 +205,15 @@ class TimelineItemContentMessageFactory(
                 )
             }
             is FileMessageType -> {
+                val dom = messageType.formattedCaption?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.caption?.withLinks()
                 val fileExtension = fileExtensionExtractor.extractFromName(messageType.filename)
                 TimelineItemFileContent(
                     filename = messageType.filename,
                     fileSize = messageType.info?.size ?: 0,
                     caption = messageType.caption?.trimEnd(),
-                    formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(),
+                    formattedCaption = formattedCaption,
                     isEdited = content.isEdited,
                     thumbnailSource = messageType.info?.thumbnailSource,
                     mediaSource = messageType.source,
@@ -207,9 +224,9 @@ class TimelineItemContentMessageFactory(
             }
             is NoticeMessageType -> {
                 val body = messageType.body.trimEnd()
-                val formattedBody = parseHtml(messageType.formatted) ?: textPillificationHelper.pillify(
-                    body
-                ).safeLinkify()
+                val dom = messageType.formatted?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedBody = dom?.let(::parseHtml)
+                    ?: textPillificationHelper.pillify(body).safeLinkify()
                 val htmlDocument = messageType.formatted?.toHtmlDocument(permalinkParser = permalinkParser)
                 TimelineItemNoticeContent(
                     body = body,
@@ -220,12 +237,13 @@ class TimelineItemContentMessageFactory(
             }
             is TextMessageType -> {
                 val body = messageType.body.trimEnd()
-                val formattedBody = parseHtml(messageType.formatted) ?: textPillificationHelper.pillify(
-                    body
-                ).safeLinkify()
+                val dom = messageType.formatted?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedBody = dom?.let(::parseHtml)
+                    ?: textPillificationHelper.pillify(body).safeLinkify()
+                val htmlDocument = messageType.formatted?.toHtmlDocument(permalinkParser = permalinkParser)
                 TimelineItemTextContent(
                     body = body,
-                    htmlDocument = messageType.formatted?.toHtmlDocument(permalinkParser = permalinkParser),
+                    htmlDocument = htmlDocument,
                     formattedBody = formattedBody,
                     isEdited = content.isEdited,
                 )
@@ -252,21 +270,11 @@ class TimelineItemContentMessageFactory(
         return result?.takeIf { it.isFinite() }
     }
 
-    private fun parseHtml(formattedBody: FormattedBody?, prefix: String? = null): CharSequence? {
-        if (formattedBody == null || formattedBody.format != MessageFormat.HTML) return null
-        val result = htmlConverterProvider.provide()
-            .fromHtmlToSpans(formattedBody.body.trimEnd())
+    private fun parseHtml(document: Document): CharSequence? {
+        return htmlConverterProvider.provide()
+            .fromDocumentToSpans(document)
             .let { textPillificationHelper.pillify(it) }
             .safeLinkify()
-        return if (prefix != null) {
-            buildSpannedString {
-                append(prefix)
-                append(" ")
-                append(result)
-            }
-        } else {
-            result
-        }
     }
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt
index ec2eba6544..2ceb81c487 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt
index a0a0b1f357..083b25658a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentProfileChangeFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRedactedFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRedactedFactory.kt
index c79f2abbbc..d60a0635de 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRedactedFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRedactedFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt
index a602e5274b..73c92c4cb7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentRoomMembershipFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt
index 6716a7ff83..7eb071b1d6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStateFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStickerFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStickerFactory.kt
index 0652f41365..2f3525471e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStickerFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentStickerFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentUTDFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentUTDFactory.kt
index 0d44b7bf65..0b3719f41a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentUTDFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentUTDFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6043cb57ff..77f1f96332 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,7 +22,6 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItemReac
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
 import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatter
-import io.element.android.libraries.architecture.map
 import io.element.android.libraries.core.bool.orTrue
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
@@ -37,7 +37,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.getDisambigua
 import io.element.android.libraries.matrix.ui.messages.reply.map
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
-import java.util.Date
 
 @AssistedInject
 class TimelineItemEventFactory(
@@ -146,10 +145,9 @@ class TimelineItemEventFactory(
                 senders = reaction.senders
                     .sortedByDescending { it.timestamp }
                     .map {
-                        val date = Date(it.timestamp)
                         AggregatedReactionSender(
                             senderId = it.senderId,
-                            timestamp = date,
+                            timestamp = it.timestamp,
                             sentTime = dateFormatter.format(
                                 it.timestamp,
                                 DateFormatterMode.TimeOrDate,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt
index a93a8888ea..afdd9734ca 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemDaySeparatorFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt
index bcb81ff9e4..73fc46669e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateProvider.kt
index 1660ab67cc..0a6fb70cc5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateView.kt
index 226d0959d5..3dff7ac4f7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/focus/FocusRequestStateView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a56a4d09e9..12c457175f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2bbcc4f3ba..6af4f8be6a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt
index c9ae593af9..5fab8071c1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionProvider.kt
index b7400c7616..e5eb52c91e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,13 +34,14 @@ fun anAggregatedReaction(
     val timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT, java.util.Locale.US).apply {
         timeZone = TimeZone.getTimeZone("UTC")
     }
-    val date = Date(1_689_061_264L)
+    val timestamp = 1_689_061_264L
+    val date = Date(timestamp)
     val senders = buildList {
         repeat(count) { index ->
             add(
                 AggregatedReactionSender(
                     senderId = if (isHighlighted && index == 0) userId else UserId("@user$index:server.org"),
-                    timestamp = date,
+                    timestamp = timestamp,
                     sentTime = timeFormatter.format(date),
                 )
             )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionSender.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionSender.kt
index 9da9781bc8..347de26888 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionSender.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionSender.kt
@@ -1,21 +1,19 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
-import java.util.Date
 
-@Immutable
 data class AggregatedReactionSender(
     val senderId: UserId,
-    val timestamp: Date,
+    val timestamp: Long,
     val sentTime: String,
     val user: MatrixUser? = null
 )
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 0d6a551410..cac2798fdd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5591616517..1f01b16012 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransa
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShieldProvider
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.SendHandleProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemDebugInfoProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
@@ -57,20 +58,18 @@ sealed interface TimelineItem {
         is GroupedEvents -> "groupedEvent"
     }
 
-    @Immutable
     data class Virtual(
         val id: UniqueId,
         val model: TimelineItemVirtualModel
     ) : TimelineItem
 
-    @Immutable
     data class Event(
         val id: UniqueId,
         // Note: eventId can be null when the event is a local echo
         val eventId: EventId? = null,
         val transactionId: TransactionId? = null,
         val senderId: UserId,
-        val senderProfile: ProfileTimelineDetails,
+        val senderProfile: ProfileDetails,
         val senderAvatar: AvatarData,
         val content: TimelineItemEventContent,
         val sentTimeMillis: Long = 0L,
@@ -124,7 +123,6 @@ sealed interface TimelineItem {
         val sendhandle: SendHandle? get() = sendHandleProvider()
     }
 
-    @Immutable
     data class GroupedEvents(
         val id: UniqueId,
         val events: ImmutableList<Event>,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemGroupPosition.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemGroupPosition.kt
index 536ebd13ef..32cbe8906b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemGroupPosition.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemGroupPosition.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactions.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactions.kt
index 115d8dab56..b20cc5148b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactions.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactionsProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactionsProvider.kt
index b0084f20ee..3190e61a75 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactionsProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReactionsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReadReceipts.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReadReceipts.kt
index 9181e94a72..e8d423e7fb 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReadReceipts.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItemReadReceipts.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleState.kt
index 81aa459413..2cbd145811 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleStateProvider.kt
index 02a6e19504..cdd24ed264 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/bubble/BubbleStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt
index d543294d07..f28de4f673 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5e9facbde5..9fddfa98ff 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEmoteContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEmoteContent.kt
index dc04e5b269..28946e8eea 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEmoteContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEmoteContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContent.kt
index 69266a75fd..5d82d17d7b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContentProvider.kt
index 8871c75cd2..bb53da3b7b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEncryptedContentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 be7c47439a..9c4c48d11e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 36c32222be..ac93a0ac4f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt
index c012cfcba7..680797e36b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9f29c861da..58e25e5dcd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt
index 5b26d28806..4828f22ba8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a5527bc74f..d07d5db6a4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLegacyCallInviteContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLegacyCallInviteContent.kt
index bffeeec767..088e438c6d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLegacyCallInviteContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLegacyCallInviteContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c5d8d33061..1114b2ab15 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5776d31a1f..0fd3f5f41b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemNoticeContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemNoticeContent.kt
index 6f2601a233..bb6f6db685 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemNoticeContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemNoticeContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContent.kt
index 7fee6aee73..8ddeb3d041 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContentProvider.kt
index 5704b9d9fc..26577f5230 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemProfileChangeContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemProfileChangeContent.kt
index c6eb1d5a46..b4d7530a47 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemProfileChangeContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemProfileChangeContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRedactedContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRedactedContent.kt
index 0652255d38..2a9a23d996 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRedactedContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRedactedContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRoomMembershipContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRoomMembershipContent.kt
index 5f1e3a9f0a..4d43f0d40a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRoomMembershipContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRoomMembershipContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0c2f21fc5b..00ad32ba5f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateContent.kt
index 50814dafef..7293fb70de 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateEventContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateEventContent.kt
index 1d4d104470..6c24e5044f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateEventContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStateEventContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt
index 6d7809b258..d333c0b6e7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContentProvider.kt
index acda873b77..eb564cd803 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextBasedContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextBasedContent.kt
index 9bac2ce531..4d941e73db 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextBasedContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextBasedContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextContent.kt
index 7cedb48377..2de0d6cead 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemTextContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemUnknownContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemUnknownContent.kt
index 3783712136..ce9525cb03 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemUnknownContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemUnknownContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt
index b8eeedd3bb..80635c6e18 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a7499dc7dd..0fadb6c9a6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt
index cc4a764c2c..29a432e6bd 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt
index 211bc5037b..d596963ebc 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModel.kt
index 8d6f363859..a55564488a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModelProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModelProvider.kt
index 2ae4928a09..d31d35d62f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModelProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemDaySeparatorModelProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLastForwardIndicatorModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLastForwardIndicatorModel.kt
index 3de014c30f..a87b577dfe 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLastForwardIndicatorModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLastForwardIndicatorModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingIndicatorModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingIndicatorModel.kt
index 5ff2ac6c5b..f05110c4b3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingIndicatorModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingIndicatorModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemReadMarkerModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemReadMarkerModel.kt
index c79218461f..b163760023 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemReadMarkerModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemReadMarkerModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemRoomBeginningModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemRoomBeginningModel.kt
index 0b198c9f3c..b53c96d720 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemRoomBeginningModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemRoomBeginningModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTypingNotificationModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTypingNotificationModel.kt
index 9ffb2c88a2..cdb957e41d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTypingNotificationModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTypingNotificationModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemVirtualModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemVirtualModel.kt
index 39feea9527..b1ab5c99c8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemVirtualModel.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemVirtualModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/AspectRatioProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/AspectRatioProvider.kt
index 6e27158e9e..0ebd63439a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/AspectRatioProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/AspectRatioProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f5129480c4..de55735b76 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/RatioHelper.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/RatioHelper.kt
index 1ef27005c8..d6031dcf1e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/RatioHelper.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/RatioHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1f306c74ea..5a5363f0c6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 99eb9fd078..3d75268777 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0d9db51d98..b2ea1d6bd8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,7 +57,7 @@ class TimelineProtectionPresenter(
 
         return TimelineProtectionState(
             protectionState = protectionState,
-            eventSink = { event -> handleEvent(event) }
+            eventSink = ::handleEvent,
         )
     }
 }
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 ddcd5c224b..169e5ba7f4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateProvider.kt
index 012fdc87c3..3e7bfdb28b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/Modifiers.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/Modifiers.kt
index e9bf26a164..311ff8c803 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/Modifiers.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/Modifiers.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 62c9c3e206..7727b28398 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5a95c2c4b2..2247566531 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
index bedbf8104c..a27d91688f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationState.kt
index 488284314c..e6c1f56dad 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 41b10478aa..0506026b86 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationView.kt
index 0d867425f2..c8e5722b19 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingRoomMember.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingRoomMember.kt
index 50a0af9135..de7232c9ea 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingRoomMember.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingRoomMember.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/Emoji.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/Emoji.kt
index 84fdd62de1..3a0f16b3e9 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/Emoji.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/Emoji.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/TextPillificationHelper.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/TextPillificationHelper.kt
index bb95e1a26c..f74d3b5f30 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/TextPillificationHelper.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/TextPillificationHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import android.text.style.URLSpan
 import android.util.Patterns
 import androidx.core.text.getSpans
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.MatrixPatternType
 import io.element.android.libraries.matrix.api.core.MatrixPatterns
@@ -33,7 +33,6 @@ interface TextPillificationHelper {
 }
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultTextPillificationHelper(
     private val mentionSpanProvider: MentionSpanProvider,
     private val permalinkParser: PermalinkParser,
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 1f1619e3f6..0aeb3bb8fc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.messages.impl.utils.messagesummary
 
 import android.content.Context
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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
@@ -33,7 +33,6 @@ import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultMessageSummaryFormatter(
     @ApplicationContext private val context: Context,
 ) : MessageSummaryFormatter {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatter.kt
index 6e590c8779..084dce192c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7c5eeb4969..56b0e402d2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,14 +26,14 @@ import dev.zacsweers.metro.AssistedInject
 import dev.zacsweers.metro.ContributesBinding
 import im.vector.app.features.analytics.plan.Composer
 import io.element.android.features.messages.api.MessageComposerContext
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerPresenter
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.mediaupload.api.MediaSender
-import io.element.android.libraries.permissions.api.PermissionsEvents
+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.VoiceMessagePlayerEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
@@ -56,7 +57,7 @@ class DefaultVoiceMessageComposerPresenter(
     @Assisted private val timelineMode: Timeline.Mode,
     private val voiceRecorder: VoiceRecorder,
     private val analyticsService: AnalyticsService,
-    mediaSenderFactory: MediaSender.Factory,
+    mediaSenderFactory: MediaSenderFactory,
     private val player: VoiceMessageComposerPlayer,
     private val messageComposerContext: MessageComposerContext,
     permissionsPresenterFactory: PermissionsPresenter.Factory
@@ -68,7 +69,6 @@ class DefaultVoiceMessageComposerPresenter(
     }
 
     private val permissionsPresenter = permissionsPresenterFactory.create(Manifest.permission.RECORD_AUDIO)
-
     private val mediaSender = mediaSenderFactory.create(timelineMode)
 
     @Composable
@@ -88,7 +88,7 @@ class DefaultVoiceMessageComposerPresenter(
             player.setMedia(recording.file.path)
         }
 
-        val onLifecycleEvent = { event: Lifecycle.Event ->
+        fun handleLifecycleEvent(event: Lifecycle.Event) {
             when (event) {
                 Lifecycle.Event.ON_PAUSE -> {
                     sessionCoroutineScope.finishRecording()
@@ -101,18 +101,17 @@ class DefaultVoiceMessageComposerPresenter(
             }
         }
 
-        val onVoiceMessageRecorderEvent = { event: VoiceMessageComposerEvents.RecorderEvent ->
-            val permissionGranted = permissionState.permissionGranted
-            when (event.recorderEvent) {
+        fun handleVoiceMessageRecorderEvent(event: VoiceMessageRecorderEvent) {
+            when (event) {
                 VoiceMessageRecorderEvent.Start -> {
                     Timber.v("Voice message record button pressed")
                     when {
-                        permissionGranted -> {
+                        permissionState.permissionGranted -> {
                             localCoroutineScope.startRecording()
                         }
                         else -> {
                             Timber.i("Voice message permission needed")
-                            permissionState.eventSink(PermissionsEvents.RequestPermissions)
+                            permissionState.eventSink(PermissionsEvent.RequestPermissions)
                         }
                     }
                 }
@@ -126,7 +125,8 @@ class DefaultVoiceMessageComposerPresenter(
                 }
             }
         }
-        val onPlayerEvent = { event: VoiceMessagePlayerEvent ->
+
+        fun handleVoiceMessagePlayerEvent(event: VoiceMessagePlayerEvent) {
             localCoroutineScope.launch {
                 when (event) {
                     VoiceMessagePlayerEvent.Play -> player.play()
@@ -136,28 +136,16 @@ class DefaultVoiceMessageComposerPresenter(
             }
         }
 
-        val onAcceptPermissionsRationale = {
-            permissionState.eventSink(PermissionsEvents.OpenSystemSettingAndCloseDialog)
-        }
-
-        val onDismissPermissionsRationale = {
-            permissionState.eventSink(PermissionsEvents.CloseDialog)
-        }
-
-        val onDismissSendFailureDialog = {
-            showSendFailureDialog = false
-        }
-
-        val onSendButtonPress = lambda@{
+        fun sendVoiceMessage() {
             val finishedState = recorderState as? VoiceRecorderState.Finished
             if (finishedState == null) {
                 val exception = VoiceMessageException.FileException("No file to send")
                 analyticsService.trackError(exception)
                 Timber.e(exception)
-                return@lambda
+                return
             }
             if (isSending) {
-                return@lambda
+                return
             }
             isSending = true
             player.pause()
@@ -176,21 +164,27 @@ class DefaultVoiceMessageComposerPresenter(
             }
         }
 
-        val handleEvents: (VoiceMessageComposerEvents) -> Unit = { event ->
+        fun handleEvent(event: VoiceMessageComposerEvent) {
             when (event) {
-                is VoiceMessageComposerEvents.RecorderEvent -> onVoiceMessageRecorderEvent(event)
-                is VoiceMessageComposerEvents.PlayerEvent -> onPlayerEvent(event.playerEvent)
-                is VoiceMessageComposerEvents.SendVoiceMessage -> localCoroutineScope.launch {
-                    onSendButtonPress()
+                is VoiceMessageComposerEvent.RecorderEvent -> handleVoiceMessageRecorderEvent(event.recorderEvent)
+                is VoiceMessageComposerEvent.PlayerEvent -> handleVoiceMessagePlayerEvent(event.playerEvent)
+                is VoiceMessageComposerEvent.SendVoiceMessage -> localCoroutineScope.launch {
+                    sendVoiceMessage()
                 }
-                VoiceMessageComposerEvents.DeleteVoiceMessage -> {
+                VoiceMessageComposerEvent.DeleteVoiceMessage -> {
                     player.pause()
                     localCoroutineScope.deleteRecording()
                 }
-                VoiceMessageComposerEvents.DismissPermissionsRationale -> onDismissPermissionsRationale()
-                VoiceMessageComposerEvents.AcceptPermissionRationale -> onAcceptPermissionsRationale()
-                is VoiceMessageComposerEvents.LifecycleEvent -> onLifecycleEvent(event.event)
-                VoiceMessageComposerEvents.DismissSendFailureDialog -> onDismissSendFailureDialog()
+                VoiceMessageComposerEvent.DismissPermissionsRationale -> {
+                    permissionState.eventSink(PermissionsEvent.CloseDialog)
+                }
+                VoiceMessageComposerEvent.AcceptPermissionRationale -> {
+                    permissionState.eventSink(PermissionsEvent.OpenSystemSettingAndCloseDialog)
+                }
+                is VoiceMessageComposerEvent.LifecycleEvent -> handleLifecycleEvent(event.event)
+                VoiceMessageComposerEvent.DismissSendFailureDialog -> {
+                    showSendFailureDialog = false
+                }
             }
         }
 
@@ -198,7 +192,10 @@ class DefaultVoiceMessageComposerPresenter(
             voiceMessageState = when (val state = recorderState) {
                 is VoiceRecorderState.Recording -> VoiceMessageState.Recording(
                     duration = state.elapsedTime,
-                    levels = state.levels.toImmutableList(),
+                    levels = state.levels
+                        // Keep only the last 128 samples for display, else we can have a crash
+                        .takeLast(128)
+                        .toImmutableList(),
                 )
                 is VoiceRecorderState.Finished ->
                     previewState(
@@ -211,7 +208,7 @@ class DefaultVoiceMessageComposerPresenter(
             showPermissionRationaleDialog = permissionState.showDialog,
             showSendFailureDialog = showSendFailureDialog,
             keepScreenOn = keepScreenOn,
-            eventSink = handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt
index a8ca37dac7..1e55c45542 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt
index 7c61aa6929..e45f28d3bf 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageSendingFailedDialog.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageSendingFailedDialog.kt
index 5e96ed4480..9a7a2b8fce 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageSendingFailedDialog.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageSendingFailedDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManager.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManager.kt
index be1db85d6b..08b5630d3f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManager.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManager.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voicemessages.timeline
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
@@ -21,7 +21,6 @@ interface RedactedVoiceMessageManager {
 }
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultRedactedVoiceMessageManager(
     private val dispatchers: CoroutineDispatchers,
     private val mediaPlayer: MediaPlayer,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenter.kt
index 2931f6af53..eef5c5efab 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8efecfaf26..57a9fed4db 100644
--- a/features/messages/impl/src/main/res/values-bg/translations.xml
+++ b/features/messages/impl/src/main/res/values-bg/translations.xml
@@ -39,10 +39,15 @@
   <string name="screen_room_timeline_no_permission_to_post">"Нямате разрешение да публикувате в тази стая"</string>
   <string name="screen_room_timeline_reactions_show_less">"Показване на по-малко"</string>
   <string name="screen_room_timeline_reactions_show_more">"Показване на повече"</string>
+  <string name="screen_room_timeline_read_marker_title">"Нови"</string>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d промяна в стаята"</item>
     <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="one">"%1$s, %2$s и %3$d друг"</item>
     <item quantity="other">"%1$s, %2$s и %3$d други"</item>
diff --git a/features/messages/impl/src/main/res/values-eo/translations.xml b/features/messages/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index a0810ca15b..0000000000
--- a/features/messages/impl/src/main/res/values-eo/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_room_encrypted_history_banner_unverified">"Message history is unavailable in this room. Confirm this device to see your message history."</string>
-</resources>
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 1446c3d389..b102f82a98 100644
--- a/features/messages/impl/src/main/res/values-fa/translations.xml
+++ b/features/messages/impl/src/main/res/values-fa/translations.xml
@@ -7,9 +7,11 @@
   <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>
   <string name="screen_report_content_block_user">"انسداد کاربر"</string>
   <string name="screen_report_content_block_user_hint">"اگر می‌خواهید همه پیام‌های فعلی و آینده را از این کاربر را پنهان کنید، علامت بزنید"</string>
   <string name="screen_report_content_explanation">"این پیام به مدیر کارساز خانگی شما گزارش خواهد شد. آنها قادر به خواندن پیام های رمزگذاری شده نخواهند بود."</string>
@@ -23,6 +25,7 @@
   <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>
@@ -37,10 +40,15 @@
   <string name="screen_room_timeline_no_permission_to_post">"اجازهٔ فرستادن به این اتاق را ندارید"</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="one">"%1$dتغییر اتاق"</item>
     <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_typing_two_members">"%1$s و %2$s"</string>
 </resources>
diff --git a/features/messages/impl/src/main/res/values-hr/translations.xml b/features/messages/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..c3427df591
--- /dev/null
+++ b/features/messages/impl/src/main/res/values-hr/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="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_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>
+  <string name="screen_media_upload_preview_error_failed_processing">"Prijenos medija za obradu nije uspio, pokušajte ponovno."</string>
+  <string name="screen_media_upload_preview_error_failed_sending">"Prijenos medija nije uspio, pokušajte ponovno."</string>
+  <string name="screen_media_upload_preview_error_too_large_message">"Maksimalna dopuštena veličina datoteke je %1$s."</string>
+  <string name="screen_media_upload_preview_error_too_large_title">"Datoteka je prevelika za prijenos"</string>
+  <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_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>
+  <string name="screen_report_content_hint">"Razlog za prijavu ovog sadržaja"</string>
+  <string name="screen_room_attachment_source_camera">"Kamera"</string>
+  <string name="screen_room_attachment_source_camera_photo">"Uslikaj"</string>
+  <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_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>
+  <string name="screen_room_encrypted_history_banner_unverified">"Povijest poruka nije dostupna u ovoj sobi. Potvrdite ovaj uređaj kako biste vidjeli povijest poruka."</string>
+  <string name="screen_room_invite_again_alert_message">"Želite li ih pozvati natrag?"</string>
+  <string name="screen_room_invite_again_alert_title">"Sami ste u ovom razgovoru"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"Obavijestite cijelu sobu"</string>
+  <string name="screen_room_mentions_at_room_title">"Svi"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"Pošalji ponovno"</string>
+  <string name="screen_room_retry_send_menu_title">"Slanje vaše poruke nije uspjelo"</string>
+  <string name="screen_room_timeline_add_reaction">"Dodaj reakciju"</string>
+  <string name="screen_room_timeline_beginning_of_room">"Ovo je početak sobe %1$s."</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"Ovo je početak ovog razgovora."</string>
+  <string name="screen_room_timeline_legacy_call">"Nepodržani poziv. Pitajte pozivatelja može li se služiti novom aplikacijom Element X."</string>
+  <string name="screen_room_timeline_less_reactions">"Prikaži manje"</string>
+  <string name="screen_room_timeline_message_copied">"Poruka je kopirana"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"Nemate dopuštenje za objavljivanje u ovoj sobi"</string>
+  <plurals name="screen_room_timeline_reaction_a11y">
+    <item quantity="one">"%1$d član reagirao je s %2$s"</item>
+    <item quantity="few">"%1$d člana reagirala su s %2$s"</item>
+    <item quantity="other">"%1$d članova reagiralo je s %2$s"</item>
+  </plurals>
+  <plurals name="screen_room_timeline_reaction_including_you_a11y">
+    <item quantity="one">"Vi i %1$d član reagirali ste s %2$s"</item>
+    <item quantity="few">"Vi i %1$d člana reagirali ste s %2$s"</item>
+    <item quantity="other">"Vi i %1$d članova reagirali ste s %2$s"</item>
+  </plurals>
+  <string name="screen_room_timeline_reaction_you_a11y">"Reagirali ste s %1$s"</string>
+  <string name="screen_room_timeline_reactions_show_less">"Prikaži manje"</string>
+  <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_state_changes">
+    <item quantity="one">"%1$d promjena sobe"</item>
+    <item quantity="few">"%1$d promjene sobe"</item>
+    <item quantity="other">"%1$d promjena sobe"</item>
+  </plurals>
+  <string name="screen_room_timeline_tombstoned_room_action">"Prijeđi u novu sobu"</string>
+  <string name="screen_room_timeline_tombstoned_room_message">"Ova je soba zamijenjena i više nije aktivna"</string>
+  <string name="screen_room_timeline_upgraded_room_action">"Pogledaj stare poruke"</string>
+  <string name="screen_room_timeline_upgraded_room_message">"Ova je soba nastavak druge sobe"</string>
+  <plurals name="screen_room_typing_many_members">
+    <item quantity="one">"%1$s, %2$s i ostalih %3$d"</item>
+    <item quantity="few">"%1$s, %2$s i ostalih %3$d"</item>
+    <item quantity="other">"%1$s, %2$s i ostalih %3$d"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="one">"%1$s tipka"</item>
+    <item quantity="few">"%1$s tipka"</item>
+    <item quantity="other">"%1$s tipka"</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-it/translations.xml b/features/messages/impl/src/main/res/values-it/translations.xml
index 87a7a05c93..c5b98c8178 100644
--- a/features/messages/impl/src/main/res/values-it/translations.xml
+++ b/features/messages/impl/src/main/res/values-it/translations.xml
@@ -7,6 +7,7 @@
   <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_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>
@@ -15,6 +16,7 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Caricamento del file multimediale fallito, riprova."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"La dimensione massima consentita del file è %1$s ."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Il file è troppo grande per essere caricato"</string>
+  <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_report_content_block_user">"Blocca utente"</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 5df3e5eac3..69b6586b4c 100644
--- a/features/messages/impl/src/main/res/values-nb/translations.xml
+++ b/features/messages/impl/src/main/res/values-nb/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Opplasting av medier mislyktes, vennligst prøv igjen."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"Maksimal tillatt filstørrelse er %1$s."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Filen er for stor til å lastes opp"</string>
+  <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_report_content_block_user">"Blokker bruker"</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 b7925c7865..bd9f649522 100644
--- a/features/messages/impl/src/main/res/values-pl/translations.xml
+++ b/features/messages/impl/src/main/res/values-pl/translations.xml
@@ -7,13 +7,18 @@
   <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_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>
   <string name="screen_media_upload_preview_error_failed_processing">"Przetwarzanie multimediów do przesłania nie powiodło się, spróbuj ponownie."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Przesyłanie multimediów nie powiodło się, spróbuj ponownie."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"Maksymalny dozwolony rozmiar pliku to %1$s."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Plik jest za duży, aby go przesłać."</string>
+  <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_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>
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 c85f17bdb3..6098fd0889 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,13 +7,18 @@
   <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>
   <string name="screen_media_upload_preview_error_failed_processing">"Falha ao processar a mídia para o envio. Tente novamente."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Falha ao enviar mídia. Tente novamente."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"O tamanho de arquivo máximo permitido é %1$s."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"O arquivo é muito grande para enviar"</string>
+  <string name="screen_media_upload_preview_item_count">"%1$d de %2$d itens"</string>
+  <string name="screen_media_upload_preview_optimize_image_quality_title">"Otimizar qualidade da imagem"</string>
+  <string name="screen_media_upload_preview_processing">"Processando…"</string>
   <string name="screen_report_content_block_user">"Bloquear usuário"</string>
   <string name="screen_report_content_block_user_hint">"Marque se você deseja ocultar todas as mensagens atuais e futuras desse usuário"</string>
   <string name="screen_report_content_explanation">"Essa mensagem será reportada ao administrador do seu servidor-casa. Eles não conseguirão ler nenhuma mensagem criptografada."</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 6fe6ec73ec..bca6ccfc89 100644
--- a/features/messages/impl/src/main/res/values-sk/translations.xml
+++ b/features/messages/impl/src/main/res/values-sk/translations.xml
@@ -7,6 +7,7 @@
   <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>
@@ -15,6 +16,7 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Nepodarilo sa nahrať médiá, skúste to prosím znova."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"Maximálna povolená veľkosť súboru je %1$s."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Súbor je príliš veľký na nahratie"</string>
+  <string name="screen_media_upload_preview_item_count">"Položka %1$d z %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimalizovať kvalitu obrázku"</string>
   <string name="screen_media_upload_preview_processing">"Prebieha spracovanie…"</string>
   <string name="screen_report_content_block_user">"Zablokovať používateľa"</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 e48de2b6ad..8f75212a31 100644
--- a/features/messages/impl/src/main/res/values-uz/translations.xml
+++ b/features/messages/impl/src/main/res/values-uz/translations.xml
@@ -8,8 +8,15 @@
   <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_symbols">"Belgilar"</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>
   <string name="screen_media_upload_preview_error_failed_processing">"Mediani yuklab bo‘lmadi, qayta urinib ko‘ring."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Media yuklanmadi, qayta urinib ko‘ring."</string>
+  <string name="screen_media_upload_preview_error_too_large_message">"Ruxsat etilgan maksimal fayl hajmi %1$s ."</string>
+  <string name="screen_media_upload_preview_error_too_large_title">"Fayl yuklash uchun juda katta"</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_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>
@@ -33,16 +40,31 @@
   <string name="screen_room_timeline_add_reaction">"Emoji qo\'shmoq"</string>
   <string name="screen_room_timeline_beginning_of_room">"Bu %1$sni boshlanishi"</string>
   <string name="screen_room_timeline_beginning_of_room_no_name">"Bu suhbatning boshlanishi."</string>
+  <string name="screen_room_timeline_legacy_call">"Chaqiruv qabul qilinmaydi. Chaqiruvchidan yangi Element X ilovasidan foydalanishi mumkinligini so‘rang."</string>
   <string name="screen_room_timeline_less_reactions">"Kamroq ko\'rsatish"</string>
   <string name="screen_room_timeline_message_copied">"Xabar nusxalandi"</string>
   <string name="screen_room_timeline_no_permission_to_post">"Sizda bu xonaga post yozishga ruxsat yo‘q"</string>
+  <plurals name="screen_room_timeline_reaction_a11y">
+    <item quantity="one">"%1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+    <item quantity="other">"%1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+  </plurals>
+  <plurals name="screen_room_timeline_reaction_including_you_a11y">
+    <item quantity="one">"Siz va %1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+    <item quantity="other">"Siz va %1$d ta a’zo %2$s bilan munosabat bildirdi"</item>
+  </plurals>
+  <string name="screen_room_timeline_reaction_you_a11y">"%1$s bilan munosabat bildirdingiz"</string>
   <string name="screen_room_timeline_reactions_show_less">"Kamroq ko\'rsatish"</string>
   <string name="screen_room_timeline_reactions_show_more">"Ko\'proq ko\'rsatish"</string>
+  <string name="screen_room_timeline_reactions_show_reactions_summary">"Reaksiyalar xulosasini chiqarish"</string>
   <string name="screen_room_timeline_read_marker_title">"Yangi"</string>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$dxonani almashtirish"</item>
     <item quantity="other">"%1$dxona o\'zgarishi"</item>
   </plurals>
+  <string name="screen_room_timeline_tombstoned_room_action">"Yangi xonaga o‘tish"</string>
+  <string name="screen_room_timeline_tombstoned_room_message">"Bu room almashtirildi va endi faol emas"</string>
+  <string name="screen_room_timeline_upgraded_room_action">"Eski xabarlarni ko‘rish"</string>
+  <string name="screen_room_timeline_upgraded_room_message">"Bu xona boshqa xonaning davomi"</string>
   <plurals name="screen_room_typing_many_members">
     <item quantity="one">"%1$s, %2$s va %3$d boshqalar"</item>
     <item quantity="other">"%1$s, %2$s va %3$d boshqalar"</item>
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 6abf951e4f..eb6ea81365 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,6 +7,7 @@
   <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>
@@ -15,6 +16,7 @@
   <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_report_content_block_user">"封鎖使用者"</string>
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 2de761ad69..90c31b911a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,25 +11,23 @@ package io.element.android.features.messages.impl
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.compose.runtime.Composable
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.api.ElementCallEntryPoint
-import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
-import io.element.android.features.location.api.SendLocationEntryPoint
-import io.element.android.features.location.api.ShowLocationEntryPoint
+import io.element.android.features.call.test.FakeElementCallEntryPoint
+import io.element.android.features.forward.test.FakeForwardEntryPoint
+import io.element.android.features.knockrequests.test.FakeKnockRequestsListEntryPoint
 import io.element.android.features.location.test.FakeLocationService
+import io.element.android.features.location.test.FakeSendLocationEntryPoint
+import io.element.android.features.location.test.FakeShowLocationEntryPoint
 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.api.create.CreatePollEntryPoint
+import io.element.android.features.poll.test.create.FakeCreatePollEntryPoint
 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
 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.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
@@ -36,7 +35,7 @@ import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 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.MediaViewerEntryPoint
+import io.element.android.libraries.mediaviewer.test.FakeMediaViewerEntryPoint
 import io.element.android.libraries.textcomposer.mentions.MentionSpanTheme
 import io.element.android.libraries.textcomposer.mentions.MentionSpanUpdater
 import io.element.android.services.analytics.test.FakeAnalyticsService
@@ -63,33 +62,12 @@ class DefaultMessagesEntryPointTest {
                 plugins = plugins,
                 roomListService = FakeRoomListService(),
                 sessionId = A_SESSION_ID,
-                sendLocationEntryPoint = object : SendLocationEntryPoint {
-                    override fun builder(timelineMode: Timeline.Mode) = lambdaError()
-                },
-                showLocationEntryPoint = object : ShowLocationEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs) = lambdaError()
-                },
-                createPollEntryPoint = object : CreatePollEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                elementCallEntryPoint = object : ElementCallEntryPoint {
-                    override fun startCall(callType: CallType) = lambdaError()
-                    override suspend fun handleIncomingCall(
-                        callType: CallType.RoomCall,
-                        eventId: EventId,
-                        senderId: UserId,
-                        roomName: String?,
-                        senderName: String?,
-                        avatarUrl: String?,
-                        timestamp: Long,
-                        expirationTimestamp: Long,
-                        notificationChannelId: String,
-                        textContent: String?,
-                    ) = lambdaError()
-                },
-                mediaViewerEntryPoint = object : MediaViewerEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                sendLocationEntryPoint = FakeSendLocationEntryPoint(),
+                showLocationEntryPoint = FakeShowLocationEntryPoint(),
+                createPollEntryPoint = FakeCreatePollEntryPoint(),
+                elementCallEntryPoint = FakeElementCallEntryPoint(),
+                mediaViewerEntryPoint = FakeMediaViewerEntryPoint(),
+                forwardEntryPoint = FakeForwardEntryPoint(),
                 analyticsService = FakeAnalyticsService(),
                 locationService = FakeLocationService(),
                 room = FakeBaseRoom(),
@@ -104,25 +82,26 @@ class DefaultMessagesEntryPointTest {
                 mentionSpanTheme = MentionSpanTheme(A_USER_ID),
                 pinnedEventsTimelineProvider = createPinnedEventsTimelineProvider(),
                 timelineController = createTimelineController(),
-                knockRequestsListEntryPoint = object : KnockRequestsListEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                knockRequestsListEntryPoint = FakeKnockRequestsListEntryPoint(),
                 dateFormatter = FakeDateFormatter(),
                 coroutineDispatchers = testCoroutineDispatchers(),
             )
         }
         val callback = object : MessagesEntryPoint.Callback {
-            override fun onRoomDetailsClick() = lambdaError()
-            override fun onUserDataClick(userId: UserId) = lambdaError()
-            override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
-            override fun onForwardedToSingleRoom(roomId: RoomId) = lambdaError()
+            override fun navigateToRoomDetails() = lambdaError()
+            override fun navigateToRoomMemberDetails(userId: UserId) = lambdaError()
+            override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
+            override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
+            override fun navigateToRoom(roomId: RoomId) = lambdaError()
         }
         val initialTarget = MessagesEntryPoint.InitialTarget.Messages(focusedEventId = AN_EVENT_ID)
         val params = MessagesEntryPoint.Params(initialTarget)
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MessagesFlowNode::class.java)
         assertThat(result.plugins).contains(MessagesEntryPoint.Params(initialTarget))
         assertThat(result.plugins).contains(callback)
@@ -131,7 +110,7 @@ class DefaultMessagesEntryPointTest {
     @Test
     fun `test initial target to nav target mapping`() {
         assertThat(MessagesEntryPoint.InitialTarget.Messages(focusedEventId = AN_EVENT_ID).toNavTarget())
-            .isEqualTo(MessagesFlowNode.NavTarget.Messages(AN_EVENT_ID))
+            .isEqualTo(MessagesFlowNode.NavTarget.Messages(focusedEventId = AN_EVENT_ID))
         assertThat(MessagesEntryPoint.InitialTarget.PinnedMessages.toNavTarget())
             .isEqualTo(MessagesFlowNode.NavTarget.PinnedMessagesList)
     }
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 bb59ca8551..68d2cd824b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,32 +25,37 @@ class FakeMessagesNavigator(
     private val onPreviewAttachmentLambda: (attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) -> Unit = { _, _ -> lambdaError() },
     private val onNavigateToRoomLambda: (roomId: RoomId, threadId: EventId?, serverNames: List<String>) -> Unit = { _, _, _ -> lambdaError() },
     private val onOpenThreadLambda: (threadRootId: ThreadId, focusedEventId: EventId?) -> Unit = { _, _ -> lambdaError() },
+    private val closeLambda: () -> Unit = { lambdaError() },
 ) : MessagesNavigator {
-    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
         onShowEventDebugInfoClickLambda(eventId, debugInfo)
     }
 
-    override fun onForwardEventClick(eventId: EventId) {
+    override fun forwardEvent(eventId: EventId) {
         onForwardEventClickLambda(eventId)
     }
 
-    override fun onReportContentClick(eventId: EventId, senderId: UserId) {
+    override fun navigateToReportMessage(eventId: EventId, senderId: UserId) {
         onReportContentClickLambda(eventId, senderId)
     }
 
-    override fun onEditPollClick(eventId: EventId) {
+    override fun navigateToEditPoll(eventId: EventId) {
         onEditPollClickLambda(eventId)
     }
 
-    override fun onPreviewAttachment(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
+    override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
         onPreviewAttachmentLambda(attachments, inReplyToEventId)
     }
 
-    override fun onNavigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>) {
+    override fun navigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>) {
         onNavigateToRoomLambda(roomId, eventId, serverNames)
     }
 
-    override fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) {
+    override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
         onOpenThreadLambda(threadRootId, focusedEventId)
     }
+
+    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 56a3badf26..bdf84e9eec 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,13 +17,16 @@ import io.element.android.features.messages.impl.actionlist.ActionListEvents
 import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.anActionListState
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
+import io.element.android.features.messages.impl.crypto.historyvisible.aHistoryVisibleState
 import io.element.android.features.messages.impl.crypto.identity.anIdentityChangeState
 import io.element.android.features.messages.impl.fixtures.aMessageEvent
 import io.element.android.features.messages.impl.link.aLinkState
-import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
+import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvent
 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.timeline.FakeMarkAsFullyRead
+import io.element.android.features.messages.impl.timeline.MarkAsFullyRead
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.TimelineEvents
 import io.element.android.features.messages.impl.timeline.aTimelineState
@@ -57,10 +61,10 @@ import io.element.android.libraries.matrix.api.core.toThreadId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
-import io.element.android.libraries.matrix.api.recentemojis.AddRecentEmoji
 import io.element.android.libraries.matrix.api.room.MessageEventType
 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.StateEventType
 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.TimelineItemDebugInfo
@@ -76,7 +80,6 @@ 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.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.core.aBuildMeta
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
@@ -84,10 +87,11 @@ 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.sync.FakeSyncService
+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.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
@@ -130,7 +134,6 @@ class MessagesPresenterTest {
                 .isEqualTo(AvatarData(id = A_ROOM_ID.value, name = "", url = AN_AVATAR_URL, size = AvatarSize.TimelineRoom))
             assertThat(initialState.userEventPermissions.canSendMessage).isTrue()
             assertThat(initialState.userEventPermissions.canRedactOwn).isTrue()
-            assertThat(initialState.hasNetworkConnection).isTrue()
             assertThat(initialState.snackbarMessage).isNull()
             assertThat(initialState.inviteProgress).isEqualTo(AsyncData.Uninitialized)
             assertThat(initialState.showReinvitePrompt).isFalse()
@@ -142,11 +145,7 @@ class MessagesPresenterTest {
     fun `present - check that the room's unread flag is removed`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
                 markAsReadResult = { lambdaError() }
             ),
             typingNoticeResult = { Result.success(Unit) },
@@ -165,22 +164,24 @@ class MessagesPresenterTest {
         val toggleReactionSuccess = lambdaRecorder { _: String, _: EventOrTransactionId -> Result.success(true) }
         val toggleReactionFailure =
             lambdaRecorder { _: String, _: EventOrTransactionId -> Result.failure<Boolean>(IllegalStateException("Failed to send reaction")) }
+        val addRecentEmojiResult = lambdaRecorder { _: String -> Result.success(Unit) }
 
         val timeline = FakeTimeline().apply {
             this.toggleReactionLambda = toggleReactionSuccess
         }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         )
-        val presenter = createMessagesPresenter(joinedRoom = room, coroutineDispatchers = coroutineDispatchers)
+        val presenter = createMessagesPresenter(
+            timeline = timeline,
+            joinedRoom = room,
+            addRecentEmoji = AddRecentEmoji { addRecentEmojiResult(it) },
+            coroutineDispatchers = coroutineDispatchers,
+        )
         presenter.testWithLifecycleOwner {
             skipItems(1)
             val initialState = awaitItem()
@@ -196,6 +197,7 @@ class MessagesPresenterTest {
             assert(toggleReactionFailure)
                 .isCalledOnce()
                 .with(value("👍"), value(AN_EVENT_ID.toEventOrTransactionId()))
+            addRecentEmojiResult.assertions().isCalledOnce().with(value("👍"))
         }
     }
 
@@ -207,22 +209,25 @@ class MessagesPresenterTest {
             toggle = !toggle
             Result.success(toggle)
         }
-
+        val addRecentEmoji = lambdaRecorder { _: String ->
+            Result.success(Unit)
+        }
         val timeline = FakeTimeline().apply {
             this.toggleReactionLambda = toggleReactionSuccess
         }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         )
-        val presenter = createMessagesPresenter(joinedRoom = room, coroutineDispatchers = coroutineDispatchers)
+        val presenter = createMessagesPresenter(
+            timeline = timeline,
+            joinedRoom = room,
+            addRecentEmoji = AddRecentEmoji { addRecentEmoji(it) },
+            coroutineDispatchers = coroutineDispatchers
+        )
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
             initialState.eventSink(MessagesEvents.ToggleReaction("👍", AN_EVENT_ID.toEventOrTransactionId()))
@@ -235,6 +240,7 @@ class MessagesPresenterTest {
                     listOf(value("👍"), value(AN_EVENT_ID.toEventOrTransactionId())),
                 )
             skipItems(1)
+            addRecentEmoji.assertions().isCalledOnce().with(value("👍"))
         }
     }
 
@@ -272,11 +278,7 @@ class MessagesPresenterTest {
         val event = aMessageEvent()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
                 eventPermalinkResult = { Result.success("a link") },
             ),
             typingNoticeResult = { Result.success(Unit) },
@@ -295,7 +297,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action reply`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -304,7 +306,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Reply, aMessageEvent()))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Reply(
                         replyToDetails = InReplyToDetails.Loading(AN_EVENT_ID),
                         hideImage = false,
@@ -326,7 +328,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action reply to an image media message`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -355,7 +357,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Reply, mediaMessage))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Reply(
                         replyToDetails = InReplyToDetails.Loading(AN_EVENT_ID),
                         hideImage = false,
@@ -367,7 +369,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action reply to a video media message`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -397,7 +399,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Reply, mediaMessage))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Reply(
                         replyToDetails = InReplyToDetails.Loading(AN_EVENT_ID),
                         hideImage = false,
@@ -409,7 +411,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action reply to a file media message`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -432,7 +434,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Reply, mediaMessage))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Reply(
                         replyToDetails = InReplyToDetails.Loading(AN_EVENT_ID),
                         hideImage = false,
@@ -444,7 +446,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action edit`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -453,7 +455,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Edit, aMessageEvent()))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Edit(
                         eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),
                         content = (aMessageEvent().content as TimelineItemTextContent).body
@@ -498,11 +500,7 @@ class MessagesPresenterTest {
         val liveTimeline = FakeTimeline()
         val joinedRoom = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             liveTimeline = liveTimeline,
             typingNoticeResult = { Result.success(Unit) },
@@ -511,6 +509,7 @@ class MessagesPresenterTest {
         val redactEventLambda = lambdaRecorder { _: EventOrTransactionId, _: String? -> Result.success(Unit) }
         liveTimeline.redactEventLambda = redactEventLambda
         val presenter = createMessagesPresenter(
+            timeline = liveTimeline,
             joinedRoom = joinedRoom,
             coroutineDispatchers = coroutineDispatchers,
         )
@@ -569,11 +568,7 @@ class MessagesPresenterTest {
     fun `present - shows prompt to reinvite users in DM`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 1, activeMembersCount = 1))
             },
@@ -602,11 +597,7 @@ class MessagesPresenterTest {
     fun `present - doesn't show reinvite prompt in non-direct room`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(isDirect = false, joinedMembersCount = 1, activeMembersCount = 1))
             },
@@ -628,11 +619,7 @@ class MessagesPresenterTest {
     fun `present - doesn't show reinvite prompt if other party is present`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 2, activeMembersCount = 2))
             },
@@ -655,11 +642,7 @@ class MessagesPresenterTest {
         val inviteUserResult = lambdaRecorder { _: UserId -> Result.success(Unit) }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             typingNoticeResult = { Result.success(Unit) },
             inviteUserResult = inviteUserResult,
@@ -690,11 +673,7 @@ class MessagesPresenterTest {
         val inviteUserResult = lambdaRecorder { _: UserId -> Result.success(Unit) }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             typingNoticeResult = { Result.success(Unit) },
             inviteUserResult = inviteUserResult,
@@ -727,11 +706,7 @@ class MessagesPresenterTest {
     fun `present - handle reinviting other user when memberlist is not ready`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -752,11 +727,7 @@ class MessagesPresenterTest {
     fun `present - handle reinviting other user when inviting fails`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             typingNoticeResult = { Result.success(Unit) },
             inviteUserResult = { Result.failure(RuntimeException("Oops!")) },
@@ -790,17 +761,7 @@ class MessagesPresenterTest {
     fun `present - permission to post`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
-                canUserSendMessageResult = { _, messageEventType ->
-                    when (messageEventType) {
-                        MessageEventType.RoomMessage -> Result.success(true)
-                        MessageEventType.Reaction -> Result.success(true)
-                        else -> lambdaError()
-                    }
-                },
+                roomPermissions = roomPermissions(),
             ),
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -816,17 +777,9 @@ class MessagesPresenterTest {
     fun `present - no permission to post`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
-                canUserSendMessageResult = { _, messageEventType ->
-                    when (messageEventType) {
-                        MessageEventType.RoomMessage -> Result.success(false)
-                        MessageEventType.Reaction -> Result.success(false)
-                        else -> lambdaError()
-                    }
-                },
+                roomPermissions = roomPermissions(
+                    canSendMessage = false
+                ),
             ),
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -842,11 +795,9 @@ class MessagesPresenterTest {
     fun `present - permission to redact own`() = runTest {
         val joinedRoom = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOtherResult = { Result.success(false) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(
+                    canRedactOther = false
+                ),
             ),
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -863,11 +814,9 @@ class MessagesPresenterTest {
     fun `present - permission to redact other`() = runTest {
         val joinedRoom = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOtherResult = { Result.success(true) },
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(false) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(
+                    canRedactOwn = false
+                ),
             ),
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -882,7 +831,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action reply to a poll`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -894,7 +843,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Reply, poll))
             skipItems(1)
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Reply(
                         replyToDetails = InReplyToDetails.Loading(AN_EVENT_ID),
                         hideImage = false,
@@ -912,16 +861,13 @@ class MessagesPresenterTest {
         val timeline = FakeTimeline()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         )
         val presenter = createMessagesPresenter(
+            timeline = timeline,
             joinedRoom = room,
             analyticsService = analyticsService,
         )
@@ -955,16 +901,16 @@ class MessagesPresenterTest {
         val analyticsService = FakeAnalyticsService()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         )
-        val presenter = createMessagesPresenter(joinedRoom = room, analyticsService = analyticsService)
+        val presenter = createMessagesPresenter(
+            timeline = timeline,
+            joinedRoom = room,
+            analyticsService = analyticsService
+        )
         presenter.testWithLifecycleOwner {
             val messageEvent = aMessageEvent(
                 content = aTimelineItemTextContent()
@@ -994,7 +940,7 @@ class MessagesPresenterTest {
                 caption = A_CAPTION,
             )
         )
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -1003,7 +949,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.EditCaption, messageEvent))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.EditCaption(
                         eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),
                         content = A_CAPTION,
@@ -1015,7 +961,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action add caption`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             messageComposerPresenter = { aMessageComposerState(eventSink = composerRecorder) },
         )
@@ -1029,7 +975,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.AddCaption, messageEvent))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.EditCaption(
                         eventOrTransactionId = AN_EVENT_ID.toEventOrTransactionId(),
                         content = "",
@@ -1052,11 +998,7 @@ class MessagesPresenterTest {
         }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
@@ -1093,11 +1035,7 @@ class MessagesPresenterTest {
         val successorReason = "This room has been moved to a new location"
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
                 initialRoomInfo = aRoomInfo(
                     successorRoom = SuccessorRoom(
                         roomId = successorRoomId,
@@ -1121,11 +1059,7 @@ class MessagesPresenterTest {
     fun `present - room without successor room has null successor info in state`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
                 initialRoomInfo = aRoomInfo(successorRoom = null)
             ),
             typingNoticeResult = { Result.success(Unit) },
@@ -1143,11 +1077,13 @@ class MessagesPresenterTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
                 sessionId = A_SESSION_ID,
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = FakeRoomPermissions(
+                    canSendState = { true },
+                    canSendMessage = { true },
+                    canRedactOther = true,
+                    canRedactOwn = true,
+                    canPinUnpin = true,
+                ),
                 initialRoomInfo = aRoomInfo(isDirect = true, isEncrypted = true)
             ).apply {
                 givenRoomMembersState(RoomMembersState.Ready(persistentListOf(aRoomMember(userId = A_SESSION_ID), aRoomMember(userId = A_USER_ID_2))))
@@ -1181,10 +1117,12 @@ class MessagesPresenterTest {
         )
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
-            initialState.eventSink(MessagesEvents.HandleAction(
-                action = TimelineItemAction.ReplyInThread,
-                event = aMessageEvent(threadInfo = TimelineItemThreadInfo.ThreadResponse(A_THREAD_ID))
-            ))
+            initialState.eventSink(
+                MessagesEvents.HandleAction(
+                    action = TimelineItemAction.ReplyInThread,
+                    event = aMessageEvent(threadInfo = TimelineItemThreadInfo.ThreadResponse(A_THREAD_ID))
+                )
+            )
             awaitItem()
             openThreadLambda.assertions().isCalledOnce().with(value(A_THREAD_ID), value(null))
         }
@@ -1201,14 +1139,16 @@ class MessagesPresenterTest {
         )
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
-            initialState.eventSink(MessagesEvents.HandleAction(
-                action = TimelineItemAction.ReplyInThread,
-                event = aMessageEvent(
-                    // The event id will be used as the thread id instead
-                    eventId = AN_EVENT_ID,
-                    threadInfo = null,
+            initialState.eventSink(
+                MessagesEvents.HandleAction(
+                    action = TimelineItemAction.ReplyInThread,
+                    event = aMessageEvent(
+                        // The event id will be used as the thread id instead
+                        eventId = AN_EVENT_ID,
+                        threadInfo = null,
+                    )
                 )
-            ))
+            )
             awaitItem()
             openThreadLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID.toThreadId()), value(null))
         }
@@ -1216,7 +1156,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action reply in a thread with threads disabled`() = runTest {
-        val composerRecorder = EventsRecorder<MessageComposerEvents>()
+        val composerRecorder = EventsRecorder<MessageComposerEvent>()
         val presenter = createMessagesPresenter(
             featureFlagService = FakeFeatureFlagService(
                 initialState = mapOf(FeatureFlags.Threads.key to false)
@@ -1228,7 +1168,7 @@ class MessagesPresenterTest {
             initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.ReplyInThread, aMessageEvent()))
             awaitItem()
             composerRecorder.assertSingle(
-                MessageComposerEvents.SetMode(
+                MessageComposerEvent.SetMode(
                     composerMode = MessageComposerMode.Reply(
                         replyToDetails = InReplyToDetails.Loading(AN_EVENT_ID),
                         hideImage = false,
@@ -1238,22 +1178,98 @@ class MessagesPresenterTest {
         }
     }
 
+    @Test
+    fun `present - handle MarkAsFullyReadAndExit marks the room as fully read and navigates up`() = runTest {
+        val markAsFullyReadRecorder = lambdaRecorder<RoomId, EventId, Unit> { _, _ -> }
+        val markAsFullyReadUseCase = FakeMarkAsFullyRead(markAsFullyReadRecorder)
+        val closeLambda = lambdaRecorder<Unit> {}
+        val navigator = FakeMessagesNavigator(closeLambda = closeLambda)
+
+        val presenter = createMessagesPresenter(
+            timeline = FakeTimeline(getLatestEventIdResult = { Result.success(AN_EVENT_ID) }),
+            markAsFullyRead = markAsFullyReadUseCase,
+            navigator = navigator,
+        )
+        presenter.testWithLifecycleOwner {
+            val initialState = awaitItem()
+            initialState.eventSink(MessagesEvents.MarkAsFullyReadAndExit)
+
+            runCurrent()
+
+            markAsFullyReadRecorder.assertions().isCalledOnce()
+            closeLambda.assertions().isCalledOnce()
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - handle MarkAsFullyReadAndExit still navigates up if marking as read fails`() = runTest {
+        val markAsFullyReadUseCase = FakeMarkAsFullyRead { _, _ -> error("boom") }
+        val closeLambda = lambdaRecorder<Unit> {}
+        val navigator = FakeMessagesNavigator(closeLambda = closeLambda)
+
+        val presenter = createMessagesPresenter(
+            timeline = FakeTimeline(getLatestEventIdResult = { Result.success(AN_EVENT_ID) }),
+            markAsFullyRead = markAsFullyReadUseCase,
+            navigator = navigator,
+        )
+        presenter.testWithLifecycleOwner {
+            val initialState = awaitItem()
+            initialState.eventSink(MessagesEvents.MarkAsFullyReadAndExit)
+
+            runCurrent()
+
+            closeLambda.assertions().isCalledOnce()
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    private fun roomPermissions(
+        canStartCall: Boolean = true,
+        canRedactOther: Boolean = true,
+        canRedactOwn: Boolean = true,
+        canSendMessage: Boolean = true,
+        canSendReaction: Boolean = true,
+        canPinUnpin: Boolean = true,
+    ) = FakeRoomPermissions(
+        canSendState = { type ->
+            when (type) {
+                StateEventType.CallMember -> canStartCall
+                else -> lambdaError()
+            }
+        },
+        canSendMessage = { type ->
+            when (type) {
+                MessageEventType.RoomMessage -> canSendMessage
+                MessageEventType.Reaction -> canSendReaction
+                else -> lambdaError()
+            }
+        },
+        canRedactOther = canRedactOther,
+        canRedactOwn = canRedactOwn,
+        canPinUnpin = canPinUnpin,
+    )
+
     private fun TestScope.createMessagesPresenter(
         coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
+        timeline: Timeline = FakeTimeline(),
         joinedRoom: FakeJoinedRoom = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserJoinCallResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = FakeRoomPermissions(
+                    canSendState = { true },
+                    canSendMessage = { true },
+                    canRedactOther = true,
+                    canRedactOwn = true,
+                    canPinUnpin = true,
+                ),
             ).apply {
                 givenRoomInfo(aRoomInfo(id = roomId, name = ""))
             },
-            liveTimeline = FakeTimeline(),
+            liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         ),
-        timeline: Timeline = joinedRoom.liveTimeline,
         navigator: FakeMessagesNavigator = FakeMessagesNavigator(),
         clipboardHelper: FakeClipboardHelper = FakeClipboardHelper(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
@@ -1271,36 +1287,39 @@ class MessagesPresenterTest {
         encryptionService: FakeEncryptionService = FakeEncryptionService(),
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
         actionListEventSink: (ActionListEvents) -> Unit = {},
-        addRecentEmoji: AddRecentEmoji = AddRecentEmoji(FakeMatrixClient(), testCoroutineDispatchers()),
+        addRecentEmoji: AddRecentEmoji = AddRecentEmoji { _ -> lambdaError() },
+        markAsFullyRead: MarkAsFullyRead = FakeMarkAsFullyRead(),
     ): MessagesPresenter {
         return MessagesPresenter(
+            navigator = navigator,
             room = joinedRoom,
             composerPresenter = messageComposerPresenter,
             voiceMessageComposerPresenterFactory = FakeDefaultVoiceMessageComposerPresenterFactory(backgroundScope),
             timelinePresenter = { aTimelineState(eventSink = timelineEventSink) },
             timelineProtectionPresenter = { aTimelineProtectionState() },
+            identityChangeStatePresenter = { anIdentityChangeState() },
+            historyVisibleStatePresenter = { aHistoryVisibleState() },
+            linkPresenter = { aLinkState() },
             actionListPresenter = { anActionListState(eventSink = actionListEventSink) },
             customReactionPresenter = { aCustomReactionState() },
             reactionSummaryPresenter = { aReactionSummaryState() },
             readReceiptBottomSheetPresenter = { aReadReceiptBottomSheetState() },
-            identityChangeStatePresenter = { anIdentityChangeState() },
-            linkPresenter = { aLinkState() },
             pinnedMessagesBannerPresenter = { aLoadedPinnedMessagesBannerState() },
             roomCallStatePresenter = { aStandByCallState() },
             roomMemberModerationPresenter = roomMemberModerationPresenter,
-            syncService = FakeSyncService(),
             snackbarDispatcher = SnackbarDispatcher(),
-            navigator = navigator,
-            clipboardHelper = clipboardHelper,
-            buildMeta = aBuildMeta(),
             dispatchers = coroutineDispatchers,
+            clipboardHelper = clipboardHelper,
             htmlConverterProvider = FakeHtmlConverterProvider(),
+            buildMeta = aBuildMeta(),
             timelineController = TimelineController(joinedRoom, timeline),
             permalinkParser = permalinkParser,
-            encryptionService = encryptionService,
             analyticsService = analyticsService,
+            encryptionService = encryptionService,
             featureFlagService = featureFlagService,
             addRecentEmoji = addRecentEmoji,
+            markAsFullyRead = markAsFullyRead,
+            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 85027eb75e..23665a043c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 52118a400d..7c61d2b8b2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,9 +43,11 @@ 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
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -54,6 +57,8 @@ class ActionListPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
+    private val suggestedEmojis = persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
+
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createActionListPresenter(isDeveloperModeEnabled = true)
@@ -95,7 +100,7 @@ class ActionListPresenterTest {
                     actions = persistentListOf(
                         TimelineItemAction.ViewSource,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -137,7 +142,7 @@ class ActionListPresenterTest {
                     actions = persistentListOf(
                         TimelineItemAction.ViewSource,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -185,7 +190,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.ReportContent,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -232,7 +237,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.ReportContent,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -279,7 +284,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.ReportContent,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -328,7 +333,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ReportContent,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -377,7 +382,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ReportContent,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -425,7 +430,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -472,7 +477,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -519,7 +524,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.CopyText,
                         TimelineItemAction.ViewSource,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -563,7 +568,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.CopyText,
                         TimelineItemAction.ViewSource,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -611,7 +616,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -663,7 +668,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -713,7 +718,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.ReportContent,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -754,7 +759,7 @@ class ActionListPresenterTest {
                     actions = persistentListOf(
                         TimelineItemAction.ViewSource,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -828,7 +833,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.CopyText,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -875,7 +880,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -929,7 +934,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.ViewSource,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
             initialState.eventSink.invoke(ActionListEvents.Clear)
@@ -1023,7 +1028,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.CopyText,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1068,7 +1073,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1112,7 +1117,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1155,7 +1160,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1201,7 +1206,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1239,7 +1244,7 @@ class ActionListPresenterTest {
                     actions = persistentListOf(
                         TimelineItemAction.ViewSource
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1317,7 +1322,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1371,7 +1376,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1426,7 +1431,7 @@ class ActionListPresenterTest {
                         TimelineItemAction.Pin,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
@@ -1478,11 +1483,56 @@ class ActionListPresenterTest {
                         TimelineItemAction.Reply,
                         TimelineItemAction.Redact,
                     ),
-                    recentEmojis = persistentListOf(),
+                    recentEmojis = suggestedEmojis,
                 )
             )
         }
     }
+
+    @Test
+    fun `present - recentEmojis merges suggested and recent emojis`() = runTest {
+        val suggestedEmojis = persistentListOf("👍️", "👎️", "🔥", "❤️", "👏")
+        val otherEmojis = (0..100).map { it.toString() }
+
+        val presenter = createActionListPresenter(
+            isDeveloperModeEnabled = false,
+            recentEmojis = GetRecentEmojis { Result.success((listOf("👍️", ":)", "❤️") + otherEmojis).toImmutableList()) },
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            val messageEvent = aMessageEvent(
+                eventId = null,
+                transactionId = A_TRANSACTION_ID,
+                isMine = true,
+                isEditable = false,
+                content = aTimelineItemVoiceContent(
+                    caption = null,
+                ),
+            )
+
+            initialState.eventSink.invoke(
+                ActionListEvents.ComputeForMessage(
+                    event = messageEvent,
+                    userEventPermissions = aUserEventPermissions(
+                        canRedactOwn = true,
+                        canRedactOther = false,
+                        canSendMessage = true,
+                        canSendReaction = true,
+                        canPinUnpin = true
+                    )
+                )
+            )
+            val successState = awaitItem()
+            assertThat(successState.target).isInstanceOf(ActionListState.Target.Success::class.java)
+
+            // Check items are deduplicated between suggested and recent emojis and we take at most 100 items
+            val expectedEmojis = (suggestedEmojis + persistentListOf(":)") + otherEmojis).take(100)
+            assertThat((successState.target as ActionListState.Target.Success).recentEmojis)
+                .isEqualTo(expectedEmojis)
+        }
+    }
 }
 
 private fun createActionListPresenter(
@@ -1490,6 +1540,7 @@ private fun createActionListPresenter(
     room: BaseRoom = FakeBaseRoom(),
     timelineMode: Timeline.Mode = Timeline.Mode.Live,
     featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
+    recentEmojis: GetRecentEmojis = GetRecentEmojis { Result.success(persistentListOf()) },
 ): ActionListPresenter {
     val preferencesStore = InMemoryAppPreferencesStore(isDeveloperModeEnabled = isDeveloperModeEnabled)
     return DefaultActionListPresenter(
@@ -1500,6 +1551,6 @@ private fun createActionListPresenter(
         dateFormatter = FakeDateFormatter(),
         timelineMode = timelineMode,
         featureFlagService = featureFlagService,
-        getRecentEmojis = { Result.success(persistentListOf()) },
+        getRecentEmojis = recentEmojis,
     )
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt
index 834b212803..2209b63521 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparatorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 941a81d075..fe462fc988 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -40,8 +41,10 @@ import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.mediaupload.api.MediaSender
+import io.element.android.libraries.mediaupload.api.MediaSenderFactory
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
+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.api.aVideoMediaInfo
 import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
@@ -596,21 +599,20 @@ class AttachmentsPreviewPresenterTest {
                 )
             }
         ),
+        mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
     ): AttachmentsPreviewPresenter {
         return AttachmentsPreviewPresenter(
             attachment = aMediaAttachment(localMedia),
             onDoneListener = onDoneListener,
-            mediaSenderFactory = object : MediaSender.Factory {
-                override fun create(timelineMode: Timeline.Mode): MediaSender {
-                    return MediaSender(
-                        preProcessor = mediaPreProcessor,
-                        room = room,
-                        timelineMode = timelineMode,
-                        mediaOptimizationConfigProvider = {
-                            MediaOptimizationConfig(compressImages = true, videoCompressionPreset = VideoCompressionPreset.STANDARD)
-                        }
-                    )
-                }
+            mediaSenderFactory = MediaSenderFactory { timelineMode ->
+                DefaultMediaSender(
+                    preProcessor = mediaPreProcessor,
+                    room = room,
+                    timelineMode = timelineMode,
+                    mediaOptimizationConfigProvider = {
+                        MediaOptimizationConfig(compressImages = true, videoCompressionPreset = VideoCompressionPreset.STANDARD)
+                    }
+                )
             },
             permalinkBuilder = permalinkBuilder,
             temporaryUriDeleter = temporaryUriDeleter,
@@ -619,6 +621,7 @@ class AttachmentsPreviewPresenterTest {
             mediaOptimizationSelectorPresenterFactory = mediaOptimizationSelectorPresenterFactory,
             timelineMode = timelineMode,
             inReplyToEventId = null,
+            mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
         )
     }
 
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 7a6dc988a4..208d9cc7c0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d095f0d58a..96cc93ea3d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,14 +21,13 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
-import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.mediaupload.api.MaxUploadSizeProvider
+import io.element.android.libraries.mediaupload.test.FakeMediaOptimizationConfigProvider
 import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo
 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
-import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.tests.testutils.WarmUpRule
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
@@ -205,7 +205,7 @@ class DefaultMediaOptimizationSelectorPresenterTest {
     @Test
     fun `present - max upload size will default to 100MB if we can't get it`() = runTest {
         val presenter = createDefaultMediaOptimizationSelectorPresenter(
-            maxUploadSizeProvider = MaxUploadSizeProvider(FakeMatrixClient(getMaxUploadSizeResult = { Result.failure(AN_EXCEPTION) }))
+            maxUploadSizeProvider = MaxUploadSizeProvider { Result.failure(AN_EXCEPTION) }
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -232,19 +232,17 @@ class DefaultMediaOptimizationSelectorPresenterTest {
 
     private fun createDefaultMediaOptimizationSelectorPresenter(
         localMedia: LocalMedia = aLocalMedia(mockMediaUrl, aVideoMediaInfo()),
-        maxUploadSizeProvider: MaxUploadSizeProvider = MaxUploadSizeProvider(
-            FakeMatrixClient(getMaxUploadSizeResult = { Result.success(1_000L) }),
-        ),
-        sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(),
+        maxUploadSizeProvider: MaxUploadSizeProvider = MaxUploadSizeProvider { Result.success(1_000L) },
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.SelectableMediaQuality.key to true)),
         mediaExtractorFactory: FakeVideoMetadataExtractorFactory = FakeVideoMetadataExtractorFactory(),
+        mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
     ): DefaultMediaOptimizationSelectorPresenter {
         return DefaultMediaOptimizationSelectorPresenter(
             localMedia = localMedia,
             maxUploadSizeProvider = maxUploadSizeProvider,
-            sessionPreferencesStore = sessionPreferencesStore,
             featureFlagService = featureFlagService,
             mediaExtractorFactory = mediaExtractorFactory,
+            mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
         )
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/FakeHistoryVisibleAcknowledgementRepository.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/FakeHistoryVisibleAcknowledgementRepository.kt
new file mode 100644
index 0000000000..faf21720fa
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/FakeHistoryVisibleAcknowledgementRepository.kt
@@ -0,0 +1,42 @@
+/*
+ * 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.crypto.historyvisible
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class FakeHistoryVisibleAcknowledgementRepository(
+    private val acknowledgements: MutableMap<RoomId, MutableStateFlow<Boolean>> = mutableMapOf()
+) : HistoryVisibleAcknowledgementRepository {
+    override fun hasAcknowledged(roomId: RoomId): Flow<Boolean> {
+        return acknowledgements.getOrPut(roomId) {
+            MutableStateFlow(false)
+        }
+    }
+
+    override suspend fun setAcknowledged(roomId: RoomId, value: Boolean) {
+        val flow = acknowledgements.getOrPut(roomId) {
+            MutableStateFlow(value)
+        }
+        flow.emit(value)
+    }
+
+    companion object {
+        /**
+         * Create the repository with a pre-existing entry.
+         */
+        fun withRoom(roomId: RoomId, acknowledged: Boolean = false): FakeHistoryVisibleAcknowledgementRepository {
+            return FakeHistoryVisibleAcknowledgementRepository(
+                mutableMapOf(
+                    roomId to MutableStateFlow(acknowledged)
+                )
+            )
+        }
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenterTest.kt
new file mode 100644
index 0000000000..afa1992cac
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/historyvisible/HistoryVisibleStatePresenterTest.kt
@@ -0,0 +1,137 @@
+/*
+ * 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.crypto.historyvisible
+
+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.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.awaitLastSequentialItem
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class HistoryVisibleStatePresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - not visible if feature disabled`() = runTest {
+        val room = FakeJoinedRoom()
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, isEncrypted = true))
+        val presenter = createHistoryVisibleStatePresenter(room, enabled = false, acknowledged = false)
+        presenter.test {
+            assertThat(awaitLastSequentialItem().showAlert).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - initial with room shared, unencrypted`() = runTest {
+        val room = FakeJoinedRoom()
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, isEncrypted = false))
+        val presenter = createHistoryVisibleStatePresenter(room)
+        presenter.test {
+            assertThat(awaitLastSequentialItem().showAlert).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - initial with room joined, encrypted`() = runTest {
+        val room = FakeJoinedRoom()
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Joined, isEncrypted = true))
+        val presenter = createHistoryVisibleStatePresenter(room)
+        presenter.test {
+            assertThat(awaitLastSequentialItem().showAlert).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - initial with room invited, encrypted`() = runTest {
+        val room = FakeJoinedRoom()
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Invited, isEncrypted = true))
+        val presenter = createHistoryVisibleStatePresenter(room)
+        presenter.test {
+            assertThat(awaitLastSequentialItem().showAlert).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - initial with room shared, encrypted, unacknowledged`() = runTest {
+        val room = FakeJoinedRoom()
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, isEncrypted = true))
+        val presenter = createHistoryVisibleStatePresenter(room, acknowledged = false)
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.showAlert).isFalse()
+            val nextState = awaitItem()
+            assertThat(nextState.showAlert).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - initial with room shared, encrypted, acknowledged`() = runTest {
+        val room = FakeJoinedRoom()
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, isEncrypted = true))
+        val presenter = createHistoryVisibleStatePresenter(room, acknowledged = true)
+        presenter.test {
+            assertThat(awaitLastSequentialItem().showAlert).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - transition from joined + unencrypted, to shared + encrypted`() = runTest {
+        val room = FakeJoinedRoom()
+        val featureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.EnableKeyShareOnInvite.key to true))
+        val repository = FakeHistoryVisibleAcknowledgementRepository()
+
+        room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Joined, isEncrypted = false))
+
+        val presenter = HistoryVisibleStatePresenter(
+            featureFlagService,
+            repository,
+            room,
+        )
+
+        presenter.test {
+            // emitted by the feature flag service(?)
+            assertThat(awaitItem().showAlert).isFalse()
+
+            // emitted state from room info assignment
+            assertThat(awaitItem().showAlert).isFalse()
+
+            // room is marked as encrypted
+            room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Joined, isEncrypted = true))
+            assertThat(awaitItem().showAlert).isFalse()
+
+            // room history visibility is changed to shared
+            room.givenRoomInfo(aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, isEncrypted = true))
+            assertThat(awaitItem().showAlert).isTrue()
+
+            // alert is acknowledged
+            repository.setAcknowledged(room.roomId, true)
+            assertThat(awaitItem().showAlert).isFalse()
+        }
+    }
+
+    private fun createHistoryVisibleStatePresenter(
+        room: JoinedRoom = FakeJoinedRoom(),
+        enabled: Boolean = true,
+        acknowledged: Boolean = false
+    ): HistoryVisibleStatePresenter {
+        return HistoryVisibleStatePresenter(
+            room = room,
+            featureFlagService = FakeFeatureFlagService(mapOf("feature.enableKeyShareOnInvite" to enabled)),
+            repository = FakeHistoryVisibleAcknowledgementRepository.withRoom(room.roomId, acknowledged)
+        )
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt
index 40da23ae29..6fb193eff5 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a96aa6c590..24779ba78a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt
index fd2a2fafc2..7f22de9159 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6a83437758..df1311b6d4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/FakeComposerDraftService.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/FakeComposerDraftService.kt
index d87b11c951..2fd73d5b17 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/FakeComposerDraftService.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/FakeComposerDraftService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStoreTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStoreTest.kt
index 9ec43f3621..5433aff318 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStoreTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/draft/VolatileComposerDraftStoreTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b0ce526af4..77207d6b52 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt
index 703b4b0043..00babf4218 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 539618df9f..c7eb7c0bce 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/DefaultLinkCheckerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/DefaultLinkCheckerTest.kt
index 9604290e54..95adf0b5d5 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/DefaultLinkCheckerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/DefaultLinkCheckerTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/FakeLinkChecker.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/FakeLinkChecker.kt
index a50f9109f4..c3bed3a00c 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/FakeLinkChecker.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/FakeLinkChecker.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkPresenterTest.kt
index 87ab37e63d..02292cf0ce 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2936cbb31d..54c95d83c7 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultRoomAliasSuggestionsDataSourceTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultRoomAliasSuggestionsDataSourceTest.kt
index e1c22f4624..5cd3607701 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultRoomAliasSuggestionsDataSourceTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/DefaultRoomAliasSuggestionsDataSourceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/FakeRoomAliasSuggestionsDataSource.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/FakeRoomAliasSuggestionsDataSource.kt
index 18a96c8fac..d33f084ccb 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/FakeRoomAliasSuggestionsDataSource.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/FakeRoomAliasSuggestionsDataSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 735fdaaabe..2feafbc9e5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -68,14 +69,16 @@ 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.ui.messages.reply.InReplyToDetails
 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.MediaSender
+import io.element.android.libraries.mediaupload.api.MediaSenderFactory
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
+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
@@ -153,10 +156,10 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink.invoke(MessageComposerEvents.ToggleFullScreenState)
+            initialState.eventSink.invoke(MessageComposerEvent.ToggleFullScreenState)
             val fullscreenState = awaitItem()
             assertThat(fullscreenState.isFullScreen).isTrue()
-            fullscreenState.eventSink.invoke(MessageComposerEvents.ToggleFullScreenState)
+            fullscreenState.eventSink.invoke(MessageComposerEvent.ToggleFullScreenState)
             val notFullscreenState = awaitItem()
             assertThat(notFullscreenState.isFullScreen).isFalse()
         }
@@ -195,7 +198,7 @@ class MessageComposerPresenterTest {
         }.test {
             var state = awaitFirstItem()
             val mode = anEditMode(message = ANOTHER_MESSAGE)
-            state.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             assertThat(state.textEditorState.messageHtml()).isEqualTo(ANOTHER_MESSAGE)
@@ -237,7 +240,7 @@ class MessageComposerPresenterTest {
         }.test {
             var state = awaitFirstItem()
             val mode = anEditCaptionMode(caption = A_CAPTION)
-            state.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             assertThat(state.textEditorState.messageHtml()).isEqualTo(A_CAPTION)
@@ -279,11 +282,11 @@ class MessageComposerPresenterTest {
         presenter.test {
             var state = awaitFirstItem()
             val mode = anEditCaptionMode(caption = A_CAPTION)
-            state.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             assertThat(state.textEditorState.messageMarkdown(permalinkBuilder)).isEqualTo(A_CAPTION)
-            state.eventSink.invoke(MessageComposerEvents.SendMessage)
+            state.eventSink.invoke(MessageComposerEvent.SendMessage)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageMarkdown(permalinkBuilder)).isEqualTo("")
             waitForPredicate { analyticsService.capturedEvents.size == 1 }
@@ -320,13 +323,13 @@ class MessageComposerPresenterTest {
         }.test {
             var state = awaitFirstItem()
             val editMode = anEditMode(message = ANOTHER_MESSAGE)
-            state.eventSink.invoke(MessageComposerEvents.SetMode(editMode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(editMode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(editMode)
             assertThat(state.textEditorState.messageHtml()).isEqualTo(ANOTHER_MESSAGE)
 
             val replyMode = aReplyMode()
-            state.eventSink.invoke(MessageComposerEvents.SetMode(replyMode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(replyMode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(replyMode)
             assertThat(state.textEditorState.messageHtml()).isEmpty()
@@ -349,7 +352,7 @@ class MessageComposerPresenterTest {
         }.test {
             var state = awaitFirstItem()
             val mode = aReplyMode()
-            state.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             assertThat(state.textEditorState.messageHtml()).isEqualTo("")
@@ -365,7 +368,7 @@ class MessageComposerPresenterTest {
         }.test {
             var state = awaitFirstItem()
             val mode = aReplyMode()
-            state.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            state.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             state.textEditorState.setHtml(A_REPLY)
@@ -394,7 +397,7 @@ class MessageComposerPresenterTest {
             initialState.textEditorState.setHtml(A_MESSAGE)
             val withMessageState = awaitItem()
             assertThat(withMessageState.textEditorState.messageHtml()).isEqualTo(A_MESSAGE)
-            withMessageState.eventSink.invoke(MessageComposerEvents.SendMessage)
+            withMessageState.eventSink.invoke(MessageComposerEvent.SendMessage)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageHtml()).isEqualTo("")
             waitForPredicate { analyticsService.capturedEvents.size == 1 }
@@ -431,7 +434,7 @@ class MessageComposerPresenterTest {
             val withMessageState = awaitItem()
             assertThat(withMessageState.textEditorState.messageMarkdown(permalinkBuilder)).isEqualTo(A_MESSAGE)
             assertThat(withMessageState.textEditorState.messageHtml()).isNull()
-            withMessageState.eventSink.invoke(MessageComposerEvents.SendMessage)
+            withMessageState.eventSink.invoke(MessageComposerEvent.SendMessage)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageMarkdown(permalinkBuilder)).isEqualTo("")
             waitForPredicate { analyticsService.capturedEvents.size == 1 }
@@ -468,14 +471,14 @@ class MessageComposerPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.textEditorState.messageHtml()).isEqualTo("")
             val mode = anEditMode()
-            initialState.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            initialState.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             val withMessageState = awaitItem()
             assertThat(withMessageState.mode).isEqualTo(mode)
             assertThat(withMessageState.textEditorState.messageHtml()).isEqualTo(A_MESSAGE)
             withMessageState.textEditorState.setHtml(ANOTHER_MESSAGE)
             val withEditedMessageState = awaitItem()
             assertThat(withEditedMessageState.textEditorState.messageHtml()).isEqualTo(ANOTHER_MESSAGE)
-            withEditedMessageState.eventSink.invoke(MessageComposerEvents.SendMessage)
+            withEditedMessageState.eventSink.invoke(MessageComposerEvent.SendMessage)
             skipItems(1)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageHtml()).isEqualTo("")
@@ -523,14 +526,14 @@ class MessageComposerPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.textEditorState.messageHtml()).isEqualTo("")
             val mode = anEditMode()
-            initialState.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            initialState.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             val withMessageState = awaitItem()
             assertThat(withMessageState.mode).isEqualTo(mode)
             assertThat(withMessageState.textEditorState.messageHtml()).isEqualTo(A_MESSAGE)
             withMessageState.textEditorState.setHtml(ANOTHER_MESSAGE)
             val withEditedMessageState = awaitItem()
             assertThat(withEditedMessageState.textEditorState.messageHtml()).isEqualTo(ANOTHER_MESSAGE)
-            withEditedMessageState.eventSink.invoke(MessageComposerEvents.SendMessage)
+            withEditedMessageState.eventSink.invoke(MessageComposerEvent.SendMessage)
             skipItems(1)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageHtml()).isEqualTo("")
@@ -578,14 +581,14 @@ class MessageComposerPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.textEditorState.messageHtml()).isEqualTo("")
             val mode = anEditMode(eventOrTransactionId = A_TRANSACTION_ID.toEventOrTransactionId())
-            initialState.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            initialState.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             val withMessageState = awaitItem()
             assertThat(withMessageState.mode).isEqualTo(mode)
             assertThat(withMessageState.textEditorState.messageHtml()).isEqualTo(A_MESSAGE)
             withMessageState.textEditorState.setHtml(ANOTHER_MESSAGE)
             val withEditedMessageState = awaitItem()
             assertThat(withEditedMessageState.textEditorState.messageHtml()).isEqualTo(ANOTHER_MESSAGE)
-            withEditedMessageState.eventSink.invoke(MessageComposerEvents.SendMessage)
+            withEditedMessageState.eventSink.invoke(MessageComposerEvent.SendMessage)
             skipItems(1)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageHtml()).isEqualTo("")
@@ -628,13 +631,13 @@ class MessageComposerPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.textEditorState.messageHtml()).isEqualTo("")
             val mode = aReplyMode()
-            initialState.eventSink.invoke(MessageComposerEvents.SetMode(mode))
+            initialState.eventSink.invoke(MessageComposerEvent.SetMode(mode))
             val state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             assertThat(state.textEditorState.messageHtml()).isEqualTo("")
             state.textEditorState.setHtml(A_REPLY)
             assertThat(state.textEditorState.messageHtml()).isEqualTo(A_REPLY)
-            state.eventSink.invoke(MessageComposerEvents.SendMessage)
+            state.eventSink.invoke(MessageComposerEvent.SendMessage)
             val messageSentState = awaitItem()
             assertThat(messageSentState.textEditorState.messageHtml()).isEqualTo("")
 
@@ -663,7 +666,7 @@ class MessageComposerPresenterTest {
         }.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.showAttachmentSourcePicker).isFalse()
-            initialState.eventSink(MessageComposerEvents.AddAttachment)
+            initialState.eventSink(MessageComposerEvent.AddAttachment)
             assertThat(awaitItem().showAttachmentSourcePicker).isTrue()
         }
     }
@@ -675,10 +678,10 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.AddAttachment)
+            initialState.eventSink(MessageComposerEvent.AddAttachment)
             skipItems(1)
 
-            initialState.eventSink(MessageComposerEvents.DismissAttachmentMenu)
+            initialState.eventSink(MessageComposerEvent.DismissAttachmentMenu)
             assertThat(awaitItem().showAttachmentSourcePicker).isFalse()
         }
     }
@@ -718,7 +721,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery)
             onPreviewAttachmentLambda.assertions().isCalledOnce()
         }
     }
@@ -759,7 +762,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery)
             onPreviewAttachmentLambda.assertions().isCalledOnce()
         }
     }
@@ -775,7 +778,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery)
             // No crashes here, otherwise it fails
         }
     }
@@ -797,7 +800,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.FromFiles)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.FromFiles)
             onPreviewAttachmentLambda.assertions().isCalledOnce()
         }
     }
@@ -812,10 +815,10 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.AddAttachment)
+            initialState.eventSink(MessageComposerEvent.AddAttachment)
             val attachmentOpenState = awaitItem()
             assertThat(attachmentOpenState.showAttachmentSourcePicker).isTrue()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.Poll)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.Poll)
             val finalState = awaitItem()
             assertThat(finalState.showAttachmentSourcePicker).isFalse()
         }
@@ -831,10 +834,10 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.AddAttachment)
+            initialState.eventSink(MessageComposerEvent.AddAttachment)
             val attachmentOpenState = awaitItem()
             assertThat(attachmentOpenState.showAttachmentSourcePicker).isTrue()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.Location)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.Location)
             val finalState = awaitItem()
             assertThat(finalState.showAttachmentSourcePicker).isFalse()
         }
@@ -859,7 +862,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.PhotoFromCamera)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.PhotoFromCamera)
             onPreviewAttachmentLambda.assertions().isCalledOnce()
         }
     }
@@ -883,7 +886,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.PhotoFromCamera)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.PhotoFromCamera)
             permissionPresenter.setPermissionGranted()
             onPreviewAttachmentLambda.assertions().isCalledOnce()
             cancelAndIgnoreRemainingEvents()
@@ -909,7 +912,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.VideoFromCamera)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.VideoFromCamera)
             onPreviewAttachmentLambda.assertions().isCalledOnce()
         }
     }
@@ -933,7 +936,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.PickAttachmentSource.VideoFromCamera)
+            initialState.eventSink(MessageComposerEvent.PickAttachmentSource.VideoFromCamera)
             val permissionState = awaitItem()
             assertThat(permissionState.showAttachmentSourcePicker).isFalse()
             permissionPresenter.setPermissionGranted()
@@ -950,7 +953,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MessageComposerEvents.Error(testException))
+            initialState.eventSink(MessageComposerEvent.Error(testException))
             assertThat(analyticsService.trackedErrors).containsExactly(testException)
         }
     }
@@ -963,10 +966,10 @@ class MessageComposerPresenterTest {
         }.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.showTextFormatting).isFalse()
-            initialState.eventSink(MessageComposerEvents.AddAttachment)
+            initialState.eventSink(MessageComposerEvent.AddAttachment)
             val composerOptions = awaitItem()
             assertThat(composerOptions.showAttachmentSourcePicker).isTrue()
-            composerOptions.eventSink(MessageComposerEvents.ToggleTextFormatting(true))
+            composerOptions.eventSink(MessageComposerEvent.ToggleTextFormatting(true))
             skipItems(2) // composer options closed
             val showTextFormatting = awaitItem()
             assertThat(showTextFormatting.showAttachmentSourcePicker).isFalse()
@@ -975,7 +978,7 @@ class MessageComposerPresenterTest {
                 Interaction(index = null, interactionType = null, name = Interaction.Name.MobileRoomComposerFormattingEnabled)
             )
             analyticsService.capturedEvents.clear()
-            showTextFormatting.eventSink(MessageComposerEvents.ToggleTextFormatting(false))
+            showTextFormatting.eventSink(MessageComposerEvent.ToggleTextFormatting(false))
             skipItems(1)
             val finished = awaitItem()
             assertThat(finished.showTextFormatting).isFalse()
@@ -989,9 +992,12 @@ class MessageComposerPresenterTest {
         val invitedUser = aRoomMember(userId = A_USER_ID_3, membership = RoomMembershipState.INVITE)
         val bob = aRoomMember(userId = A_USER_ID_2, membership = RoomMembershipState.JOIN)
         val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
-        var canUserTriggerRoomNotificationResult = true
         val room = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(canUserTriggerRoomNotificationResult = { Result.success(canUserTriggerRoomNotificationResult) }),
+            baseRoom = FakeBaseRoom(
+                roomPermissions = FakeRoomPermissions(
+                    canTriggerRoomNotification = true,
+                )
+            ),
             typingNoticeResult = { Result.success(Unit) }
         ).apply {
             givenRoomMembersState(
@@ -1008,33 +1014,61 @@ class MessageComposerPresenterTest {
             val initialState = awaitItem()
 
             // A null suggestion (no suggestion was received) returns nothing
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(null))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(null))
             assertThat(awaitItem().suggestions).isEmpty()
 
             // An empty suggestion returns the room and joined members that are not the current user
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "")))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "")))
             assertThat(awaitItem().suggestions)
                 .containsExactly(ResolvedSuggestion.AtRoom, ResolvedSuggestion.Member(bob), ResolvedSuggestion.Member(david))
 
             // A suggestion containing a part of "room" will also return the room mention
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "roo")))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "roo")))
             assertThat(awaitItem().suggestions).containsExactly(ResolvedSuggestion.AtRoom)
 
             // A non-empty suggestion will return those joined members whose user id matches it
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "bob")))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "bob")))
             assertThat(awaitItem().suggestions).containsExactly(ResolvedSuggestion.Member(bob))
 
             // A non-empty suggestion will return those joined members whose display name matches it
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "dave")))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "dave")))
             assertThat(awaitItem().suggestions).containsExactly(ResolvedSuggestion.Member(david))
 
             // If the suggestion isn't a mention, no suggestions are returned
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Command, "")))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Command, "")))
             assertThat(awaitItem().suggestions).isEmpty()
+        }
+    }
 
-            // If user has no permission to send `@room` mentions, `RoomMemberSuggestion.Room` is not returned
-            canUserTriggerRoomNotificationResult = false
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "")))
+    @Test
+    fun `present - room mention suggestions no permission`() = runTest {
+        val currentUser = aRoomMember(userId = A_USER_ID, membership = RoomMembershipState.JOIN)
+        val invitedUser = aRoomMember(userId = A_USER_ID_3, membership = RoomMembershipState.INVITE)
+        val bob = aRoomMember(userId = A_USER_ID_2, membership = RoomMembershipState.JOIN)
+        val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = FakeRoomPermissions(
+                    canTriggerRoomNotification = false,
+                )
+            ),
+            typingNoticeResult = { Result.success(Unit) }
+        ).apply {
+            givenRoomMembersState(
+                RoomMembersState.Ready(
+                    persistentListOf(currentUser, invitedUser, bob, david),
+                )
+            )
+            givenRoomInfo(aRoomInfo(isDirect = false))
+        }
+        val presenter = createPresenter(room)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            // An empty suggestion returns the joined members that are not the current user, but not the room
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "")))
+            skipItems(1)
             assertThat(awaitItem().suggestions)
                 .containsExactly(ResolvedSuggestion.Member(bob), ResolvedSuggestion.Member(david))
         }
@@ -1047,7 +1081,9 @@ class MessageComposerPresenterTest {
         val bob = aRoomMember(userId = A_USER_ID_2, membership = RoomMembershipState.JOIN)
         val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
         val room = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(canUserTriggerRoomNotificationResult = { Result.success(true) }),
+            baseRoom = FakeBaseRoom(
+                roomPermissions = FakeRoomPermissions(canTriggerRoomNotification = true),
+            ),
             typingNoticeResult = { Result.success(Unit) }
         ).apply {
             givenRoomMembersState(
@@ -1067,9 +1103,8 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-
             // An empty suggestion returns the joined members that are not the current user, but not the room
-            initialState.eventSink(MessageComposerEvents.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "")))
+            initialState.eventSink(MessageComposerEvent.SuggestionReceived(Suggestion(0, 0, SuggestionType.Mention, "")))
             skipItems(1)
             assertThat(awaitItem().suggestions)
                 .containsExactly(ResolvedSuggestion.Member(bob), ResolvedSuggestion.Member(david))
@@ -1089,7 +1124,7 @@ class MessageComposerPresenterTest {
         }.test {
             val initialState = awaitFirstItem()
             initialState.textEditorState.setHtml("Hey @bo")
-            initialState.eventSink(MessageComposerEvents.InsertSuggestion(ResolvedSuggestion.Member(aRoomMember(userId = A_USER_ID_2))))
+            initialState.eventSink(MessageComposerEvent.InsertSuggestion(ResolvedSuggestion.Member(aRoomMember(userId = A_USER_ID_2))))
 
             assertThat(initialState.textEditorState.messageHtml())
                 .isEqualTo("Hey <a href='https://matrix.to/#/${A_USER_ID_2.value}'>${A_USER_ID_2.value}</a>")
@@ -1132,7 +1167,7 @@ class MessageComposerPresenterTest {
                 hasAtRoomMention = false
             )
             initialState.textEditorState.setHtml(A_MESSAGE)
-            initialState.eventSink(MessageComposerEvents.SendMessage)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
 
             advanceUntilIdle()
 
@@ -1140,7 +1175,7 @@ class MessageComposerPresenterTest {
                 .with(value(A_MESSAGE), any(), value(listOf(IntentionalMention.User(A_USER_ID))))
 
             // Check intentional mentions on reply sent
-            initialState.eventSink(MessageComposerEvents.SetMode(aReplyMode()))
+            initialState.eventSink(MessageComposerEvent.SetMode(aReplyMode()))
             val mentionUser2 = listOf(A_USER_ID_2.value)
             (awaitItem().textEditorState as? TextEditorState.Rich)?.richTextEditorState?.mentionsState = MentionsState(
                 userIds = mentionUser2,
@@ -1149,7 +1184,7 @@ class MessageComposerPresenterTest {
                 hasAtRoomMention = false
             )
 
-            initialState.eventSink(MessageComposerEvents.SendMessage)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
             advanceUntilIdle()
 
             assert(replyMessageLambda)
@@ -1158,7 +1193,7 @@ class MessageComposerPresenterTest {
 
             // Check intentional mentions on edit message
             skipItems(1)
-            initialState.eventSink(MessageComposerEvents.SetMode(anEditMode()))
+            initialState.eventSink(MessageComposerEvent.SetMode(anEditMode()))
             val mentionUser3 = listOf(A_USER_ID_3.value)
             (awaitItem().textEditorState as? TextEditorState.Rich)?.richTextEditorState?.mentionsState = MentionsState(
                 userIds = mentionUser3,
@@ -1167,7 +1202,7 @@ class MessageComposerPresenterTest {
                 hasAtRoomMention = false
             )
 
-            initialState.eventSink(MessageComposerEvents.SendMessage)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
             advanceUntilIdle()
 
             assert(editMessageLambda)
@@ -1195,7 +1230,7 @@ class MessageComposerPresenterTest {
             remember(state, state.textEditorState.messageHtml()) { state }
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink.invoke(MessageComposerEvents.SendUri(Uri.parse("content://uri")))
+            initialState.eventSink.invoke(MessageComposerEvent.SendUri(Uri.parse("content://uri")))
             waitForPredicate { mediaPreProcessor.processCallCount == 1 }
         }
     }
@@ -1212,8 +1247,8 @@ class MessageComposerPresenterTest {
         }.test {
             val initialState = awaitFirstItem()
             typingNoticeResult.assertions().isNeverCalled()
-            initialState.eventSink.invoke(MessageComposerEvents.TypingNotice(true))
-            initialState.eventSink.invoke(MessageComposerEvents.TypingNotice(false))
+            initialState.eventSink.invoke(MessageComposerEvent.TypingNotice(true))
+            initialState.eventSink.invoke(MessageComposerEvent.TypingNotice(false))
             advanceUntilIdle()
             typingNoticeResult.assertions().isCalledExactly(2)
                 .withSequence(
@@ -1238,8 +1273,8 @@ class MessageComposerPresenterTest {
         }.test {
             val initialState = awaitFirstItem()
             typingNoticeResult.assertions().isNeverCalled()
-            initialState.eventSink.invoke(MessageComposerEvents.TypingNotice(true))
-            initialState.eventSink.invoke(MessageComposerEvents.TypingNotice(false))
+            initialState.eventSink.invoke(MessageComposerEvent.TypingNotice(true))
+            initialState.eventSink.invoke(MessageComposerEvent.TypingNotice(false))
             typingNoticeResult.assertions().isNeverCalled()
         }
     }
@@ -1421,7 +1456,7 @@ class MessageComposerPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink.invoke(MessageComposerEvents.SaveDraft)
+            initialState.eventSink.invoke(MessageComposerEvent.SaveDraft)
             advanceUntilIdle()
             assert(saveDraftLambda)
                 .isCalledOnce()
@@ -1451,26 +1486,26 @@ class MessageComposerPresenterTest {
 
             val withMessageState = awaitItem()
             assertThat(withMessageState.textEditorState.messageMarkdown(permalinkBuilder)).isEqualTo(A_MESSAGE)
-            withMessageState.eventSink(MessageComposerEvents.SaveDraft)
+            withMessageState.eventSink(MessageComposerEvent.SaveDraft)
             advanceUntilIdle()
 
-            withMessageState.eventSink(MessageComposerEvents.ToggleTextFormatting(true))
+            withMessageState.eventSink(MessageComposerEvent.ToggleTextFormatting(true))
             skipItems(1)
             val withFormattingState = awaitItem()
             assertThat(withFormattingState.showTextFormatting).isTrue()
-            withFormattingState.eventSink(MessageComposerEvents.SaveDraft)
+            withFormattingState.eventSink(MessageComposerEvent.SaveDraft)
             advanceUntilIdle()
 
-            withFormattingState.eventSink(MessageComposerEvents.SetMode(anEditMode()))
+            withFormattingState.eventSink(MessageComposerEvent.SetMode(anEditMode()))
             val withEditModeState = awaitItem()
             assertThat(withEditModeState.mode).isEqualTo(anEditMode())
-            withEditModeState.eventSink(MessageComposerEvents.SaveDraft)
+            withEditModeState.eventSink(MessageComposerEvent.SaveDraft)
             advanceUntilIdle()
 
-            withEditModeState.eventSink(MessageComposerEvents.SetMode(aReplyMode()))
+            withEditModeState.eventSink(MessageComposerEvent.SetMode(aReplyMode()))
             val withReplyModeState = awaitItem()
             assertThat(withReplyModeState.mode).isEqualTo(aReplyMode())
-            withReplyModeState.eventSink(MessageComposerEvents.SaveDraft)
+            withReplyModeState.eventSink(MessageComposerEvent.SaveDraft)
             advanceUntilIdle()
 
             assert(saveDraftLambda)
@@ -1513,7 +1548,7 @@ class MessageComposerPresenterTest {
     }
 
     private suspend fun ReceiveTurbine<MessageComposerState>.backToNormalMode(state: MessageComposerState, skipCount: Int = 0): MessageComposerState {
-        state.eventSink.invoke(MessageComposerEvents.CloseSpecialMode)
+        state.eventSink.invoke(MessageComposerEvent.CloseSpecialMode)
         skipItems(skipCount)
         val normalState = awaitItem()
         assertThat(normalState.mode).isEqualTo(MessageComposerMode.Normal)
@@ -1550,20 +1585,18 @@ class MessageComposerPresenterTest {
         mediaPickerProvider = pickerProvider,
         sessionPreferencesStore = sessionPreferencesStore,
         localMediaFactory = localMediaFactory,
-        mediaSenderFactory = object : MediaSender.Factory {
-            override fun create(timelineMode: Timeline.Mode): MediaSender {
-                return MediaSender(
-                    preProcessor = mediaPreProcessor,
-                    room = room,
-                    timelineMode = timelineMode,
-                    mediaOptimizationConfigProvider = {
-                        MediaOptimizationConfig(
+        mediaSenderFactory = MediaSenderFactory { timelineMode ->
+            DefaultMediaSender(
+                preProcessor = mediaPreProcessor,
+                room = room,
+                timelineMode = timelineMode,
+                mediaOptimizationConfigProvider = {
+                    MediaOptimizationConfig(
                         compressImages = true,
                         videoCompressionPreset = VideoCompressionPreset.STANDARD
                     )
-                    }
-                )
-            }
+                }
+            )
         },
         snackbarDispatcher = snackbarDispatcher,
         analyticsService = analyticsService,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/TestRichTextEditorStateFactory.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/TestRichTextEditorStateFactory.kt
index 79615c8802..41acf8b664 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/TestRichTextEditorStateFactory.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/TestRichTextEditorStateFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6d7b4f8c7c..daba41fb3c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagesummary/FakeMessageSummaryFormatter.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagesummary/FakeMessageSummaryFormatter.kt
index 06d1cca1c7..681bbf0d79 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagesummary/FakeMessageSummaryFormatter.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagesummary/FakeMessageSummaryFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
index 38182dec1d..d8269f85d8 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.pinned.banner
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider
+import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimelineProvider
 import io.element.android.libraries.eventformatter.test.FakePinnedMessagesBannerFormatter
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.sync.SyncService
@@ -195,7 +196,7 @@ class PinnedMessagesBannerPresenterTest {
 internal fun TestScope.createPinnedEventsTimelineProvider(
     room: JoinedRoom = FakeJoinedRoom(),
     syncService: SyncService = FakeSyncService(),
-) = PinnedEventsTimelineProvider(
+) = DefaultPinnedEventsTimelineProvider(
     room = room,
     syncService = syncService,
     dispatchers = testCoroutineDispatchers(),
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 40af4c4a71..a7bbdf999a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bf0a24dd5a..479139a45b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,17 +13,17 @@ import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugIn
 
 class FakePinnedMessagesListNavigator : PinnedMessagesListNavigator {
     var onViewInTimelineClickLambda: ((EventId) -> Unit)? = null
-    override fun onViewInTimelineClick(eventId: EventId) {
+    override fun viewInTimeline(eventId: EventId) {
         onViewInTimelineClickLambda?.invoke(eventId)
     }
 
     var onShowEventDebugInfoClickLambda: ((EventId?, TimelineItemDebugInfo) -> Unit)? = null
-    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+    override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
         onShowEventDebugInfoClickLambda?.invoke(eventId, debugInfo)
     }
 
     var onForwardEventClickLambda: ((EventId) -> Unit)? = null
-    override fun onForwardEventClick(eventId: EventId) {
+    override fun forwardEvent(eventId: EventId) {
         onForwardEventClickLambda?.invoke(eventId)
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
index 07778ab381..351f841fcf 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,9 +14,10 @@ import io.element.android.features.messages.impl.actionlist.anActionListState
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.fixtures.aTimelineItemsFactoryCreator
 import io.element.android.features.messages.impl.link.aLinkState
-import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider
+import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimelineProvider
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.protection.aTimelineProtectionState
+import io.element.android.features.messages.test.timeline.FakeHtmlConverterProvider
 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.EventId
@@ -29,6 +31,7 @@ import io.element.android.libraries.matrix.test.A_UNIQUE_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.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
@@ -53,9 +56,7 @@ class PinnedMessagesListPresenterTest {
     fun `present - initial state`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             }
@@ -72,9 +73,7 @@ class PinnedMessagesListPresenterTest {
     fun `present - timeline failure state`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             },
@@ -93,9 +92,7 @@ class PinnedMessagesListPresenterTest {
     fun `present - empty state`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf()))
             },
@@ -115,9 +112,7 @@ class PinnedMessagesListPresenterTest {
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             },
@@ -144,9 +139,7 @@ class PinnedMessagesListPresenterTest {
         val analyticsService = FakeAnalyticsService()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             },
@@ -192,9 +185,7 @@ class PinnedMessagesListPresenterTest {
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             },
@@ -223,9 +214,7 @@ class PinnedMessagesListPresenterTest {
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             },
@@ -254,9 +243,7 @@ class PinnedMessagesListPresenterTest {
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canRedactOwnResult = { Result.success(true) },
-                canRedactOtherResult = { Result.success(true) },
-                canUserPinUnpinResult = { Result.success(true) },
+                roomPermissions = roomPermissions(),
             ).apply {
                 givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
             },
@@ -293,6 +280,16 @@ class PinnedMessagesListPresenterTest {
         )
     }
 
+    private fun roomPermissions(
+        canRedactOther: Boolean = true,
+        canRedactOwn: Boolean = true,
+        canPinUnpin: Boolean = true,
+    ) = FakeRoomPermissions(
+        canRedactOther = canRedactOther,
+        canRedactOwn = canRedactOwn,
+        canPinUnpin = canPinUnpin,
+    )
+
     private fun TestScope.createPinnedMessagesListPresenter(
         navigator: PinnedMessagesListNavigator = FakePinnedMessagesListNavigator(),
         room: JoinedRoom = FakeJoinedRoom(),
@@ -300,7 +297,7 @@ class PinnedMessagesListPresenterTest {
         analyticsService: AnalyticsService = FakeAnalyticsService(),
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
     ): PinnedMessagesListPresenter {
-        val timelineProvider = PinnedEventsTimelineProvider(
+        val timelineProvider = DefaultPinnedEventsTimelineProvider(
             room = room,
             syncService = syncService,
             dispatchers = testCoroutineDispatchers(),
@@ -318,6 +315,7 @@ class PinnedMessagesListPresenterTest {
             analyticsService = analyticsService,
             featureFlagService = featureFlagService,
             sessionCoroutineScope = this,
+            htmlConverterProvider = FakeHtmlConverterProvider(),
         )
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt
index ee728b1436..df79394f2c 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5e9ad97f87..3f96f1dfca 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt
index abaa6a5653..fd8d33d1b6 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d2d5914674..315d9c459c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt
index 6340ce56a5..395ed0107f 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,15 @@
 
 package io.element.android.features.messages.impl.timeline
 
-import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+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.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 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
@@ -22,34 +26,30 @@ import org.junit.Test
 
 class DefaultMarkAsFullyReadTest {
     @Test
-    fun `When room is not found, then no exception is thrown`() = runTest {
+    fun `When marking as read fails, no exception is thrown`() = runTest {
         val markAsFullyRead = DefaultMarkAsFullyRead(
-            FakeMatrixClient(
-                sessionCoroutineScope = backgroundScope,
+            matrixClient = FakeMatrixClient(
+                markRoomAsFullyReadResult = { _, _ -> Result.failure(IllegalStateException("Room not found")) },
             ).apply {
                 givenGetRoomResult(A_ROOM_ID, null)
-            }
+            },
+            coroutineDispatchers = testCoroutineDispatchers(),
         )
-        markAsFullyRead.invoke(A_ROOM_ID)
+        assertThat(markAsFullyRead.invoke(A_ROOM_ID, AN_EVENT_ID).isFailure).isTrue()
         runCurrent()
     }
 
     @Test
-    fun `When room is found, the expected method is invoked`() = runTest {
-        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { Result.success(Unit) }
-        val baseRoom = FakeBaseRoom(
-            markAsReadResult = markAsReadResult
-        )
+    fun `When marking as read is successful, the expected method is invoked`() = runTest {
+        val markAsFullyReadResult = lambdaRecorder<RoomId, EventId, Result<Unit>> { _, _ -> Result.success(Unit) }
         val markAsFullyRead = DefaultMarkAsFullyRead(
-            FakeMatrixClient(
-                sessionCoroutineScope = backgroundScope,
-            ).apply {
-                givenGetRoomResult(A_ROOM_ID, baseRoom)
-            }
+            matrixClient = FakeMatrixClient(
+                markRoomAsFullyReadResult = markAsFullyReadResult,
+            ),
+            coroutineDispatchers = testCoroutineDispatchers(),
         )
-        markAsFullyRead.invoke(A_ROOM_ID)
+        assertThat(markAsFullyRead.invoke(A_ROOM_ID, AN_EVENT_ID).isSuccess).isTrue()
         runCurrent()
-        markAsReadResult.assertions().isCalledOnce().with(value(ReceiptType.FULLY_READ))
-        baseRoom.assertDestroyed()
+        markAsFullyReadResult.assertions().isCalledOnce().with(value(A_ROOM_ID), value(AN_EVENT_ID))
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt
index 895676a126..8dca151c2d 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt
@@ -1,19 +1,22 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 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.tests.testutils.lambda.lambdaError
 
 class FakeMarkAsFullyRead(
-    private val invokeResult: (RoomId) -> Unit = { lambdaError() }
+    private val invokeResult: (RoomId, EventId) -> Unit = { _, _ -> lambdaError() },
 ) : MarkAsFullyRead {
-    override fun invoke(roomId: RoomId) {
-        invokeResult(roomId)
+    override suspend fun invoke(roomId: RoomId, eventId: EventId): Result<Unit> {
+        return runCatchingExceptions { invokeResult(roomId, eventId) }
     }
 }
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 524cb3e1e8..034c952f3d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexerTest.kt
index a922f29028..65a29f5422 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineItemIndexerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8da614f67e..b84975c6a5 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
@@ -1,14 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 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
@@ -34,6 +33,7 @@ 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.UniqueId
 import io.element.android.libraries.matrix.api.core.asEventId
+import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.tombstone.PredecessorRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
@@ -54,16 +54,19 @@ 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.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.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.lambda.any
 import io.element.android.tests.testutils.lambda.assert
+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.test
@@ -95,9 +98,7 @@ class TimelinePresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createTimelinePresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.timelineItems).isEmpty()
             assertThat(initialState.isLive).isTrue()
@@ -116,9 +117,7 @@ class TimelinePresenterTest {
             this.paginateLambda = paginateLambda
         }
         val presenter = createTimelinePresenter(timeline = timeline)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(TimelineEvents.LoadMore(Timeline.PaginationDirection.BACKWARDS))
             initialState.eventSink.invoke(TimelineEvents.LoadMore(Timeline.PaginationDirection.FORWARDS))
@@ -151,20 +150,19 @@ class TimelinePresenterTest {
         isSendPublicReadReceiptsEnabled: Boolean,
         expectedReceiptType: ReceiptType,
     ) = runTest(StandardTestDispatcher()) {
+        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { Result.success(Unit) }
+        val sendReadReceiptLambda = lambdaRecorder<EventId, ReceiptType, Result<Unit>> { _, _ -> Result.success(Unit) }
         val timeline = FakeTimeline(
             timelineItems = flowOf(
                 listOf(
                     MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem())
                 )
-            )
+            ),
+            markAsReadResult = markAsReadResult,
+            sendReadReceiptLambda = sendReadReceiptLambda,
         )
-        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { Result.success(Unit) }
         val room = FakeJoinedRoom(
             liveTimeline = timeline,
-            baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
-                markAsReadResult = markAsReadResult,
-            )
         )
         val sessionPreferencesStore = InMemorySessionPreferencesStore(isSendPublicReadReceiptsEnabled = isSendPublicReadReceiptsEnabled)
         val presenter = createTimelinePresenter(
@@ -172,9 +170,7 @@ class TimelinePresenterTest {
             room = room,
             sessionPreferencesStore = sessionPreferencesStore,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.OnScrollFinished(0))
             runCurrent()
@@ -185,25 +181,6 @@ class TimelinePresenterTest {
         }
     }
 
-    @Test
-    fun `present - once presenter is disposed, room is marked as fully read`() = runTest {
-        val invokeResult = lambdaRecorder<RoomId, Unit> { }
-        val presenter = createTimelinePresenter(
-            room = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canUserSendMessageResult = { _, _ -> Result.success(true) },
-                )
-            ),
-            markAsFullyRead = FakeMarkAsFullyRead(
-                invokeResult = invokeResult,
-            )
-        )
-        presenter.test {
-            awaitFirstItem()
-        }
-        invokeResult.assertions().isCalledOnce().with(value(A_ROOM_ID))
-    }
-
     @Test
     fun `present - on scroll finished send read receipt if an event is before the index`() = runTest {
         val sendReadReceiptsLambda = lambdaRecorder { _: EventId, _: ReceiptType ->
@@ -226,9 +203,7 @@ class TimelinePresenterTest {
             this.sendReadReceiptLambda = sendReadReceiptsLambda
         }
         val presenter = createTimelinePresenter(timeline)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().run {
                 eventSink.invoke(TimelineEvents.OnScrollFinished(1))
@@ -258,18 +233,16 @@ class TimelinePresenterTest {
                         )
                     )
                 )
-            )
-        ).apply {
-            this.sendReadReceiptLambda = sendReadReceiptsLambda
-        }
+            ),
+            markAsReadResult = { Result.success(Unit) },
+            sendReadReceiptLambda = sendReadReceiptsLambda,
+        )
         val sessionPreferencesStore = InMemorySessionPreferencesStore(isSendPublicReadReceiptsEnabled = false)
         val presenter = createTimelinePresenter(
             timeline = timeline,
             sessionPreferencesStore = sessionPreferencesStore,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().run {
                 eventSink.invoke(TimelineEvents.OnScrollFinished(0))
@@ -305,9 +278,7 @@ class TimelinePresenterTest {
             this.sendReadReceiptLambda = sendReadReceiptsLambda
         }
         val presenter = createTimelinePresenter(timeline)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().run {
                 eventSink.invoke(TimelineEvents.OnScrollFinished(1))
@@ -335,9 +306,7 @@ class TimelinePresenterTest {
             this.sendReadReceiptLambda = sendReadReceiptsLambda
         }
         val presenter = createTimelinePresenter(timeline)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.OnScrollFinished(1))
@@ -349,11 +318,12 @@ class TimelinePresenterTest {
     @Test
     fun `present - covers newEventState scenarios`() = runTest {
         val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
-        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val timeline = FakeTimeline(
+            timelineItems = timelineItems,
+            markAsReadResult = { Result.success(Unit) },
+        )
         val presenter = createTimelinePresenter(timeline)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.newEventState).isEqualTo(NewEventState.None)
             assertThat(initialState.timelineItems.size).isEqualTo(0)
@@ -402,9 +372,7 @@ class TimelinePresenterTest {
             timelineItems = timelineItems,
         )
         val presenter = createTimelinePresenter(timeline)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.newEventState).isEqualTo(NewEventState.None)
             assertThat(initialState.timelineItems.size).isEqualTo(0)
@@ -458,9 +426,7 @@ class TimelinePresenterTest {
         val presenter = createTimelinePresenter(
             sendPollResponseAction = sendPollResponseAction,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.SelectPollAnswer(AN_EVENT_ID, "anAnswerId"))
         }
@@ -474,9 +440,7 @@ class TimelinePresenterTest {
         val presenter = createTimelinePresenter(
             endPollAction = endPollAction,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.EndPoll(AN_EVENT_ID))
         }
@@ -493,9 +457,7 @@ class TimelinePresenterTest {
         val presenter = createTimelinePresenter(
             messagesNavigator = navigator,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitFirstItem().eventSink(TimelineEvents.EditPoll(AN_EVENT_ID))
             onEditPollClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
         }
@@ -512,9 +474,7 @@ class TimelinePresenterTest {
             ),
             redactedVoiceMessageManager = redactedVoiceMessageManager,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             assertThat(redactedVoiceMessageManager.invocations.size).isEqualTo(0)
             skipItems(2)
             assertThat(redactedVoiceMessageManager.invocations.size).isEqualTo(1)
@@ -540,16 +500,14 @@ class TimelinePresenterTest {
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) },
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 threadRootIdForEventResult = { _ -> Result.success(null) },
             ),
         )
         val presenter = createTimelinePresenter(
             room = room,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
             awaitItem().also { state ->
@@ -577,9 +535,7 @@ class TimelinePresenterTest {
 
     @Test
     fun `present - focus on known event retrieves the event from cache`() = runTest {
-        val timelineItemIndexer = TimelineItemIndexer().apply {
-            process(listOf(aMessageEvent(eventId = AN_EVENT_ID)))
-        }
+        val timelineItemIndexer = TimelineItemIndexer()
         val presenter = createTimelinePresenter(
             room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline(
@@ -592,15 +548,25 @@ class TimelinePresenterTest {
                         )
                     )
                 ),
-                baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = roomPermissions(),
+                    threadRootIdForEventResult = { Result.success(null) },
+                ),
             ),
             timelineItemIndexer = timelineItemIndexer,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
+
+            advanceUntilIdle()
+
+            // Pre-populate the indexer after the first items have been retrieved
+            timelineItemIndexer.process(listOf(aMessageEvent(eventId = AN_EVENT_ID)))
+
             initialState.eventSink.invoke(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
+
+            advanceUntilIdle()
+
             awaitItem().also { state ->
                 assertThat(state.focusedEventId).isEqualTo(AN_EVENT_ID)
                 assertThat(state.focusRequestState).isEqualTo(FocusRequestState.Requested(AN_EVENT_ID, Duration.ZERO))
@@ -621,14 +587,12 @@ class TimelinePresenterTest {
                 ),
                 createTimelineResult = { Result.failure(RuntimeException("An error")) },
                 baseRoom = FakeBaseRoom(
-                    canUserSendMessageResult = { _, _ -> Result.success(true) },
+                    roomPermissions = roomPermissions(),
                     threadRootIdForEventResult = { _ -> Result.success(null) },
                 ),
             )
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
             awaitItem().also { state ->
@@ -670,7 +634,7 @@ class TimelinePresenterTest {
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) },
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 threadRootIdForEventResult = { _ -> Result.success(threadId) },
             ),
         )
@@ -681,9 +645,7 @@ class TimelinePresenterTest {
             timeline = liveTimeline,
             messagesNavigator = navigator,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
 
@@ -731,7 +693,7 @@ class TimelinePresenterTest {
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) },
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 threadRootIdForEventResult = { _ -> Result.success(threadId) },
             ),
         )
@@ -742,9 +704,7 @@ class TimelinePresenterTest {
             timeline = liveTimeline,
             messagesNavigator = navigator,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
 
@@ -787,7 +747,7 @@ class TimelinePresenterTest {
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) },
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 // Use a different thread id
                 threadRootIdForEventResult = { _ -> Result.success(A_THREAD_ID_2) },
             ),
@@ -799,9 +759,7 @@ class TimelinePresenterTest {
             timeline = liveTimeline,
             messagesNavigator = navigator,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
 
@@ -848,7 +806,7 @@ class TimelinePresenterTest {
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) },
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 // The event is in the main timeline, not in a thread
                 threadRootIdForEventResult = { _ -> Result.success(null) },
             ),
@@ -860,9 +818,7 @@ class TimelinePresenterTest {
             timeline = liveTimeline,
             messagesNavigator = navigator,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.FocusOnEvent(AN_EVENT_ID))
 
@@ -893,9 +849,7 @@ class TimelinePresenterTest {
     fun `present - show shield hide shield`() = runTest {
         val presenter = createTimelinePresenter()
         val shield = aCriticalShield()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.messageShield).isNull()
             initialState.eventSink(TimelineEvents.ShowShieldDialog(shield))
@@ -931,7 +885,9 @@ class TimelinePresenterTest {
         )
         val room = FakeJoinedRoom(
             liveTimeline = timeline,
-            baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+            ),
         ).apply {
             givenRoomMembersState(RoomMembersState.Unknown)
         }
@@ -939,9 +895,7 @@ class TimelinePresenterTest {
         val avatarUrl = "https://domain.com/avatar.jpg"
 
         val presenter = createTimelinePresenter(timeline, room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = consumeItemsUntilPredicate(30.seconds) { it.timelineItems.isNotEmpty() }.last()
             val event = initialState.timelineItems.first() as TimelineItem.Event
             assertThat(event.senderAvatar.url).isNull()
@@ -965,15 +919,13 @@ class TimelinePresenterTest {
 
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 predecessorRoomResult = { predecessorRoom }
             ),
         )
 
         val presenter = createTimelinePresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.timelineRoomInfo.predecessorRoom).isNotNull()
             assertThat(initialState.timelineRoomInfo.predecessorRoom?.roomId).isEqualTo(predecessorRoomId)
@@ -984,14 +936,12 @@ class TimelinePresenterTest {
     fun `present - timeline room info no predecessor`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 predecessorRoomResult = { null }
             ),
         )
         val presenter = createTimelinePresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.timelineRoomInfo.predecessorRoom).isNull()
         }
@@ -1001,7 +951,7 @@ class TimelinePresenterTest {
     fun `present - timeline event navigate to room`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
             ),
         )
         val onNavigateToRoomLambda = lambdaRecorder<RoomId, EventId?, List<String>, Unit> { _, _, _ -> }
@@ -1027,11 +977,32 @@ class TimelinePresenterTest {
         return awaitItem()
     }
 
+    private fun roomPermissions(
+        canRedactOther: Boolean = false,
+        canRedactOwn: Boolean = true,
+        canSendMessage: Boolean = true,
+        canSendReaction: Boolean = true,
+        canPinUnpin: Boolean = false,
+    ) = FakeRoomPermissions(
+        canSendMessage = { type ->
+            when (type) {
+                MessageEventType.RoomMessage -> canSendMessage
+                MessageEventType.Reaction -> canSendReaction
+                else -> lambdaError()
+            }
+        },
+        canRedactOther = canRedactOther,
+        canRedactOwn = canRedactOwn,
+        canPinUnpin = canPinUnpin,
+    )
+
     private fun TestScope.createTimelinePresenter(
         timeline: Timeline = FakeTimeline(),
         room: FakeJoinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
-            baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+            ),
         ),
         redactedVoiceMessageManager: RedactedVoiceMessageManager = FakeRedactedVoiceMessageManager(),
         messagesNavigator: FakeMessagesNavigator = FakeMessagesNavigator(),
@@ -1039,7 +1010,6 @@ class TimelinePresenterTest {
         sendPollResponseAction: SendPollResponseAction = FakeSendPollResponseAction(),
         sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(),
         timelineItemIndexer: TimelineItemIndexer = TimelineItemIndexer(),
-        markAsFullyRead: MarkAsFullyRead = FakeMarkAsFullyRead(),
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
     ): TimelinePresenter {
         return TimelinePresenter(
@@ -1057,8 +1027,8 @@ class TimelinePresenterTest {
             resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() },
             typingNotificationPresenter = { aTypingNotificationState() },
             roomCallStatePresenter = { aStandByCallState() },
-            markAsFullyRead = markAsFullyRead,
             featureFlagService = featureFlagService,
+            analyticsService = FakeAnalyticsService(),
         )
     }
 }
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 451f5bddcc..cdc0a6c9d0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e34bbdcbef..a43b4121bb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,9 @@ 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.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.recentemojis.test.FakeEmojibaseProvider
 import io.element.android.tests.testutils.WarmUpRule
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -25,7 +28,7 @@ class CustomReactionPresenterTest {
 
     private val presenter = CustomReactionPresenter(
         emojibaseProvider = FakeEmojibaseProvider(),
-        getRecentEmojis = { Result.success(emptyList()) },
+        getRecentEmojis = { Result.success(persistentListOf()) },
     )
 
     @Test
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt
deleted file mode 100644
index 498027bae6..0000000000
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.features.messages.impl.timeline.components.customreaction
-
-import io.element.android.emojibasebindings.EmojibaseStore
-import kotlinx.collections.immutable.persistentMapOf
-
-class FakeEmojibaseProvider : EmojibaseProvider {
-    override val emojibaseStore: EmojibaseStore
-        get() = EmojibaseStore(persistentMapOf())
-}
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
index cf4930b389..aa177b07e2 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3935d6d615..f8b416a302 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ee52aff578..154225aa7a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt
index 115c8a9690..a05b7da5f5 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt
index ab083d56f3..d39500fec2 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fb13103694..9f23388ecb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -66,6 +67,7 @@ import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractor
 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
@@ -186,7 +188,7 @@ class TimelineItemContentMessageFactoryTest {
             }
         }.toSpannable()
         val sut = createTimelineItemContentMessageFactory(
-            htmlConverterTransform = { expected }
+            domConverterTransform = { expected }
         )
         val result = sut.create(
             content = createMessageContent(
@@ -678,7 +680,7 @@ class TimelineItemContentMessageFactoryTest {
             }
         }.toSpannable()
         val sut = createTimelineItemContentMessageFactory(
-            htmlConverterTransform = { expectedSpanned },
+            domConverterTransform = { expectedSpanned },
             permalinkParser = FakePermalinkParser { PermalinkData.FallbackLink(Uri.EMPTY) }
         )
         val result = sut.create(
@@ -764,11 +766,12 @@ class TimelineItemContentMessageFactoryTest {
 
     private fun createTimelineItemContentMessageFactory(
         htmlConverterTransform: (String) -> CharSequence = { it },
+        domConverterTransform: (Document) -> CharSequence = { it.body().html() },
         permalinkParser: FakePermalinkParser = FakePermalinkParser(),
     ) = TimelineItemContentMessageFactory(
         fileSizeFormatter = FakeFileSizeFormatter(),
         fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
-        htmlConverterProvider = FakeHtmlConverterProvider(htmlConverterTransform),
+        htmlConverterProvider = FakeHtmlConverterProvider(htmlConverterTransform, domConverterTransform),
         permalinkParser = permalinkParser,
         textPillificationHelper = FakeTextPillificationHelper(),
     )
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 1bdc43ebef..2a31d9063e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionTest.kt
index c7b1d718b2..2cc690a329 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ec0ddf943d..af3acee6a2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 49f30716a8..d6af8ebd68 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 978cc1089b..645039b30c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt
index 5b1f7f8654..896c529ed1 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0d571a2459..16c8c922ca 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/EmojiTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/EmojiTest.kt
index 9714f11a1c..5c979dbb7c 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/EmojiTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/EmojiTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeMentionSpanFormatter.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeMentionSpanFormatter.kt
index a8128bf622..6ef91ac010 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeMentionSpanFormatter.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeMentionSpanFormatter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeTextPillificationHelper.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeTextPillificationHelper.kt
index bbc7c7a728..54faa030b1 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeTextPillificationHelper.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/FakeTextPillificationHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
similarity index 70%
rename from features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
rename to features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
index 0d6a96d75d..48348f5e9a 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,13 +12,10 @@ package io.element.android.features.messages.impl.voicemessages.composer
 
 import android.Manifest
 import androidx.lifecycle.Lifecycle
-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 im.vector.app.features.analytics.plan.Composer
-import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvents
+import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.features.messages.impl.messagecomposer.aReplyMode
 import io.element.android.features.messages.test.FakeMessageComposerContext
@@ -29,7 +27,7 @@ import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaplayer.test.FakeMediaPlayer
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
-import io.element.android.libraries.mediaupload.api.MediaSender
+import io.element.android.libraries.mediaupload.impl.DefaultMediaSender
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import io.element.android.libraries.permissions.api.aPermissionsState
@@ -41,10 +39,12 @@ import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageState
 import io.element.android.libraries.voiceplayer.api.VoiceMessageException
+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.lambdaRecorder
+import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
@@ -56,7 +56,7 @@ import java.io.File
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-class VoiceMessageComposerPresenterTest {
+class DefaultVoiceMessageComposerPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -74,7 +74,7 @@ class VoiceMessageComposerPresenterTest {
         },
     )
     private val mediaPreProcessor = FakeMediaPreProcessor().apply { givenAudioResult() }
-    private val mediaSender = MediaSender(
+    private val mediaSender = DefaultMediaSender(
         preProcessor = mediaPreProcessor,
         room = joinedRoom,
         timelineMode = Timeline.Mode.Live,
@@ -90,9 +90,7 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             voiceRecorder.assertCalls(started = 0)
@@ -104,10 +102,8 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - recording state`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(RECORDING_STATE)
@@ -117,20 +113,42 @@ class VoiceMessageComposerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - recording state - number of levels is limited`() = runTest {
+        val numberOfLevels = 200
+        val levels = List(numberOfLevels) { it / numberOfLevels.toFloat() }
+        val voiceRecorder = FakeVoiceRecorder(
+            levels = levels,
+            recordingDuration = RECORDING_DURATION,
+        )
+        val presenter = createDefaultVoiceMessageComposerPresenter(
+            voiceRecorder = voiceRecorder,
+        )
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            skipItems(numberOfLevels / 2 - 1)
+            val finalState = awaitItem()
+            assertThat(finalState.voiceMessageState).isInstanceOf(VoiceMessageState.Recording::class.java)
+            val recordingState = finalState.voiceMessageState as VoiceMessageState.Recording
+            // The number of levels should be limited to 128 items
+            assertThat(recordingState.levels.size).isEqualTo(128)
+            assertThat(recordingState.levels).isEqualTo(levels.takeLast(128))
+            testPauseAndDestroy(finalState)
+        }
+    }
+
     @Test
     fun `present - recording keeps screen on`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().apply {
-                eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+                eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
                 assertThat(keepScreenOn).isFalse()
             }
 
             awaitItem().apply {
                 assertThat(keepScreenOn).isTrue()
-                eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+                eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             }
 
             val finalState = awaitItem().apply {
@@ -144,11 +162,9 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - abort recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Cancel))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Cancel))
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             voiceRecorder.assertCalls(started = 1, stopped = 1, deleted = 1)
@@ -159,11 +175,9 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - finish recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(aPreviewState())
@@ -176,12 +190,10 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - play recording before it is ready`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem().apply {
-                this.eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
+                this.eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
             }
 
             // Nothing should happen
@@ -195,12 +207,10 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - play recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
             val finalState = awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(aPlayingState())
             }
@@ -213,13 +223,11 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - pause recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Pause))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Pause))
             val finalState = awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(aPausedState())
             }
@@ -232,18 +240,16 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - seek recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.5f)))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.5f)))
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState(playbackProgress = 0.5f, time = 0.seconds, showCursor = true))
             }
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState(playbackProgress = 0.5f, time = 5.seconds, showCursor = true))
-                eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.2f)))
+                eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Seek(0.2f)))
             }
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState(playbackProgress = 0.2f, time = 5.seconds, showCursor = true))
@@ -259,12 +265,10 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - delete recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.DeleteVoiceMessage)
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
@@ -277,13 +281,11 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - delete while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
-            awaitItem().eventSink(VoiceMessageComposerEvents.DeleteVoiceMessage)
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.DeleteVoiceMessage)
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPausedState())
             }
@@ -299,12 +301,10 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - send recording`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+        presenter.test {
+            awaitItem().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)
@@ -318,21 +318,19 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - sending is tracked`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Send a normal voice message
             messageComposerContext.composerMode = MessageComposerMode.Normal
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             skipItems(1) // Sending state
             advanceUntilIdle()
             // Now reply with a voice message
             messageComposerContext.composerMode = aReplyMode()
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             val finalState = awaitItem() // Sending state
 
             assertThat(analyticsService.capturedEvents).containsExactly(
@@ -347,13 +345,11 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - send while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.PlayerEvent(VoiceMessagePlayerEvent.Play))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.PlayerEvent(VoiceMessagePlayerEvent.Play))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPlayingState().toSendingState())
             skipItems(1) // Duplicate sending state
 
@@ -369,14 +365,12 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - send recording before previous completed, waits`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().run {
-                eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
-                eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+                eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
+                eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             }
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
 
@@ -394,20 +388,18 @@ class VoiceMessageComposerPresenterTest {
         // Let sending fail due to media preprocessing error
         mediaPreProcessor.givenResult(Result.failure(Exception()))
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState())
-                eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+                eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             }
 
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(aPreviewState(isSending = true))
             sendVoiceMessageResult.assertions().isNeverCalled()
-            assertThat(analyticsService.trackedErrors).hasSize(0)
+            assertThat(analyticsService.trackedErrors).isEmpty()
             voiceRecorder.assertCalls(started = 1, stopped = 1, deleted = 0)
 
             testPauseAndDestroy(finalState)
@@ -418,15 +410,13 @@ class VoiceMessageComposerPresenterTest {
     fun `present - send failures can be retried`() = runTest {
         // Let sending fail due to media preprocessing error
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             mediaPreProcessor.givenResult(Result.failure(Exception()))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             val previewState = awaitItem()
 
-            previewState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            previewState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
 
             ensureAllEventsConsumed()
@@ -434,7 +424,7 @@ class VoiceMessageComposerPresenterTest {
             sendVoiceMessageResult.assertions().isNeverCalled()
 
             mediaPreProcessor.givenAudioResult()
-            previewState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            previewState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             sendVoiceMessageResult.assertions().isCalledOnce()
@@ -447,14 +437,12 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - send failures are displayed as an error dialog`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Let sending fail due to media preprocessing error
             mediaPreProcessor.givenResult(Result.failure(Exception()))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
-            awaitItem().eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
 
             assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
 
@@ -466,7 +454,7 @@ class VoiceMessageComposerPresenterTest {
             awaitItem().apply {
                 assertThat(voiceMessageState).isEqualTo(aPreviewState())
                 assertThat(showSendFailureDialog).isTrue()
-                eventSink(VoiceMessageComposerEvents.DismissSendFailureDialog)
+                eventSink(VoiceMessageComposerEvent.DismissSendFailureDialog)
             }
 
             val finalState = awaitItem().apply {
@@ -482,12 +470,10 @@ class VoiceMessageComposerPresenterTest {
     @Test
     fun `present - send error - missing recording is tracked`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             // Send the message before recording anything
-            initialState.eventSink(VoiceMessageComposerEvents.SendVoiceMessage)
+            initialState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
 
             assertThat(initialState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
             sendVoiceMessageResult.assertions().isNeverCalled()
@@ -503,11 +489,9 @@ class VoiceMessageComposerPresenterTest {
         val exception = SecurityException("")
         voiceRecorder.givenThrowsSecurityException(exception)
         val presenter = createDefaultVoiceMessageComposerPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            initialState.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             sendVoiceMessageResult.assertions().isNeverCalled()
             assertThat(analyticsService.trackedErrors).containsExactly(
@@ -527,19 +511,17 @@ class VoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter(
             permissionsPresenter = permissionsPresenter,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            initialState.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             assertThat(awaitItem().voiceMessageState).isEqualTo(VoiceMessageState.Idle)
 
-            initialState.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            initialState.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
             voiceRecorder.assertCalls(stopped = 1)
 
             permissionsPresenter.setPermissionGranted()
 
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(RECORDING_STATE)
             voiceRecorder.assertCalls(stopped = 1, started = 1)
@@ -556,16 +538,14 @@ class VoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter(
             permissionsPresenter = permissionsPresenter,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             // See the dialog and accept it
             awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
                 assertThat(it.showPermissionRationaleDialog).isTrue()
-                it.eventSink(VoiceMessageComposerEvents.AcceptPermissionRationale)
+                it.eventSink(VoiceMessageComposerEvent.AcceptPermissionRationale)
             }
 
             // Dialog is hidden, user accepts permissions
@@ -573,7 +553,7 @@ class VoiceMessageComposerPresenterTest {
 
             permissionsPresenter.setPermissionGranted()
 
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             val finalState = awaitItem()
             assertThat(finalState.voiceMessageState).isEqualTo(RECORDING_STATE)
             voiceRecorder.assertCalls(started = 1)
@@ -590,22 +570,20 @@ class VoiceMessageComposerPresenterTest {
         val presenter = createDefaultVoiceMessageComposerPresenter(
             permissionsPresenter = permissionsPresenter,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            awaitItem().eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+        presenter.test {
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
 
             // See the dialog and accept it
             awaitItem().also {
                 assertThat(it.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
                 assertThat(it.showPermissionRationaleDialog).isTrue()
-                it.eventSink(VoiceMessageComposerEvents.DismissPermissionsRationale)
+                it.eventSink(VoiceMessageComposerEvent.DismissPermissionsRationale)
             }
 
             // Dialog is hidden, user tries to record again
             awaitItem().also {
                 assertThat(it.showPermissionRationaleDialog).isFalse()
-                it.eventSink(VoiceMessageComposerEvents.RecorderEvent(VoiceMessageRecorderEvent.Start))
+                it.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
             }
 
             // Dialog is shown once again
@@ -623,7 +601,7 @@ class VoiceMessageComposerPresenterTest {
         mostRecentState: VoiceMessageComposerState,
     ) {
         mostRecentState.eventSink(
-            VoiceMessageComposerEvents.LifecycleEvent(event = Lifecycle.Event.ON_PAUSE)
+            VoiceMessageComposerEvent.LifecycleEvent(event = Lifecycle.Event.ON_PAUSE)
         )
 
         val onPauseState = when (val state = mostRecentState.voiceMessageState) {
@@ -644,7 +622,7 @@ class VoiceMessageComposerPresenterTest {
         }
 
         onPauseState.eventSink(
-            VoiceMessageComposerEvents.LifecycleEvent(event = Lifecycle.Event.ON_DESTROY)
+            VoiceMessageComposerEvent.LifecycleEvent(event = Lifecycle.Event.ON_DESTROY)
         )
 
         when (val state = onPauseState.voiceMessageState) {
@@ -661,17 +639,14 @@ class VoiceMessageComposerPresenterTest {
 
     private fun TestScope.createDefaultVoiceMessageComposerPresenter(
         permissionsPresenter: PermissionsPresenter = createFakePermissionsPresenter(),
+        voiceRecorder: VoiceRecorder = this@DefaultVoiceMessageComposerPresenterTest.voiceRecorder,
     ): DefaultVoiceMessageComposerPresenter {
         return DefaultVoiceMessageComposerPresenter(
             sessionCoroutineScope = backgroundScope,
             timelineMode = Timeline.Mode.Live,
             voiceRecorder = voiceRecorder,
             analyticsService = analyticsService,
-            mediaSenderFactory = object : MediaSender.Factory {
-                override fun create(timelineMode: Timeline.Mode): MediaSender {
-                    return mediaSender
-                }
-            },
+            mediaSenderFactory = { mediaSender },
             player = VoiceMessageComposerPlayer(FakeMediaPlayer(), this),
             messageComposerContext = messageComposerContext,
             permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/FakeRedactedVoiceMessageManager.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/FakeRedactedVoiceMessageManager.kt
index b36e839d8f..39355a2d4e 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/FakeRedactedVoiceMessageManager.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/FakeRedactedVoiceMessageManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
index da349d7a9c..8bced93023 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,7 @@ 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.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
@@ -85,7 +86,7 @@ fun aRedactedMatrixTimeline(eventId: EventId) = listOf<MatrixTimelineItem>(
             reactions = persistentListOf(),
             receipts = persistentListOf(),
             sender = A_USER_ID,
-            senderProfile = ProfileTimelineDetails.Unavailable,
+            senderProfile = ProfileDetails.Unavailable,
             timestamp = 9442,
             content = RedactedContent,
             origin = null,
diff --git a/features/messages/test/build.gradle.kts b/features/messages/test/build.gradle.kts
index 93f5166f29..09d357357d 100644
--- a/features/messages/test/build.gradle.kts
+++ b/features/messages/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,4 +24,6 @@ dependencies {
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.voicerecorder.test)
     implementation(projects.services.analytics.test)
+    implementation(projects.tests.testutils)
+    implementation(projects.libraries.mediaupload.impl)
 }
diff --git a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessageComposerContext.kt b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessageComposerContext.kt
index 02bb713142..25978f2db0 100644
--- a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessageComposerContext.kt
+++ b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessageComposerContext.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessagesEntryPoint.kt b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessagesEntryPoint.kt
new file mode 100644
index 0000000000..491e1ff48f
--- /dev/null
+++ b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/FakeMessagesEntryPoint.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.messages.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.messages.api.MessagesEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeMessagesEntryPoint : MessagesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: MessagesEntryPoint.Params,
+        callback: MessagesEntryPoint.Callback,
+    ): Node = lambdaError()
+}
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 780638a205..02a6918ad8 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeVideoMetadataExtractor.kt b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeVideoMetadataExtractor.kt
index 45d3e31dfb..6a815c48fe 100644
--- a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeVideoMetadataExtractor.kt
+++ b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeVideoMetadataExtractor.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/FakeHtmlConverterProvider.kt b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/FakeHtmlConverterProvider.kt
index b9ea0d2416..1277783f6a 100644
--- a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/FakeHtmlConverterProvider.kt
+++ b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/FakeHtmlConverterProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,9 +11,11 @@ package io.element.android.features.messages.test.timeline
 import androidx.compose.runtime.Composable
 import io.element.android.features.messages.api.timeline.HtmlConverterProvider
 import io.element.android.wysiwyg.utils.HtmlConverter
+import org.jsoup.nodes.Document
 
 class FakeHtmlConverterProvider(
     private val transform: (String) -> CharSequence = { it },
+    private val transformDom: (Document) -> CharSequence = { it.html() },
 ) : HtmlConverterProvider {
     @Composable
     override fun Update() = Unit
@@ -22,6 +25,10 @@ class FakeHtmlConverterProvider(
             override fun fromHtmlToSpans(html: String): CharSequence {
                 return transform(html)
             }
+
+            override fun fromDocumentToSpans(dom: Document): CharSequence {
+                return transformDom(dom)
+            }
         }
     }
 }
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 da83fa69e2..0de1b69d78 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,6 +15,7 @@ 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.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.permissions.test.FakePermissionsPresenterFactory
@@ -23,7 +25,7 @@ import kotlinx.coroutines.CoroutineScope
 
 class FakeDefaultVoiceMessageComposerPresenterFactory(
     private val sessionCoroutineScope: CoroutineScope,
-    private val mediaSender: MediaSender = MediaSender(
+    private val mediaSender: MediaSender = DefaultMediaSender(
         preProcessor = FakeMediaPreProcessor(),
         room = FakeJoinedRoom(),
         timelineMode = Timeline.Mode.Live,
@@ -36,11 +38,7 @@ class FakeDefaultVoiceMessageComposerPresenterFactory(
             timelineMode = timelineMode,
             voiceRecorder = FakeVoiceRecorder(),
             analyticsService = FakeAnalyticsService(),
-            mediaSenderFactory = object : MediaSender.Factory {
-                override fun create(timelineMode: Timeline.Mode): MediaSender {
-                    return mediaSender
-                }
-            },
+            mediaSenderFactory = { mediaSender },
             player = VoiceMessageComposerPlayer(
                 mediaPlayer = FakeMediaPlayer(),
                 sessionCoroutineScope = sessionCoroutineScope,
diff --git a/features/migration/api/build.gradle.kts b/features/migration/api/build.gradle.kts
index 594522b86a..23cb041842 100644
--- a/features/migration/api/build.gradle.kts
+++ b/features/migration/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationEntryPoint.kt b/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationEntryPoint.kt
index 6ef7d07068..471ee30d22 100644
--- a/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationEntryPoint.kt
+++ b/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationState.kt b/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationState.kt
index 44ddca7d2c..000d898a6a 100644
--- a/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationState.kt
+++ b/features/migration/api/src/main/kotlin/io/element/android/features/api/MigrationState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/build.gradle.kts b/features/migration/impl/build.gradle.kts
index 8926f258bd..eb22d06399 100644
--- a/features/migration/impl/build.gradle.kts
+++ b/features/migration/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationEntryPoint.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationEntryPoint.kt
index 68c4c7ce3a..edefa7ce75 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationEntryPoint.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.api.MigrationEntryPoint
 import io.element.android.features.api.MigrationState
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMigrationEntryPoint(
     private val migrationPresenter: MigrationPresenter,
 ) : MigrationEntryPoint {
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationStore.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationStore.kt
index 78883a4e03..fe73a6a607 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationStore.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/DefaultMigrationStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.map
 private val applicationMigrationVersion = intPreferencesKey("applicationMigrationVersion")
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMigrationStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : MigrationStore {
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationPresenter.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationPresenter.kt
index d4e6d6dc37..2d78e5f706 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationPresenter.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStateProvider.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStateProvider.kt
index b9179c4ca2..8f738d3207 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStateProvider.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStore.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStore.kt
index 30d637070f..7fdade821d 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStore.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationView.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationView.kt
index 58b9177267..a294c32534 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationView.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/MigrationView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration.kt
index f14ec89dbe..dcac76c3e0 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01.kt
index 88fdb16b9e..60969dcb1d 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02.kt
index 0ba2712427..64682749d8 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03.kt
index e24e18a205..62674cf583 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04.kt
index f1f16b7a97..8ac4146640 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05.kt
index 2a60822c5d..094248f5a0 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06.kt
index be3050f919..0fbda43207 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07.kt
index 5367323b75..d562be793b 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08.kt b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08.kt
index 12355b4bc4..0f3b33a66d 100644
--- a/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08.kt
+++ b/features/migration/impl/src/main/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/InMemoryMigrationStore.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/InMemoryMigrationStore.kt
index 6107ee8d86..d9724dbb4e 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/InMemoryMigrationStore.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/InMemoryMigrationStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
index e5898ea0dd..f3f7e27c74 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01Test.kt
index 6e1b663e3c..9f87670d01 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration01Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt
index 08c10160b8..c326d80736 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03Test.kt
index 0f4db78aa2..ad69f03a15 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration03Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 68cbfde689..7b954abf86 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt
index ff5b8cd40a..fee0a2e717 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06Test.kt
index e7e15ba821..f5410229ab 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07Test.kt
index a2575b32df..2f5027d3d7 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration07Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08Test.kt
index 75ffa28882..46bde271c4 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration08Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/networkmonitor/api/build.gradle.kts b/features/networkmonitor/api/build.gradle.kts
index 61bd3ae457..1cc9869fc2 100644
--- a/features/networkmonitor/api/build.gradle.kts
+++ b/features/networkmonitor/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkMonitor.kt b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkMonitor.kt
index 196eb89310..484a210380 100644
--- a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkMonitor.kt
+++ b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkMonitor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkStatus.kt b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkStatus.kt
index aebcb5a1d1..f96f8666e3 100644
--- a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkStatus.kt
+++ b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkStatus.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/Indicator.kt b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicator.kt
similarity index 86%
rename from features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/Indicator.kt
rename to features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicator.kt
index 95c46d3fd0..c79f2a1ff5 100644
--- a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/Indicator.kt
+++ b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,6 +21,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.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.compound.theme.ElementTheme
@@ -32,7 +34,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
-internal fun Indicator(
+internal fun ConnectivityIndicator(
+    verticalPadding: Dp,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -40,7 +43,7 @@ internal fun Indicator(
             .fillMaxWidth()
             .background(ElementTheme.colors.bgSubtlePrimary)
             .statusBarsPadding()
-            .padding(vertical = 6.dp),
+            .padding(vertical = verticalPadding),
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -61,6 +64,6 @@ internal fun Indicator(
 
 @PreviewsDayNight
 @Composable
-internal fun IndicatorPreview() = ElementPreview {
-    Indicator()
+internal fun ConnectivityIndicatorPreview() = ElementPreview {
+    ConnectivityIndicator(verticalPadding = 6.dp)
 }
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 6079cb7bbe..7c3ff4a988 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,55 +17,58 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 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 androidx.compose.ui.unit.dp
 
+private val INDICATOR_VERTICAL_PADDING = 6.dp
+
 /**
- * A view that displays a connectivity indicator when the device is offline, passing the padding
- * needed to make sure the status bar is not overlapped to its content views.
+ * A view that displays a connectivity indicator when the device is offline.
  */
 @Composable
 fun ConnectivityIndicatorContainer(
     isOnline: Boolean,
     modifier: Modifier = Modifier,
-    content: @Composable (topPadding: Dp) -> Unit = {},
+    content: @Composable (Modifier) -> Unit = {},
 ) {
     val isIndicatorVisible = remember { MutableTransitionState(!isOnline) }.apply { targetState = !isOnline }
-
-    val statusBarTopPadding = if (LocalInspectionMode.current) {
-        // Needed to get valid UI previews
-        24.dp
-    } else {
-        WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + 6.dp
-    }
-    val target = remember(isIndicatorVisible.targetState, statusBarTopPadding) {
-        if (!isIndicatorVisible.targetState) 0.dp else statusBarTopPadding
-    }
-    val animationStateOffset by animateDpAsState(
-        targetValue = target,
-        animationSpec = spring(
-            stiffness = Spring.StiffnessMediumLow,
-            visibilityThreshold = 1.dp,
-        ),
-        label = "insets-animation",
-    )
-
-    content(animationStateOffset)
-
-    // Display the network indicator with an animation
-    AnimatedVisibility(
-        visibleState = isIndicatorVisible,
-        enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically(),
-    ) {
-        Indicator(modifier)
+    Column(modifier = modifier) {
+        val statusBarTopPadding = if (LocalInspectionMode.current) {
+            // Needed to get valid UI previews
+            24.dp
+        } else {
+            WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + INDICATOR_VERTICAL_PADDING
+        }
+        val target = if (isIndicatorVisible.targetState) statusBarTopPadding else 0.dp
+        val topWindowInset by animateDpAsState(
+            targetValue = target,
+            animationSpec = spring(
+                stiffness = Spring.StiffnessMediumLow,
+                visibilityThreshold = 1.dp,
+            ),
+            label = "insets-animation",
+        )
+        // Display the network indicator with an animation
+        AnimatedVisibility(
+            visibleState = isIndicatorVisible,
+            enter = fadeIn() + expandVertically(),
+            exit = fadeOut() + shrinkVertically(),
+        ) {
+            ConnectivityIndicator(verticalPadding = INDICATOR_VERTICAL_PADDING)
+        }
+        // Consume the window insets to avoid double padding.
+        content(
+            Modifier.consumeWindowInsets(PaddingValues(top = topWindowInset))
+        )
     }
 }
diff --git a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorView.kt b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorView.kt
deleted file mode 100644
index 3e18046878..0000000000
--- a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorView.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.features.networkmonitor.api.ui
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.MutableTransitionState
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.shrinkVertically
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-
-/**
- * A view that displays a connectivity indicator when the device is offline, adding a default
- * padding to make sure the status bar is not overlapped.
- */
-@Composable
-fun ConnectivityIndicatorView(
-    isOnline: Boolean,
-) {
-    val isIndicatorVisible = remember { MutableTransitionState(!isOnline) }.apply { targetState = !isOnline }
-    val isStatusBarPaddingVisible = remember { MutableTransitionState(isOnline) }.apply { targetState = isOnline }
-
-    // Display the network indicator with an animation
-    AnimatedVisibility(
-        visibleState = isIndicatorVisible,
-        enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically(),
-    ) {
-        Indicator()
-    }
-
-    // Show missing status bar padding when the indicator is not visible
-    AnimatedVisibility(
-        visibleState = isStatusBarPaddingVisible,
-        enter = fadeIn() + expandVertically(),
-        exit = fadeOut() + shrinkVertically(),
-    ) {
-        StatusBarPaddingSpacer()
-    }
-}
-
-@Composable
-private fun StatusBarPaddingSpacer(modifier: Modifier = Modifier) {
-    Spacer(modifier = modifier.statusBarsPadding())
-}
-
-@PreviewsDayNight
-@Composable
-internal fun ConnectivityIndicatorViewPreview() {
-    ElementPreview {
-        ConnectivityIndicatorView(isOnline = false)
-    }
-}
diff --git a/features/networkmonitor/impl/build.gradle.kts b/features/networkmonitor/impl/build.gradle.kts
index 1c070e66df..ba754ec1db 100644
--- a/features/networkmonitor/impl/build.gradle.kts
+++ b/features/networkmonitor/impl/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.setupDependencyInjection
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/networkmonitor/impl/src/main/AndroidManifest.xml b/features/networkmonitor/impl/src/main/AndroidManifest.xml
index e37080298d..f13a0993df 100644
--- a/features/networkmonitor/impl/src/main/AndroidManifest.xml
+++ b/features/networkmonitor/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
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 76525ff657..8e10ceeabf 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,6 @@ import android.net.Network
 import android.net.NetworkRequest
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
@@ -37,7 +37,6 @@ import java.util.concurrent.atomic.AtomicInteger
 
 @ContributesBinding(scope = AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultNetworkMonitor(
     @ApplicationContext context: Context,
     @AppCoroutineScope
diff --git a/features/networkmonitor/test/build.gradle.kts b/features/networkmonitor/test/build.gradle.kts
index 970a102ae7..5a6eff9984 100644
--- a/features/networkmonitor/test/build.gradle.kts
+++ b/features/networkmonitor/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/networkmonitor/test/src/main/kotlin/io/element/android/features/networkmonitor/test/FakeNetworkMonitor.kt b/features/networkmonitor/test/src/main/kotlin/io/element/android/features/networkmonitor/test/FakeNetworkMonitor.kt
index 298e06aa5b..37d569dbc6 100644
--- a/features/networkmonitor/test/src/main/kotlin/io/element/android/features/networkmonitor/test/FakeNetworkMonitor.kt
+++ b/features/networkmonitor/test/src/main/kotlin/io/element/android/features/networkmonitor/test/FakeNetworkMonitor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/build.gradle.kts b/features/poll/api/build.gradle.kts
index 360c2f16c2..fb7534a947 100644
--- a/features/poll/api/build.gradle.kts
+++ b/features/poll/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/EndPollAction.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/EndPollAction.kt
index 8e5b5c6ba3..a46a2db781 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/EndPollAction.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/EndPollAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/SendPollResponseAction.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/SendPollResponseAction.kt
index 49da04829b..00b60ed5ae 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/SendPollResponseAction.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/actions/SendPollResponseAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollEntryPoint.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollEntryPoint.kt
index 348f2f6c60..1bdb20b8b9 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollEntryPoint.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,10 +19,9 @@ interface CreatePollEntryPoint : FeatureEntryPoint {
         val mode: CreatePollMode,
     )
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+    ): Node
 }
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollMode.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollMode.kt
index 3701b7c92f..28431096e6 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollMode.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollMode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt
index 49f5f92b87..15bc15691c 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerItem.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerItem.kt
index f50ba22b41..1fa7eca0f5 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerItem.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerView.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerView.kt
index 59d13fed1e..489a8d4137 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerView.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollAnswerView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentState.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentState.kt
index 0c43baab39..1689408098 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentState.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFactory.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFactory.kt
index e42bb98bef..c9bd31ea4f 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFactory.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt
index a54ebcca51..7f15c7d513 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
index 3f32f90678..e1df373218 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollTitleView.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollTitleView.kt
index 297a00a914..06eb75941d 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollTitleView.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollTitleView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/api/src/main/res/values-hr/translations.xml b/features/poll/api/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..117ed51c6b
--- /dev/null
+++ b/features/poll/api/src/main/res/values-hr/translations.xml
@@ -0,0 +1,10 @@
+<?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 posto ukupnog broja glasova"</item>
+    <item quantity="few">"%1$d posto ukupnog broja glasova"</item>
+    <item quantity="other">"%1$d posto ukupnog broja glasova"</item>
+  </plurals>
+  <string name="a11y_polls_will_remove_selection">"Uklonit će prethodni odabir"</string>
+  <string name="a11y_polls_winning_answer">"Ovo je pobjednički odgovor"</string>
+</resources>
diff --git a/features/poll/api/src/main/res/values-uz/translations.xml b/features/poll/api/src/main/res/values-uz/translations.xml
index 6e1a16a013..8446135f20 100644
--- a/features/poll/api/src/main/res/values-uz/translations.xml
+++ b/features/poll/api/src/main/res/values-uz/translations.xml
@@ -1,5 +1,9 @@
 <?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">"Jami ovozlarning %1$d foizi"</item>
+    <item quantity="other">"Jami ovozlarning %1$d foizi"</item>
+  </plurals>
   <string name="a11y_polls_will_remove_selection">"Oldingi tanlov olib tashlanadi"</string>
   <string name="a11y_polls_winning_answer">"Bu g\'alaba qozongan javob"</string>
 </resources>
diff --git a/features/poll/impl/build.gradle.kts b/features/poll/impl/build.gradle.kts
index 99ebefa71c..175f7b4471 100644
--- a/features/poll/impl/build.gradle.kts
+++ b/features/poll/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/PollConstants.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/PollConstants.kt
index d7f5fed75a..c3579dc447 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/PollConstants.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/PollConstants.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt
index e028209ae8..a483930fb2 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.poll.impl.actions
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.PollEnd
 import io.element.android.features.poll.api.actions.EndPollAction
 import io.element.android.libraries.di.RoomScope
@@ -17,7 +17,6 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultEndPollAction(
     private val analyticsService: AnalyticsService,
 ) : EndPollAction {
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt
index a067757357..f48604b21d 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.poll.impl.actions
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.PollVote
 import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.libraries.di.RoomScope
@@ -17,7 +17,6 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultSendPollResponseAction(
     private val analyticsService: AnalyticsService,
 ) : SendPollResponseAction {
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollEvent.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollEvent.kt
new file mode 100644
index 0000000000..b98ab899b9
--- /dev/null
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollEvent.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.features.poll.impl.create
+
+import io.element.android.libraries.matrix.api.poll.PollKind
+
+sealed interface CreatePollEvent {
+    data object Save : CreatePollEvent
+    data class Delete(val confirmed: Boolean) : CreatePollEvent
+    data class SetQuestion(val question: String) : CreatePollEvent
+    data class SetAnswer(val index: Int, val text: String) : CreatePollEvent
+    data object AddAnswer : CreatePollEvent
+    data class RemoveAnswer(val index: Int) : CreatePollEvent
+    data class SetPollKind(val pollKind: PollKind) : CreatePollEvent
+    data object NavBack : CreatePollEvent
+    data object ConfirmNavBack : CreatePollEvent
+    data object HideConfirmation : CreatePollEvent
+}
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollEvents.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollEvents.kt
deleted file mode 100644
index 527c91b011..0000000000
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollEvents.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.features.poll.impl.create
-
-import io.element.android.libraries.matrix.api.poll.PollKind
-
-sealed interface CreatePollEvents {
-    data object Save : CreatePollEvents
-    data class Delete(val confirmed: Boolean) : CreatePollEvents
-    data class SetQuestion(val question: String) : CreatePollEvents
-    data class SetAnswer(val index: Int, val text: String) : CreatePollEvents
-    data object AddAnswer : CreatePollEvents
-    data class RemoveAnswer(val index: Int) : CreatePollEvents
-    data class SetPollKind(val pollKind: PollKind) : CreatePollEvents
-    data object NavBack : CreatePollEvents
-    data object ConfirmNavBack : CreatePollEvents
-    data object HideConfirmation : CreatePollEvents
-}
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollException.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollException.kt
index 987a876be5..e5bb32ef42 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollException.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollNode.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollNode.kt
index 992fde1c4e..9e08b58839 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollNode.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenter.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenter.kt
index 5136571acd..6138bab2ae 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenter.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -96,9 +97,9 @@ class CreatePollPresenter(
 
         val scope = rememberCoroutineScope()
 
-        fun handleEvents(event: CreatePollEvents) {
+        fun handleEvent(event: CreatePollEvent) {
             when (event) {
-                is CreatePollEvents.Save -> scope.launch {
+                is CreatePollEvent.Save -> scope.launch {
                     if (canSave) {
                         repository.savePoll(
                             existingPollId = when (mode) {
@@ -122,7 +123,7 @@ class CreatePollPresenter(
                         Timber.d("Cannot create poll")
                     }
                 }
-                is CreatePollEvents.Delete -> {
+                is CreatePollEvent.Delete -> {
                     if (mode !is CreatePollMode.EditPoll) {
                         return
                     }
@@ -138,25 +139,25 @@ class CreatePollPresenter(
                         navigateUp()
                     }
                 }
-                is CreatePollEvents.AddAnswer -> {
+                is CreatePollEvent.AddAnswer -> {
                     poll = poll.withNewAnswer()
                 }
-                is CreatePollEvents.RemoveAnswer -> {
+                is CreatePollEvent.RemoveAnswer -> {
                     poll = poll.withAnswerRemoved(event.index)
                 }
-                is CreatePollEvents.SetAnswer -> {
+                is CreatePollEvent.SetAnswer -> {
                     poll = poll.withAnswerChanged(event.index, event.text)
                 }
-                is CreatePollEvents.SetPollKind -> {
+                is CreatePollEvent.SetPollKind -> {
                     poll = poll.copy(isDisclosed = event.pollKind.isDisclosed)
                 }
-                is CreatePollEvents.SetQuestion -> {
+                is CreatePollEvent.SetQuestion -> {
                     poll = poll.copy(question = event.question)
                 }
-                is CreatePollEvents.NavBack -> {
+                is CreatePollEvent.NavBack -> {
                     navigateUp()
                 }
-                CreatePollEvents.ConfirmNavBack -> {
+                CreatePollEvent.ConfirmNavBack -> {
                     val shouldConfirm = isDirty
                     if (shouldConfirm) {
                         showBackConfirmation = true
@@ -164,7 +165,7 @@ class CreatePollPresenter(
                         navigateUp()
                     }
                 }
-                is CreatePollEvents.HideConfirmation -> {
+                is CreatePollEvent.HideConfirmation -> {
                     showBackConfirmation = false
                     showDeleteConfirmation = false
                 }
@@ -183,7 +184,7 @@ class CreatePollPresenter(
             pollKind = poll.pollKind,
             showBackConfirmation = showBackConfirmation,
             showDeleteConfirmation = showDeleteConfirmation,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollState.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollState.kt
index 2b4f232871..80aa7dc4b0 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollState.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,7 +20,7 @@ data class CreatePollState(
     val pollKind: PollKind,
     val showBackConfirmation: Boolean,
     val showDeleteConfirmation: Boolean,
-    val eventSink: (CreatePollEvents) -> Unit,
+    val eventSink: (CreatePollEvent) -> Unit,
 ) {
     enum class Mode {
         New,
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollStateProvider.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollStateProvider.kt
index f1f345b468..20d9f0d557 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollStateProvider.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ce6a8682b6..3abf3718af 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -35,6 +36,7 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.poll.impl.R
 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.SaveChangesDialog
 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
@@ -60,21 +62,21 @@ fun CreatePollView(
 ) {
     val coroutineScope = rememberCoroutineScope()
 
-    val navBack = { state.eventSink(CreatePollEvents.ConfirmNavBack) }
+    val navBack = { state.eventSink(CreatePollEvent.ConfirmNavBack) }
     BackHandler(onBack = navBack)
     if (state.showBackConfirmation) {
-        ConfirmationDialog(
-            content = stringResource(id = R.string.screen_create_poll_cancel_confirmation_content_android),
-            onSubmitClick = { state.eventSink(CreatePollEvents.NavBack) },
-            onDismiss = { state.eventSink(CreatePollEvents.HideConfirmation) }
+        SaveChangesDialog(
+            onSaveClick = { state.eventSink(CreatePollEvent.Save) },
+            onDiscardClick = { state.eventSink(CreatePollEvent.NavBack) },
+            onDismiss = { state.eventSink(CreatePollEvent.HideConfirmation) },
         )
     }
     if (state.showDeleteConfirmation) {
         ConfirmationDialog(
             title = stringResource(id = R.string.screen_edit_poll_delete_confirmation_title),
             content = stringResource(id = R.string.screen_edit_poll_delete_confirmation),
-            onSubmitClick = { state.eventSink(CreatePollEvents.Delete(confirmed = true)) },
-            onDismiss = { state.eventSink(CreatePollEvents.HideConfirmation) }
+            onSubmitClick = { state.eventSink(CreatePollEvent.Delete(confirmed = true)) },
+            onDismiss = { state.eventSink(CreatePollEvent.HideConfirmation) }
         )
     }
     val questionFocusRequester = remember { FocusRequester() }
@@ -89,7 +91,7 @@ fun CreatePollView(
                 mode = state.mode,
                 saveEnabled = state.canSave,
                 onBackClick = navBack,
-                onSaveClick = { state.eventSink(CreatePollEvents.Save) }
+                onSaveClick = { state.eventSink(CreatePollEvent.Save) }
             )
         },
     ) { paddingValues ->
@@ -110,7 +112,7 @@ fun CreatePollView(
                                 label = stringResource(id = R.string.screen_create_poll_question_desc),
                                 value = state.question,
                                 onValueChange = {
-                                    state.eventSink(CreatePollEvents.SetQuestion(it))
+                                    state.eventSink(CreatePollEvent.SetQuestion(it))
                                 },
                                 modifier = Modifier
                                     .focusRequester(questionFocusRequester)
@@ -129,7 +131,7 @@ fun CreatePollView(
                         TextField(
                             value = answer.text,
                             onValueChange = {
-                                state.eventSink(CreatePollEvents.SetAnswer(index, it))
+                                state.eventSink(CreatePollEvent.SetAnswer(index, it))
                             },
                             modifier = Modifier
                                 .then(if (isLastItem) Modifier.focusRequester(answerFocusRequester) else Modifier)
@@ -143,7 +145,7 @@ fun CreatePollView(
                             imageVector = CompoundIcons.Delete(),
                             contentDescription = stringResource(R.string.screen_create_poll_delete_option_a11y, answer.text),
                             modifier = Modifier.clickable(answer.canDelete) {
-                                state.eventSink(CreatePollEvents.RemoveAnswer(index))
+                                state.eventSink(CreatePollEvent.RemoveAnswer(index))
                             },
                         )
                     },
@@ -159,7 +161,7 @@ fun CreatePollView(
                         ),
                         style = ListItemStyle.Primary,
                         onClick = {
-                            state.eventSink(CreatePollEvents.AddAnswer)
+                            state.eventSink(CreatePollEvent.AddAnswer)
                             coroutineScope.launch(Dispatchers.Main) {
                                 lazyListState.animateScrollToItem(state.answers.size + 1)
                                 answerFocusRequester.requestFocus()
@@ -179,7 +181,7 @@ fun CreatePollView(
                         ),
                         onClick = {
                             state.eventSink(
-                                CreatePollEvents.SetPollKind(
+                                CreatePollEvent.SetPollKind(
                                     if (state.pollKind == PollKind.Disclosed) PollKind.Undisclosed else PollKind.Disclosed
                                 )
                             )
@@ -189,7 +191,7 @@ fun CreatePollView(
                         ListItem(
                             headlineContent = { Text(text = stringResource(id = CommonStrings.action_delete_poll)) },
                             style = ListItemStyle.Destructive,
-                            onClick = { state.eventSink(CreatePollEvents.Delete(confirmed = false)) },
+                            onClick = { state.eventSink(CreatePollEvent.Delete(confirmed = false)) },
                         )
                     }
                 }
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPoint.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPoint.kt
index 3c76aad7c8..7566a5dcf0 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPoint.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,21 @@ package io.element.android.features.poll.impl.create
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.poll.api.create.CreatePollEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCreatePollEntryPoint : CreatePollEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreatePollEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : CreatePollEntryPoint.NodeBuilder {
-            override fun params(params: CreatePollEntryPoint.Params): CreatePollEntryPoint.NodeBuilder {
-                plugins += CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode)
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<CreatePollNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: CreatePollEntryPoint.Params,
+    ): Node {
+        return parentNode.createNode<CreatePollNode>(
+            buildContext = buildContext,
+            plugins = listOf(CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode))
+        )
     }
 }
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/PollFormState.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/PollFormState.kt
index 34b9d6206b..46045d711d 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/PollFormState.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/PollFormState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt
index ee53ca7826..d3f177736a 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt
index 8c89a47c65..920e2db79f 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.poll.api.history.PollHistoryEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPollHistoryEntryPoint : PollHistoryEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
         return parentNode.createNode<PollHistoryFlowNode>(buildContext)
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryEvents.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryEvents.kt
index 1e063887a5..14ce13d67a 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryEvents.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt
index 19142508a1..a71edeb859 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -53,18 +54,18 @@ class PollHistoryFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             is NavTarget.EditPoll -> {
-                createPollEntryPoint.nodeBuilder(this, buildContext)
-                    .params(
-                        CreatePollEntryPoint.Params(
+                createPollEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = CreatePollEntryPoint.Params(
                         timelineMode = Timeline.Mode.Live,
                         mode = CreatePollMode.EditPoll(eventId = navTarget.pollStartEventId)
-                        )
                     )
-                    .build()
+                )
             }
             NavTarget.Root -> {
                 val callback = object : PollHistoryNode.Callback {
-                    override fun onEditPoll(pollStartEventId: EventId) {
+                    override fun navigateToEditPoll(pollStartEventId: EventId) {
                         backstack.push(NavTarget.EditPoll(pollStartEventId))
                     }
                 }
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt
index 3fdfdb921f..ba1018e65f 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,10 +13,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.EventId
 
@@ -30,19 +31,17 @@ class PollHistoryNode(
     plugins = plugins,
 ) {
     interface Callback : Plugin {
-        fun onEditPoll(pollStartEventId: EventId)
+        fun navigateToEditPoll(pollStartEventId: EventId)
     }
 
-    private fun onEditPoll(pollStartEventId: EventId) {
-        plugins<Callback>().forEach { it.onEditPoll(pollStartEventId) }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         PollHistoryView(
             state = presenter.present(),
             modifier = modifier,
-            onEditPoll = ::onEditPoll,
+            onEditPoll = callback::navigateToEditPoll,
             goBack = this::navigateUp,
         )
     }
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
index 15bc803f51..434e2ed18c 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -62,7 +63,7 @@ class PollHistoryPresenter(
             }
         }
         val coroutineScope = rememberCoroutineScope()
-        fun handleEvents(event: PollHistoryEvents) {
+        fun handleEvent(event: PollHistoryEvents) {
             when (event) {
                 is PollHistoryEvents.LoadMore -> {
                     coroutineScope.loadMore(timeline)
@@ -88,7 +89,7 @@ class PollHistoryPresenter(
             hasMoreToLoad = paginationState.hasMoreToLoad,
             pollHistoryItems = pollHistoryItems,
             activeFilter = activeFilter,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryState.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryState.kt
index 85d1324bcd..bddfd153f6 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryState.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt
index 2d126ce7cf..a08550f2a1 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
index 0ff1ef57a5..9a654c2abb 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryFilter.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryFilter.kt
index d8eb122785..51449a7bd5 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryFilter.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryFilter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItem.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItem.kt
index 949ba5fb3c..b688000789 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItem.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItems.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItems.kt
index 28ca67ac40..c1df275a9e 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItems.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItems.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt
index c895a2c16c..5edd99c0c6 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/model/PollHistoryItemsFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt
index 8647d80f23..f781b9474d 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.poll.impl.model
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.poll.api.pollcontent.PollAnswerItem
 import io.element.android.features.poll.api.pollcontent.PollContentState
 import io.element.android.features.poll.api.pollcontent.PollContentStateFactory
@@ -20,7 +20,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import kotlinx.collections.immutable.toImmutableList
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultPollContentStateFactory(
     private val matrixClient: MatrixClient,
 ) : PollContentStateFactory {
diff --git a/features/poll/impl/src/main/res/values-hr/translations.xml b/features/poll/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..adc11a1be7
--- /dev/null
+++ b/features/poll/impl/src/main/res/values-hr/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">"Dodaj mogućnost"</string>
+  <string name="screen_create_poll_anonymous_desc">"Prikaži rezultate tek nakon završetka ankete"</string>
+  <string name="screen_create_poll_anonymous_headline">"Sakrij glasove"</string>
+  <string name="screen_create_poll_answer_hint">"Mogućnost %1$d"</string>
+  <string name="screen_create_poll_cancel_confirmation_content_android">"Vaše promjene nisu spremljene. Jeste li sigurni da se želite vratiti?"</string>
+  <string name="screen_create_poll_delete_option_a11y">"Izbriši mogućnost %1$s"</string>
+  <string name="screen_create_poll_question_desc">"Pitanje ili tema"</string>
+  <string name="screen_create_poll_question_hint">"O čemu se radi u anketi?"</string>
+  <string name="screen_create_poll_title">"Izradi anketu"</string>
+  <string name="screen_edit_poll_delete_confirmation">"Jeste li sigurni da želite izbrisati ovu anketu?"</string>
+  <string name="screen_edit_poll_delete_confirmation_title">"Izbriši anketu"</string>
+  <string name="screen_edit_poll_title">"Uredi anketu"</string>
+  <string name="screen_polls_history_empty_ongoing">"Ne mogu pronaći nijednu tekuću anketu."</string>
+  <string name="screen_polls_history_empty_past">"Ne mogu pronaći nijednu prijašnju anketu."</string>
+  <string name="screen_polls_history_filter_ongoing">"Tekuće"</string>
+  <string name="screen_polls_history_filter_past">"Prijašnje"</string>
+  <string name="screen_polls_history_title">"Ankete"</string>
+</resources>
diff --git a/features/poll/impl/src/main/res/values-uz/translations.xml b/features/poll/impl/src/main/res/values-uz/translations.xml
index 8ea1c4b827..28f496f3dd 100644
--- a/features/poll/impl/src/main/res/values-uz/translations.xml
+++ b/features/poll/impl/src/main/res/values-uz/translations.xml
@@ -5,6 +5,7 @@
   <string name="screen_create_poll_anonymous_headline">"Ovozlarni yashirish"</string>
   <string name="screen_create_poll_answer_hint">"Variant%1$d"</string>
   <string name="screen_create_poll_cancel_confirmation_content_android">"Oʻzgarishlar saqlanmadi. Haqiqatan ham orqaga qaytmoqchimisiz?"</string>
+  <string name="screen_create_poll_delete_option_a11y">"%1$s variantini o‘chirish"</string>
   <string name="screen_create_poll_question_desc">"Savol yoki mavzu"</string>
   <string name="screen_create_poll_question_hint">"So\'rovnoma nima haqida?"</string>
   <string name="screen_create_poll_title">"So‘rovnoma yaratish"</string>
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/PollFixtures.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/PollFixtures.kt
index 182e7cd86b..db6c8e849f 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/PollFixtures.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/PollFixtures.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt
index 6bec98f1b9..dee0268c1c 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -103,15 +104,15 @@ class CreatePollPresenterTest {
             val initial = awaitItem()
             assertThat(initial.canSave).isFalse()
 
-            initial.eventSink(CreatePollEvents.SetQuestion("A question?"))
+            initial.eventSink(CreatePollEvent.SetQuestion("A question?"))
             val questionSet = awaitItem()
             assertThat(questionSet.canSave).isFalse()
 
-            questionSet.eventSink(CreatePollEvents.SetAnswer(0, "Answer 1"))
+            questionSet.eventSink(CreatePollEvent.SetAnswer(0, "Answer 1"))
             val answer1Set = awaitItem()
             assertThat(answer1Set.canSave).isFalse()
 
-            answer1Set.eventSink(CreatePollEvents.SetAnswer(1, "Answer 2"))
+            answer1Set.eventSink(CreatePollEvent.SetAnswer(1, "Answer 2"))
             val answer2Set = awaitItem()
             assertThat(answer2Set.canSave).isTrue()
         }
@@ -132,11 +133,11 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             val initial = awaitItem()
-            initial.eventSink(CreatePollEvents.SetQuestion("A question?"))
-            initial.eventSink(CreatePollEvents.SetAnswer(0, "Answer 1"))
-            initial.eventSink(CreatePollEvents.SetAnswer(1, "Answer 2"))
+            initial.eventSink(CreatePollEvent.SetQuestion("A question?"))
+            initial.eventSink(CreatePollEvent.SetAnswer(0, "Answer 1"))
+            initial.eventSink(CreatePollEvent.SetAnswer(1, "Answer 2"))
             skipItems(3)
-            initial.eventSink(CreatePollEvents.Save)
+            initial.eventSink(CreatePollEvent.Save)
             delay(1) // Wait for the coroutine to finish
             createPollResult.assertions().isCalledOnce()
                 .with(
@@ -181,10 +182,10 @@ class CreatePollPresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            awaitDefaultItem().eventSink(CreatePollEvents.SetQuestion("A question?"))
-            awaitItem().eventSink(CreatePollEvents.SetAnswer(0, "Answer 1"))
-            awaitItem().eventSink(CreatePollEvents.SetAnswer(1, "Answer 2"))
-            awaitItem().eventSink(CreatePollEvents.Save)
+            awaitDefaultItem().eventSink(CreatePollEvent.SetQuestion("A question?"))
+            awaitItem().eventSink(CreatePollEvent.SetAnswer(0, "Answer 1"))
+            awaitItem().eventSink(CreatePollEvent.SetAnswer(1, "Answer 2"))
+            awaitItem().eventSink(CreatePollEvent.Save)
             delay(1) // Wait for the coroutine to finish
             createPollResult.assertions().isCalledOnce()
             assertThat(fakeAnalyticsService.capturedEvents).isEmpty()
@@ -209,20 +210,20 @@ class CreatePollPresenterTest {
         }.test {
             awaitDefaultItem()
             awaitPollLoaded().apply {
-                eventSink(CreatePollEvents.SetQuestion("Changed question"))
+                eventSink(CreatePollEvent.SetQuestion("Changed question"))
             }
             awaitItem().apply {
-                eventSink(CreatePollEvents.SetAnswer(0, "Changed answer 1"))
+                eventSink(CreatePollEvent.SetAnswer(0, "Changed answer 1"))
             }
             awaitItem().apply {
-                eventSink(CreatePollEvents.SetAnswer(1, "Changed answer 2"))
+                eventSink(CreatePollEvent.SetAnswer(1, "Changed answer 2"))
             }
             awaitPollLoaded(
                 newQuestion = "Changed question",
                 newAnswer1 = "Changed answer 1",
                 newAnswer2 = "Changed answer 2",
             ).apply {
-                eventSink(CreatePollEvents.Save)
+                eventSink(CreatePollEvent.Save)
             }
             advanceUntilIdle() // Wait for the coroutine to finish
 
@@ -274,8 +275,8 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             awaitDefaultItem()
-            awaitPollLoaded().eventSink(CreatePollEvents.SetAnswer(0, "A"))
-            awaitPollLoaded(newAnswer1 = "A").eventSink(CreatePollEvents.Save)
+            awaitPollLoaded().eventSink(CreatePollEvent.SetAnswer(0, "A"))
+            awaitPollLoaded(newAnswer1 = "A").eventSink(CreatePollEvent.Save)
             advanceUntilIdle() // Wait for the coroutine to finish
             editPollLambda.assertions().isCalledOnce()
             assertThat(fakeAnalyticsService.capturedEvents).isEmpty()
@@ -295,12 +296,12 @@ class CreatePollPresenterTest {
             val initial = awaitItem()
             assertThat(initial.answers.size).isEqualTo(2)
 
-            initial.eventSink(CreatePollEvents.AddAnswer)
+            initial.eventSink(CreatePollEvent.AddAnswer)
             val answerAdded = awaitItem()
             assertThat(answerAdded.answers.size).isEqualTo(3)
             assertThat(answerAdded.answers[2].text).isEmpty()
 
-            initial.eventSink(CreatePollEvents.RemoveAnswer(2))
+            initial.eventSink(CreatePollEvent.RemoveAnswer(2))
             val answerRemoved = awaitItem()
             assertThat(answerRemoved.answers.size).isEqualTo(2)
         }
@@ -313,7 +314,7 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             val initial = awaitItem()
-            initial.eventSink(CreatePollEvents.SetQuestion("A question?"))
+            initial.eventSink(CreatePollEvent.SetQuestion("A question?"))
             val questionSet = awaitItem()
             assertThat(questionSet.question).isEqualTo("A question?")
         }
@@ -326,7 +327,7 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             val initial = awaitItem()
-            initial.eventSink(CreatePollEvents.SetAnswer(0, "This is answer 1"))
+            initial.eventSink(CreatePollEvent.SetAnswer(0, "This is answer 1"))
             val answerSet = awaitItem()
             assertThat(answerSet.answers.first().text).isEqualTo("This is answer 1")
         }
@@ -339,7 +340,7 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             val initial = awaitItem()
-            initial.eventSink(CreatePollEvents.SetPollKind(PollKind.Undisclosed))
+            initial.eventSink(CreatePollEvent.SetPollKind(PollKind.Undisclosed))
             val kindSet = awaitItem()
             assertThat(kindSet.pollKind).isEqualTo(PollKind.Undisclosed)
         }
@@ -354,10 +355,10 @@ class CreatePollPresenterTest {
             val initial = awaitItem()
             assertThat(initial.canAddAnswer).isTrue()
             repeat(17) {
-                initial.eventSink(CreatePollEvents.AddAnswer)
+                initial.eventSink(CreatePollEvent.AddAnswer)
                 assertThat(awaitItem().canAddAnswer).isTrue()
             }
-            initial.eventSink(CreatePollEvents.AddAnswer)
+            initial.eventSink(CreatePollEvent.AddAnswer)
             assertThat(awaitItem().canAddAnswer).isFalse()
         }
     }
@@ -370,7 +371,7 @@ class CreatePollPresenterTest {
         }.test {
             val initial = awaitItem()
             assertThat(initial.answers.all { it.canDelete }).isFalse()
-            initial.eventSink(CreatePollEvents.AddAnswer)
+            initial.eventSink(CreatePollEvent.AddAnswer)
             assertThat(awaitItem().answers.all { it.canDelete }).isTrue()
         }
     }
@@ -382,7 +383,7 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             val initial = awaitItem()
-            initial.eventSink(CreatePollEvents.SetAnswer(0, "A".repeat(241)))
+            initial.eventSink(CreatePollEvent.SetAnswer(0, "A".repeat(241)))
             assertThat(awaitItem().answers.first().text.length).isEqualTo(240)
         }
     }
@@ -395,7 +396,7 @@ class CreatePollPresenterTest {
         }.test {
             val initial = awaitItem()
             assertThat(navUpInvocationsCount).isEqualTo(0)
-            initial.eventSink(CreatePollEvents.NavBack)
+            initial.eventSink(CreatePollEvent.NavBack)
             assertThat(navUpInvocationsCount).isEqualTo(1)
         }
     }
@@ -409,7 +410,7 @@ class CreatePollPresenterTest {
             val initial = awaitItem()
             assertThat(navUpInvocationsCount).isEqualTo(0)
             assertThat(initial.showBackConfirmation).isFalse()
-            initial.eventSink(CreatePollEvents.ConfirmNavBack)
+            initial.eventSink(CreatePollEvent.ConfirmNavBack)
             assertThat(navUpInvocationsCount).isEqualTo(1)
         }
     }
@@ -421,11 +422,11 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             val initial = awaitItem()
-            initial.eventSink(CreatePollEvents.SetQuestion("Non blank"))
+            initial.eventSink(CreatePollEvent.SetQuestion("Non blank"))
             assertThat(awaitItem().showBackConfirmation).isFalse()
-            initial.eventSink(CreatePollEvents.ConfirmNavBack)
+            initial.eventSink(CreatePollEvent.ConfirmNavBack)
             assertThat(awaitItem().showBackConfirmation).isTrue()
-            initial.eventSink(CreatePollEvents.HideConfirmation)
+            initial.eventSink(CreatePollEvent.HideConfirmation)
             assertThat(awaitItem().showBackConfirmation).isFalse()
             assertThat(navUpInvocationsCount).isEqualTo(0)
         }
@@ -441,7 +442,7 @@ class CreatePollPresenterTest {
             val loaded = awaitPollLoaded()
             assertThat(navUpInvocationsCount).isEqualTo(0)
             assertThat(loaded.showBackConfirmation).isFalse()
-            loaded.eventSink(CreatePollEvents.ConfirmNavBack)
+            loaded.eventSink(CreatePollEvent.ConfirmNavBack)
             assertThat(navUpInvocationsCount).isEqualTo(1)
         }
     }
@@ -454,11 +455,11 @@ class CreatePollPresenterTest {
         }.test {
             awaitDefaultItem()
             val loaded = awaitPollLoaded()
-            loaded.eventSink(CreatePollEvents.SetQuestion("CHANGED"))
+            loaded.eventSink(CreatePollEvent.SetQuestion("CHANGED"))
             assertThat(awaitItem().showBackConfirmation).isFalse()
-            loaded.eventSink(CreatePollEvents.ConfirmNavBack)
+            loaded.eventSink(CreatePollEvent.ConfirmNavBack)
             assertThat(awaitItem().showBackConfirmation).isTrue()
-            loaded.eventSink(CreatePollEvents.HideConfirmation)
+            loaded.eventSink(CreatePollEvent.HideConfirmation)
             assertThat(awaitItem().showBackConfirmation).isFalse()
             assertThat(navUpInvocationsCount).isEqualTo(0)
         }
@@ -473,7 +474,7 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             awaitDefaultItem()
-            awaitPollLoaded().eventSink(CreatePollEvents.Delete(confirmed = false))
+            awaitPollLoaded().eventSink(CreatePollEvent.Delete(confirmed = false))
             awaitDeleteConfirmation()
             assert(redactEventLambda).isNeverCalled()
         }
@@ -488,8 +489,8 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             awaitDefaultItem()
-            awaitPollLoaded().eventSink(CreatePollEvents.Delete(confirmed = false))
-            awaitDeleteConfirmation().eventSink(CreatePollEvents.HideConfirmation)
+            awaitPollLoaded().eventSink(CreatePollEvent.Delete(confirmed = false))
+            awaitDeleteConfirmation().eventSink(CreatePollEvent.HideConfirmation)
             awaitPollLoaded().apply {
                 assertThat(showDeleteConfirmation).isFalse()
             }
@@ -506,8 +507,8 @@ class CreatePollPresenterTest {
             presenter.present()
         }.test {
             awaitDefaultItem()
-            awaitPollLoaded().eventSink(CreatePollEvents.Delete(confirmed = false))
-            awaitDeleteConfirmation().eventSink(CreatePollEvents.Delete(confirmed = true))
+            awaitPollLoaded().eventSink(CreatePollEvent.Delete(confirmed = false))
+            awaitDeleteConfirmation().eventSink(CreatePollEvent.Delete(confirmed = true))
             awaitPollLoaded().apply {
                 assertThat(showDeleteConfirmation).isFalse()
             }
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPointTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPointTest.kt
index bf77cb4535..573c7b1950 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPointTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -53,9 +54,11 @@ class DefaultCreatePollEntryPointTest {
             timelineMode = Timeline.Mode.Live,
             mode = CreatePollMode.NewPoll,
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+        )
         assertThat(result).isInstanceOf(CreatePollNode::class.java)
         assertThat(result.plugins).contains(CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode))
     }
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateSaverTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateSaverTest.kt
index bab6171477..86e4b28676 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateSaverTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateSaverTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateTest.kt
index 9594903c69..8f6bc32ea9 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/PollFormStateTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPointTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPointTest.kt
index dfab33e837..d0d0490e44 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPointTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,9 @@ package io.element.android.features.poll.impl.history
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.poll.api.create.CreatePollEntryPoint
-import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.features.poll.test.create.FakeCreatePollEntryPoint
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -33,9 +32,7 @@ class DefaultPollHistoryEntryPointTest {
             PollHistoryFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                createPollEntryPoint = object : CreatePollEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                }
+                createPollEntryPoint = FakeCreatePollEntryPoint(),
             )
         }
         val result = entryPoint.createNode(parentNode, BuildContext.root(null))
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
index cac5fae135..8d4cedc6a8 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 54df066bbe..1ff25a0a81 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/pollcontent/PollContentStateFactoryTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/pollcontent/PollContentStateFactoryTest.kt
index 4e56c4f48d..277508681e 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/pollcontent/PollContentStateFactoryTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/pollcontent/PollContentStateFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -219,6 +220,7 @@ class PollContentStateFactoryTest {
         votes = votes,
         endTime = endTime,
         isEdited = false,
+        threadInfo = null,
     )
 
     private fun aPollContentState(
diff --git a/features/poll/test/build.gradle.kts b/features/poll/test/build.gradle.kts
index 150a0bd3fc..a3779809d7 100644
--- a/features/poll/test/build.gradle.kts
+++ b/features/poll/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,4 +18,5 @@ dependencies {
     implementation(projects.libraries.matrix.api)
     api(projects.features.poll.api)
     implementation(libs.kotlinx.collections.immutable)
+    implementation(projects.tests.testutils)
 }
diff --git a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeEndPollAction.kt b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeEndPollAction.kt
index 872110d0b6..1a0b8b29d3 100644
--- a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeEndPollAction.kt
+++ b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeEndPollAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeSendPollResponseAction.kt b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeSendPollResponseAction.kt
index f77d974178..1a779d5cab 100644
--- a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeSendPollResponseAction.kt
+++ b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/actions/FakeSendPollResponseAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/create/FakeCreatePollEntryPoint.kt b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/create/FakeCreatePollEntryPoint.kt
new file mode 100644
index 0000000000..bad968d157
--- /dev/null
+++ b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/create/FakeCreatePollEntryPoint.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.poll.test.create
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.poll.api.create.CreatePollEntryPoint
+import io.element.android.features.poll.api.create.CreatePollEntryPoint.Params
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeCreatePollEntryPoint : CreatePollEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+    ): Node = lambdaError()
+}
diff --git a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/history/FakePollHistoryEntryPoint.kt b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/history/FakePollHistoryEntryPoint.kt
new file mode 100644
index 0000000000..2c211c8b71
--- /dev/null
+++ b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/history/FakePollHistoryEntryPoint.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.poll.test.history
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.poll.api.history.PollHistoryEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakePollHistoryEntryPoint : PollHistoryEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node = lambdaError()
+}
diff --git a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/pollcontent/FakePollContentStateFactory.kt b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/pollcontent/FakePollContentStateFactory.kt
index 701d2e4640..87755afaf0 100644
--- a/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/pollcontent/FakePollContentStateFactory.kt
+++ b/features/poll/test/src/main/kotlin/io/element/android/features/poll/test/pollcontent/FakePollContentStateFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/api/build.gradle.kts b/features/preferences/api/build.gradle.kts
index 91538d5709..b5a08b9435 100644
--- a/features/preferences/api/build.gradle.kts
+++ b/features/preferences/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/CacheService.kt b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/CacheService.kt
index f18a77a2b5..82fcd1053f 100644
--- a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/CacheService.kt
+++ b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/CacheService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c0affde2df..5a59d9be8a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,19 +32,19 @@ interface PreferencesEntryPoint : FeatureEntryPoint {
 
     data class Params(val initialElement: InitialTarget) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onAddAccount()
-        fun onOpenBugReport()
-        fun onSecureBackupClick()
-        fun onOpenRoomNotificationSettings(roomId: RoomId)
-        fun navigateTo(roomId: RoomId, eventId: EventId)
+        fun navigateToAddAccount()
+        fun navigateToLinkNewDevice()
+        fun navigateToBugReport()
+        fun navigateToSecureBackup()
+        fun navigateToRoomNotificationSettings(roomId: RoomId)
+        fun navigateToEvent(roomId: RoomId, eventId: EventId)
     }
 }
diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts
index eb057a9d53..ad28c90966 100644
--- a/features/preferences/impl/build.gradle.kts
+++ b/features/preferences/impl/build.gradle.kts
@@ -4,9 +4,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -72,6 +73,7 @@ dependencies {
     implementation(projects.features.rageshake.api)
     implementation(projects.features.lockscreen.api)
     implementation(projects.features.analytics.api)
+    implementation(projects.features.enterprise.api)
     implementation(projects.features.licenses.api)
     implementation(projects.features.logout.api)
     implementation(projects.features.deactivation.api)
@@ -83,6 +85,7 @@ dependencies {
     implementation(projects.services.toolbox.api)
     implementation(libs.datetime)
     implementation(libs.coil.compose)
+    implementation(libs.color.picker)
     implementation(libs.androidx.browser)
     implementation(libs.androidx.datastore.preferences)
     api(projects.features.preferences.api)
@@ -100,12 +103,19 @@ dependencies {
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.libraries.pushstore.test)
+    testImplementation(projects.libraries.roomselect.test)
+    testImplementation(projects.libraries.troubleshoot.test)
+    testImplementation(projects.features.deactivation.test)
+    testImplementation(projects.features.enterprise.test)
     testImplementation(projects.features.invite.test)
+    testImplementation(projects.features.licenses.test)
+    testImplementation(projects.features.lockscreen.test)
     testImplementation(projects.features.rageshake.test)
     testImplementation(projects.features.logout.test)
     testImplementation(projects.libraries.indicator.test)
     testImplementation(projects.libraries.pushproviders.test)
     testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.services.appnavstate.impl)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.toolbox.test)
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultCacheService.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultCacheService.kt
index da42cf87dd..34ea62864c 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultCacheService.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultCacheService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.preferences.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.preferences.api.CacheService
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -18,7 +18,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCacheService : CacheService {
     private val _clearedCacheEventFlow = MutableSharedFlow<SessionId>(0)
     override val clearedCacheEventFlow: Flow<SessionId> = _clearedCacheEventFlow
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 d0efc2107e..4348b33756 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,34 +10,23 @@ package io.element.android.features.preferences.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPreferencesEntryPoint : PreferencesEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): PreferencesEntryPoint.NodeBuilder {
-        return object : PreferencesEntryPoint.NodeBuilder {
-            val plugins = ArrayList<Plugin>()
-
-            override fun params(params: PreferencesEntryPoint.Params): PreferencesEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun callback(callback: PreferencesEntryPoint.Callback): PreferencesEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<PreferencesFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: PreferencesEntryPoint.Params,
+        callback: PreferencesEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<PreferencesFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(params, callback)
+        )
     }
 }
 
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 e4ba87c43a..c646923c77 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -38,6 +38,7 @@ import io.element.android.features.preferences.impl.user.editprofile.EditUserPro
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.canPop
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
@@ -116,63 +117,69 @@ class PreferencesFlowNode(
         data object OssLicenses : NavTarget
     }
 
+    private val callback: PreferencesEntryPoint.Callback = callback()
+
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Root -> {
                 val callback = object : PreferencesRootNode.Callback {
-                    override fun onAddAccount() {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onAddAccount() }
+                    override fun navigateToAddAccount() {
+                        callback.navigateToAddAccount()
                     }
 
-                    override fun onOpenBugReport() {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                     }
 
-                    override fun onSecureBackupClick() {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClick() }
+                    override fun navigateToSecureBackup() {
+                        callback.navigateToSecureBackup()
                     }
 
-                    override fun onOpenAnalytics() {
+                    override fun navigateToAnalyticsSettings() {
                         backstack.push(NavTarget.AnalyticsSettings)
                     }
 
-                    override fun onOpenAbout() {
+                    override fun navigateToAbout() {
                         backstack.push(NavTarget.About)
                     }
 
-                    override fun onOpenDeveloperSettings() {
+                    override fun navigateToDeveloperSettings() {
                         backstack.push(NavTarget.DeveloperSettings)
                     }
 
-                    override fun onOpenNotificationSettings() {
+                    override fun navigateToNotificationSettings() {
                         backstack.push(NavTarget.NotificationSettings)
                     }
 
-                    override fun onOpenLockScreenSettings() {
+                    override fun navigateToLockScreenSettings() {
                         backstack.push(NavTarget.LockScreenSettings)
                     }
 
-                    override fun onOpenAdvancedSettings() {
+                    override fun navigateToAdvancedSettings() {
                         backstack.push(NavTarget.AdvancedSettings)
                     }
 
-                    override fun onOpenLabs() {
+                    override fun navigateToLabs() {
                         backstack.push(NavTarget.Labs)
                     }
 
-                    override fun onOpenUserProfile(matrixUser: MatrixUser) {
+                    override fun navigateToLinkNewDevice() {
+                        callback.navigateToLinkNewDevice()
+                    }
+
+                    override fun navigateToUserProfile(matrixUser: MatrixUser) {
                         backstack.push(NavTarget.UserProfile(matrixUser))
                     }
 
-                    override fun onOpenBlockedUsers() {
+                    override fun navigateToBlockedUsers() {
                         backstack.push(NavTarget.BlockedUsers)
                     }
 
-                    override fun onSignOutClick() {
+                    override fun startSignOutFlow() {
                         backstack.push(NavTarget.SignOut)
                     }
 
-                    override fun onOpenAccountDeactivation() {
+                    override fun startAccountDeactivationFlow() {
                         backstack.push(NavTarget.AccountDeactivation)
                     }
                 }
@@ -180,18 +187,27 @@ class PreferencesFlowNode(
             }
             NavTarget.DeveloperSettings -> {
                 val developerSettingsCallback = object : DeveloperSettingsNode.Callback {
-                    override fun onPushHistoryClick() {
+                    override fun navigateToPushHistory() {
                         backstack.push(NavTarget.PushHistory)
                     }
+
+                    override fun onDone() {
+                        backstack.pop()
+                    }
                 }
                 createNode<DeveloperSettingsNode>(buildContext, listOf(developerSettingsCallback))
             }
             NavTarget.Labs -> {
-                createNode<LabsNode>(buildContext)
+                val callback = object : LabsNode.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                createNode<LabsNode>(buildContext, listOf(callback))
             }
             NavTarget.About -> {
                 val callback = object : AboutNode.Callback {
-                    override fun openOssLicenses() {
+                    override fun navigateToOssLicenses() {
                         backstack.push(NavTarget.OssLicenses)
                     }
                 }
@@ -202,19 +218,21 @@ class PreferencesFlowNode(
             }
             NavTarget.NotificationSettings -> {
                 val notificationSettingsCallback = object : NotificationSettingsNode.Callback {
-                    override fun editDefaultNotificationMode(isOneToOne: Boolean) {
+                    override fun navigateToEditDefaultNotificationSetting(isOneToOne: Boolean) {
                         backstack.push(NavTarget.EditDefaultNotificationSetting(isOneToOne))
                     }
 
-                    override fun onTroubleshootNotificationsClick() {
+                    override fun navigateToTroubleshootNotifications() {
                         backstack.push(NavTarget.TroubleshootNotifications)
                     }
                 }
                 createNode<NotificationSettingsNode>(buildContext, listOf(notificationSettingsCallback))
             }
             NavTarget.TroubleshootNotifications -> {
-                notificationTroubleShootEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(object : NotificationTroubleShootEntryPoint.Callback {
+                notificationTroubleShootEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = object : NotificationTroubleShootEntryPoint.Callback {
                         override fun onDone() {
                             if (backstack.canPop()) {
                                 backstack.pop()
@@ -223,15 +241,17 @@ class PreferencesFlowNode(
                             }
                         }
 
-                        override fun openIgnoredUsers() {
+                        override fun navigateToBlockedUsers() {
                             backstack.push(NavTarget.BlockedUsers)
                         }
-                    })
-                    .build()
+                    },
+                )
             }
             NavTarget.PushHistory -> {
-                pushHistoryEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(object : PushHistoryEntryPoint.Callback {
+                pushHistoryEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = object : PushHistoryEntryPoint.Callback {
                         override fun onDone() {
                             if (backstack.canPop()) {
                                 backstack.pop()
@@ -240,16 +260,16 @@ class PreferencesFlowNode(
                             }
                         }
 
-                        override fun navigateTo(roomId: RoomId, eventId: EventId) {
-                            plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateTo(roomId, eventId) }
+                        override fun navigateToEvent(roomId: RoomId, eventId: EventId) {
+                            callback.navigateToEvent(roomId, eventId)
                         }
-                    })
-                    .build()
+                    },
+                )
             }
             is NavTarget.EditDefaultNotificationSetting -> {
                 val callback = object : EditDefaultNotificationSettingNode.Callback {
-                    override fun openRoomNotificationSettings(roomId: RoomId) {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onOpenRoomNotificationSettings(roomId) }
+                    override fun navigateToRoomNotificationSettings(roomId: RoomId) {
+                        callback.navigateToRoomNotificationSettings(roomId)
                     }
                 }
                 val input = EditDefaultNotificationSettingNode.Inputs(navTarget.isOneToOne)
@@ -260,23 +280,39 @@ class PreferencesFlowNode(
             }
             is NavTarget.UserProfile -> {
                 val inputs = EditUserProfileNode.Inputs(navTarget.matrixUser)
-                createNode<EditUserProfileNode>(buildContext, listOf(inputs))
+                val callback = object : EditUserProfileNode.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                createNode<EditUserProfileNode>(buildContext, listOf(inputs, callback))
             }
             NavTarget.LockScreenSettings -> {
-                lockScreenEntryPoint.nodeBuilder(this, buildContext, LockScreenEntryPoint.Target.Settings).build()
+                lockScreenEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    navTarget = LockScreenEntryPoint.Target.Settings,
+                    callback = object : LockScreenEntryPoint.Callback {
+                        override fun onSetupDone() {
+                            // No op
+                        }
+                    }
+                )
             }
             NavTarget.BlockedUsers -> {
                 createNode<BlockedUsersNode>(buildContext)
             }
             NavTarget.SignOut -> {
                 val callBack: LogoutEntryPoint.Callback = object : LogoutEntryPoint.Callback {
-                    override fun onChangeRecoveryKeyClick() {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClick() }
+                    override fun navigateToSecureBackup() {
+                        callback.navigateToSecureBackup()
                     }
                 }
-                logoutEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(callBack)
-                    .build()
+                logoutEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callBack,
+                )
             }
             is NavTarget.OssLicenses -> {
                 openSourceLicensesEntryPoint.createNode(this, buildContext)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
index 37de32bab7..4ece133bcd 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,6 +20,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -29,9 +31,11 @@ class AboutNode(
     private val presenter: AboutPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun openOssLicenses()
+        fun navigateToOssLicenses()
     }
 
+    private val callback: Callback = callback()
+
     private fun onElementLegalClick(
         activity: Activity,
         darkTheme: Boolean,
@@ -51,9 +55,7 @@ class AboutNode(
             onElementLegalClick = { elementLegal ->
                 onElementLegalClick(activity, isDark, elementLegal)
             },
-            onOpenSourceLicensesClick = {
-                plugins.filterIsInstance<Callback>().forEach { it.openOssLicenses() }
-            },
+            onOpenSourceLicensesClick = callback::navigateToOssLicenses,
             modifier = modifier
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutPresenter.kt
index f36dc50543..6abf896f1f 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutState.kt
index 2c46bf2419..165585bd87 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutState.kt
@@ -1,12 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.about
 
+import kotlinx.collections.immutable.ImmutableList
+
 data class AboutState(
-    val elementLegals: List<ElementLegal>,
+    val elementLegals: ImmutableList<ElementLegal>,
 )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutStateProvider.kt
index 6d6a4813df..561fe53a49 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutStateProvider.kt
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.about
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import kotlinx.collections.immutable.toImmutableList
 
 open class AboutStateProvider : PreviewParameterProvider<AboutState> {
     override val values: Sequence<AboutState>
@@ -19,5 +21,5 @@ open class AboutStateProvider : PreviewParameterProvider<AboutState> {
 fun anAboutState(
     elementLegals: List<ElementLegal> = getAllLegals(),
 ) = AboutState(
-    elementLegals = elementLegals,
+    elementLegals = elementLegals.toImmutableList(),
 )
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 9d2018f4a7..b71db181e8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/ElementLegal.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/ElementLegal.kt
index a5de31f05d..0f3c25afea 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/ElementLegal.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/ElementLegal.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,8 @@ package io.element.android.features.preferences.impl.about
 import androidx.annotation.StringRes
 import io.element.android.features.preferences.impl.BuildConfig
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 
 private const val COPYRIGHT_URL = BuildConfig.URL_COPYRIGHT
 private const val USE_POLICY_URL = BuildConfig.URL_ACCEPTABLE_USE
@@ -24,8 +27,8 @@ sealed class ElementLegal(
     data object PrivacyPolicy : ElementLegal(CommonStrings.common_privacy_policy, PRIVACY_URL)
 }
 
-fun getAllLegals(): List<ElementLegal> {
-    return listOf(
+fun getAllLegals(): ImmutableList<ElementLegal> {
+    return persistentListOf(
         ElementLegal.Copyright,
         ElementLegal.AcceptableUsePolicy,
         ElementLegal.PrivacyPolicy,
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 d685402055..b3fb68fe05 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 adcf12cf42..e58706e9fe 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6378b3038d..c2871e0be8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -82,7 +83,7 @@ class AdvancedSettingsPresenter(
             }.collect()
         }
 
-        fun handleEvents(event: AdvancedSettingsEvents) {
+        fun handleEvent(event: AdvancedSettingsEvents) {
             when (event) {
                 is AdvancedSettingsEvents.SetDeveloperModeEnabled -> sessionCoroutineScope.launch {
                     appPreferencesStore.setDeveloperModeEnabled(event.enabled)
@@ -117,7 +118,7 @@ class AdvancedSettingsPresenter(
             mediaOptimizationState = mediaOptimizationState,
             theme = themeOption,
             mediaPreviewConfigState = mediaPreviewConfigState,
-            eventSink = ::handleEvents,
+            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 1251723f1c..6eb7414a29 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 055edd20d2..6cbe6e5c51 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e1c6ce259a..c2b51973d0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -233,7 +234,7 @@ private fun VideoQualitySelectorDialog(
                     supportingContent = {
                         Text(
                             text = subtitle,
-                            style = ElementTheme.materialTypography.bodyMedium,
+                            style = ElementTheme.typography.fontBodyMdRegular,
                             color = ElementTheme.colors.textSecondary,
                         )
                     },
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
index b2d7243ccc..d23168e29a 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.preferences.impl.advanced
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.runUpdatingState
@@ -45,7 +45,6 @@ interface MediaPreviewConfigStateStore {
 
 @ContributesBinding(SessionScope::class)
 @SingleIn(SessionScope::class)
-@Inject
 class DefaultMediaPreviewConfigStateStore(
     @SessionCoroutineScope
     private val sessionCoroutineScope: CoroutineScope,
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt
index 7f96e8f181..8931f7f6a8 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenter.kt
index 4f833b783d..3affad55c4 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsState.kt
index 7f0cbb4672..ba2b9dfb7e 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.preferences.impl.analytics
 
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class AnalyticsSettingsState(
     val analyticsPreferencesState: AnalyticsPreferencesState,
 )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsStateProvider.kt
index cbbf9839b9..9e15ea2f35 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt
index d8cf70e3eb..ef84600e2e 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersEvents.kt
index e3311862b8..0db5c4c576 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt
index 4c94a8dfb4..44e6a155b1 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenter.kt
index 5fbbe3e797..fc150d0bfc 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -64,7 +65,7 @@ class BlockedUsersPresenter(
             }
         }
 
-        fun handleEvents(event: BlockedUsersEvents) {
+        fun handleEvent(event: BlockedUsersEvents) {
             when (event) {
                 is BlockedUsersEvents.Unblock -> {
                     pendingUserToUnblock = event.userId
@@ -85,7 +86,7 @@ class BlockedUsersPresenter(
         return BlockedUsersState(
             blockedUsers = ignoredMatrixUser.toImmutableList(),
             unblockUserAction = unblockUserAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersState.kt
index 79b0b0b1e8..8c478371ad 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersStateProvider.kt
index ac344ba838..92cc8a0936 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt
index 56b5dd709e..40e58022bd 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ced7b8d2b4..1804d7e070 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.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
@@ -16,5 +18,8 @@ sealed interface 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
 }
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 6208d0123e..98c7d89633 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,10 +15,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.designsystem.showkase.getBrowserIntent
 import io.element.android.libraries.di.SessionScope
 
@@ -29,14 +30,11 @@ class DeveloperSettingsNode(
     private val presenter: DeveloperSettingsPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onPushHistoryClick()
+        fun navigateToPushHistory()
+        fun onDone()
     }
 
-    private val callbacks = plugins<Callback>()
-
-    private fun onPushHistoryClick() {
-        callbacks.forEach { it.onPushHistoryClick() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -51,8 +49,8 @@ class DeveloperSettingsNode(
             state = state,
             modifier = modifier,
             onOpenShowkase = ::openShowkase,
-            onPushHistoryClick = ::onPushHistoryClick,
-            onBackClick = ::navigateUp
+            onPushHistoryClick = callback::navigateToPushHistory,
+            onBackClick = callback::onDone,
         )
     }
 }
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 fe7a3461b8..a0d96be540 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,33 +14,43 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateMapOf
+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.snapshots.SnapshotStateMap
+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.tasks.ClearCacheUseCase
 import io.element.android.features.preferences.impl.tasks.ComputeCacheSizeUseCase
+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.bool.orFalse
+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.Feature
 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.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
@@ -48,29 +59,36 @@ import java.net.URL
 
 @Inject
 class DeveloperSettingsPresenter(
+    private val sessionId: SessionId,
     private val featureFlagService: FeatureFlagService,
     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,
 ) : Presenter<DeveloperSettingsState> {
     @Composable
     override fun present(): DeveloperSettingsState {
         val rageshakeState = rageshakePresenter.present()
-
-        val features = remember {
-            mutableStateMapOf<String, Feature>()
-        }
         val enabledFeatures = remember {
-            mutableStateMapOf<String, Boolean>()
+            mutableStateListOf<EnabledFeature>()
         }
         val cacheSize = remember {
             mutableStateOf<AsyncData<String>>(AsyncData.Uninitialized)
         }
+        val databaseSizes = remember {
+            mutableStateOf<AsyncData<ImmutableMap<String, String>>>(AsyncData.Uninitialized)
+        }
         val clearCacheAction = remember {
             mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
         }
+        var showColorPicker by remember {
+            mutableStateOf(false)
+        }
         val customElementCallBaseUrl by remember {
             appPreferencesStore
                 .getCustomElementCallBaseUrlFlow()
@@ -83,13 +101,13 @@ class DeveloperSettingsPresenter(
         val tracingLogPacks by produceState(persistentListOf()) {
             appPreferencesStore.getTracingLogPacksFlow()
                 // Sort the entries alphabetically by its title
-                .map { it.sortedBy { it.title } }
+                .map { it.sortedBy { pack -> pack.title } }
                 .collectLatest { value = it.toImmutableList() }
         }
 
         LaunchedEffect(Unit) {
+            computeDatabaseSizes(databaseSizes)
             featureFlagService.getAvailableFeatures()
-                .filter { it.isInLabs.not() && it.isFinished.not() }
                 .run {
                     // Never display room directory search in release builds for Play Store
                     if (buildMeta.flavorDescription == "GooglePlay" && buildMeta.buildType == BuildType.RELEASE) {
@@ -99,25 +117,23 @@ class DeveloperSettingsPresenter(
                     }
                 }
                 .forEach { feature ->
-                    features[feature.key] = feature
-                    enabledFeatures[feature.key] = featureFlagService.isFeatureEnabled(feature)
+                    enabledFeatures.add(EnabledFeature(feature, featureFlagService.isFeatureEnabled(feature)))
                 }
         }
-        val featureUiModels = createUiModels(features, enabledFeatures)
+        val featureUiModels = createUiModels(enabledFeatures)
         val coroutineScope = rememberCoroutineScope()
         // Compute cache size each time the clear cache action value is changed
         LaunchedEffect(clearCacheAction.value.isSuccess()) {
             computeCacheSize(cacheSize)
         }
 
-        fun handleEvents(event: DeveloperSettingsEvents) {
+        fun handleEvent(event: DeveloperSettingsEvents) {
             when (event) {
                 is DeveloperSettingsEvents.UpdateEnabledFeature -> coroutineScope.updateEnabledFeature(
-                    features,
-                    enabledFeatures,
-                    event.feature,
-                    event.isEnabled,
-                    triggerClearCache = { handleEvents(DeveloperSettingsEvents.ClearCache) }
+                    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() }
@@ -136,12 +152,28 @@ class DeveloperSettingsPresenter(
                     }
                     appPreferencesStore.setTracingLogPacks(currentPacks)
                 }
+                is DeveloperSettingsEvents.ChangeBrandColor -> coroutineScope.launch {
+                    showColorPicker = false
+                    val color = event.color
+                        ?.toArgb()
+                        ?.toHexString(HexFormat.UpperCase)
+                        ?.substring(2, 8)
+                        ?.padStart(7, '#')
+                    enterpriseService.overrideBrandColor(sessionId, color)
+                }
+                is DeveloperSettingsEvents.SetShowColorPicker -> {
+                    showColorPicker = event.show
+                }
+                DeveloperSettingsEvents.VacuumStores -> coroutineScope.launch {
+                    vacuumStoresUseCase()
+                }
             }
         }
 
         return DeveloperSettingsState(
-            features = featureUiModels.toImmutableList(),
+            features = featureUiModels,
             cacheSize = cacheSize.value,
+            databaseSizes = databaseSizes.value,
             clearCacheAction = clearCacheAction.value,
             rageshakeState = rageshakeState,
             customElementCallBaseUrlState = CustomElementCallBaseUrlState(
@@ -150,41 +182,41 @@ class DeveloperSettingsPresenter(
             ),
             tracingLogLevel = tracingLogLevel,
             tracingLogPacks = tracingLogPacks,
-            eventSink = ::handleEvents
+            isEnterpriseBuild = enterpriseService.isEnterpriseBuild,
+            showColorPicker = showColorPicker,
+            eventSink = ::handleEvent,
         )
     }
 
     @Composable
     private fun createUiModels(
-        features: SnapshotStateMap<String, Feature>,
-        enabledFeatures: SnapshotStateMap<String, Boolean>
-    ): List<FeatureUiModel> {
-        return features.values.map { feature ->
-            key(feature.key) {
-                val isEnabled = enabledFeatures[feature.key].orFalse()
-                remember(feature, isEnabled) {
+        enabledFeatures: SnapshotStateList<EnabledFeature>,
+    ): ImmutableList<FeatureUiModel> {
+        return enabledFeatures.map { enabledFeature ->
+            key(enabledFeature.feature.key) {
+                remember(enabledFeature) {
                     FeatureUiModel(
-                        key = feature.key,
-                        title = feature.title,
-                        description = feature.description,
+                        key = enabledFeature.feature.key,
+                        title = enabledFeature.feature.title,
+                        description = enabledFeature.feature.description,
                         icon = null,
-                        isEnabled = isEnabled
+                        isEnabled = enabledFeature.isEnabled
                     )
                 }
             }
-        }
+        }.toImmutableList()
     }
 
     private fun CoroutineScope.updateEnabledFeature(
-        features: SnapshotStateMap<String, Feature>,
-        enabledFeatures: SnapshotStateMap<String, Boolean>,
-        featureUiModel: FeatureUiModel,
+        enabledFeatures: SnapshotStateList<EnabledFeature>,
+        featureKey: String,
         enabled: Boolean,
         @Suppress("UNUSED_PARAMETER") triggerClearCache: () -> Unit,
     ) = launch {
-        val feature = features[featureUiModel.key] ?: return@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[featureUiModel.key] = enabled
+            enabledFeatures[featureIndex] = enabledFeatures[featureIndex].copy(isEnabled = enabled)
         }
     }
 
@@ -194,6 +226,27 @@ class DeveloperSettingsPresenter(
         }.runCatchingUpdatingState(cacheSize)
     }
 
+    private fun CoroutineScope.computeDatabaseSizes(databaseSizes: MutableState<AsyncData<ImmutableMap<String, String>>>) = launch {
+        suspend {
+            databaseSizesUseCase(sessionId).getOrThrow().let { sizes ->
+                buildMap {
+                    sizes.stateStore?.let { stateStoreSize ->
+                        put("State store", fileSizeFormatter.format(stateStoreSize.into(ByteUnit.BYTES), useShortFormat = true))
+                    }
+                    sizes.eventCacheStore?.let { eventCacheStoreSize ->
+                        put("Event cache store", fileSizeFormatter.format(eventCacheStoreSize.into(ByteUnit.BYTES), useShortFormat = true))
+                    }
+                    sizes.mediaStore?.let { mediaStoreSize ->
+                        put("Media store", fileSizeFormatter.format(mediaStoreSize.into(ByteUnit.BYTES), useShortFormat = true))
+                    }
+                    sizes.cryptoStore?.let { cryptoStoreSize ->
+                        put("Crypto store", fileSizeFormatter.format(cryptoStoreSize.into(ByteUnit.BYTES), useShortFormat = true))
+                    }
+                }
+            }.toImmutableMap()
+        }.runCatchingUpdatingState(databaseSizes)
+    }
+
     private fun CoroutineScope.clearCache(clearCacheAction: MutableState<AsyncAction<Unit>>) = launch {
         suspend {
             clearCacheUseCase()
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 93e7b9ae7b..920c8ec95c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,17 +15,23 @@ 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 kotlinx.collections.immutable.ImmutableMap
 
 data class DeveloperSettingsState(
     val features: ImmutableList<FeatureUiModel>,
     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 isEnterpriseBuild: Boolean,
+    val showColorPicker: Boolean,
     val eventSink: (DeveloperSettingsEvents) -> Unit
-)
+) {
+    val showLoader = clearCacheAction is AsyncAction.Loading
+}
 
 data class CustomElementCallBaseUrlState(
     val baseUrl: String?,
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 6ccd857552..9ac4fdfcc8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,6 +15,7 @@ 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 kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 
 open class DeveloperSettingsStateProvider : PreviewParameterProvider<DeveloperSettingsState> {
@@ -28,6 +30,10 @@ open class DeveloperSettingsStateProvider : PreviewParameterProvider<DeveloperSe
                     baseUrl = "https://call.element.ahoy",
                 )
             ),
+            aDeveloperSettingsState(
+                isEnterpriseBuild = true,
+                showColorPicker = true,
+            ),
         )
 }
 
@@ -35,15 +41,20 @@ fun aDeveloperSettingsState(
     clearCacheAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     customElementCallBaseUrlState: CustomElementCallBaseUrlState = aCustomElementCallBaseUrlState(),
     traceLogPacks: List<TraceLogPack> = emptyList(),
+    isEnterpriseBuild: Boolean = false,
+    showColorPicker: Boolean = false,
     eventSink: (DeveloperSettingsEvents) -> Unit = {},
 ) = DeveloperSettingsState(
     features = aFeatureUiModelList(),
     rageshakeState = aRageshakePreferencesState(),
     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(),
+    isEnterpriseBuild = isEnterpriseBuild,
+    showColorPicker = showColorPicker,
     eventSink = eventSink,
 )
 
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 97f08f7a16..444a391d43 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
@@ -1,17 +1,21 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.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.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
@@ -21,6 +25,7 @@ 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.designsystem.components.ProgressDialog
 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
@@ -36,8 +41,11 @@ 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 io.mhssn.colorpicker.ColorPickerDialog
+import io.mhssn.colorpicker.ColorPickerType
 import kotlinx.collections.immutable.toImmutableList
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun DeveloperSettingsView(
     state: DeveloperSettingsState,
@@ -46,15 +54,25 @@ fun DeveloperSettingsView(
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    if (state.showLoader) {
+        ProgressDialog()
+    }
+    BackHandler(
+        enabled = !state.showLoader,
+        onBack = onBackClick,
+    )
     PreferencePage(
         modifier = modifier,
-        onBackClick = onBackClick,
+        onBackClick = {
+            if (!state.showLoader) {
+                onBackClick()
+            }
+        },
         title = stringResource(id = CommonStrings.common_developer_options)
     ) {
         // Note: this is OK to hardcode strings in this debug screen.
         PreferenceCategory(
             title = "Feature flags",
-            showTopDivider = true,
         ) {
             FeatureListContent(state)
         }
@@ -99,7 +117,27 @@ fun DeveloperSettingsView(
         RageshakePreferencesView(
             state = state.rageshakeState,
         )
-        PreferenceCategory(title = "Crash", showTopDivider = false) {
+        if (state.isEnterpriseBuild) {
+            PreferenceCategory(title = "Theme") {
+                ListItem(
+                    headlineContent = {
+                        Text("Change brand color")
+                    },
+                    onClick = {
+                        state.eventSink(DeveloperSettingsEvents.SetShowColorPicker(true))
+                    }
+                )
+                ListItem(
+                    headlineContent = {
+                        Text("Reset brand color")
+                    },
+                    onClick = {
+                        state.eventSink(DeveloperSettingsEvents.ChangeBrandColor(null))
+                    }
+                )
+            }
+        }
+        PreferenceCategory(title = "Crash") {
             ListItem(
                 headlineContent = {
                     Text("Crash the app 💥")
@@ -108,7 +146,34 @@ fun DeveloperSettingsView(
             )
         }
         val cache = state.cacheSize
-        PreferenceCategory(title = "Cache", showTopDivider = false) {
+        PreferenceCategory(title = "Cache") {
+            ListItem(
+                headlineContent = { Text("Database sizes") },
+                supportingContent = {
+                    if (state.databaseSizes.isLoading()) {
+                        Text("Computing...")
+                    } else {
+                        val dbSizes = state.databaseSizes.dataOrNull()
+                        if (dbSizes != null && dbSizes.isNotEmpty()) {
+                            Column {
+                                for ((dbName, size) in dbSizes) {
+                                    Text("$dbName: $size")
+                                }
+                            }
+                        } else {
+                            Text("Unknown")
+                        }
+                    }
+                }
+            )
+            ListItem(
+                headlineContent = {
+                    Text("Vacuum stores")
+                },
+                onClick = {
+                    state.eventSink(DeveloperSettingsEvents.VacuumStores)
+                }
+            )
             ListItem(
                 headlineContent = {
                     Text("Clear cache")
@@ -133,13 +198,25 @@ fun DeveloperSettingsView(
             )
         }
     }
+    ColorPickerDialog(
+        show = state.showColorPicker,
+        type = ColorPickerType.Classic(
+            showAlphaBar = false,
+        ),
+        onDismissRequest = {
+            state.eventSink(DeveloperSettingsEvents.SetShowColorPicker(false))
+        },
+        onPickedColor = {
+            state.eventSink(DeveloperSettingsEvents.ChangeBrandColor(it))
+        },
+    )
 }
 
 @Composable
 private fun ElementCallCategory(
     state: DeveloperSettingsState,
 ) {
-    PreferenceCategory(title = "Element Call", showTopDivider = true) {
+    PreferenceCategory(title = "Element Call") {
         val callUrlState = state.customElementCallBaseUrlState
 
         val supportingText = if (callUrlState.baseUrl.isNullOrEmpty()) {
@@ -189,7 +266,9 @@ private fun FeatureListContent(
 
 @PreviewsDayNight
 @Composable
-internal fun DeveloperSettingsViewPreview(@PreviewParameter(DeveloperSettingsStateProvider::class) state: DeveloperSettingsState) = ElementPreview {
+internal fun DeveloperSettingsViewPreview(
+    @PreviewParameter(DeveloperSettingsStateProvider::class) state: DeveloperSettingsState
+) = ElementPreview {
     DeveloperSettingsView(
         state = state,
         onOpenShowkase = {},
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelItem.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelItem.kt
index 7148cff57f..ca8fe007aa 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelItem.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelItem.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelMapper.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelMapper.kt
index fabfffa2cc..c271499aa0 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelMapper.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/LogLevelMapper.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsEvents.kt
index 0f652a5c5c..bc948da09c 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt
index 5c2b5ed0e3..b7ba73c9af 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,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.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -24,9 +26,18 @@ class LabsNode(
     @Assisted plugins: List<Plugin>,
     private val presenter: LabsPresenter,
 ) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
+    val callback: Callback = callback()
+
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
-        LabsView(state = state, onBack = ::navigateUp)
+        LabsView(
+            state = state,
+            onBack = callback::onDone,
+        )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenter.kt
index 5e74454d75..3b7d499ecf 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,20 +12,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import dev.zacsweers.metro.Inject
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.preferences.impl.R
+import io.element.android.features.preferences.impl.model.EnabledFeature
 import io.element.android.features.preferences.impl.tasks.ClearCacheUseCase
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.designsystem.theme.components.IconSource
-import io.element.android.libraries.featureflag.api.Feature
 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
@@ -42,46 +42,38 @@ class LabsPresenter(
     @Composable
     override fun present(): LabsState {
         val coroutineScope = rememberCoroutineScope()
-        val features = remember {
-            val entries = featureFlagService.getAvailableFeatures()
-                .filter { it.isInLabs && !it.isFinished }
-                .map { it.key to it }
-            mutableStateMapOf(*entries.toTypedArray())
-        }
         val enabledFeatures = remember {
-            mutableStateMapOf<String, Boolean>()
+            mutableStateListOf<EnabledFeature>()
         }
-
         LaunchedEffect(Unit) {
-            for (feature in features.values) {
-                val isEnabled = featureFlagService.isFeatureEnabled(feature)
-                enabledFeatures[feature.key] = isEnabled
-            }
+            featureFlagService.getAvailableFeatures(isInLabs = true)
+                .forEach { feature ->
+                    enabledFeatures.add(EnabledFeature(feature, featureFlagService.isFeatureEnabled(feature)))
+                }
         }
-
         var isApplyingChanges by remember { mutableStateOf(false) }
-
-        val featureUiModels = createUiModels(features, enabledFeatures)
+        val featureUiModels = createUiModels(enabledFeatures)
 
         fun handleEvent(event: LabsEvents) {
             when (event) {
                 is LabsEvents.ToggleFeature -> coroutineScope.launch {
-                    val feature = features[event.feature.key] ?: return@launch
-                    val isEnabled = featureFlagService.isFeatureEnabled(feature)
-                    featureFlagService.setFeatureEnabled(feature = feature, enabled = !isEnabled)
-                    enabledFeatures[feature.key] = !isEnabled
-
-                    when (feature.key) {
-                        FeatureFlags.Threads.key -> {
-                            // Threads require a cache clear to recreate the event cache
-                            clearCacheUseCase()
-                            isApplyingChanges = true
+                    val featureIndex = enabledFeatures.indexOfFirst { it.feature.key == event.feature.key }.takeIf { it != -1 } ?: return@launch
+                    val enabledFeature = enabledFeatures[featureIndex]
+                    val feature = enabledFeature.feature
+                    val newValue = enabledFeature.isEnabled.not()
+                    if (featureFlagService.setFeatureEnabled(feature, newValue)) {
+                        enabledFeatures[featureIndex] = enabledFeatures[featureIndex].copy(isEnabled = newValue)
+                        when (feature.key) {
+                            FeatureFlags.Threads.key -> {
+                                // Threads require a cache clear to recreate the event cache
+                                clearCacheUseCase()
+                                isApplyingChanges = true
+                            }
                         }
                     }
                 }
             }
         }
-
         return LabsState(
             features = featureUiModels,
             isApplyingChanges = isApplyingChanges,
@@ -91,31 +83,29 @@ class LabsPresenter(
 
     @Composable
     private fun createUiModels(
-        features: SnapshotStateMap<String, Feature>,
-        enabledFeatures: SnapshotStateMap<String, Boolean>
+        enabledFeatures: SnapshotStateList<EnabledFeature>,
     ): ImmutableList<FeatureUiModel> {
-        return features.values.map { feature ->
-            key(feature.key) {
-                val isEnabled = enabledFeatures[feature.key].orFalse()
-                val title = when (feature) {
+        return enabledFeatures.map { enabledFeature ->
+            key(enabledFeature.feature.key) {
+                val title = when (enabledFeature.feature) {
                     FeatureFlags.Threads -> stringProvider.getString(R.string.screen_labs_enable_threads)
-                    else -> feature.title
+                    else -> enabledFeature.feature.title
                 }
-                val description = when (feature) {
+                val description = when (enabledFeature.feature) {
                     FeatureFlags.Threads -> stringProvider.getString(R.string.screen_labs_enable_threads_description)
-                    else -> feature.description
+                    else -> enabledFeature.feature.description
                 }
-                val icon = when (feature) {
+                val icon = when (enabledFeature.feature) {
                     FeatureFlags.Threads -> CompoundIcons.Threads()
                     else -> null
                 }
-                remember(feature, isEnabled) {
+                remember(enabledFeature) {
                     FeatureUiModel(
-                        key = feature.key,
+                        key = enabledFeature.feature.key,
                         title = title,
                         description = description,
                         icon = icon?.let(IconSource::Vector),
-                        isEnabled = isEnabled
+                        isEnabled = enabledFeature.isEnabled
                     )
                 }
             }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsState.kt
index 0925cd7893..42e70d58c9 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsStateProvider.kt
index df804cd409..08e251dcfa 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsView.kt
index 2738da4b63..7a6703e3bc 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/labs/LabsView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/model/EnabledFeature.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/model/EnabledFeature.kt
new file mode 100644
index 0000000000..2d1b5e54e7
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/model/EnabledFeature.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.preferences.impl.model
+
+import io.element.android.libraries.featureflag.api.Feature
+
+data class EnabledFeature(
+    val feature: Feature,
+    val isEnabled: Boolean,
+)
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 59dca36b3b..8f1b332c8c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
index f488889c5b..d300217ecc 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,10 +13,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -26,28 +27,20 @@ class NotificationSettingsNode(
     private val presenter: NotificationSettingsPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun editDefaultNotificationMode(isOneToOne: Boolean)
-        fun onTroubleshootNotificationsClick()
+        fun navigateToEditDefaultNotificationSetting(isOneToOne: Boolean)
+        fun navigateToTroubleshootNotifications()
     }
 
-    private val callbacks = plugins<Callback>()
-
-    private fun openEditDefault(isOneToOne: Boolean) {
-        callbacks.forEach { it.editDefaultNotificationMode(isOneToOne) }
-    }
-
-    private fun onTroubleshootNotificationsClick() {
-        callbacks.forEach { it.onTroubleshootNotificationsClick() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         NotificationSettingsView(
             state = state,
-            onOpenEditDefault = { openEditDefault(isOneToOne = it) },
+            onOpenEditDefault = callback::navigateToEditDefaultNotificationSetting,
             onBackClick = ::navigateUp,
-            onTroubleshootNotificationsClick = ::onTroubleshootNotificationsClick,
+            onTroubleshootNotificationsClick = callback::navigateToTroubleshootNotifications,
             modifier = modifier,
         )
     }
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 1fcb984924..9d9e80b3f3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,6 +25,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingStateNoSuccess
 import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
@@ -50,6 +52,8 @@ class NotificationSettingsPresenter(
     private val pushService: PushService,
     private val systemNotificationsEnabledProvider: SystemNotificationsEnabledProvider,
     private val fullScreenIntentPermissionsPresenter: Presenter<FullScreenIntentPermissionsState>,
+    @SessionCoroutineScope
+    private val sessionCoroutineScope: CoroutineScope,
 ) : Presenter<NotificationSettingsState> {
     @Composable
     override fun present(): NotificationSettingsState {
@@ -94,7 +98,7 @@ class NotificationSettingsPresenter(
         var refreshPushProvider by remember { mutableIntStateOf(0) }
 
         LaunchedEffect(refreshPushProvider) {
-            val p = pushService.getCurrentPushProvider()
+            val p = pushService.getCurrentPushProvider(matrixClient.sessionId)
             val distributor = p?.getCurrentDistributor(matrixClient.sessionId)
             currentDistributor = if (distributor != null) {
                 AsyncData.Success(distributor)
@@ -129,7 +133,7 @@ class NotificationSettingsPresenter(
                 )
         }
 
-        fun handleEvents(event: NotificationSettingsEvents) {
+        fun handleEvent(event: NotificationSettingsEvents) {
             when (event) {
                 is NotificationSettingsEvents.SetAtRoomNotificationsEnabled -> {
                     localCoroutineScope.setAtRoomNotificationsEnabled(event.enabled, changeNotificationSettingAction)
@@ -140,7 +144,7 @@ class NotificationSettingsPresenter(
                 is NotificationSettingsEvents.SetInviteForMeNotificationsEnabled -> {
                     localCoroutineScope.setInviteForMeNotificationsEnabled(event.enabled, changeNotificationSettingAction)
                 }
-                is NotificationSettingsEvents.SetNotificationsEnabled -> localCoroutineScope.setNotificationsEnabled(userPushStore, event.enabled)
+                is NotificationSettingsEvents.SetNotificationsEnabled -> sessionCoroutineScope.setNotificationsEnabled(userPushStore, event.enabled)
                 NotificationSettingsEvents.ClearConfigurationMismatchError -> {
                     matrixSettings.value = NotificationSettingsState.MatrixSettings.Invalid(fixFailed = false)
                 }
@@ -167,7 +171,7 @@ class NotificationSettingsPresenter(
             availablePushDistributors = availableDistributors,
             showChangePushProviderDialog = showChangePushProviderDialog,
             fullScreenIntentPermissionsState = key(refreshFullScreenIntentSettings) { fullScreenIntentPermissionsPresenter.present() },
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -261,5 +265,10 @@ class NotificationSettingsPresenter(
 
     private fun CoroutineScope.setNotificationsEnabled(userPushStore: UserPushStore, enabled: Boolean) = launch {
         userPushStore.setNotificationEnabledForDevice(enabled)
+        if (enabled) {
+            pushService.ensurePusherIsRegistered(matrixClient)
+        } else {
+            pushService.getCurrentPushProvider(matrixClient.sessionId)?.unregister(matrixClient)
+        }
     }
 }
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 a7a1bf9192..0a55909e2c 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
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.runtime.Immutable
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
@@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.pushproviders.api.Distributor
 import kotlinx.collections.immutable.ImmutableList
 
-@Immutable
 data class NotificationSettingsState(
     val matrixSettings: MatrixSettings,
     val appSettings: AppSettings,
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 0b46328b9b..fb396443c3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 26b2de590e..09f54b7027 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/SystemNotificationsEnabledProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/SystemNotificationsEnabledProvider.kt
index 8dc8b3d2bd..a21dbb1bf2 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/SystemNotificationsEnabledProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/SystemNotificationsEnabledProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.preferences.impl.notifications
 import androidx.core.app.NotificationManagerCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 
 interface SystemNotificationsEnabledProvider {
@@ -19,7 +19,6 @@ interface SystemNotificationsEnabledProvider {
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSystemNotificationsEnabledProvider(
     private val notificationManager: NotificationManagerCompat,
 ) : SystemNotificationsEnabledProvider {
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 a8431e70b5..f7fc251eeb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ccba221d9a..96097983c9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 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
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -29,27 +30,23 @@ class EditDefaultNotificationSettingNode(
     presenterFactory: EditDefaultNotificationSettingPresenter.Factory
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun openRoomNotificationSettings(roomId: RoomId)
+        fun navigateToRoomNotificationSettings(roomId: RoomId)
     }
 
     data class Inputs(
         val isOneToOne: Boolean
     ) : NodeInputs
 
+    private val callback: Callback = callback()
     private val inputs = inputs<Inputs>()
-    private val callbacks = plugins<Callback>()
     private val presenter = presenterFactory.create(inputs.isOneToOne)
 
-    private fun openRoomNotificationSettings(roomId: RoomId) {
-        callbacks.forEach { it.openRoomNotificationSettings(roomId) }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         EditDefaultNotificationSettingView(
             state = state,
-            openRoomNotificationSettings = { openRoomNotificationSettings(it) },
+            openRoomNotificationSettings = callback::navigateToRoomNotificationSettings,
             onBackClick = ::navigateUp,
             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 25b062827f..df5247188a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,6 +23,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingStateNoSuccess
 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.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
@@ -48,6 +50,10 @@ class EditDefaultNotificationSettingPresenter(
         fun create(oneToOne: Boolean): EditDefaultNotificationSettingPresenter
     }
 
+    private val collator = Collator.getInstance().apply {
+        decomposition = Collator.CANONICAL_DECOMPOSITION
+    }
+
     @Composable
     override fun present(): EditDefaultNotificationSettingState {
         var displayMentionsOnlyDisclaimer by remember { mutableStateOf(false) }
@@ -70,7 +76,7 @@ class EditDefaultNotificationSettingPresenter(
             displayMentionsOnlyDisclaimer = !notificationSettingsService.canHomeServerPushEncryptedEventsToDevice().getOrDefault(true)
         }
 
-        fun handleEvents(event: EditDefaultNotificationSettingStateEvents) {
+        fun handleEvent(event: EditDefaultNotificationSettingStateEvents) {
             when (event) {
                 is EditDefaultNotificationSettingStateEvents.SetNotificationMode -> {
                     localCoroutineScope.setDefaultNotificationMode(event.mode, changeNotificationSettingAction)
@@ -85,7 +91,7 @@ class EditDefaultNotificationSettingPresenter(
             roomsWithUserDefinedMode = roomsWithUserDefinedMode.value.toImmutableList(),
             changeNotificationSettingAction = changeNotificationSettingAction.value,
             displayMentionsOnlyDisclaimer = displayMentionsOnlyDisclaimer,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -120,10 +126,10 @@ class EditDefaultNotificationSettingPresenter(
         summaries: List<RoomSummary>,
         roomsWithUserDefinedMode: MutableState<List<EditNotificationSettingRoomInfo>>
     ) {
-        val roomWithUserDefinedRules: Set<String> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrDefault(emptyList()).toSet()
+        val roomWithUserDefinedRules: Set<RoomId> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrDefault(emptyList()).toSet()
         roomsWithUserDefinedMode.value = summaries
             .filter { roomSummary ->
-                roomWithUserDefinedRules.contains(roomSummary.roomId.value) && roomSummary.isOneToOne == isOneToOne
+                roomWithUserDefinedRules.contains(roomSummary.roomId) && roomSummary.isOneToOne == isOneToOne
             }
             .map { roomSummary ->
                 EditNotificationSettingRoomInfo(
@@ -137,7 +143,12 @@ class EditDefaultNotificationSettingPresenter(
                 )
             }
             // locale sensitive sorting
-            .sortedWith(compareBy(Collator.getInstance()) { roomSummary -> roomSummary.name })
+            .sortedWith(
+                compareBy(collator) { roomSummary ->
+                    // Collator does not handle null values, so we provide a fallback
+                    roomSummary.name ?: roomSummary.roomId.value
+                }
+            )
     }
 
     private fun CoroutineScope.setDefaultNotificationMode(mode: RoomNotificationMode, action: MutableState<AsyncAction<Unit>>) = launch {
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingState.kt
index 2689850571..17c8cad95c 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateEvents.kt
index 5287b27d85..a7993c118a 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt
index 7a8fcea628..389554d2e0 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f38e59355c..3b46ae737e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditNotificationSettingRoomInfo.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditNotificationSettingRoomInfo.kt
index 53c25eb263..daed0771b3 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditNotificationSettingRoomInfo.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditNotificationSettingRoomInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/PreferencesRootEvents.kt
index 87074ec7f9..be266869be 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/PreferencesRootEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 67d50a76f0..6b54a763af 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
@@ -22,6 +22,7 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.logout.api.direct.DirectLogoutEvents
 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.matrix.api.user.MatrixUser
 
@@ -34,53 +35,24 @@ class PreferencesRootNode(
     private val directLogoutView: DirectLogoutView,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onAddAccount()
-        fun onOpenBugReport()
-        fun onSecureBackupClick()
-        fun onOpenAnalytics()
-        fun onOpenAbout()
-        fun onOpenDeveloperSettings()
-        fun onOpenNotificationSettings()
-        fun onOpenLockScreenSettings()
-        fun onOpenAdvancedSettings()
-        fun onOpenLabs()
-        fun onOpenUserProfile(matrixUser: MatrixUser)
-        fun onOpenBlockedUsers()
-        fun onSignOutClick()
-        fun onOpenAccountDeactivation()
+        fun navigateToAddAccount()
+        fun navigateToBugReport()
+        fun navigateToSecureBackup()
+        fun navigateToAnalyticsSettings()
+        fun navigateToAbout()
+        fun navigateToDeveloperSettings()
+        fun navigateToNotificationSettings()
+        fun navigateToLockScreenSettings()
+        fun navigateToAdvancedSettings()
+        fun navigateToLabs()
+        fun navigateToLinkNewDevice()
+        fun navigateToUserProfile(matrixUser: MatrixUser)
+        fun navigateToBlockedUsers()
+        fun startSignOutFlow()
+        fun startAccountDeactivationFlow()
     }
 
-    private fun onAddAccount() {
-        plugins<Callback>().forEach { it.onAddAccount() }
-    }
-
-    private fun onOpenBugReport() {
-        plugins<Callback>().forEach { it.onOpenBugReport() }
-    }
-
-    private fun onSecureBackupClick() {
-        plugins<Callback>().forEach { it.onSecureBackupClick() }
-    }
-
-    private fun onOpenDeveloperSettings() {
-        plugins<Callback>().forEach { it.onOpenDeveloperSettings() }
-    }
-
-    private fun onOpenAdvancedSettings() {
-        plugins<Callback>().forEach { it.onOpenAdvancedSettings() }
-    }
-
-    private fun onOpenLabs() {
-        plugins<Callback>().forEach { it.onOpenLabs() }
-    }
-
-    private fun onOpenAnalytics() {
-        plugins<Callback>().forEach { it.onOpenAnalytics() }
-    }
-
-    private fun onOpenAbout() {
-        plugins<Callback>().forEach { it.onOpenAbout() }
-    }
+    private val callback: Callback = callback()
 
     private fun onManageAccountClick(
         activity: Activity,
@@ -96,30 +68,6 @@ class PreferencesRootNode(
         }
     }
 
-    private fun onOpenNotificationSettings() {
-        plugins<Callback>().forEach { it.onOpenNotificationSettings() }
-    }
-
-    private fun onOpenLockScreenSettings() {
-        plugins<Callback>().forEach { it.onOpenLockScreenSettings() }
-    }
-
-    private fun onOpenUserProfile(matrixUser: MatrixUser) {
-        plugins<Callback>().forEach { it.onOpenUserProfile(matrixUser) }
-    }
-
-    private fun onOpenBlockedUsers() {
-        plugins<Callback>().forEach { it.onOpenBlockedUsers() }
-    }
-
-    private fun onSignOutClick() {
-        plugins<Callback>().forEach { it.onSignOutClick() }
-    }
-
-    private fun onOpenAccountDeactivation() {
-        plugins<Callback>().forEach { it.onOpenAccountDeactivation() }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
@@ -129,27 +77,28 @@ class PreferencesRootNode(
             state = state,
             modifier = modifier,
             onBackClick = this::navigateUp,
-            onAddAccountClick = this::onAddAccount,
-            onOpenRageShake = this::onOpenBugReport,
-            onOpenAnalytics = this::onOpenAnalytics,
-            onOpenAbout = this::onOpenAbout,
-            onSecureBackupClick = this::onSecureBackupClick,
-            onOpenDeveloperSettings = this::onOpenDeveloperSettings,
-            onOpenAdvancedSettings = this::onOpenAdvancedSettings,
-            onOpenLabs = this::onOpenLabs,
+            onAddAccountClick = callback::navigateToAddAccount,
+            onOpenRageShake = callback::navigateToBugReport,
+            onOpenAnalytics = callback::navigateToAnalyticsSettings,
+            onOpenAbout = callback::navigateToAbout,
+            onSecureBackupClick = callback::navigateToSecureBackup,
+            onOpenDeveloperSettings = callback::navigateToDeveloperSettings,
+            onOpenAdvancedSettings = callback::navigateToAdvancedSettings,
+            onOpenLabs = callback::navigateToLabs,
+            onLinkNewDeviceClick = callback::navigateToLinkNewDevice,
             onManageAccountClick = { onManageAccountClick(activity, it, isDark) },
-            onOpenNotificationSettings = this::onOpenNotificationSettings,
-            onOpenLockScreenSettings = this::onOpenLockScreenSettings,
-            onOpenUserProfile = this::onOpenUserProfile,
-            onOpenBlockedUsers = this::onOpenBlockedUsers,
+            onOpenNotificationSettings = callback::navigateToNotificationSettings,
+            onOpenLockScreenSettings = callback::navigateToLockScreenSettings,
+            onOpenUserProfile = callback::navigateToUserProfile,
+            onOpenBlockedUsers = callback::navigateToBlockedUsers,
             onSignOutClick = {
                 if (state.directLogoutState.canDoDirectSignOut) {
                     state.directLogoutState.eventSink(DirectLogoutEvents.Logout(ignoreSdkError = false))
                 } else {
-                    onSignOutClick()
+                    callback.startSignOutFlow()
                 }
             },
-            onDeactivateClick = this::onOpenAccountDeactivation
+            onDeactivateClick = callback::startAccountDeactivationFlow
         )
 
         directLogoutView.Render(state = state.directLogoutState)
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 3da72f982e..1e056c0bf0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -68,6 +69,9 @@ class PreferencesRootPresenter(
         val isMultiAccountEnabled by remember {
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.MultiAccount)
         }.collectAsState(initial = false)
+        val showLinkNewDevice by remember {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.QrCodeLogin)
+        }.collectAsState(initial = false)
 
         val otherSessions by remember {
             sessionStore.sessionsFlow().map { list ->
@@ -112,7 +116,7 @@ class PreferencesRootPresenter(
                 .launchIn(this)
         }
 
-        val showLabsItem = remember { featureFlagService.getAvailableFeatures().any { it.isInLabs && !it.isFinished } }
+        val showLabsItem = remember { featureFlagService.getAvailableFeatures(isInLabs = true).isNotEmpty() }
 
         val directLogoutState = directLogoutPresenter.present()
 
@@ -145,6 +149,7 @@ class PreferencesRootPresenter(
             devicesManagementUrl = devicesManagementUrl.value,
             showAnalyticsSettings = hasAnalyticsProviders,
             canReportBug = canReportBug,
+            showLinkNewDevice = showLinkNewDevice,
             showDeveloperSettings = showDeveloperSettings,
             canDeactivateAccount = canDeactivateAccount,
             showBlockedUsersItem = showBlockedUsersItem,
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 3df13e0efd..d637ae6c87 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,6 +25,7 @@ data class PreferencesRootState(
     val accountManagementUrl: String?,
     val devicesManagementUrl: String?,
     val canReportBug: Boolean,
+    val showLinkNewDevice: Boolean,
     val showAnalyticsSettings: Boolean,
     val showDeveloperSettings: Boolean,
     val canDeactivateAccount: Boolean,
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 ab30d07bcf..b8d1f1c2b6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -30,6 +31,7 @@ fun aPreferencesRootState(
     accountManagementUrl = "aUrl",
     devicesManagementUrl = "anOtherUrl",
     showAnalyticsSettings = true,
+    showLinkNewDevice = true,
     canReportBug = true,
     showDeveloperSettings = true,
     showBlockedUsersItem = true,
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 3b4d2d2670..5e3c9d6759 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -53,6 +54,7 @@ fun PreferencesRootView(
     onAddAccountClick: () -> Unit,
     onSecureBackupClick: () -> Unit,
     onManageAccountClick: (url: String) -> Unit,
+    onLinkNewDeviceClick: () -> Unit,
     onOpenAnalytics: () -> Unit,
     onOpenRageShake: () -> Unit,
     onOpenLockScreenSettings: () -> Unit,
@@ -100,6 +102,7 @@ fun PreferencesRootView(
         ManageAccountSection(
             state = state,
             onManageAccountClick = onManageAccountClick,
+            onLinkNewDeviceClick = onLinkNewDeviceClick,
             onOpenBlockedUsers = onOpenBlockedUsers
         )
 
@@ -192,8 +195,16 @@ private fun ColumnScope.ManageAppSection(
 private fun ColumnScope.ManageAccountSection(
     state: PreferencesRootState,
     onManageAccountClick: (url: String) -> Unit,
+    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)) },
@@ -352,6 +363,7 @@ private fun ContentToPreview(matrixUser: MatrixUser) {
         onOpenAbout = {},
         onSecureBackupClick = {},
         onManageAccountClick = {},
+        onLinkNewDeviceClick = {},
         onOpenNotificationSettings = {},
         onOpenLockScreenSettings = {},
         onOpenUserProfile = {},
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 ce65f62f37..52517b5ca2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.preferences.impl.root
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
@@ -19,7 +19,6 @@ interface VersionFormatter {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultVersionFormatter(
     private val stringProvider: StringProvider,
     private val buildMeta: BuildMeta,
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 50d9cf8798..6c26866e93 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.preferences.impl.tasks
 import android.content.Context
 import coil3.SingletonImageLoader
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.Provider
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.preferences.impl.DefaultCacheService
@@ -28,7 +28,6 @@ interface ClearCacheUseCase {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultClearCacheUseCase(
     @ApplicationContext private val context: Context,
     private val matrixClient: MatrixClient,
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt
index 10b1748590..a7ac97c000 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ComputeCacheSizeUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.preferences.impl.tasks
 
 import android.content.Context
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.file.getSizeOfFiles
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -23,7 +23,6 @@ interface ComputeCacheSizeUseCase {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultComputeCacheSizeUseCase(
     @ApplicationContext private val context: Context,
     private val matrixClient: MatrixClient,
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/VacuumStoresUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/VacuumStoresUseCase.kt
new file mode 100644
index 0000000000..1d0de56f09
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/VacuumStoresUseCase.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.preferences.impl.tasks
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.MatrixClient
+import timber.log.Timber
+
+fun interface VacuumStoresUseCase {
+    suspend operator fun invoke()
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultVacuumStoresUseCase(
+    private val matrixClient: MatrixClient,
+) : VacuumStoresUseCase {
+    override suspend fun invoke() {
+        matrixClient.performDatabaseVacuum()
+            .onFailure { Timber.e(it, "Failed to vacuum stores") }
+    }
+}
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 8b4a2dd21a..a9066dcd73 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvent.kt
similarity index 57%
rename from features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt
rename to features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvent.kt
index e42de507b0..d88eb75963 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,9 +10,10 @@ package io.element.android.features.preferences.impl.user.editprofile
 
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 
-sealed interface EditUserProfileEvents {
-    data class HandleAvatarAction(val action: AvatarAction) : EditUserProfileEvents
-    data class UpdateDisplayName(val name: String) : EditUserProfileEvents
-    data object Save : EditUserProfileEvents
-    data object CancelSaveChanges : EditUserProfileEvents
+sealed interface EditUserProfileEvent {
+    data class HandleAvatarAction(val action: AvatarAction) : EditUserProfileEvent
+    data class UpdateDisplayName(val name: String) : EditUserProfileEvent
+    data object Exit : EditUserProfileEvent
+    data object Save : EditUserProfileEvent
+    data object CloseDialog : EditUserProfileEvent
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt
new file mode 100644
index 0000000000..2935bce747
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNavigator.kt
@@ -0,0 +1,12 @@
+/*
+ * 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.preferences.impl.user.editprofile
+
+interface EditUserProfileNavigator {
+    fun close()
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
index d691508427..2303abb06e 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ 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
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -26,22 +28,32 @@ class EditUserProfileNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     presenterFactory: EditUserProfilePresenter.Factory,
-) : Node(buildContext, plugins = plugins) {
+) : Node(buildContext, plugins = plugins),
+    EditUserProfileNavigator {
     data class Inputs(
         val matrixUser: MatrixUser
     ) : NodeInputs
 
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
     val matrixUser = inputs<Inputs>().matrixUser
-    val presenter = presenterFactory.create(matrixUser)
+    val callback: Callback = callback()
+    val presenter = presenterFactory.create(
+        matrixUser = matrixUser,
+        navigator = this,
+    )
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         EditUserProfileView(
             state = state,
-            onBackClick = ::navigateUp,
-            onEditProfileSuccess = ::navigateUp,
+            onEditProfileSuccess = ::close,
             modifier = modifier
         )
     }
+
+    override fun close() = callback.onDone()
 }
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 0cd0144986..bddae2fffb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,7 +35,7 @@ import io.element.android.libraries.matrix.ui.media.AvatarAction
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -44,6 +45,7 @@ import timber.log.Timber
 @AssistedInject
 class EditUserProfilePresenter(
     @Assisted private val matrixUser: MatrixUser,
+    @Assisted private val navigator: EditUserProfileNavigator,
     private val matrixClient: MatrixClient,
     private val mediaPickerProvider: PickerProvider,
     private val mediaPreProcessor: MediaPreProcessor,
@@ -56,27 +58,30 @@ class EditUserProfilePresenter(
 
     @AssistedFactory
     interface Factory {
-        fun create(matrixUser: MatrixUser): EditUserProfilePresenter
+        fun create(
+            matrixUser: MatrixUser,
+            navigator: EditUserProfileNavigator,
+        ): EditUserProfilePresenter
     }
 
     @Composable
     override fun present(): EditUserProfileState {
         val cameraPermissionState = cameraPermissionPresenter.present()
-        var userAvatarUri by rememberSaveable { mutableStateOf(matrixUser.avatarUrl?.toUri()) }
+        var userAvatarUri by rememberSaveable { mutableStateOf(matrixUser.avatarUrl) }
         var userDisplayName by rememberSaveable { mutableStateOf(matrixUser.displayName) }
         val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker(
             onResult = { uri ->
                 if (uri != null) {
-                    temporaryUriDeleter.delete(userAvatarUri)
-                    userAvatarUri = uri
+                    temporaryUriDeleter.delete(userAvatarUri?.toUri())
+                    userAvatarUri = uri.toString()
                 }
             }
         )
         val galleryImagePicker = mediaPickerProvider.registerGalleryImagePicker(
             onResult = { uri ->
                 if (uri != null) {
-                    temporaryUriDeleter.delete(userAvatarUri)
-                    userAvatarUri = uri
+                    temporaryUriDeleter.delete(userAvatarUri?.toUri())
+                    userAvatarUri = uri.toString()
                 }
             }
         )
@@ -100,36 +105,62 @@ class EditUserProfilePresenter(
 
         val saveAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val localCoroutineScope = rememberCoroutineScope()
-        fun handleEvents(event: EditUserProfileEvents) {
+
+        val canSave = remember(userDisplayName, userAvatarUri) {
+            val hasProfileChanged = hasDisplayNameChanged(userDisplayName, matrixUser) ||
+                hasAvatarUrlChanged(userAvatarUri, matrixUser)
+            !userDisplayName.isNullOrBlank() && hasProfileChanged
+        }
+
+        fun handleEvent(event: EditUserProfileEvent) {
             when (event) {
-                is EditUserProfileEvents.Save -> localCoroutineScope.saveChanges(userDisplayName, userAvatarUri, matrixUser, saveAction)
-                is EditUserProfileEvents.HandleAvatarAction -> {
+                is EditUserProfileEvent.Save -> localCoroutineScope.saveChanges(
+                    name = userDisplayName,
+                    avatarUri = userAvatarUri?.toUri(),
+                    currentUser = matrixUser,
+                    action = saveAction,
+                )
+                is EditUserProfileEvent.HandleAvatarAction -> {
                     when (event.action) {
                         AvatarAction.ChoosePhoto -> galleryImagePicker.launch()
                         AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
                             cameraPhotoPicker.launch()
                         } else {
                             pendingPermissionRequest = true
-                            cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
+                            cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
                         }
                         AvatarAction.Remove -> {
-                            temporaryUriDeleter.delete(userAvatarUri)
+                            temporaryUriDeleter.delete(userAvatarUri?.toUri())
                             userAvatarUri = null
                         }
                     }
                 }
-
-                is EditUserProfileEvents.UpdateDisplayName -> userDisplayName = event.name
-                EditUserProfileEvents.CancelSaveChanges -> saveAction.value = AsyncAction.Uninitialized
+                is EditUserProfileEvent.UpdateDisplayName -> userDisplayName = event.name
+                EditUserProfileEvent.Exit -> {
+                    when (saveAction.value) {
+                        is AsyncAction.Confirming -> {
+                            // Close the dialog right now
+                            saveAction.value = AsyncAction.Uninitialized
+                            navigator.close()
+                        }
+                        AsyncAction.Loading -> Unit
+                        is AsyncAction.Failure,
+                        is AsyncAction.Success -> {
+                            // Should not happen
+                        }
+                        AsyncAction.Uninitialized -> {
+                            if (canSave) {
+                                saveAction.value = AsyncAction.ConfirmingCancellation
+                            } else {
+                                navigator.close()
+                            }
+                        }
+                    }
+                }
+                EditUserProfileEvent.CloseDialog -> saveAction.value = AsyncAction.Uninitialized
             }
         }
 
-        val canSave = remember(userDisplayName, userAvatarUri) {
-            val hasProfileChanged = hasDisplayNameChanged(userDisplayName, matrixUser) ||
-                hasAvatarUrlChanged(userAvatarUri, matrixUser)
-            !userDisplayName.isNullOrBlank() && hasProfileChanged
-        }
-
         return EditUserProfileState(
             userId = matrixUser.userId,
             displayName = userDisplayName.orEmpty(),
@@ -138,16 +169,15 @@ class EditUserProfilePresenter(
             saveButtonEnabled = canSave && saveAction.value !is AsyncAction.Loading,
             saveAction = saveAction.value,
             cameraPermissionState = cameraPermissionState,
-            eventSink = { handleEvents(it) },
+            eventSink = ::handleEvent,
         )
     }
 
     private fun hasDisplayNameChanged(name: String?, currentUser: MatrixUser) =
         name?.trim() != currentUser.displayName?.trim()
 
-    private fun hasAvatarUrlChanged(avatarUri: Uri?, currentUser: MatrixUser) =
-        // Need to call `toUri()?.toString()` to make the test pass (we mockk Uri)
-        avatarUri?.toString()?.trim() != currentUser.avatarUrl?.toUri()?.toString()?.trim()
+    private fun hasAvatarUrlChanged(avatarUri: String?, currentUser: MatrixUser) =
+        avatarUri?.trim() != currentUser.avatarUrl?.trim()
 
     private fun CoroutineScope.saveChanges(
         name: String?,
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 5d3bd1baee..a638ed8378 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
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.user.editprofile
 
-import android.net.Uri
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.media.AvatarAction
@@ -17,10 +17,10 @@ import kotlinx.collections.immutable.ImmutableList
 data class EditUserProfileState(
     val userId: UserId,
     val displayName: String,
-    val userAvatarUrl: Uri?,
+    val userAvatarUrl: String?,
     val avatarActions: ImmutableList<AvatarAction>,
     val saveButtonEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
     val cameraPermissionState: PermissionsState,
-    val eventSink: (EditUserProfileEvents) -> Unit
+    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 0e4c1b4f2d..ca9571aea5 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
@@ -1,38 +1,46 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.user.editprofile
 
-import android.net.Uri
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import androidx.core.net.toUri
 import io.element.android.libraries.architecture.AsyncAction
 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
 import io.element.android.libraries.permissions.api.aPermissionsState
-import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 
 open class EditUserProfileStateProvider : PreviewParameterProvider<EditUserProfileState> {
     override val values: Sequence<EditUserProfileState>
         get() = sequenceOf(
             aEditUserProfileState(),
-            aEditUserProfileState(userAvatarUrl = "example://uri".toUri()),
-            // Add other states here
+            aEditUserProfileState(userAvatarUrl = "example://uri"),
+            aEditUserProfileState(saveAction = AsyncAction.ConfirmingCancellation),
         )
 }
 
 fun aEditUserProfileState(
-    userAvatarUrl: Uri? = null,
+    userId: UserId = UserId("@john.doe:matrix.org"),
+    displayName: String = "John Doe",
+    userAvatarUrl: String? = null,
+    avatarActions: List<AvatarAction> = emptyList(),
+    saveButtonEnabled: Boolean = true,
+    saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    cameraPermissionState: PermissionsState = aPermissionsState(showDialog = false),
+    eventSink: (EditUserProfileEvent) -> Unit = {},
 ) = EditUserProfileState(
-    userId = UserId("@john.doe:matrix.org"),
-    displayName = "John Doe",
+    userId = userId,
+    displayName = displayName,
     userAvatarUrl = userAvatarUrl,
-    avatarActions = persistentListOf(),
-    saveAction = AsyncAction.Uninitialized,
-    saveButtonEnabled = true,
-    cameraPermissionState = aPermissionsState(showDialog = false),
-    eventSink = {}
+    avatarActions = avatarActions.toImmutableList(),
+    saveButtonEnabled = saveButtonEnabled,
+    saveAction = saveAction,
+    cameraPermissionState = cameraPermissionState,
+    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 00581745ce..5b42440101 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.user.editprofile
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -29,11 +31,13 @@ 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.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 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.components.dialogs.SaveChangesDialog
 import io.element.android.libraries.designsystem.modifiers.clearFocusOnTap
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -51,7 +55,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun EditUserProfileView(
     state: EditUserProfileState,
-    onBackClick: () -> Unit,
     onEditProfileSuccess: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -63,19 +66,28 @@ fun EditUserProfileView(
         isAvatarActionsSheetVisible.value = true
     }
 
+    fun onBackClick() {
+        focusManager.clearFocus()
+        state.eventSink(EditUserProfileEvent.Exit)
+    }
+
+    BackHandler(
+        enabled = true,
+        ::onBackClick,
+    )
     Scaffold(
         modifier = modifier.clearFocusOnTap(focusManager),
         topBar = {
             TopAppBar(
                 titleStr = stringResource(R.string.screen_edit_profile_title),
-                navigationIcon = { BackButton(onClick = onBackClick) },
+                navigationIcon = { BackButton(::onBackClick) },
                 actions = {
                     TextButton(
                         text = stringResource(CommonStrings.action_save),
                         enabled = state.saveButtonEnabled,
                         onClick = {
                             focusManager.clearFocus()
-                            state.eventSink(EditUserProfileEvents.Save)
+                            state.eventSink(EditUserProfileEvent.Save)
                         },
                     )
                 }
@@ -113,7 +125,7 @@ fun EditUserProfileView(
                 value = state.displayName,
                 placeholder = stringResource(CommonStrings.common_room_name_placeholder),
                 singleLine = true,
-                onValueChange = { state.eventSink(EditUserProfileEvents.UpdateDisplayName(it)) },
+                onValueChange = { state.eventSink(EditUserProfileEvent.UpdateDisplayName(it)) },
             )
         }
 
@@ -121,7 +133,7 @@ fun EditUserProfileView(
             actions = state.avatarActions,
             isVisible = isAvatarActionsSheetVisible.value,
             onDismiss = { isAvatarActionsSheetVisible.value = false },
-            onSelectAction = { state.eventSink(EditUserProfileEvents.HandleAvatarAction(it)) }
+            onSelectAction = { state.eventSink(EditUserProfileEvent.HandleAvatarAction(it)) }
         )
 
         AsyncActionView(
@@ -131,10 +143,21 @@ fun EditUserProfileView(
                     progressText = stringResource(R.string.screen_edit_profile_updating_details),
                 )
             },
+            confirmationDialog = { confirming ->
+                when (confirming) {
+                    is AsyncAction.ConfirmingCancellation -> {
+                        SaveChangesDialog(
+                            onSaveClick = { state.eventSink(EditUserProfileEvent.Save) },
+                            onDiscardClick = { state.eventSink(EditUserProfileEvent.Exit) },
+                            onDismiss = { state.eventSink(EditUserProfileEvent.CloseDialog) },
+                        )
+                    }
+                }
+            },
             onSuccess = { onEditProfileSuccess() },
             errorTitle = { stringResource(R.string.screen_edit_profile_error_title) },
             errorMessage = { stringResource(R.string.screen_edit_profile_error) },
-            onErrorDismiss = { state.eventSink(EditUserProfileEvents.CancelSaveChanges) },
+            onErrorDismiss = { state.eventSink(EditUserProfileEvent.CloseDialog) },
         )
     }
     PermissionsView(
@@ -147,7 +170,6 @@ fun EditUserProfileView(
 internal fun EditUserProfileViewPreview(@PreviewParameter(EditUserProfileStateProvider::class) state: EditUserProfileState) =
     ElementPreview {
         EditUserProfileView(
-            onBackClick = {},
             onEditProfileSuccess = {},
             state = state,
         )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/utils/ShowDeveloperSettingsProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/utils/ShowDeveloperSettingsProvider.kt
index d87b205d5e..b0cfea07d4 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/utils/ShowDeveloperSettingsProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/utils/ShowDeveloperSettingsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bfcab248c6..704bcc256d 100644
--- a/features/preferences/impl/src/main/res/values-bg/translations.xml
+++ b/features/preferences/impl/src/main/res/values-bg/translations.xml
@@ -4,6 +4,7 @@
   <string name="screen_advanced_settings_developer_mode">"Режим за програмисти"</string>
   <string name="screen_advanced_settings_developer_mode_description">"Активирайте, за да имате достъп до функции и функционалности за програмисти."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_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_moderation_and_safety_section_title">"Модерация и безопасност"</string>
@@ -27,6 +28,9 @@
   <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_header_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_configuration_mismatch">"Несъответствие в конфигурацията"</string>
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 9fe8715cc3..0127a98b41 100644
--- a/features/preferences/impl/src/main/res/values-cs/translations.xml
+++ b/features/preferences/impl/src/main/res/values-cs/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Neplatné URL, ujistěte se, že jste uvedli protokol (http/https) a správnou adresu."</string>
   <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_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>
@@ -43,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Nelze aktualizovat profil"</string>
   <string name="screen_edit_profile_title">"Upravit profil"</string>
   <string name="screen_edit_profile_updating_details">"Aktualizace profilu…"</string>
+  <string name="screen_labs_enable_threads">"Povolit odpovědi ve vlákně"</string>
+  <string name="screen_labs_enable_threads_description">"Aplikace se restartuje, aby se tato změna projevila."</string>
+  <string name="screen_labs_header_description">"Vyzkoušejte naše nejnovější nápady, které jsou ve vývoji. Tyto funkce nejsou finalizované; mohou být nestabilní a mohou se změnit."</string>
+  <string name="screen_labs_header_title">"Máte chuť experimentovat?"</string>
+  <string name="screen_labs_title">"Experimentální funkce"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Další nastavení"</string>
   <string name="screen_notification_settings_calls_label">"Halsové a video hovory"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Neshoda konfigurace"</string>
diff --git a/features/preferences/impl/src/main/res/values-en-rUS/translations.xml b/features/preferences/impl/src/main/res/values-en-rUS/translations.xml
index b1f615e697..9f69227bec 100644
--- a/features/preferences/impl/src/main/res/values-en-rUS/translations.xml
+++ b/features/preferences/impl/src/main/res/values-en-rUS/translations.xml
@@ -3,4 +3,5 @@
   <string name="screen_advanced_settings_media_compression_title">"Optimize media quality"</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Automatically optimize images for faster uploads and smaller file sizes."</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Optimize image upload quality"</string>
+  <string name="screen_labs_header_description">"Try out our latest ideas in development. These features are not finalized; they may be unstable, may change."</string>
 </resources>
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 9b2f04a9f7..4e7ba1c26e 100644
--- a/features/preferences/impl/src/main/res/values-et/translations.xml
+++ b/features/preferences/impl/src/main/res/values-et/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Vigane url. Palun vaata, et url algaks protokolliga (http/https) ning aadress ise oleks ka õige."</string>
   <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_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>
@@ -43,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Profiili uuendamine ei õnnestunud"</string>
   <string name="screen_edit_profile_title">"Muuda profiili"</string>
   <string name="screen_edit_profile_updating_details">"Profiil on muutmisel…"</string>
+  <string name="screen_labs_enable_threads">"Võta kasutusele vastamine jutulõngas"</string>
+  <string name="screen_labs_enable_threads_description">"Selle muudatuse jõustamiseks käivitub rakendus uuesti."</string>
+  <string name="screen_labs_header_description">"Katseta meie uusimaid arendusideid. Need funktsionaalsused pole veel lõplikud, nad ei pruugi toimida parimal viisil ning võivad veel muutuda."</string>
+  <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_calls_label">"Hääl- ja videokõned"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Eelistused ei sobi omavahel"</string>
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 22ff843dc2..05e73febb4 100644
--- a/features/preferences/impl/src/main/res/values-fa/translations.xml
+++ b/features/preferences/impl/src/main/res/values-fa/translations.xml
@@ -9,8 +9,13 @@
   <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_title">"بهینه سازی کیفیت رسانه"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"نظارت و امنیت"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"زیاد (۱۰۸۰ت)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"کم (۴۸۰ت)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"استاندارد (۷۲۰ت)"</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">"از کار انداختن ویرایشگر متن غنی یا نوشتن دستی مارک‌دون."</string>
   <string name="screen_advanced_settings_send_read_receipts">"رسید‌های خواندن"</string>
@@ -31,6 +36,7 @@
   <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_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_configuration_mismatch">"نامتطابقت در پیکربندی"</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
new file mode 100644
index 0000000000..250af33d49
--- /dev/null
+++ b/features/preferences/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,82 @@
+<?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">"Kako biste bili sigurni da nikada nećete propustiti važan poziv, promijenite postavke kako biste omogućili obavijesti preko cijelog zaslona kada je telefon zaključan."</string>
+  <string name="full_screen_intent_banner_title">"Poboljšajte svoje iskustvo poziva"</string>
+  <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"Odaberite kako želite primati obavijesti"</string>
+  <string name="screen_advanced_settings_developer_mode">"Način rada za razvojne inženjere"</string>
+  <string name="screen_advanced_settings_developer_mode_description">"Omogućite pristup značajkama i funkcionalnostima za razvojne inženjere."</string>
+  <string name="screen_advanced_settings_element_call_base_url">"Prilagođeni osnovni URL za Element Call"</string>
+  <string name="screen_advanced_settings_element_call_base_url_description">"Postavite prilagođeni osnovni URL za Element Call."</string>
+  <string name="screen_advanced_settings_element_call_base_url_validation_error">"Nevažeći URL; provjerite jeste li uključili protokol (http/https) i ispravnu adresu."</string>
+  <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_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>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Automatski optimizirajte slike za brži prijenos i manje veličine datoteka."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Optimiziraj kvalitetu prijenosa slika"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Ovdje dodirnite za promjenu."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Visoka (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Niska (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Standardna (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Kvaliteta prijenosa videozapisa"</string>
+  <string name="screen_advanced_settings_push_provider_android">"Pružatelj push obavijesti"</string>
+  <string name="screen_advanced_settings_rich_text_editor_description">"Onemogućite uređivač obogaćenog teksta kako biste ručno tipkali Markdown."</string>
+  <string name="screen_advanced_settings_send_read_receipts">"Potvrde o čitanju"</string>
+  <string name="screen_advanced_settings_send_read_receipts_description">"Ako je to isključeno, vaše potvrde o čitanju neće se slati nikome. I dalje ćete primati potvrde o čitanju od drugih korisnika."</string>
+  <string name="screen_advanced_settings_share_presence">"Podijeli prisutnost"</string>
+  <string name="screen_advanced_settings_share_presence_description">"Ako je to isključeno, nećete moći slati ili primati potvrde o čitanju ili obavijesti o tipkanju."</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"Uvijek sakrij"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"Uvijek prikaži"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"U privatnim sobama"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"Skriveni medij uvijek se može prikazati tako se da se dodirne"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"Prikaži medije na vremenskoj traci"</string>
+  <string name="screen_advanced_settings_view_source_description">"Omogući opciju za prikaz izvora poruke na vremenskoj traci."</string>
+  <string name="screen_blocked_users_empty">"Nemate blokiranih korisnika"</string>
+  <string name="screen_blocked_users_unblock_alert_action">"Odblokiraj"</string>
+  <string name="screen_blocked_users_unblock_alert_description">"Moći ćete ponovno vidjeti sve njihove poruke."</string>
+  <string name="screen_blocked_users_unblock_alert_title">"Odblokiraj korisnika"</string>
+  <string name="screen_blocked_users_unblocking">"Deblokiranje…"</string>
+  <string name="screen_edit_profile_display_name">"Ime za prikaz"</string>
+  <string name="screen_edit_profile_display_name_placeholder">"Vaše ime za prikaz"</string>
+  <string name="screen_edit_profile_error">"Došlo je do nepoznate pogreške i informacije se nisu mogle promijeniti."</string>
+  <string name="screen_edit_profile_error_title">"Nije moguće ažurirati profil"</string>
+  <string name="screen_edit_profile_title">"Uredi profil"</string>
+  <string name="screen_edit_profile_updating_details">"Ažuriranje profila…"</string>
+  <string name="screen_labs_enable_threads">"Omogući odgovore u nizu"</string>
+  <string name="screen_labs_enable_threads_description">"Aplikacija će se ponovno pokrenuti kako bi se primijenila ova promjena."</string>
+  <string name="screen_labs_header_description">"Isprobajte naše najnovije ideje u razvoju. Ove značajke nisu finalizirane; mogu biti nestabilne i mijenjati se."</string>
+  <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_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.
+
+Ako nastavite, neke od vaših postavki mogu se promijeniti."</string>
+  <string name="screen_notification_settings_direct_chats">"Izravni razgovori"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Prilagođena postavka po razgovoru"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Došlo je do pogreške prilikom ažuriranja postavke obavijesti."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Sve poruke"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Samo spominjanja i ključne riječi"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"U izravnim razgovorima obavijesti me za"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"U grupnim chatovima obavijesti me za"</string>
+  <string name="screen_notification_settings_enable_notifications">"Omogući obavijesti na ovom uređaju"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Konfiguracija nije ispravljena, pokušajte ponovno."</string>
+  <string name="screen_notification_settings_group_chats">"Grupni razgovori"</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_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_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="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>
+</resources>
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 9cc5a97a44..c588e60eaf 100644
--- a/features/preferences/impl/src/main/res/values-hu/translations.xml
+++ b/features/preferences/impl/src/main/res/values-hu/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Érvénytelen webcím, győződjön meg arról, hogy szerepel-e benne a protokoll (http/https), és hogy helyes-e a cím."</string>
   <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_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>
@@ -43,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Nem sikerült frissíteni a profilt"</string>
   <string name="screen_edit_profile_title">"Profil szerkesztése"</string>
   <string name="screen_edit_profile_updating_details">"Profil frissítése…"</string>
+  <string name="screen_labs_enable_threads">"Üzenetszál válaszok engedélyezése"</string>
+  <string name="screen_labs_enable_threads_description">"Az alkalmazás újraindul, hogy a változás érvénybe lépjen."</string>
+  <string name="screen_labs_header_description">"Próbálja ki legújabb fejlesztéseinket. Ezek a funkciók még nem véglegesek, instabilak lehetnek és változhatnak."</string>
+  <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_calls_label">"Hang- és videóhívások"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Konfigurációs eltérés"</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 0a37b0d394..a10dcc9594 100644
--- a/features/preferences/impl/src/main/res/values-it/translations.xml
+++ b/features/preferences/impl/src/main/res/values-it/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL non valido, assicurati di includere il protocollo (http/https) e l\'indirizzo corretto."</string>
   <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_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>
@@ -43,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Impossibile aggiornare il profilo"</string>
   <string name="screen_edit_profile_title">"Modifica profilo"</string>
   <string name="screen_edit_profile_updating_details">"Aggiornamento del profilo…"</string>
+  <string name="screen_labs_enable_threads">"Abilita le risposte alle discussioni"</string>
+  <string name="screen_labs_enable_threads_description">"L\'app si riavvierà per applicare questa modifica."</string>
+  <string name="screen_labs_header_description">"Prova le nostre ultime idee in fase di sviluppo. Queste funzionalità non sono definitive; potrebbero essere instabili e soggette a modifiche."</string>
+  <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_calls_label">"Chiamate audio e video"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Mancata corrispondenza di configurazione"</string>
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 8ae089b170..9e2c56e580 100644
--- a/features/preferences/impl/src/main/res/values-pl/translations.xml
+++ b/features/preferences/impl/src/main/res/values-pl/translations.xml
@@ -10,9 +10,17 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Nieprawidłowy adres URL, upewnij się, że zawiera protokół (http/https) i poprawny adres."</string>
   <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_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>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Automatycznie optymalizuj obrazy, aby szybciej je przesyłać i zmniejszać rozmiar plików."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Zoptymalizuj jakość przesyłania obrazów"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Dotknij tutaj, aby zmienić."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Wysoka (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Niska (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Standardowa (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Jakość przesyłania wideo"</string>
   <string name="screen_advanced_settings_push_provider_android">"Dostawca powiadomień push"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Wyłącz edytor tekstu bogatego, aby pisać tekst Markdown ręcznie."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Potwierdzenia odczytania"</string>
@@ -36,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Nie można zaktualizować profilu"</string>
   <string name="screen_edit_profile_title">"Edytuj profil"</string>
   <string name="screen_edit_profile_updating_details">"Aktualizuję profil…"</string>
+  <string name="screen_labs_enable_threads">"Włącz odpowiedzi w wątkach"</string>
+  <string name="screen_labs_enable_threads_description">"Aplikacja uruchomi się ponownie, aby zastosować tę zmianę."</string>
+  <string name="screen_labs_header_description">"Wypróbuj nasze najnowsze pomysły w fazie rozwoju. Funkcje te nie są jeszcze sfinalizowane; mogą być niestabilne i ulec zmianie."</string>
+  <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_calls_label">"Połączenia audio i wideo"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Niezgodność konfiguracji"</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 5b3e75e7ec..f6e1bc90ba 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
@@ -10,9 +10,17 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL inválida, por favor verifique se o protocolo (http/https) está incluso e o endereço correto."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Ocultar avatares em solicitações de convite para salas"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Ocultar pré-visualizações de mídia na linha do tempo"</string>
+  <string name="screen_advanced_settings_labs">"Experimentos"</string>
   <string name="screen_advanced_settings_media_compression_description">"Envie fotos e vídeos com mais rapidez e reduza o uso de dados"</string>
   <string name="screen_advanced_settings_media_compression_title">"Otimizar a qualidade da mídia"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderação e segurança"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Otimizar automaticamente as imagens para envios mais rápidos e arquivos com tamanhos menores."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Otimizar qualidade de envio de imagens"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Toque aqui para alterar."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Alta (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Baixa (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Normal (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Qualidade de envio de vídeos"</string>
   <string name="screen_advanced_settings_push_provider_android">"Provedor de notificações push"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Desative o editor de rich text para digitar Markdown manualmente."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Confirmações de leitura"</string>
@@ -36,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Não foi possível atualizar o perfil"</string>
   <string name="screen_edit_profile_title">"Editar perfil"</string>
   <string name="screen_edit_profile_updating_details">"Atualizando o perfil…"</string>
+  <string name="screen_labs_enable_threads">"Ativar respostas de tópicos"</string>
+  <string name="screen_labs_enable_threads_description">"O app será reiniciado para aplicar esta mudança."</string>
+  <string name="screen_labs_header_description">"Teste as nossas mais novas ideias em desenvolvimento. Esses recursos não estão finalizados; podem estar instáveis, e podem mudar."</string>
+  <string name="screen_labs_header_title">"Se sentindo experimental?"</string>
+  <string name="screen_labs_title">"Experimentos"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Configurações adicionais"</string>
   <string name="screen_notification_settings_calls_label">"Chamadas de áudio e vídeo"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Não correspondência de configuração"</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 6ac5a5d03c..7b2e1ebdb6 100644
--- a/features/preferences/impl/src/main/res/values-ru/translations.xml
+++ b/features/preferences/impl/src/main/res/values-ru/translations.xml
@@ -45,6 +45,7 @@
   <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>
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 f484a1aee0..9968c6d4cb 100644
--- a/features/preferences/impl/src/main/res/values-sk/translations.xml
+++ b/features/preferences/impl/src/main/res/values-sk/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Neplatná adresa URL, uistite sa, že ste uviedli protokol (http/https) a správnu adresu."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Skrytie profilové obrázky v žiadostiach o pozvánku do miestnosti"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Skryť ukážky médií na časovej osi"</string>
+  <string name="screen_advanced_settings_labs">"Laboratóriá"</string>
   <string name="screen_advanced_settings_media_compression_description">"Nahrávajte fotografie a videá rýchlejšie a znížte spotrebu dát"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimalizovať kvalitu médií"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderovanie a bezpečnosť"</string>
@@ -43,6 +44,11 @@
   <string name="screen_edit_profile_error_title">"Nepodarilo sa aktualizovať profil"</string>
   <string name="screen_edit_profile_title">"Upraviť profil"</string>
   <string name="screen_edit_profile_updating_details">"Aktualizácia profilu…"</string>
+  <string name="screen_labs_enable_threads">"Povoliť odpovede vo vlákne"</string>
+  <string name="screen_labs_enable_threads_description">"Aplikácia sa reštartuje, aby sa táto zmena prejavila."</string>
+  <string name="screen_labs_header_description">"Vyskúšajte naše najnovšie nápady vo vývoji. Tieto funkcie nie sú finalizované; môžu byť nestabilné a môžu sa zmeniť."</string>
+  <string name="screen_labs_header_title">"Máte chuť experimentovať?"</string>
+  <string name="screen_labs_title">"Laboratóriá"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Ďalšie nastavenia"</string>
   <string name="screen_notification_settings_calls_label">"Audio a video hovory"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Nezhoda konfigurácie"</string>
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 b01bd11fbd..82e9b24e98 100644
--- a/features/preferences/impl/src/main/res/values-uz/translations.xml
+++ b/features/preferences/impl/src/main/res/values-uz/translations.xml
@@ -8,14 +8,29 @@
   <string name="screen_advanced_settings_element_call_base_url">"Maxsus element qo‘ng‘iroqlar bazasi URL manzili"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"Element qo\'ng\'irog\'iga maxsus asosiy url or\'natish"</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL noto‘g‘ri, iltimos, protokol (http/https) va to‘g‘ri manzilni kiritganingizga ishonch hosil qiling."</string>
+  <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_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>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Tezroq yuklash va kichikroq fayl hajmi uchun rasmlarni avtomatik optimallashtirish."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Rasm yuklash sifatini optimallashtirish"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Oʻzgartirish uchun bu yerga bosing."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Yuqori (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Past (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Standart (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Video yuklash sifati"</string>
   <string name="screen_advanced_settings_push_provider_android">"Push bildirishnoma provayderi"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Boy matn muharriri o\'chiring Markdown bilan qo\'lda yozish uchun"</string>
   <string name="screen_advanced_settings_send_read_receipts">"Kvitansiyalarni oʻqish"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Agar oʻchirib qo‘yilsa, sizning oʻqilganlik bildirishnomangiz hech kimga yuborilmaydi. Siz boshqa foydalanuvchilardan oʻqilganlik bildirishnomalarini olishda davom etasiz."</string>
   <string name="screen_advanced_settings_share_presence">"Mavjudligini ulashish"</string>
   <string name="screen_advanced_settings_share_presence_description">"Agar oʻchirib qoʻyilsa, siz oʻqilganlik haqidagi bildirishnomalarni yoki yozayotganingiz haqidagi xabarlarni yubora olmaysiz va qabul qila olmaysiz."</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"Doim berkitilsin"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"Har doim ko‘rsatish"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"Shaxsiy xonalarda"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"Yashirin media har doim unga bosish orqali ko‘rsatilishi mumkin"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"Vaqt jadvalida media ko‘rsatish"</string>
   <string name="screen_advanced_settings_view_source_description">"Xabar manbasini vaqt jadvalida ko‘rish imkoniyatini yoqing."</string>
   <string name="screen_blocked_users_empty">"Sizda bloklangan foydalanuvchi yo‘q"</string>
   <string name="screen_blocked_users_unblock_alert_action">"Blokdan chiqarish"</string>
@@ -55,6 +70,7 @@ Davom ettirsangiz, baʼzi sozlamalaringiz oʻzgarishi mumkin."</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="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>
 </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 bda2b085a5..634911100a 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
@@ -10,6 +10,7 @@
   <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_moderation_and_safety_section_title">"管理與安全"</string>
@@ -43,6 +44,11 @@
   <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_calls_label">"音訊與視訊通話"</string>
   <string name="screen_notification_settings_configuration_mismatch">"組態錯誤"</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 7ac8952090..0c576b58b6 100644
--- a/features/preferences/impl/src/main/res/values-zh/translations.xml
+++ b/features/preferences/impl/src/main/res/values-zh/translations.xml
@@ -44,6 +44,10 @@
   <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_calls_label">"音视频通话"</string>
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
index 9e1bd70376..963d7846b4 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
@@ -1,27 +1,26 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.deactivation.api.AccountDeactivationEntryPoint
-import io.element.android.features.licenses.api.OpenSourceLicensesEntryPoint
-import io.element.android.features.lockscreen.api.LockScreenEntryPoint
-import io.element.android.features.logout.api.LogoutEntryPoint
+import io.element.android.features.deactivation.test.FakeAccountDeactivationEntryPoint
+import io.element.android.features.licenses.test.FakeOpenSourceLicensesEntryPoint
+import io.element.android.features.lockscreen.test.FakeLockScreenEntryPoint
+import io.element.android.features.logout.test.FakeLogoutEntryPoint
 import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.troubleshoot.api.NotificationTroubleShootEntryPoint
-import io.element.android.libraries.troubleshoot.api.PushHistoryEntryPoint
+import io.element.android.libraries.troubleshoot.test.FakeNotificationTroubleShootEntryPoint
+import io.element.android.libraries.troubleshoot.test.FakePushHistoryEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import org.junit.Rule
@@ -41,41 +40,31 @@ class DefaultPreferencesEntryPointTest {
             PreferencesFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                lockScreenEntryPoint = object : LockScreenEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext, navTarget: LockScreenEntryPoint.Target) = lambdaError()
-                    override fun pinUnlockIntent(context: Context) = lambdaError()
-                },
-                notificationTroubleShootEntryPoint = object : NotificationTroubleShootEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                pushHistoryEntryPoint = object : PushHistoryEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                logoutEntryPoint = object : LogoutEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                openSourceLicensesEntryPoint = object : OpenSourceLicensesEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                accountDeactivationEntryPoint = object : AccountDeactivationEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                lockScreenEntryPoint = FakeLockScreenEntryPoint(),
+                notificationTroubleShootEntryPoint = FakeNotificationTroubleShootEntryPoint(),
+                pushHistoryEntryPoint = FakePushHistoryEntryPoint(),
+                logoutEntryPoint = FakeLogoutEntryPoint(),
+                openSourceLicensesEntryPoint = FakeOpenSourceLicensesEntryPoint(),
+                accountDeactivationEntryPoint = FakeAccountDeactivationEntryPoint(),
             )
         }
         val callback = object : PreferencesEntryPoint.Callback {
-            override fun onAddAccount() = lambdaError()
-            override fun onOpenBugReport() = lambdaError()
-            override fun onSecureBackupClick() = lambdaError()
-            override fun onOpenRoomNotificationSettings(roomId: RoomId) = lambdaError()
-            override fun navigateTo(roomId: RoomId, eventId: EventId) = lambdaError()
+            override fun navigateToAddAccount() = lambdaError()
+            override fun navigateToLinkNewDevice() = lambdaError()
+            override fun navigateToBugReport() = lambdaError()
+            override fun navigateToSecureBackup() = lambdaError()
+            override fun navigateToRoomNotificationSettings(roomId: RoomId) = lambdaError()
+            override fun navigateToEvent(roomId: RoomId, eventId: EventId) = lambdaError()
         }
         val params = PreferencesEntryPoint.Params(
             initialElement = PreferencesEntryPoint.InitialTarget.NotificationSettings,
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(PreferencesFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutPresenterTest.kt
index e9b9e2a5ef..eb0aa73675 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 95c22da46f..258e9855de 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9bd90aa28c..942d549dab 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9e105d4da1..36fd30983e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/FakeMediaPreviewConfigStateStore.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/FakeMediaPreviewConfigStateStore.kt
index 18c6283965..b07e8b7a55 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/FakeMediaPreviewConfigStateStore.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/FakeMediaPreviewConfigStateStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStoreTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStoreTest.kt
index 01ede60e92..becd6b1a2f 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStoreTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/MediaPreviewConfigStateStoreTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenterTest.kt
index 67d7f3688f..5a00a1f7a7 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ec7ac7e2e3..b3549762ab 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenterTest.kt
index bb68063797..d3ac29df9a 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 76b22871f0..1fcf9bff70 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,22 +10,36 @@
 
 package io.element.android.features.preferences.impl.developer
 
+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.tasks.FakeClearCacheUseCase
 import io.element.android.features.preferences.impl.tasks.FakeComputeCacheSizeUseCase
+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.SessionId
+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
 import io.element.android.tests.testutils.test
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -36,15 +51,22 @@ class DeveloperSettingsPresenterTest {
 
     @Test
     fun `present - ensures initial states are correct`() = runTest {
-        val availableFeatures = listOf(
-            FakeFeature(
-                key = "feature_1",
-                title = "Feature 1",
-                isInLabs = false,
+        val getAvailableFeaturesResult = lambdaRecorder<Boolean, Boolean, List<Feature>> { _, _ ->
+            listOf(
+                FakeFeature(
+                    key = "feature_1",
+                    title = "Feature 1",
+                    isInLabs = false,
+                )
             )
-        )
+        }
         val presenter = createDeveloperSettingsPresenter(
-            featureFlagService = FakeFeatureFlagService(providedAvailableFeatures = availableFeatures)
+            featureFlagService = FakeFeatureFlagService(getAvailableFeaturesResult = getAvailableFeaturesResult),
+            databaseSizesUseCase = GetDatabaseSizesUseCase {
+                Result.success(
+                    SdkStoreSizes(stateStore = 10.megaBytes, eventCacheStore = 10.megaBytes, mediaStore = 10.megaBytes, cryptoStore = 10.megaBytes)
+                )
+            }
         )
         presenter.test {
             awaitItem().also { state ->
@@ -57,6 +79,8 @@ class DeveloperSettingsPresenterTest {
                 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()
             }
             awaitItem().also { state ->
                 assertThat(state.features).isNotEmpty()
@@ -65,7 +89,17 @@ class DeveloperSettingsPresenterTest {
             }
             awaitItem().also { state ->
                 assertThat(state.cacheSize).isInstanceOf(AsyncData.Success::class.java)
+                assertThat(state.databaseSizes.dataOrNull()).isEqualTo(
+                    persistentMapOf(
+                        "State store" to "10485760 Bytes",
+                        "Event cache store" to "10485760 Bytes",
+                        "Media store" to "10485760 Bytes",
+                        "Crypto store" to "10485760 Bytes"
+                    )
+                )
             }
+            getAvailableFeaturesResult.assertions().isCalledOnce()
+                .with(value(false), value(false))
         }
     }
 
@@ -171,62 +205,82 @@ class DeveloperSettingsPresenterTest {
     }
 
     @Test
-    fun `present - won't display features in labs or finished`() = runTest {
-        val availableFeatures = listOf(
-            // Only this feature should be displayed
-            FakeFeature(
-                key = "feature_1",
-                title = "Feature 1",
-                isInLabs = false,
-            ),
-            FakeFeature(
-                key = "feature_2",
-                title = "Feature 2",
-                isInLabs = true,
-            ),
-            FakeFeature(
-                key = "feature_3",
-                title = "Feature 3",
-                isInLabs = false,
-                isFinished = true,
-            )
-        )
-
+    fun `present - enterprise build can change the brand color`() = runTest {
+        val overrideBrandColorResult = lambdaRecorder<SessionId?, String?, Unit> { _, _ -> }
         val presenter = createDeveloperSettingsPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                providedAvailableFeatures = availableFeatures,
+            enterpriseService = FakeEnterpriseService(
+                isEnterpriseBuild = true,
+                overrideBrandColorResult = overrideBrandColorResult,
             )
         )
         presenter.test {
-            skipItems(2)
-            awaitItem().also { state ->
-                assertThat(state.features).hasSize(1)
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.isEnterpriseBuild).isTrue()
+            initialState.eventSink(DeveloperSettingsEvents.SetShowColorPicker(true))
+            assertThat(awaitItem().showColorPicker).isTrue()
+            initialState.eventSink(DeveloperSettingsEvents.SetShowColorPicker(false))
+            assertThat(awaitItem().showColorPicker).isFalse()
+            initialState.eventSink(DeveloperSettingsEvents.SetShowColorPicker(true))
+            assertThat(awaitItem().showColorPicker).isTrue()
+            initialState.eventSink(DeveloperSettingsEvents.ChangeBrandColor(Color.Green))
+            assertThat(awaitItem().showColorPicker).isFalse()
+            skipItems(1)
+            overrideBrandColorResult.assertions().isCalledOnce()
+                .with(value(A_SESSION_ID), value("#00FF00"))
+        }
+    }
+
+    @Test
+    fun `present - VacuumStores action invokes the VacuumStoresUseCase`() = runTest {
+        var vacuumCalled = false
+        val presenter = createDeveloperSettingsPresenter(
+            vacuumStoresUseCase = VacuumStoresUseCase {
+                vacuumCalled = true
             }
+        )
+        presenter.test {
+            val state = awaitItem()
+            assertThat(vacuumCalled).isFalse()
+            state.eventSink(DeveloperSettingsEvents.VacuumStores)
+            skipItems(1)
+            assertThat(vacuumCalled).isTrue()
         }
     }
 
     private fun createDeveloperSettingsPresenter(
+        sessionId: SessionId = A_SESSION_ID,
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(
-            providedAvailableFeatures = listOf(
-                FakeFeature(
-                    key = "feature_1",
-                    title = "Feature 1",
-                    isInLabs = false,
+            getAvailableFeaturesResult = { _, _ ->
+                listOf(
+                    FakeFeature(
+                        key = "feature_1",
+                        title = "Feature 1",
+                        isInLabs = false,
+                    )
                 )
-            )
+            }
         ),
         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)) },
     ): DeveloperSettingsPresenter {
         return DeveloperSettingsPresenter(
+            sessionId = sessionId,
             featureFlagService = featureFlagService,
             computeCacheSizeUseCase = cacheSizeUseCase,
             clearCacheUseCase = clearCacheUseCase,
             rageshakePresenter = { aRageshakePreferencesState() },
             appPreferencesStore = preferencesStore,
             buildMeta = buildMeta,
+            enterpriseService = enterpriseService,
+            vacuumStoresUseCase = vacuumStoresUseCase,
+            databaseSizesUseCase = databaseSizesUseCase,
+            fileSizeFormatter = FakeFileSizeFormatter(),
         )
     }
 }
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 f10fdc93c4..3854e3f4a1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -112,7 +113,7 @@ class DeveloperSettingsViewTest {
         eventsRecorder.assertSingle(DeveloperSettingsEvents.SetTracingLogLevel(LogLevelItem.DEBUG))
     }
 
-    @Config(qualifiers = "h2000dp")
+    @Config(qualifiers = "h2200dp")
     @Test
     fun `clicking on clear cache emits the expected event`() {
         val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>()
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenterTest.kt
index 5117a9fe94..acf65ef2e6 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/labs/LabsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,13 +16,15 @@ 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.services.toolbox.test.strings.FakeStringProvider
+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.test.runTest
 import org.junit.Test
 
 class LabsPresenterTest {
     @Test
-    fun `present - ensures only unfinished features in labs are displayed`() = runTest {
+    fun `present - ensures features are displayed in the correct order`() = runTest {
         val availableFeatures = listOf(
             FakeFeature(
                 key = "feature_1",
@@ -30,24 +33,23 @@ class LabsPresenterTest {
             ),
             FakeFeature(
                 key = "feature_2",
-                title = "Feature 2",
-                isInLabs = false,
-            ),
-            FakeFeature(
-                key = "feature_3",
                 title = "Feature 3",
                 isInLabs = true,
-                isFinished = true,
             )
         )
+        val getAvailableFeaturesResult = lambdaRecorder<Boolean, Boolean, List<Feature>> { _, _ ->
+            availableFeatures
+        }
         createLabsPresenter(
-            availableFeatures = availableFeatures,
+            getAvailableFeaturesResult = getAvailableFeaturesResult,
         ).test {
+            skipItems(1)
             val receivedFeatures = awaitItem().features
-            assertThat(receivedFeatures).hasSize(1)
-            assertThat(receivedFeatures.first().key).isEqualTo(availableFeatures.first().key)
-
-            cancelAndIgnoreRemainingEvents()
+            assertThat(receivedFeatures).hasSize(2)
+            assertThat(receivedFeatures[0].key).isEqualTo(availableFeatures[0].key)
+            assertThat(receivedFeatures[1].key).isEqualTo(availableFeatures[1].key)
+            getAvailableFeaturesResult.assertions().isCalledOnce()
+                .with(value(false), value(true))
         }
     }
 
@@ -61,19 +63,15 @@ class LabsPresenterTest {
             ),
         )
         createLabsPresenter(
-            availableFeatures = availableFeatures,
+            getAvailableFeaturesResult = { _, _ -> availableFeatures },
         ).test {
+            skipItems(1)
             val initialItem = awaitItem()
             val feature = initialItem.features.first()
             assertThat(feature.isEnabled).isFalse()
-
-            // Wait until the data finished loading
-            skipItems(1)
-
             // Toggle the feature, should be true now
             initialItem.eventSink(LabsEvents.ToggleFeature(feature))
             assertThat(awaitItem().features.first().isEnabled).isTrue()
-
             // Toggle the feature, should be false now
             initialItem.eventSink(LabsEvents.ToggleFeature(feature))
             assertThat(awaitItem().features.first().isEnabled).isFalse()
@@ -92,21 +90,17 @@ class LabsPresenterTest {
 
         val clearCacheUseCase = FakeClearCacheUseCase()
         createLabsPresenter(
-            availableFeatures = availableFeatures,
+            getAvailableFeaturesResult = { _, _ -> availableFeatures },
             clearCacheUseCase = clearCacheUseCase,
         ).test {
+            skipItems(1)
             val initialItem = awaitItem()
             val feature = initialItem.features.first()
             assertThat(feature.isEnabled).isFalse()
             assertThat(initialItem.isApplyingChanges).isFalse()
-
-            // Wait until the data finished loading
-            skipItems(1)
-
             // Toggle the feature
             initialItem.eventSink(LabsEvents.ToggleFeature(feature))
             assertThat(awaitItem().features.first().isEnabled).isTrue()
-
             // The clear cache use case should have been called
             assertThat(awaitItem().isApplyingChanges).isTrue()
             assertThat(clearCacheUseCase.executeHasBeenCalled).isTrue()
@@ -114,12 +108,12 @@ class LabsPresenterTest {
     }
 
     private fun createLabsPresenter(
-        availableFeatures: List<Feature> = emptyList(),
+        getAvailableFeaturesResult: (Boolean, Boolean) -> List<Feature> = { _, _ -> emptyList() },
         clearCacheUseCase: ClearCacheUseCase = FakeClearCacheUseCase(),
     ): LabsPresenter {
         return LabsPresenter(
             stringProvider = FakeStringProvider(),
-            featureFlagService = FakeFeatureFlagService(providedAvailableFeatures = availableFeatures),
+            featureFlagService = FakeFeatureFlagService(getAvailableFeaturesResult = getAvailableFeaturesResult),
             clearCacheUseCase = clearCacheUseCase,
         )
     }
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 b452b9c744..153c265560 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
@@ -1,39 +1,41 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 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.preferences.impl.notifications.edit.EditDefaultNotificationSettingPresenter
 import io.element.android.features.preferences.impl.notifications.edit.EditDefaultNotificationSettingStateEvents
 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.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 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.FakeRoomListService
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class EditDefaultNotificationSettingsPresenterTest {
     @Test
     fun `present - ensures initial state is correct`() = runTest {
-        val notificationSettingsService = FakeNotificationSettingsService()
+        val notificationSettingsService = FakeNotificationSettingsService(
+            getRoomsWithUserDefinedRulesResult = { Result.success(emptyList()) },
+        )
         val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.mode).isNull()
             assertThat(initialState.isOneToOne).isFalse()
+            assertThat(initialState.roomsWithUserDefinedMode).isEmpty()
 
             val loadedState = consumeItemsUntilPredicate {
                 it.mode == RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
@@ -48,13 +50,12 @@ class EditDefaultNotificationSettingsPresenterTest {
     fun `present - ensure list of rooms with user defined mode`() = runTest {
         val notificationSettingsService = FakeNotificationSettingsService(
             initialRoomMode = RoomNotificationMode.ALL_MESSAGES,
-            initialRoomModeIsDefault = false
+            initialRoomModeIsDefault = false,
+            getRoomsWithUserDefinedRulesResult = { Result.success(listOf(A_ROOM_ID)) },
         )
         val roomListService = FakeRoomListService()
         val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService, roomListService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             roomListService.postAllRooms(listOf(aRoomSummary(userDefinedNotificationMode = RoomNotificationMode.ALL_MESSAGES)))
             val loadedState = consumeItemsUntilPredicate { state ->
                 state.roomsWithUserDefinedMode.any { it.notificationMode == RoomNotificationMode.ALL_MESSAGES }
@@ -63,12 +64,78 @@ class EditDefaultNotificationSettingsPresenterTest {
         }
     }
 
+    @Test
+    fun `present - ensure list of rooms is sorted`() = runTest {
+        val notificationSettingsService = FakeNotificationSettingsService(
+            initialRoomMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
+            initialRoomModeIsDefault = false,
+            getRoomsWithUserDefinedRulesResult = { Result.success(listOf(A_ROOM_ID, A_ROOM_ID_2)) },
+        )
+        val roomListService = FakeRoomListService()
+        val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService, roomListService)
+        presenter.test {
+            roomListService.postAllRooms(
+                listOf(
+                    aRoomSummary(
+                        roomId = A_ROOM_ID,
+                        name = "Z",
+                        userDefinedNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
+                    ),
+                    aRoomSummary(
+                        roomId = A_ROOM_ID_2,
+                        name = "A",
+                        userDefinedNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
+                    ),
+                ),
+            )
+            val loadedState = consumeItemsUntilPredicate { state ->
+                state.roomsWithUserDefinedMode.any { it.notificationMode == RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY }
+            }.last()
+            assertThat(loadedState.roomsWithUserDefinedMode[0].name).isEqualTo("A")
+            assertThat(loadedState.roomsWithUserDefinedMode[1].name).isEqualTo("Z")
+        }
+    }
+
+    @Test
+    fun `present - ensure list of rooms is sorted, with name null`() = runTest {
+        val notificationSettingsService = FakeNotificationSettingsService(
+            initialRoomMode = RoomNotificationMode.MUTE,
+            initialRoomModeIsDefault = false,
+            getRoomsWithUserDefinedRulesResult = { Result.success(listOf(A_ROOM_ID, A_ROOM_ID_2)) },
+        )
+        val roomListService = FakeRoomListService()
+        val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService, roomListService)
+        presenter.test {
+            roomListService.postAllRooms(
+                listOf(
+                    aRoomSummary(
+                        roomId = A_ROOM_ID,
+                        name = "Z",
+                        userDefinedNotificationMode = RoomNotificationMode.MUTE,
+                    ),
+                    aRoomSummary(
+                        roomId = A_ROOM_ID_2,
+                        name = null,
+                        userDefinedNotificationMode = RoomNotificationMode.MUTE,
+                    ),
+                ),
+            )
+            val loadedState = consumeItemsUntilPredicate { state ->
+                state.roomsWithUserDefinedMode.any { it.notificationMode == RoomNotificationMode.MUTE }
+            }.last()
+            assertThat(loadedState.roomsWithUserDefinedMode[0].name).isNull()
+            assertThat(loadedState.roomsWithUserDefinedMode[1].name).isEqualTo("Z")
+        }
+    }
+
     @Test
     fun `present - edit default notification setting`() = runTest {
-        val presenter = createEditDefaultNotificationSettingPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createEditDefaultNotificationSettingPresenter(
+            notificationSettingsService = FakeNotificationSettingsService(
+                getRoomsWithUserDefinedRulesResult = { Result.success(emptyList()) },
+            ),
+        )
+        presenter.test {
             awaitItem().eventSink(EditDefaultNotificationSettingStateEvents.SetNotificationMode(RoomNotificationMode.ALL_MESSAGES))
             val loadedState = consumeItemsUntilPredicate {
                 it.mode == RoomNotificationMode.ALL_MESSAGES
@@ -79,12 +146,12 @@ class EditDefaultNotificationSettingsPresenterTest {
 
     @Test
     fun `present - edit default notification setting failed`() = runTest {
-        val notificationSettingsService = FakeNotificationSettingsService()
+        val notificationSettingsService = FakeNotificationSettingsService(
+            getRoomsWithUserDefinedRulesResult = { Result.success(emptyList()) },
+        )
         val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService)
         notificationSettingsService.givenSetDefaultNotificationModeError(AN_EXCEPTION)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().eventSink(EditDefaultNotificationSettingStateEvents.SetNotificationMode(RoomNotificationMode.ALL_MESSAGES))
             val errorState = consumeItemsUntilPredicate {
                 it.changeNotificationSettingAction.isFailure()
@@ -100,13 +167,13 @@ class EditDefaultNotificationSettingsPresenterTest {
 
     @Test
     fun `present - display mentions only warning if homeserver does not support it`() = runTest {
-        val notificationSettingsService = FakeNotificationSettingsService().apply {
+        val notificationSettingsService = FakeNotificationSettingsService(
+            getRoomsWithUserDefinedRulesResult = { Result.success(emptyList()) },
+        ).apply {
             givenCanHomeServerPushEncryptedEventsToDeviceResult(Result.success(false))
         }
         val presenter = createEditDefaultNotificationSettingPresenter(notificationSettingsService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             assertThat(awaitLastSequentialItem().displayMentionsOnlyDisclaimer).isTrue()
         }
     }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/FakeSystemNotificationsEnabledProvider.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/FakeSystemNotificationsEnabledProvider.kt
index f9804d1399..57357b5b9e 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/FakeSystemNotificationsEnabledProvider.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/FakeSystemNotificationsEnabledProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8517d9d285..9b36c477a4 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
@@ -1,15 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 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.architecture.AsyncData
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
@@ -27,6 +25,9 @@ import io.element.android.libraries.pushproviders.test.FakePushProvider
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStoreFactory
 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.test
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import kotlin.time.Duration.Companion.milliseconds
@@ -35,9 +36,7 @@ class NotificationSettingsPresenterTest {
     @Test
     fun `present - ensures initial state is correct`() = runTest {
         val presenter = createNotificationSettingsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.appSettings.appNotificationsEnabled).isFalse()
             assertThat(initialState.appSettings.systemNotificationsEnabled).isTrue()
@@ -61,9 +60,7 @@ class NotificationSettingsPresenterTest {
     fun `present - default group notification mode changed`() = runTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val presenter = createNotificationSettingsPresenter(notificationSettingsService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = false, mode = RoomNotificationMode.ALL_MESSAGES)
             notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, isOneToOne = false, mode = RoomNotificationMode.ALL_MESSAGES)
             val updatedState = consumeItemsUntilPredicate {
@@ -79,9 +76,7 @@ class NotificationSettingsPresenterTest {
     fun `present - notification settings mismatched`() = runTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val presenter = createNotificationSettingsPresenter(notificationSettingsService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             notificationSettingsService.setDefaultRoomNotificationMode(
                 isEncrypted = true,
                 isOneToOne = false,
@@ -109,9 +104,7 @@ class NotificationSettingsPresenterTest {
             initialOneToOneDefaultMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
         )
         val presenter = createNotificationSettingsPresenter(notificationSettingsService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(NotificationSettingsEvents.FixConfigurationMismatch)
             val fixedState = consumeItemsUntilPredicate(timeout = 2000.milliseconds) {
@@ -124,10 +117,19 @@ class NotificationSettingsPresenterTest {
 
     @Test
     fun `present - set notifications enabled`() = runTest {
-        val presenter = createNotificationSettingsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val unregisterWithResult = lambdaRecorder<MatrixClient, Result<Unit>> { Result.success(Unit) }
+        val ensurePusherIsRegisteredResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val presenter = createNotificationSettingsPresenter(
+            pushService = FakePushService(
+                currentPushProvider = {
+                    FakePushProvider(
+                        unregisterWithResult = unregisterWithResult,
+                    )
+                },
+                ensurePusherIsRegisteredResult = ensurePusherIsRegisteredResult,
+            )
+        )
+        presenter.test {
             val loadedState = consumeItemsUntilPredicate {
                 it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
             }.last()
@@ -137,16 +139,21 @@ class NotificationSettingsPresenterTest {
                 !it.appSettings.appNotificationsEnabled
             }.last()
             assertThat(updatedState.appSettings.appNotificationsEnabled).isFalse()
-            cancelAndIgnoreRemainingEvents()
+            unregisterWithResult.assertions().isCalledOnce()
+            // Enable notification again
+            loadedState.eventSink(NotificationSettingsEvents.SetNotificationsEnabled(true))
+            val updatedState2 = consumeItemsUntilPredicate {
+                it.appSettings.appNotificationsEnabled
+            }.last()
+            assertThat(updatedState2.appSettings.appNotificationsEnabled).isTrue()
+            ensurePusherIsRegisteredResult.assertions().isCalledOnce()
         }
     }
 
     @Test
     fun `present - set call notifications enabled`() = runTest {
         val presenter = createNotificationSettingsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val loadedState = consumeItemsUntilPredicate {
                 (it.matrixSettings as? NotificationSettingsState.MatrixSettings.Valid)?.callNotificationsEnabled == false
             }.last()
@@ -165,9 +172,7 @@ class NotificationSettingsPresenterTest {
     @Test
     fun `present - set invite for me notifications enabled`() = runTest {
         val presenter = createNotificationSettingsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val loadedState = consumeItemsUntilPredicate {
                 (it.matrixSettings as? NotificationSettingsState.MatrixSettings.Valid)?.inviteForMeNotificationsEnabled == false
             }.last()
@@ -186,9 +191,7 @@ class NotificationSettingsPresenterTest {
     @Test
     fun `present - set atRoom notifications enabled`() = runTest {
         val presenter = createNotificationSettingsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val loadedState = consumeItemsUntilPredicate {
                 (it.matrixSettings as? NotificationSettingsState.MatrixSettings.Valid)?.atRoomNotificationsEnabled == false
             }.last()
@@ -209,9 +212,7 @@ class NotificationSettingsPresenterTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val presenter = createNotificationSettingsPresenter(notificationSettingsService)
         notificationSettingsService.givenSetAtRoomError(AN_EXCEPTION)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val loadedState = consumeItemsUntilPredicate {
                 (it.matrixSettings as? NotificationSettingsState.MatrixSettings.Valid)?.atRoomNotificationsEnabled == false
             }.last()
@@ -236,9 +237,7 @@ class NotificationSettingsPresenterTest {
         val presenter = createNotificationSettingsPresenter(
             pushService = createFakePushService(),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitLastSequentialItem()
             assertThat(initialState.currentPushDistributor).isEqualTo(AsyncData.Success(Distributor(value = "aDistributorValue0", name = "aDistributorName0")))
             assertThat(initialState.availablePushDistributors).containsExactly(
@@ -270,9 +269,7 @@ class NotificationSettingsPresenterTest {
         val presenter = createNotificationSettingsPresenter(
             pushService = createFakePushService(),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitLastSequentialItem()
             assertThat(initialState.currentPushDistributor).isEqualTo(AsyncData.Success(Distributor(value = "aDistributorValue0", name = "aDistributorName0")))
             assertThat(initialState.availablePushDistributors).containsExactly(
@@ -297,9 +294,7 @@ class NotificationSettingsPresenterTest {
             pushService = createFakePushService(),
             fullScreenIntentPermissionsStateLambda = fullScreenIntentPermissionsStateLambda,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitLastSequentialItem()
             assertThat(initialState.fullScreenIntentPermissionsState.permissionGranted).isFalse()
 
@@ -323,9 +318,7 @@ class NotificationSettingsPresenterTest {
                 },
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitLastSequentialItem()
             initialState.eventSink.invoke(NotificationSettingsEvents.ChangePushProvider)
             val withDialog = awaitItem()
@@ -340,7 +333,7 @@ class NotificationSettingsPresenterTest {
     }
 
     private fun createFakePushService(
-        registerWithLambda: suspend (MatrixClient, PushProvider, Distributor) -> Result<Unit> = { _, _, _ ->
+        registerWithLambda: (MatrixClient, PushProvider, Distributor) -> Result<Unit> = { _, _, _ ->
             Result.success(Unit)
         }
     ): PushService {
@@ -360,7 +353,7 @@ class NotificationSettingsPresenterTest {
         )
     }
 
-    private fun createNotificationSettingsPresenter(
+    private fun TestScope.createNotificationSettingsPresenter(
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
         pushService: PushService = FakePushService(),
         fullScreenIntentPermissionsStateLambda: () -> FullScreenIntentPermissionsState = { aFullScreenIntentPermissionsState() },
@@ -373,6 +366,7 @@ class NotificationSettingsPresenterTest {
             pushService = pushService,
             systemNotificationsEnabledProvider = FakeSystemNotificationsEnabledProvider(),
             fullScreenIntentPermissionsPresenter = { fullScreenIntentPermissionsStateLambda() },
+            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 2aa485a192..ea140abbd7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/FakeVersionFormatter.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/FakeVersionFormatter.kt
index 3e8035fa2b..95691dac37 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/FakeVersionFormatter.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/FakeVersionFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f65589beb6..d10f860f0d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -86,6 +87,7 @@ class PreferencesRootPresenterTest {
             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()
@@ -189,14 +191,16 @@ class PreferencesRootPresenterTest {
     fun `present - labs can be shown if any feature flag is in labs and not finished`() = runTest {
         createPresenter(
             featureFlagService = FakeFeatureFlagService(
-                providedAvailableFeatures = listOf(
-                    FakeFeature(
-                        key = "feature_1",
-                        title = "Feature 1",
-                        isInLabs = true,
-                        isFinished = false,
+                getAvailableFeaturesResult = { _, _ ->
+                    listOf(
+                        FakeFeature(
+                            key = "feature_1",
+                            title = "Feature 1",
+                            isInLabs = true,
+                            isFinished = false,
+                        )
                     )
-                )
+                }
             ),
             matrixClient = FakeMatrixClient(
                 canDeactivateAccountResult = { true },
@@ -212,20 +216,16 @@ class PreferencesRootPresenterTest {
     fun `present - labs can't be shown if all feature flags in labs are finished`() = runTest {
         createPresenter(
             featureFlagService = FakeFeatureFlagService(
-                providedAvailableFeatures = listOf(
-                    FakeFeature(
-                        key = "feature_1",
-                        title = "Feature 1",
-                        isInLabs = true,
-                        isFinished = true,
-                    )
-                )
+                getAvailableFeaturesResult = { _, _ ->
+                    emptyList()
+                }
             ),
             matrixClient = FakeMatrixClient(
                 canDeactivateAccountResult = { true },
                 accountManagementUrlResult = { Result.success(null) },
             ),
         ).test {
+            skipItems(1)
             assertThat(awaitItem().showLabsItem).isFalse()
             cancelAndIgnoreRemainingEvents()
         }
@@ -259,6 +259,22 @@ class PreferencesRootPresenterTest {
         }
     }
 
+    @Test
+    fun `present - link new device`() = runTest {
+        createPresenter(
+            matrixClient = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                canDeactivateAccountResult = { true },
+            ),
+            featureFlagService = FakeFeatureFlagService(
+                initialState = mapOf(FeatureFlags.QrCodeLogin.key to true)
+            ),
+        ).test {
+            val state = awaitFirstItem()
+            assertThat(state.showLinkNewDevice).isTrue()
+        }
+    }
+
     private suspend fun <T> ReceiveTurbine<T>.awaitFirstItem(): T {
         skipItems(1)
         return awaitItem()
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 ce772fe3f2..c00dc7689b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1e16509ad2..6845ecb3a4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,7 @@ 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.services.appnavstate.api.ActiveRoomsHolder
+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.testCoroutineDispatchers
@@ -33,7 +34,7 @@ import org.robolectric.RobolectricTestRunner
 class DefaultClearCacheUseCaseTest {
     @Test
     fun `execute clear cache should do all the expected tasks`() = runTest {
-        val activeRoomsHolder = ActiveRoomsHolder().apply { addRoom(FakeJoinedRoom()) }
+        val activeRoomsHolder = DefaultActiveRoomsHolder().apply { addRoom(FakeJoinedRoom()) }
         val clearCacheLambda = lambdaRecorder<Unit> { }
         val matrixClient = FakeMatrixClient(
             sessionId = A_SESSION_ID,
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt
index e10e7f1a6a..94dec8488b 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeClearCacheUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt
index 1b12d2804e..455c181cc0 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeComputeCacheSizeUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
index 947be54785..0602709ec8 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenterTest.kt
@@ -1,16 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.user.editprofile
 
 import android.net.Uri
-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.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
@@ -34,6 +32,7 @@ import io.element.android.tests.testutils.consumeItemsUntilTimeout
 import io.element.android.tests.testutils.fake.FakeTemporaryUriDeleter
 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.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
@@ -57,8 +56,6 @@ class EditUserProfilePresenterTest {
     private val userAvatarUri: Uri = mockk()
     private val anotherAvatarUri: Uri = mockk()
 
-    private val fakeFileContents = ByteArray(2)
-
     @Before
     fun setup() {
         fakePickerProvider = FakePickerProvider()
@@ -66,7 +63,9 @@ class EditUserProfilePresenterTest {
         mockkStatic(Uri::class)
 
         every { Uri.parse(AN_AVATAR_URL) } returns userAvatarUri
+        every { userAvatarUri.toString() } returns AN_AVATAR_URL
         every { Uri.parse(ANOTHER_AVATAR_URL) } returns anotherAvatarUri
+        every { anotherAvatarUri.toString() } returns ANOTHER_AVATAR_URL
     }
 
     @After
@@ -76,6 +75,7 @@ class EditUserProfilePresenterTest {
 
     private fun createEditUserProfilePresenter(
         matrixClient: MatrixClient = FakeMatrixClient(),
+        navigator: EditUserProfileNavigator = FakeEditUserProfileNavigator(),
         matrixUser: MatrixUser = aMatrixUser(),
         permissionsPresenter: PermissionsPresenter = FakePermissionsPresenter(),
         temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),
@@ -83,6 +83,7 @@ class EditUserProfilePresenterTest {
     ): EditUserProfilePresenter {
         return EditUserProfilePresenter(
             matrixClient = matrixClient,
+            navigator = navigator,
             matrixUser = matrixUser,
             mediaPickerProvider = fakePickerProvider,
             mediaPreProcessor = fakeMediaPreProcessor,
@@ -96,13 +97,11 @@ class EditUserProfilePresenterTest {
     fun `present - initial state is created from user info`() = runTest {
         val user = aMatrixUser(avatarUrl = AN_AVATAR_URL)
         val presenter = createEditUserProfilePresenter(matrixUser = user)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.userId).isEqualTo(user.userId)
             assertThat(initialState.displayName).isEqualTo(user.displayName)
-            assertThat(initialState.userAvatarUrl).isEqualTo(userAvatarUri)
+            assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             assertThat(initialState.avatarActions).containsExactly(
                 AvatarAction.ChoosePhoto,
                 AvatarAction.TakePhoto,
@@ -113,6 +112,53 @@ class EditUserProfilePresenterTest {
         }
     }
 
+    @Test
+    fun `present - exit invokes the expected callback`() = runTest {
+        val user = aMatrixUser(avatarUrl = AN_AVATAR_URL)
+        val closeLambda = lambdaRecorder<Unit> {}
+        val presenter = createEditUserProfilePresenter(
+            matrixUser = user,
+            navigator = FakeEditUserProfileNavigator(closeLambda),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(EditUserProfileEvent.Exit)
+            closeLambda.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - exit without unsaved changes`() = runTest {
+        val user = aMatrixUser(avatarUrl = AN_AVATAR_URL)
+        val closeLambda = lambdaRecorder<Unit> {}
+        val presenter = createEditUserProfilePresenter(
+            matrixUser = user,
+            navigator = FakeEditUserProfileNavigator(closeLambda),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("New name"))
+            val withUpdatedName = awaitItem()
+            withUpdatedName.eventSink(EditUserProfileEvent.Exit)
+            val withConfirmation = awaitItem()
+            assertThat(withConfirmation.saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
+            // Cancel
+            withConfirmation.eventSink(EditUserProfileEvent.CloseDialog)
+            val afterCancel = awaitItem()
+            assertThat(afterCancel.saveAction).isEqualTo(AsyncAction.Uninitialized)
+            // Try again and confirm
+            afterCancel.eventSink(EditUserProfileEvent.Exit)
+            val withConfirmation2 = awaitItem()
+            assertThat(withConfirmation2.saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
+            closeLambda.assertions().isNeverCalled()
+            withConfirmation2.eventSink(EditUserProfileEvent.Exit)
+            // Dialog is closed
+            val finalState = awaitItem()
+            assertThat(finalState.saveAction).isEqualTo(AsyncAction.Uninitialized)
+            closeLambda.assertions().isCalledOnce()
+        }
+    }
+
     @Test
     fun `present - updates state in response to changes`() = runTest {
         val user = aMatrixUser(id = A_USER_ID.value, displayName = "Name", avatarUrl = AN_AVATAR_URL)
@@ -122,23 +168,21 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.displayName).isEqualTo("Name")
-            assertThat(initialState.userAvatarUrl).isEqualTo(userAvatarUri)
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("Name II"))
+            assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("Name II"))
             awaitItem().apply {
                 assertThat(displayName).isEqualTo("Name II")
-                assertThat(userAvatarUrl).isEqualTo(userAvatarUri)
+                assertThat(userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             }
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("Name III"))
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("Name III"))
             awaitItem().apply {
                 assertThat(displayName).isEqualTo("Name III")
-                assertThat(userAvatarUrl).isEqualTo(userAvatarUri)
+                assertThat(userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             }
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.Remove))
             awaitItem().apply {
                 assertThat(displayName).isEqualTo("Name III")
                 assertThat(userAvatarUrl).isNull()
@@ -156,14 +200,12 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            assertThat(initialState.userAvatarUrl).isEqualTo(userAvatarUri)
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             awaitItem().apply {
-                assertThat(userAvatarUrl).isEqualTo(anotherAvatarUri)
+                assertThat(userAvatarUrl).isEqualTo(ANOTHER_AVATAR_URL)
             }
         }
     }
@@ -181,25 +223,23 @@ class EditUserProfilePresenterTest {
                 deleteLambda = deleteCallback,
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            assertThat(initialState.userAvatarUrl).isEqualTo(userAvatarUri)
+            assertThat(initialState.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             assertThat(initialState.cameraPermissionState.permissionGranted).isFalse()
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.TakePhoto))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.TakePhoto))
             val stateWithAskingPermission = awaitItem()
             assertThat(stateWithAskingPermission.cameraPermissionState.showDialog).isTrue()
             fakePermissionsPresenter.setPermissionGranted()
             val stateWithPermission = awaitItem()
             assertThat(stateWithPermission.cameraPermissionState.permissionGranted).isTrue()
             val stateWithNewAvatar = awaitItem()
-            assertThat(stateWithNewAvatar.userAvatarUrl).isEqualTo(anotherAvatarUri)
+            assertThat(stateWithNewAvatar.userAvatarUrl).isEqualTo(ANOTHER_AVATAR_URL)
             // Do it again, no permission is requested
             fakePickerProvider.givenResult(userAvatarUri)
-            stateWithNewAvatar.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.TakePhoto))
+            stateWithNewAvatar.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.TakePhoto))
             val stateWithNewAvatar2 = awaitItem()
-            assertThat(stateWithNewAvatar2.userAvatarUrl).isEqualTo(userAvatarUri)
+            assertThat(stateWithNewAvatar2.userAvatarUrl).isEqualTo(AN_AVATAR_URL)
             deleteCallback.assertions().isCalledExactly(2).withSequence(
                 listOf(value(userAvatarUri)),
                 listOf(value(anotherAvatarUri)),
@@ -218,28 +258,26 @@ class EditUserProfilePresenterTest {
                 deleteLambda = deleteCallback
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.saveButtonEnabled).isFalse()
             // Once a change is made, the save button is enabled
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("Name II"))
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("Name II"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // If it's reverted then the save disables again
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("Name"))
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("Name"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
             // Make a change...
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.Remove))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // Revert it...
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
@@ -261,28 +299,26 @@ class EditUserProfilePresenterTest {
                 deleteLambda = deleteCallback
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.saveButtonEnabled).isFalse()
             // Once a change is made, the save button is enabled
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("Name II"))
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("Name II"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // If it's reverted then the save disables again
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("Name"))
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("Name"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
             // Make a change...
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // Revert it...
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.Remove))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
@@ -304,13 +340,11 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("New name"))
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.Remove))
-            initialState.eventSink(EditUserProfileEvents.Save)
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("New name"))
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(EditUserProfileEvent.Save)
             consumeItemsUntilPredicate { matrixClient.setDisplayNameCalled && matrixClient.removeAvatarCalled && !matrixClient.uploadAvatarCalled }
             assertThat(matrixClient.setDisplayNameCalled).isTrue()
             assertThat(matrixClient.removeAvatarCalled).isTrue()
@@ -327,12 +361,10 @@ class EditUserProfilePresenterTest {
             matrixClient = matrixClient,
             matrixUser = user
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("   Name   "))
-            initialState.eventSink(EditUserProfileEvents.Save)
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("   Name   "))
+            initialState.eventSink(EditUserProfileEvent.Save)
             consumeItemsUntilTimeout()
             assertThat(matrixClient.setDisplayNameCalled).isFalse()
             assertThat(matrixClient.uploadAvatarCalled).isFalse()
@@ -348,12 +380,10 @@ class EditUserProfilePresenterTest {
             matrixClient = matrixClient,
             matrixUser = user
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName(""))
-            initialState.eventSink(EditUserProfileEvents.Save)
+            initialState.eventSink(EditUserProfileEvent.UpdateDisplayName(""))
+            initialState.eventSink(EditUserProfileEvent.Save)
             assertThat(matrixClient.setDisplayNameCalled).isFalse()
             assertThat(matrixClient.uploadAvatarCalled).isFalse()
             assertThat(matrixClient.removeAvatarCalled).isFalse()
@@ -365,7 +395,7 @@ class EditUserProfilePresenterTest {
     fun `present - save processes and sets avatar when processor returns successfully`() = runTest {
         val matrixClient = FakeMatrixClient()
         val user = aMatrixUser(id = A_USER_ID.value, displayName = "Name", avatarUrl = AN_AVATAR_URL)
-        givenPickerReturnsFile()
+        val tmpFile = givenPickerReturnsFile()
         val presenter = createEditUserProfilePresenter(
             matrixClient = matrixClient,
             matrixUser = user,
@@ -373,14 +403,16 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
-            initialState.eventSink(EditUserProfileEvents.Save)
-            consumeItemsUntilPredicate { matrixClient.uploadAvatarCalled }
-            assertThat(matrixClient.uploadAvatarCalled).isTrue()
+        try {
+            presenter.test {
+                val initialState = awaitItem()
+                initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
+                initialState.eventSink(EditUserProfileEvent.Save)
+                consumeItemsUntilPredicate { matrixClient.uploadAvatarCalled }
+                assertThat(matrixClient.uploadAvatarCalled).isTrue()
+            }
+        } finally {
+            tmpFile.delete()
         }
     }
 
@@ -397,12 +429,10 @@ class EditUserProfilePresenterTest {
         )
         fakePickerProvider.givenResult(anotherAvatarUri)
         fakeMediaPreProcessor.givenResult(Result.failure(RuntimeException("Oh no")))
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
-            initialState.eventSink(EditUserProfileEvents.Save)
+            initialState.eventSink(EditUserProfileEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            initialState.eventSink(EditUserProfileEvent.Save)
             skipItems(2)
             assertThat(matrixClient.uploadAvatarCalled).isFalse()
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
@@ -415,7 +445,7 @@ class EditUserProfilePresenterTest {
         val matrixClient = FakeMatrixClient().apply {
             givenSetDisplayNameResult(Result.failure(RuntimeException("!")))
         }
-        saveAndAssertFailure(user, matrixClient, EditUserProfileEvents.UpdateDisplayName("New name"))
+        saveAndAssertFailure(user, matrixClient, EditUserProfileEvent.UpdateDisplayName("New name"))
     }
 
     @Test
@@ -424,41 +454,47 @@ class EditUserProfilePresenterTest {
         val matrixClient = FakeMatrixClient().apply {
             givenRemoveAvatarResult(Result.failure(RuntimeException("!")))
         }
-        saveAndAssertFailure(user, matrixClient, EditUserProfileEvents.HandleAvatarAction(AvatarAction.Remove))
+        saveAndAssertFailure(user, matrixClient, EditUserProfileEvent.HandleAvatarAction(AvatarAction.Remove))
     }
 
     @Test
     fun `present - sets save action to failure if setting avatar fails`() = runTest {
-        givenPickerReturnsFile()
+        val tmpFile = givenPickerReturnsFile()
         val user = aMatrixUser(id = A_USER_ID.value, displayName = "Name", avatarUrl = AN_AVATAR_URL)
         val matrixClient = FakeMatrixClient().apply {
             givenUploadAvatarResult(Result.failure(RuntimeException("!")))
         }
-        saveAndAssertFailure(user, matrixClient, EditUserProfileEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+        try {
+            saveAndAssertFailure(user, matrixClient, EditUserProfileEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
+        } finally {
+            tmpFile.delete()
+        }
     }
 
     @Test
-    fun `present - CancelSaveChanges resets save action state`() = runTest {
-        givenPickerReturnsFile()
+    fun `present - CloseDialog resets save action state`() = runTest {
+        val tmpFile = givenPickerReturnsFile()
         val user = aMatrixUser(id = A_USER_ID.value, displayName = "Name", avatarUrl = AN_AVATAR_URL)
         val matrixClient = FakeMatrixClient().apply {
             givenSetDisplayNameResult(Result.failure(RuntimeException("!")))
         }
         val presenter = createEditUserProfilePresenter(matrixUser = user, matrixClient = matrixClient)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            initialState.eventSink(EditUserProfileEvents.UpdateDisplayName("foo"))
-            initialState.eventSink(EditUserProfileEvents.Save)
-            skipItems(2)
-            assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
-            initialState.eventSink(EditUserProfileEvents.CancelSaveChanges)
-            assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+        try {
+            presenter.test {
+                val initialState = awaitItem()
+                initialState.eventSink(EditUserProfileEvent.UpdateDisplayName("foo"))
+                initialState.eventSink(EditUserProfileEvent.Save)
+                skipItems(2)
+                assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
+                initialState.eventSink(EditUserProfileEvent.CloseDialog)
+                assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+        } finally {
+            tmpFile.delete()
         }
     }
 
-    private suspend fun saveAndAssertFailure(matrixUser: MatrixUser, matrixClient: MatrixClient, event: EditUserProfileEvents) {
+    private suspend fun saveAndAssertFailure(matrixUser: MatrixUser, matrixClient: MatrixClient, event: EditUserProfileEvent) {
         val presenter = createEditUserProfilePresenter(
             matrixUser = matrixUser,
             matrixClient = matrixClient,
@@ -466,32 +502,28 @@ class EditUserProfilePresenterTest {
                 deleteLambda = { assertThat(it).isEqualTo(userAvatarUri) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(event)
-            initialState.eventSink(EditUserProfileEvents.Save)
+            initialState.eventSink(EditUserProfileEvent.Save)
             skipItems(1)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Loading::class.java)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
         }
     }
 
-    private fun givenPickerReturnsFile() {
-        mockkStatic(File::readBytes)
-        val processedFile: File = mockk {
-            every { readBytes() } returns fakeFileContents
-        }
+    private fun givenPickerReturnsFile(): File {
+        val file = File.createTempFile("test", "jpg")
         fakePickerProvider.givenResult(anotherAvatarUri)
         fakeMediaPreProcessor.givenResult(
             Result.success(
                 MediaUploadInfo.AnyFile(
-                    file = processedFile,
+                    file = file,
                     fileInfo = mockk(),
                 )
             )
         )
+        return file
     }
 
     companion object {
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
new file mode 100644
index 0000000000..728e05ee7e
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt
@@ -0,0 +1,136 @@
+/*
+ * 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.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.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.ui.media.AvatarAction
+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 org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EditUserProfileViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on back emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.pressBack()
+        eventsRecorder.assertSingle(EditUserProfileEvent.Exit)
+    }
+
+    @Test
+    fun `clicking on save from the exit confirmation dialog emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveAction = AsyncAction.ConfirmingCancellation,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        eventsRecorder.assertSingle(EditUserProfileEvent.Save)
+    }
+
+    @Test
+    fun `clicking on discard exit emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveAction = AsyncAction.ConfirmingCancellation,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_discard)
+        eventsRecorder.assertSingle(EditUserProfileEvent.Exit)
+    }
+
+    @Test
+    fun `clicking on save emits the expected event`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveButtonEnabled = true,
+                saveAction = AsyncAction.Uninitialized,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_save)
+        eventsRecorder.assertSingle(EditUserProfileEvent.Save)
+    }
+
+    @Test
+    fun `clicking on avatar opens the bottom sheet dialog`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
+        val actions = listOf(
+            AvatarAction.TakePhoto,
+            AvatarAction.ChoosePhoto,
+            AvatarAction.Remove,
+        )
+        rule.setEditUserProfileView(
+            aEditUserProfileState(
+                saveAction = AsyncAction.Uninitialized,
+                avatarActions = actions,
+                eventSink = eventsRecorder,
+            ),
+        )
+        val contentDescription = rule.activity.getString(CommonStrings.a11y_avatar)
+        rule.onNodeWithContentDescription(contentDescription).performClick()
+        // Assert that the actions are displayed
+        actions.forEach { action ->
+            val text = rule.activity.getString(action.titleResId)
+            rule.onNodeWithText(text).assertExists()
+        }
+    }
+
+    @Test
+    fun `success invokes the expected callback`() {
+        val eventsRecorder = EventsRecorder<EditUserProfileEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            rule.setEditUserProfileView(
+                aEditUserProfileState(
+                    saveAction = AsyncAction.Success(Unit),
+                    eventSink = eventsRecorder,
+                ),
+                onEditProfileSuccess = callback,
+            )
+        }
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setEditUserProfileView(
+    state: EditUserProfileState,
+    onEditProfileSuccess: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        EditUserProfileView(
+            state = state,
+            onEditProfileSuccess = onEditProfileSuccess,
+        )
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt
new file mode 100644
index 0000000000..7b34e904a1
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/FakeEditUserProfileNavigator.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.preferences.impl.user.editprofile
+
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeEditUserProfileNavigator(
+    val closeLambda: () -> Unit = { lambdaError() }
+) : EditUserProfileNavigator {
+    override fun close() = closeLambda()
+}
diff --git a/features/rageshake/api/build.gradle.kts b/features/rageshake/api/build.gradle.kts
index 7fe1620613..8a37497094 100644
--- a/features/rageshake/api/build.gradle.kts
+++ b/features/rageshake/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/RageshakeFeatureAvailability.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/RageshakeFeatureAvailability.kt
index a22040355e..bc72e7021b 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/RageshakeFeatureAvailability.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/RageshakeFeatureAvailability.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/bugreport/BugReportEntryPoint.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/bugreport/BugReportEntryPoint.kt
index 0eb84b529b..6030c8552c 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/bugreport/BugReportEntryPoint.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/bugreport/BugReportEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,11 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface BugReportEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone()
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionEvents.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionEvents.kt
index f3364d2a33..89c49338d1 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionEvents.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionPresenter.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionPresenter.kt
index 913e1b65f4..085d4c8e41 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionPresenter.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionState.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionState.kt
index 66c206adcd..dd08cbf86c 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionState.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionState.kt
@@ -1,15 +1,13 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rageshake.api.crash
 
-import androidx.compose.runtime.Immutable
-
-@Immutable
 data class CrashDetectionState(
     val appName: String,
     val crashDetected: Boolean,
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionStateProvider.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionStateProvider.kt
index 2674552093..b1516731fb 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionStateProvider.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 163f0b50e6..57d28527ca 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionEvents.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionEvents.kt
index 75b377588f..921ae861f2 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionEvents.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionPresenter.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionPresenter.kt
index 1be1ae67c4..d371e475fa 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionPresenter.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionState.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionState.kt
index 8ace909da3..a240fed687 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionState.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionState.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rageshake.api.detection
 
-import androidx.compose.runtime.Immutable
 import io.element.android.features.rageshake.api.preferences.RageshakePreferencesState
 
-@Immutable
 data class RageshakeDetectionState(
     val takeScreenshot: Boolean,
     val showDialog: Boolean,
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionStateProvider.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionStateProvider.kt
index 09134c7a75..f79024ef25 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionStateProvider.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c0fc0ce099..dff6d9b716 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/LogFilesRemover.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/LogFilesRemover.kt
index 9d1f9157d9..f8eee31675 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/LogFilesRemover.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/LogFilesRemover.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/WriteToFilesConfigurationFactory.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/WriteToFilesConfigurationFactory.kt
index 52298b5414..dafefb0e2e 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/WriteToFilesConfigurationFactory.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/logs/WriteToFilesConfigurationFactory.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesEvents.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesEvents.kt
index fa34c10740..49458c2e34 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesEvents.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesPresenter.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesPresenter.kt
index b508b7f0fe..d4c1e348c0 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesPresenter.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesState.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesState.kt
index 40a9d0282b..faba80a3c5 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesState.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesStateProvider.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesStateProvider.kt
index a98c75a02a..d1a863745f 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesStateProvider.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 86f1c05247..e4f32982f9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bb625370cf..79b05ea32e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,6 +19,7 @@ interface BugReporter {
      * @param withScreenshot true to include the screenshot
      * @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 listener the listener
      */
     suspend fun sendBugReport(
@@ -26,6 +28,7 @@ interface BugReporter {
         withScreenshot: Boolean,
         problemDescription: String,
         canContact: Boolean = false,
+        sendPushRules: Boolean = false,
         listener: BugReporterListener
     )
 
@@ -34,14 +37,6 @@ interface BugReporter {
      */
     fun logDirectory(): File
 
-    /**
-     * Set the subfolder name for the log directory.
-     * This will create a subfolder in the log directory with the given name.
-     * It will also configure the Rust SDK to use this subfolder for its logs.
-     * If the name is null, the log files will be stored in the base folder for the logs.
-     */
-    fun setLogDirectorySubfolder(subfolderName: String?)
-
     /**
      * Set the current tracing log level.
      */
@@ -50,5 +45,5 @@ interface BugReporter {
     /**
      * Save the logcat.
      */
-    fun saveLogCat()
+    fun saveLogCat(): File?
 }
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporterListener.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporterListener.kt
index 0e7d8d4028..b8c2d26d07 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporterListener.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporterListener.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/screenshot/Screenshot.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/screenshot/Screenshot.kt
index 7498f5e151..e820a14346 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/screenshot/Screenshot.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/screenshot/Screenshot.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/api/src/main/res/values-hr/translations.xml b/features/rageshake/api/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..c3dfcb3203
--- /dev/null
+++ b/features/rageshake/api/src/main/res/values-hr/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 neočekivano je prestao s radom prilikom posljednjeg korištenja. Želite li s nama podijeliti izvješće o padu?"</string>
+  <string name="rageshake_detection_dialog_content">"Čini se da ljutito treseš telefon. Želiš li otvoriti zaslon s izvješćem o pogrešci?"</string>
+  <string name="settings_rageshake">"Snažno protresi"</string>
+  <string name="settings_rageshake_detection_threshold">"Prag detekcije"</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 f8fd569add..72bf6fc363 100644
--- a/features/rageshake/api/src/main/res/values-ru/translations.xml
+++ b/features/rageshake/api/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="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">"Встряхните"</string>
   <string name="settings_rageshake_detection_threshold">"Порог обнаружения"</string>
diff --git a/features/rageshake/impl/build.gradle.kts b/features/rageshake/impl/build.gradle.kts
index b17d78f3aa..0200f21e61 100644
--- a/features/rageshake/impl/build.gradle.kts
+++ b/features/rageshake/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -52,6 +53,7 @@ dependencies {
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.features.rageshake.test)
+    testImplementation(projects.features.viewfolder.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.services.toolbox.test)
     testImplementation(libs.network.mockwebserver)
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailability.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailability.kt
index 8cb210159b..97fe32513d 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailability.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailability.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,12 @@ package io.element.android.features.rageshake.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.features.rageshake.impl.reporter.BugReporterUrlProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRageshakeFeatureAvailability(
     private val bugReporterUrlProvider: BugReporterUrlProvider,
 ) : RageshakeFeatureAvailability {
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 fbf2906623..90751873dd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,4 +17,5 @@ sealed interface BugReportEvents {
     data class SetSendLog(val sendLog: Boolean) : BugReportEvents
     data class SetCanContact(val canContact: Boolean) : BugReportEvents
     data class SetSendScreenshot(val sendScreenshot: Boolean) : BugReportEvents
+    data class SetSendPushRules(val sendPushRules: Boolean) : BugReportEvents
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFlowNode.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFlowNode.kt
index 10af89f740..f843d7da82 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFlowNode.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFlowNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -25,6 +25,7 @@ import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
 import io.element.android.features.viewfolder.api.ViewFolderEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import kotlinx.parcelize.Parcelize
 
@@ -42,9 +43,7 @@ class BugReportFlowNode(
     buildContext = buildContext,
     plugins = plugins
 ) {
-    private fun onDone() {
-        plugins<BugReportEntryPoint.Callback>().forEach { it.onDone() }
-    }
+    private val callback: BugReportEntryPoint.Callback = callback()
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
@@ -61,10 +60,10 @@ class BugReportFlowNode(
             NavTarget.Root -> {
                 val callback = object : BugReportNode.Callback {
                     override fun onDone() {
-                        this@BugReportFlowNode.onDone()
+                        callback.onDone()
                     }
 
-                    override fun onViewLogs(basePath: String) {
+                    override fun navigateToViewLogs(basePath: String) {
                         backstack.push(NavTarget.ViewLogs(rootPath = basePath))
                     }
                 }
@@ -79,11 +78,12 @@ class BugReportFlowNode(
                 val params = ViewFolderEntryPoint.Params(
                     rootPath = navTarget.rootPath,
                 )
-                viewFolderEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .params(params)
-                    .callback(callback)
-                    .build()
+                viewFolderEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
             }
         }
     }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFormError.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFormError.kt
index d912510951..ba3d9f16f0 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFormError.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFormError.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
index e307dba8ec..f6d6788ba7 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,13 +14,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.rageshake.api.reporter.BugReporter
 import io.element.android.libraries.androidutils.system.toast
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @ContributesNode(AppScope::class)
@@ -32,16 +33,10 @@ class BugReportNode(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onDone()
-        fun onViewLogs(basePath: String)
+        fun navigateToViewLogs(basePath: String)
     }
 
-    private fun onViewLogs(basePath: String) {
-        plugins<Callback>().forEach { it.onViewLogs(basePath) }
-    }
-
-    private fun onDone() {
-        plugins<Callback>().forEach { it.onDone() }
-    }
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -53,12 +48,12 @@ class BugReportNode(
             onBackClick = { navigateUp() },
             onSuccess = {
                 activity?.toast(CommonStrings.common_report_submitted)
-                onDone()
+                callback.onDone()
             },
             onViewLogs = {
                 // Force a logcat dump
                 bugReporter.saveLogCat()
-                onViewLogs(bugReporter.logDirectory().absolutePath)
+                callback.navigateToViewLogs(bugReporter.logDirectory().absolutePath)
             }
         )
     }
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 4faef73589..4985f9b30e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -77,12 +78,12 @@ class BugReportPresenter(
         val sendingAction: MutableState<AsyncAction<Unit>> = remember {
             mutableStateOf(AsyncAction.Uninitialized)
         }
-        val formState: MutableState<BugReportFormState> = remember {
+        val formState: MutableState<BugReportFormState> = rememberSaveable {
             mutableStateOf(BugReportFormState.Default)
         }
         val uploadListener = BugReporterUploadListener(sendingProgress, sendingAction)
 
-        fun handleEvents(event: BugReportEvents) {
+        fun handleEvent(event: BugReportEvents) {
             when (event) {
                 BugReportEvents.SendBugReport -> {
                     if (formState.value.description.length < 10) {
@@ -105,6 +106,9 @@ class BugReportPresenter(
                 is BugReportEvents.SetSendScreenshot -> updateFormState(formState) {
                     copy(sendScreenshot = event.sendScreenshot)
                 }
+                is BugReportEvents.SetSendPushRules -> updateFormState(formState) {
+                    copy(sendPushRules = event.sendPushRules)
+                }
                 BugReportEvents.ClearError -> {
                     sendingProgress.floatValue = 0f
                     sendingAction.value = AsyncAction.Uninitialized
@@ -118,7 +122,7 @@ class BugReportPresenter(
             sending = sendingAction.value,
             formState = formState.value,
             screenshotUri = screenshotUri.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
@@ -137,6 +141,7 @@ class BugReportPresenter(
             withScreenshot = formState.sendScreenshot,
             problemDescription = formState.description,
             canContact = formState.canContact,
+            sendPushRules = formState.sendPushRules,
             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 8922446329..65cc055ec9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,14 +30,16 @@ data class BugReportFormState(
     val description: String,
     val sendLogs: Boolean,
     val canContact: Boolean,
-    val sendScreenshot: Boolean
+    val sendScreenshot: Boolean,
+    val sendPushRules: Boolean,
 ) : Parcelable {
     companion object {
         val Default = BugReportFormState(
             description = "",
             sendLogs = true,
             canContact = false,
-            sendScreenshot = false
+            sendScreenshot = false,
+            sendPushRules = false,
         )
     }
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportStateProvider.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportStateProvider.kt
index ef36feabbd..0afd06f22a 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportStateProvider.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 760106b0fb..612d3aa68c 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rageshake.impl.bugreport
 
+import android.content.res.Configuration
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -26,6 +28,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
@@ -40,7 +43,6 @@ import io.element.android.libraries.designsystem.components.preferences.Preferen
 import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
 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.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -142,6 +144,13 @@ fun BugReportView(
                     }
                 }
             }
+            PreferenceSwitch(
+                isChecked = state.formState.sendPushRules,
+                onCheckedChange = { eventSink(BugReportEvents.SetSendPushRules(it)) },
+                enabled = isFormEnabled,
+                title = stringResource(R.string.screen_bug_report_send_notification_settings_title),
+                subtitle = stringResource(R.string.screen_bug_report_send_notification_settings_description),
+            )
             // Submit
             PreferenceRow {
                 Button(
@@ -174,9 +183,20 @@ fun BugReportView(
     }
 }
 
-@PreviewsDayNight
+@Preview(heightDp = 1000)
 @Composable
-internal fun BugReportViewPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreview {
+internal fun BugReportViewDayPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreview {
+    BugReportView(
+        state = state,
+        onSuccess = {},
+        onBackClick = {},
+        onViewLogs = {},
+    )
+}
+
+@Preview(heightDp = 1000, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+internal fun BugReportViewNightPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreview {
     BugReportView(
         state = state,
         onSuccess = {},
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPoint.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPoint.kt
index 6fa5772c17..615bd37f2d 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPoint.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.features.rageshake.impl.bugreport
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultBugReportEntryPoint : BugReportEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): BugReportEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : BugReportEntryPoint.NodeBuilder {
-            override fun callback(callback: BugReportEntryPoint.Callback): BugReportEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<BugReportFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: BugReportEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<BugReportFlowNode>(buildContext, listOf(callback))
     }
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/CrashDataStore.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/CrashDataStore.kt
index 3d6df9a424..234605d644 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/CrashDataStore.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/CrashDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/DefaultCrashDetectionPresenter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/DefaultCrashDetectionPresenter.kt
index 4d9f596d1d..25afadec57 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/DefaultCrashDetectionPresenter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/DefaultCrashDetectionPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.features.rageshake.api.crash.CrashDetectionEvents
 import io.element.android.features.rageshake.api.crash.CrashDetectionPresenter
@@ -29,7 +29,6 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCrashDetectionPresenter(
     private val buildMeta: BuildMeta,
     private val crashDataStore: CrashDataStore,
@@ -49,7 +48,7 @@ class DefaultCrashDetectionPresenter(
                 }
         }.collectAsState(false)
 
-        fun handleEvents(event: CrashDetectionEvents) {
+        fun handleEvent(event: CrashDetectionEvents) {
             when (event) {
                 CrashDetectionEvents.ResetAllCrashData -> localCoroutineScope.resetAll()
                 CrashDetectionEvents.ResetAppHasCrashed -> localCoroutineScope.resetAppHasCrashed()
@@ -59,7 +58,7 @@ class DefaultCrashDetectionPresenter(
         return CrashDetectionState(
             appName = buildMeta.applicationName,
             crashDetected = crashDetected,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/PreferencesCrashDataStore.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/PreferencesCrashDataStore.kt
index a2be13b4cd..91aee0dc67 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/PreferencesCrashDataStore.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/PreferencesCrashDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
@@ -23,7 +23,6 @@ private val appHasCrashedKey = booleanPreferencesKey("appHasCrashed")
 private val crashDataKey = stringPreferencesKey("crashData")
 
 @ContributesBinding(AppScope::class)
-@Inject
 class PreferencesCrashDataStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : CrashDataStore {
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandler.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandler.kt
index e41583b61c..0eafdf35a9 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandler.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/detection/DefaultRageshakeDetectionPresenter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/detection/DefaultRageshakeDetectionPresenter.kt
index c0120bfc3a..a7813ed6fb 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/detection/DefaultRageshakeDetectionPresenter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/detection/DefaultRageshakeDetectionPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionEvents
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionPresenter
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionState
@@ -30,7 +30,6 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRageshakeDetectionPresenter(
     private val screenshotHolder: ScreenshotHolder,
     private val rageShake: RageShake,
@@ -50,7 +49,7 @@ class DefaultRageshakeDetectionPresenter(
             mutableStateOf(false)
         }
 
-        fun handleEvents(event: RageshakeDetectionEvents) {
+        fun handleEvent(event: RageshakeDetectionEvents) {
             when (event) {
                 RageshakeDetectionEvents.Disable -> {
                     preferencesState.eventSink(RageshakePreferencesEvents.SetIsEnabled(false))
@@ -69,7 +68,7 @@ class DefaultRageshakeDetectionPresenter(
                 takeScreenshot = takeScreenshot.value,
                 showDialog = showDialog.value,
                 preferenceState = preferencesState,
-                eventSink = ::handleEvents
+                eventSink = ::handleEvent,
             )
         }
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeBindings.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeBindings.kt
index e1172c31fc..59795e528f 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeBindings.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeBindings.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeModule.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeModule.kt
index 97f4d39ec3..475127a345 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeModule.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/di/RageshakeModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/logs/DefaultLogFilesRemover.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/logs/DefaultLogFilesRemover.kt
index 1122042d7f..0e1abd30b7 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/logs/DefaultLogFilesRemover.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/logs/DefaultLogFilesRemover.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,13 +10,11 @@ package io.element.android.features.rageshake.impl.logs
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.rageshake.api.logs.LogFilesRemover
 import io.element.android.features.rageshake.impl.reporter.DefaultBugReporter
 import java.io.File
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLogFilesRemover(
     private val bugReporter: DefaultBugReporter,
 ) : LogFilesRemover {
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/preferences/DefaultRageshakePreferencesPresenter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/preferences/DefaultRageshakePreferencesPresenter.kt
index d1072f360c..f16d99c634 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/preferences/DefaultRageshakePreferencesPresenter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/preferences/DefaultRageshakePreferencesPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.features.rageshake.api.preferences.RageshakePreferencesEvents
 import io.element.android.features.rageshake.api.preferences.RageshakePreferencesPresenter
@@ -28,7 +28,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRageshakePreferencesPresenter(
     private val rageshake: RageShake,
     private val rageshakeDataStore: RageshakeDataStore,
@@ -49,7 +48,7 @@ class DefaultRageshakePreferencesPresenter(
             rageshakeDataStore.sensitivity()
         }.collectAsState(initial = 0f)
 
-        fun handleEvents(event: RageshakePreferencesEvents) {
+        fun handleEvent(event: RageshakePreferencesEvents) {
             when (event) {
                 is RageshakePreferencesEvents.SetIsEnabled -> localCoroutineScope.setIsEnabled(event.isEnabled)
                 is RageshakePreferencesEvents.SetSensitivity -> localCoroutineScope.setSensitivity(event.sensitivity)
@@ -61,7 +60,7 @@ class DefaultRageshakePreferencesPresenter(
             isEnabled = isEnabled,
             isSupported = isSupported.value,
             sensitivity = sensitivity,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/DefaultRageShake.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/DefaultRageShake.kt
index 634e3ed65a..04efd5bcfc 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/DefaultRageShake.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/DefaultRageShake.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,14 +15,12 @@ import androidx.core.content.getSystemService
 import com.squareup.seismic.ShakeDetector
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import dev.zacsweers.metro.binding
 import io.element.android.libraries.di.annotations.ApplicationContext
 
 @SingleIn(AppScope::class)
 @ContributesBinding(scope = AppScope::class, binding = binding<RageShake>())
-@Inject
 class DefaultRageShake(
     @ApplicationContext context: Context,
 ) : ShakeDetector.Listener, RageShake {
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/PreferencesRageshakeDataStore.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/PreferencesRageshakeDataStore.kt
index 32be2f7e95..04ead6ee14 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/PreferencesRageshakeDataStore.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/PreferencesRageshakeDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.floatPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
@@ -22,7 +22,6 @@ private val enabledKey = booleanPreferencesKey("enabled")
 private val sensitivityKey = floatPreferencesKey("sensitivity")
 
 @ContributesBinding(AppScope::class)
-@Inject
 class PreferencesRageshakeDataStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : RageshakeDataStore {
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageShake.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageShake.kt
index d75d5e5666..f1f6e6f5c2 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageShake.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageShake.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageshakeDataStore.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageshakeDataStore.kt
index f13419bfb2..7afaa0d976 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageshakeDataStore.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/rageshake/RageshakeDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReportAppNameProvider.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReportAppNameProvider.kt
index 9e450d5edb..cef434a5dd 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReportAppNameProvider.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReportAppNameProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.rageshake.impl.reporter
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.RageshakeConfig
 
 fun interface BugReportAppNameProvider {
@@ -17,7 +17,6 @@ fun interface BugReportAppNameProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultBugReportAppNameProvider : BugReportAppNameProvider {
     override fun provide(): String = RageshakeConfig.BUG_REPORT_APP_NAME
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBody.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBody.kt
index 0fe0bfdc86..ccdff2e69e 100755
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBody.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBody.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2014 Square, Inc.
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ * Copyright 2014 Square, Inc.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 @file:Suppress(
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBodyListener.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBodyListener.kt
index f6fe406666..8d21b281ca 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBodyListener.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterMultipartBodyListener.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterUrlProvider.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterUrlProvider.kt
index e7e0e4e060..d6d74d81a5 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterUrlProvider.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/BugReporterUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5787939688..f51d699350 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,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.Inject
 import dev.zacsweers.metro.Provider
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.RageshakeConfig
@@ -28,22 +28,29 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.mimetype.MimeTypes
+import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.SdkMetadata
-import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.tracing.TracingService
 import io.element.android.libraries.network.useragent.UserAgentProvider
 import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.api.sessionIdFlow
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.json.JSONException
 import org.json.JSONObject
@@ -63,9 +70,10 @@ import java.util.Locale
  */
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultBugReporter(
     @ApplicationContext private val context: Context,
+    @AppCoroutineScope
+    private val appCoroutineScope: CoroutineScope,
     private val screenshotHolder: ScreenshotHolder,
     private val crashDataStore: CrashDataStore,
     private val coroutineDispatchers: CoroutineDispatchers,
@@ -77,7 +85,6 @@ class DefaultBugReporter(
     private val sdkMetadata: SdkMetadata,
     private val matrixClientProvider: MatrixClientProvider,
     private val tracingService: TracingService,
-    matrixAuthenticationService: MatrixAuthenticationService,
 ) : BugReporter {
     companion object {
         // filenames
@@ -88,8 +95,6 @@ class DefaultBugReporter(
     private val logcatCommandDebug = arrayOf("logcat", "-d", "-v", "threadtime", "*:*")
     private var currentTracingLogLevel: String? = null
 
-    private val logCatErrFile: File
-        get() = File(logDirectory(), LOG_CAT_FILENAME)
     private val baseLogDirectory = File(context.cacheDir, LOG_DIRECTORY_NAME)
     private var currentLogDirectory: File = baseLogDirectory
 
@@ -97,13 +102,18 @@ class DefaultBugReporter(
         if (buildMeta.isEnterpriseBuild) {
             val logSubfolder = runBlocking {
                 sessionStore.getLatestSession()
-            }?.userId?.substringAfter(":")
+            }?.userId?.let(::UserId)?.domainName
             setCurrentLogDirectory(logSubfolder)
-            matrixAuthenticationService.listenToNewMatrixClients {
-                // When a new Matrix client is created, we update the tracing configuration to write
-                // the files in a dedicated subfolders.
-                setLogDirectorySubfolder(it.userIdServerName())
-            }
+            sessionStore.sessionIdFlow()
+                .map {
+                    it?.let(::UserId)?.domainName
+                }
+                .distinctUntilChanged()
+                .onEach { logSubfolder ->
+                    setCurrentLogDirectory(logSubfolder)
+                    tracingService.updateWriteToFilesConfiguration(createWriteToFilesConfiguration())
+                }
+                .launchIn(appCoroutineScope)
         }
     }
 
@@ -113,6 +123,7 @@ class DefaultBugReporter(
         withScreenshot: Boolean,
         problemDescription: String,
         canContact: Boolean,
+        sendPushRules: Boolean,
         listener: BugReporterListener,
     ) {
         val url = bugReporterUrlProvider.provide().first()
@@ -147,12 +158,17 @@ class DefaultBugReporter(
                 }
                 if (withCrashLogs || withDevicesLogs) {
                     saveLogCat()
-                    val gzippedLogcat = compressFile(logCatErrFile)
-                    if (gzippedLogcat != null) {
-                        gzippedFiles.add(0, gzippedLogcat)
-                    }
+                        ?.let { logCatFile ->
+                            compressFile(logCatFile).also {
+                                logCatFile.safeDelete()
+                            }
+                        }
+                        ?.let { gzippedLogcat ->
+                            gzippedFiles.add(0, gzippedLogcat)
+                        }
                 }
                 val sessionData = sessionStore.getLatestSession()
+                val numberOfAccounts = sessionStore.numberOfSessions()
                 val deviceId = sessionData?.deviceId ?: "undefined"
                 val userId = sessionData?.userId?.let { UserId(it) }
                 // build the multi part request
@@ -161,6 +177,7 @@ class DefaultBugReporter(
                     .addFormDataPart("app", RageshakeConfig.BUG_REPORT_APP_NAME)
                     .addFormDataPart("user_agent", userAgentProvider.provide())
                     .addFormDataPart("user_id", userId?.toString() ?: "undefined")
+                    .addFormDataPart("number_of_accounts", numberOfAccounts.toString())
                     .addFormDataPart("can_contact", canContact.toString())
                     .addFormDataPart("device_id", deviceId)
                     .addFormDataPart("device", Build.MODEL.trim())
@@ -181,6 +198,16 @@ class DefaultBugReporter(
                         if (curveKey != null && edKey != null) {
                             builder.addFormDataPart("device_keys", "curve25519:$curveKey, ed25519:$edKey")
                         }
+
+                        if (sendPushRules) {
+                            client.notificationSettingsService.getRawPushRules().getOrNull()?.let { pushRules ->
+                                builder.addFormDataPart(
+                                    name = "file",
+                                    filename = "push_rules.json",
+                                    body = pushRules.toByteArray().toRequestBody(MimeTypes.Json.toMediaTypeOrNull())
+                                )
+                            }
+                        }
                     }
                 }
                 if (crashCallStack.isNotEmpty() && withCrashLogs) {
@@ -321,13 +348,6 @@ class DefaultBugReporter(
         }
     }
 
-    override fun setLogDirectorySubfolder(subfolderName: String?) {
-        if (buildMeta.isEnterpriseBuild) {
-            setCurrentLogDirectory(subfolderName)
-            tracingService.updateWriteToFilesConfiguration(createWriteToFilesConfiguration())
-        }
-    }
-
     private fun setCurrentLogDirectory(subfolderName: String?) {
         currentLogDirectory = if (subfolderName == null) {
             baseLogDirectory
@@ -369,7 +389,8 @@ class DefaultBugReporter(
             onException = { Timber.e(it, "## getLogFiles() failed") }
         ) {
             val logDirectory = logDirectory()
-            logDirectory.listFiles()?.toList()
+            logDirectory.listFiles()
+                ?.filter { it.isFile && !it.name.endsWith(LOG_CAT_FILENAME) }
         }.orEmpty()
     }
 
@@ -382,19 +403,19 @@ class DefaultBugReporter(
      *
      * @return the file if the operation succeeds
      */
-    override fun saveLogCat() {
-        val file = logCatErrFile
+    override fun saveLogCat(): File? {
+        val file = File(baseLogDirectory, LOG_CAT_FILENAME)
         if (file.exists()) {
             file.safeDelete()
         }
-        try {
+        return try {
             file.writer().use {
-                getLogCatError(it)
+                getLogCatContent(it)
             }
-        } catch (error: OutOfMemoryError) {
-            Timber.e(error, "## saveLogCat() : fail to write logcat OOM")
+            file
         } catch (e: Exception) {
             Timber.e(e, "## saveLogCat() : fail to write logcat")
+            null
         }
     }
 
@@ -403,15 +424,10 @@ class DefaultBugReporter(
      *
      * @param streamWriter the stream writer
      */
-    private fun getLogCatError(streamWriter: OutputStreamWriter) {
-        val logcatProcess: Process
-
-        try {
-            logcatProcess = Runtime.getRuntime().exec(logcatCommandDebug)
-        } catch (e1: IOException) {
-            return
-        }
-
+    private fun getLogCatContent(streamWriter: OutputStreamWriter) {
+        val logcatProcess = tryOrNull {
+            Runtime.getRuntime().exec(logcatCommandDebug)
+        } ?: return
         try {
             val separator = System.lineSeparator()
             logcatProcess.inputStream
@@ -422,7 +438,7 @@ class DefaultBugReporter(
                     streamWriter.append(separator)
                 }
         } catch (e: IOException) {
-            Timber.e(e, "getLog fails")
+            Timber.e(e, "getLogCatContent fails")
         }
     }
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt
index 84f8e2ca0a..384d059e80 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,32 +10,39 @@ package io.element.android.features.rageshake.impl.reporter
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.RageshakeConfig
 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.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.api.sessionIdFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultBugReporterUrlProvider(
     private val bugReportAppNameProvider: BugReportAppNameProvider,
     private val enterpriseService: EnterpriseService,
+    private val sessionStore: SessionStore,
 ) : BugReporterUrlProvider {
+    @OptIn(ExperimentalCoroutinesApi::class)
     override fun provide(): Flow<HttpUrl?> {
         if (bugReportAppNameProvider.provide().isEmpty()) return flowOf(null)
-        return enterpriseService.bugReportUrlFlow
-            .map { bugReportUrl ->
-                when (bugReportUrl) {
-                    is BugReportUrl.Custom -> bugReportUrl.url
-                    BugReportUrl.Disabled -> null
-                    BugReportUrl.UseDefault -> RageshakeConfig.BUG_REPORT_URL.takeIf { it.isNotEmpty() }
+        return sessionStore.sessionIdFlow().flatMapLatest { sessionId ->
+            enterpriseService.bugReportUrlFlow(sessionId?.let(::SessionId))
+                .map { bugReportUrl ->
+                    when (bugReportUrl) {
+                        is BugReportUrl.Custom -> bugReportUrl.url
+                        BugReportUrl.Disabled -> null
+                        BugReportUrl.UseDefault -> RageshakeConfig.BUG_REPORT_URL.takeIf { it.isNotEmpty() }
+                    }
                 }
-            }
-            .map { it?.toHttpUrl() }
+                .map { it?.toHttpUrl() }
+        }
     }
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/DefaultScreenshotHolder.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/DefaultScreenshotHolder.kt
index 5166f3d672..96fb145d83 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/DefaultScreenshotHolder.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/DefaultScreenshotHolder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import android.graphics.Bitmap
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.androidutils.bitmap.writeBitmap
 import io.element.android.libraries.androidutils.file.safeDelete
@@ -21,7 +21,6 @@ import java.io.File
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultScreenshotHolder(
     @ApplicationContext private val context: Context,
 ) : ScreenshotHolder {
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/ScreenshotHolder.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/ScreenshotHolder.kt
index c746a573d3..8ea58f67d8 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/ScreenshotHolder.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/screenshot/ScreenshotHolder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/main/res/values-hr/translations.xml b/features/rageshake/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..e49427b2a9
--- /dev/null
+++ b/features/rageshake/impl/src/main/res/values-hr/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">"Priloži snimku zaslona"</string>
+  <string name="screen_bug_report_contact_me">"Možete mi se obratiti ako imate bilo kakvih dodatnih pitanja."</string>
+  <string name="screen_bug_report_contact_me_title">"Javi mi se"</string>
+  <string name="screen_bug_report_edit_screenshot">"Uredi snimku zaslona"</string>
+  <string name="screen_bug_report_editor_description">"Opišite problem. Što ste napravili? Što ste očekivali da će se dogoditi? Što se zapravo dogodilo. Molimo vas da što detaljnije opišete problem."</string>
+  <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_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>
+  <string name="screen_bug_report_include_screenshot">"Pošalji snimku zaslona"</string>
+  <string name="screen_bug_report_logs_description">"Zapisnici će biti uključeni u vašu poruku kako bismo bili sigurni da sve ispravno funkcionira. Kako biste poslali poruku bez zapisnika, isključite ovu postavku."</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"%1$s neočekivano je prestao s radom prilikom posljednjeg korištenja. Želite li s nama podijeliti izvješće o padu?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Ako imate problema s obavijestima, prijenos pravila za slanje obavijesti može nam pomoći da utvrdimo uzrok. Imajte na umu da ta pravila mogu sadržavati privatne podatke, kao što su vaše ime za prikaz ili ključne riječi za koje želite primati obavijesti."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Postavke slanja obavijesti"</string>
+  <string name="screen_bug_report_view_logs">"Prikaz zapisnika"</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 8709881709..31fb95f9f6 100644
--- a/features/rageshake/impl/src/main/res/values-it/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-it/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Invia istantanea schermo"</string>
   <string name="screen_bug_report_logs_description">"Per verificare che le cose funzionino come previsto, i log verranno inviati con il tuo messaggio. Per inviare solo il tuo messaggio, disattiva questa impostazione."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s si è chiuso inaspettatamente l\'ultima volta che è stato usato. Vuoi condividere con noi un rapporto sull\'arresto anomalo?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Se riscontri problemi con le notifiche, caricare le regole per le notifiche push può aiutarci a individuare la causa principale. Tieni presente che queste regole possono contenere informazioni private, come il tuo nome visualizzato o le parole chiave per cui ricevere notifiche."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Invia impostazioni di notifica"</string>
   <string name="screen_bug_report_view_logs">"Visualizza i log"</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 4fa4d0a653..996793c262 100644
--- a/features/rageshake/impl/src/main/res/values-nb/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-nb/translations.xml
@@ -15,5 +15,6 @@
   <string name="screen_bug_report_logs_description">"Logger vil bli inkludert i meldingen din, for å sikre at alt fungerer som det skal. For å sende meldingen uten logger, slå av denne innstillingen."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s krasjet sist gang den ble brukt. Vil du dele en krasjrapport med oss?"</string>
   <string name="screen_bug_report_send_notification_settings_description">"Hvis du har problemer med varsler, kan det å laste opp varslingsinnstillingene hjelpe oss med å finne den underliggende årsaken."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Send varslingsinnstillinger"</string>
   <string name="screen_bug_report_view_logs">"Vis logger"</string>
 </resources>
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 e421d747bf..c433071584 100644
--- a/features/rageshake/impl/src/main/res/values-pl/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-pl/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Wyślij zrzut ekranu"</string>
   <string name="screen_bug_report_logs_description">"Logi zostaną dołączone do Twojej wiadomości, aby upewnić się, że wszystko działa poprawnie. Aby wysłać wiadomość bez logów, wyłącz to ustawienie."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s uległ awarii podczas ostatniego użycia. Czy chcesz przesłać nam raport o awarii?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Jeśli posiadasz problemy z powiadomieniami, przesłanie nam swoich ustawień pomoże nam ustalić przyczynę usterki."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Ustawienia powiadomień"</string>
   <string name="screen_bug_report_view_logs">"Wyświetl logi"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml b/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml
index 046c1b30d7..7495d5946e 100644
--- a/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-pt-rBR/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Enviar captura de tela"</string>
   <string name="screen_bug_report_logs_description">"Os registros serão incluídos com sua mensagem para garantir que tudo esteja funcionando corretamente. Para enviar sua mensagem sem registros, desative essa configuração."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s falhou inesperadamente na última vez que foi usado. Gostaria de compartilhar um relatório de falhas conosco?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Se estiver enfrentando problemas com as notificações, enviar as regras de notificações push pode ajudar-nos a descobrir o que está errado. Observe que as regras podem conter informações privadas, como o seu nome de exibição ou palavras chaves de notificação."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Enviar configurações de notificação"</string>
   <string name="screen_bug_report_view_logs">"Ver registros"</string>
 </resources>
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 f1d5216405..42286efa44 100644
--- a/features/rageshake/impl/src/main/res/values-ru/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-ru/translations.xml
@@ -13,7 +13,7 @@
   <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_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>
diff --git a/features/rageshake/impl/src/main/res/values-sk/translations.xml b/features/rageshake/impl/src/main/res/values-sk/translations.xml
index c46181ad29..9edad566ce 100644
--- a/features/rageshake/impl/src/main/res/values-sk/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-sk/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Odoslať snímku obrazovky"</string>
   <string name="screen_bug_report_logs_description">"K vašej správe budú priložené záznamy o chybe, aby sme sa uistili, že všetko funguje správne. Ak chcete odoslať správu bez záznamov o chybe, vypnite toto nastavenie."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s zlyhal pri poslednom použití. Chcete zdieľať správu o páde s našim tímom?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Ak máte problémy s upozorneniami, nahranie pravidiel pre push upozornenia nám môže pomôcť určiť príčinu. Upozorňujeme, že tieto pravidlá môžu obsahovať súkromné ​​informácie, ako napríklad vaše zobrazované meno alebo kľúčové slová, na ktoré sa majú dostávať upozornenia."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Nastavenia odosielania upozornení"</string>
   <string name="screen_bug_report_view_logs">"Zobraziť záznamy"</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 fbeb0d3271..e3aceaa7d6 100644
--- a/features/rageshake/impl/src/main/res/values-uz/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-uz/translations.xml
@@ -10,6 +10,7 @@
   <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_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>
diff --git a/features/rageshake/impl/src/main/res/values-zh-rTW/translations.xml b/features/rageshake/impl/src/main/res/values-zh-rTW/translations.xml
index 2105ab1697..10252ab699 100644
--- a/features/rageshake/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-zh-rTW/translations.xml
@@ -14,5 +14,7 @@
   <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/localazy.xml b/features/rageshake/impl/src/main/res/values/localazy.xml
index f6d93c4114..85af2af4a7 100644
--- a/features/rageshake/impl/src/main/res/values/localazy.xml
+++ b/features/rageshake/impl/src/main/res/values/localazy.xml
@@ -14,7 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Send screenshot"</string>
   <string name="screen_bug_report_logs_description">"Logs will be included with your message to make sure that everything is working properly. To send your message without logs, turn off this setting."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s crashed the last time it was used. Would you like to share a crash report with us?"</string>
-  <string name="screen_bug_report_send_notification_settings_description">"If you are having issues with notifications, uploading the notification settings can help us pinpoint the root cause."</string>
+  <string name="screen_bug_report_send_notification_settings_description">"If you are having issues with notifications, uploading the notification push rules can help us pinpoint the root cause. Note these rules can contain private information, such as your display name or keywords to be notified for."</string>
   <string name="screen_bug_report_send_notification_settings_title">"Send notification settings"</string>
   <string name="screen_bug_report_view_logs">"View logs"</string>
 </resources>
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailabilityTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailabilityTest.kt
index 7f59245647..b656d14803 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailabilityTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/DefaultRageshakeFeatureAvailabilityTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 362b3798d6..f5b0508063 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -106,6 +107,20 @@ class BugReportPresenterTest {
         }
     }
 
+    @Test
+    fun `present - send notification settings`() = runTest {
+        val presenter = createPresenter()
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(BugReportEvents.SetSendPushRules(true))
+            assertThat(awaitItem().formState).isEqualTo(BugReportFormState.Default.copy(sendPushRules = true))
+            initialState.eventSink.invoke(BugReportEvents.SetSendPushRules(false))
+            assertThat(awaitItem().formState).isEqualTo(BugReportFormState.Default.copy(sendPushRules = false))
+        }
+    }
+
     @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/DefaultBugReportEntryPointTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPointTest.kt
index 23d74f7247..bf459827fe 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPointTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,10 @@ package io.element.android.features.rageshake.impl.bugreport
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
-import io.element.android.features.viewfolder.api.ViewFolderEntryPoint
+import io.element.android.features.viewfolder.test.FakeViewFolderEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@@ -34,17 +34,17 @@ class DefaultBugReportEntryPointTest {
             BugReportFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                viewFolderEntryPoint = object : ViewFolderEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                viewFolderEntryPoint = FakeViewFolderEntryPoint(),
             )
         }
         val callback = object : BugReportEntryPoint.Callback {
             override fun onDone() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(BugReportFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
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 ebaa524bd5..36cc185e86 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,6 +27,7 @@ class FakeBugReporter(val mode: Mode = Mode.Success) : BugReporter {
         withScreenshot: Boolean,
         problemDescription: String,
         canContact: Boolean,
+        sendPushRules: Boolean,
         listener: BugReporterListener,
     ) {
         delay(100)
@@ -53,15 +55,11 @@ class FakeBugReporter(val mode: Mode = Mode.Success) : BugReporter {
         return File("fake")
     }
 
-    override fun setLogDirectorySubfolder(subfolderName: String?) {
-        // No op
-    }
-
     override fun setCurrentTracingLogLevel(logLevel: String) {
         // No op
     }
 
-    override fun saveLogCat() {
-        // No op
+    override fun saveLogCat(): File? {
+        return null
     }
 }
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/FakeCrashDataStore.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/FakeCrashDataStore.kt
index 8ab5d33eb3..3ddacd3d58 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/FakeCrashDataStore.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/FakeCrashDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f19362f99c..665e1ce4bd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/ui/CrashDetectionPresenterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/ui/CrashDetectionPresenterTest.kt
index a0172e3d39..dcaaa20a69 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/ui/CrashDetectionPresenterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/ui/CrashDetectionPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/detection/RageshakeDetectionPresenterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/detection/RageshakeDetectionPresenterTest.kt
index 451bfd82ed..d76ab73aa8 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/detection/RageshakeDetectionPresenterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/detection/RageshakeDetectionPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/preferences/RageshakePreferencesPresenterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/preferences/RageshakePreferencesPresenterTest.kt
index df34e1cf48..8fda5c3d97 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/preferences/RageshakePreferencesPresenterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/preferences/RageshakePreferencesPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageShake.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageShake.kt
index b35bde295a..08dbe91823 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageShake.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageShake.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageshakeDataStore.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageshakeDataStore.kt
index ec67ed13c0..122706b12b 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageshakeDataStore.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/rageshake/FakeRageshakeDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ecb8d13b12..41e136a53e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,15 +16,16 @@ import io.element.android.features.rageshake.impl.crash.FakeCrashDataStore
 import io.element.android.features.rageshake.impl.screenshot.FakeScreenshotHolder
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.MatrixClientProvider
-import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.tracing.TracingService
 import io.element.android.libraries.matrix.api.tracing.WriteToFilesConfiguration
+import io.element.android.libraries.matrix.test.A_DEVICE_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.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.FakeSdkMetadata
-import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 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.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.tracing.FakeTracingService
 import io.element.android.libraries.network.useragent.DefaultUserAgentProvider
 import io.element.android.libraries.sessionstorage.api.SessionStore
@@ -31,8 +33,10 @@ 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.testCoroutineDispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import okhttp3.MultipartReader
 import okhttp3.OkHttpClient
@@ -65,6 +69,7 @@ class DefaultBugReporterTest {
             withDevicesLogs = true,
             withCrashLogs = true,
             withScreenshot = true,
+            sendPushRules = true,
             problemDescription = "a bug occurred",
             canContact = true,
             listener = object : BugReporterListener {
@@ -108,6 +113,79 @@ class DefaultBugReporterTest {
             initialList = listOf(aSessionData(sessionId = "@foo:example.com", deviceId = "ABCDEFGH"))
         )
 
+        val fakeEncryptionService = FakeEncryptionService()
+
+        val fakePushRules = "{ content: ... }"
+        val fakeNotificationSettingsService = FakeNotificationSettingsService(
+            getRawPushRulesResult = { Result.success(fakePushRules) }
+        )
+        val matrixClient = FakeMatrixClient(encryptionService = fakeEncryptionService, notificationSettingsService = fakeNotificationSettingsService)
+
+        fakeEncryptionService.givenDeviceKeys("CURVECURVECURVE", "EDKEYEDKEYEDKY")
+        val sut = createDefaultBugReporter(
+            server = server,
+            crashDataStore = FakeCrashDataStore(),
+            sessionStore = mockSessionStore,
+            matrixClientProvider = FakeMatrixClientProvider(getClient = { Result.success(matrixClient) })
+        )
+
+        val progressValues = mutableListOf<Int>()
+        sut.sendBugReport(
+            withDevicesLogs = true,
+            withCrashLogs = true,
+            withScreenshot = true,
+            sendPushRules = true,
+            problemDescription = "a bug occurred",
+            canContact = true,
+            listener = object : BugReporterListener {
+                override fun onUploadCancelled() {}
+
+                override fun onUploadFailed(reason: String?) {}
+
+                override fun onProgress(progress: Int) {
+                    progressValues.add(progress)
+                }
+
+                override fun onUploadSucceed() {}
+            },
+        )
+        val request = server.takeRequest()
+
+        val foundValues = collectValuesFromFormData(request)
+
+        assertThat(foundValues["app"]).isEqualTo(RageshakeConfig.BUG_REPORT_APP_NAME)
+        assertThat(foundValues["can_contact"]).isEqualTo("true")
+        assertThat(foundValues["device_id"]).isEqualTo("ABCDEFGH")
+        assertThat(foundValues["sdk_sha"]).isEqualTo("123456789")
+        assertThat(foundValues["user_id"]).isEqualTo("@foo:example.com")
+        assertThat(foundValues["number_of_accounts"]).isEqualTo("1")
+        assertThat(foundValues["text"]).isEqualTo("a bug occurred")
+        assertThat(foundValues["device_keys"]).isEqualTo("curve25519:CURVECURVECURVE, ed25519:EDKEYEDKEYEDKY")
+        assertThat(foundValues["file"]).contains(fakePushRules)
+
+        // device_key now added given they are not null
+        // so is the file value for the included push_rules
+        assertThat(progressValues.size).isEqualTo(EXPECTED_NUMBER_OF_PROGRESS_VALUE + 2)
+
+        server.shutdown()
+    }
+
+    @Test
+    fun `test sendBugReport multi accounts`() = runTest {
+        val server = MockWebServer()
+        server.enqueue(
+            MockResponse()
+                .setResponseCode(200)
+        )
+        server.start()
+
+        val mockSessionStore = InMemorySessionStore(
+            initialList = listOf(
+                aSessionData(sessionId = "@foo:example.com", deviceId = "ABCDEFGH"),
+                aSessionData(sessionId = A_USER_ID.value, deviceId = A_DEVICE_ID.value),
+            )
+        )
+
         val fakeEncryptionService = FakeEncryptionService()
         val matrixClient = FakeMatrixClient(encryptionService = fakeEncryptionService)
 
@@ -147,6 +225,7 @@ class DefaultBugReporterTest {
         assertThat(foundValues["device_id"]).isEqualTo("ABCDEFGH")
         assertThat(foundValues["sdk_sha"]).isEqualTo("123456789")
         assertThat(foundValues["user_id"]).isEqualTo("@foo:example.com")
+        assertThat(foundValues["number_of_accounts"]).isEqualTo("2")
         assertThat(foundValues["text"]).isEqualTo("a bug occurred")
         assertThat(foundValues["device_keys"]).isEqualTo("curve25519:CURVECURVECURVE, ed25519:EDKEYEDKEYEDKY")
 
@@ -228,6 +307,7 @@ class DefaultBugReporterTest {
         assertThat(foundValues["device_keys"]).isNull()
         assertThat(foundValues["device_id"]).isEqualTo("undefined")
         assertThat(foundValues["user_id"]).isEqualTo("undefined")
+        assertThat(foundValues["number_of_accounts"]).isEqualTo("0")
         assertThat(foundValues["label"]).isEqualTo("crash")
     }
 
@@ -243,7 +323,7 @@ class DefaultBugReporterTest {
                 while (part != null) {
                     part.headers["Content-Disposition"]?.let { contentDisposition ->
                         regex.find(contentDisposition)?.groupValues?.get(1)?.let { name ->
-                            foundValues.put(name, part!!.body.readUtf8())
+                            foundValues.put(name, part.body.readUtf8())
                         }
                     }
                     part = multipartReader.nextPart()
@@ -272,6 +352,7 @@ class DefaultBugReporterTest {
             withDevicesLogs = true,
             withCrashLogs = true,
             withScreenshot = true,
+            sendPushRules = true,
             problemDescription = "a bug occurred",
             canContact = true,
             listener = object : BugReporterListener {
@@ -325,53 +406,85 @@ class DefaultBugReporterTest {
         assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs")
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun `when the log directory is updated, the tracing service is invoked`() = runTest {
+    fun `when a session is added, the tracing service is invoked`() = runTest {
         var param: WriteToFilesConfiguration? = null
         val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {
             param = it
         }
-        val sut = createDefaultBugReporter(
+        val sessionStore = InMemorySessionStore()
+        createDefaultBugReporter(
             buildMeta = aBuildMeta(isEnterpriseBuild = true),
+            sessionStore = sessionStore,
             tracingService = FakeTracingService(
                 updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
             ),
         )
-        sut.setLogDirectorySubfolder("my.sub.folder")
+        sessionStore.addSession(aSessionData(sessionId = "@alice:server.org"))
+        runCurrent()
         updateWriteToFilesConfigurationResult.assertions().isCalledOnce()
         assertThat(param).isNotNull()
         assertThat(param).isInstanceOf(WriteToFilesConfiguration.Enabled::class.java)
-        assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs/my.sub.folder")
+        assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs/server.org")
         assertThat((param as WriteToFilesConfiguration.Enabled).filenamePrefix).isEqualTo("logs")
         assertThat((param as WriteToFilesConfiguration.Enabled).numberOfFiles).isEqualTo(168)
         assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo("log")
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun `foss build - when the log directory is updated, the tracing service is not invoked`() = runTest {
+    fun `when another session is added on same domain, the tracing service is not invoked`() = runTest {
         val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {}
-        val sut = createDefaultBugReporter(
-            tracingService = FakeTracingService(
-                updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
-            )
-        )
-        sut.setLogDirectorySubfolder("my.sub.folder")
-        updateWriteToFilesConfigurationResult.assertions().isNeverCalled()
-    }
-
-    @Test
-    fun `when the log directory is reset, the tracing service is invoked`() = runTest {
-        var param: WriteToFilesConfiguration? = null
-        val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {
-            param = it
-        }
-        val sut = createDefaultBugReporter(
+        val sessionStore = InMemorySessionStore()
+        createDefaultBugReporter(
             buildMeta = aBuildMeta(isEnterpriseBuild = true),
+            sessionStore = sessionStore,
             tracingService = FakeTracingService(
                 updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
             ),
         )
-        sut.setLogDirectorySubfolder(null)
+        sessionStore.addSession(aSessionData(sessionId = "@alice:server.org"))
+        runCurrent()
+        updateWriteToFilesConfigurationResult.assertions().isCalledOnce()
+        sessionStore.addSession(aSessionData(sessionId = "@bob:server.org"))
+        runCurrent()
+        updateWriteToFilesConfigurationResult.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `foss build - when a session is added, the tracing service is not invoked`() = runTest {
+        val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {}
+        val sessionStore = InMemorySessionStore()
+        createDefaultBugReporter(
+            tracingService = FakeTracingService(
+                updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
+            ),
+            sessionStore = sessionStore,
+        )
+        sessionStore.addSession(aSessionData(sessionId = "@alice:server.org"))
+        updateWriteToFilesConfigurationResult.assertions().isNeverCalled()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `when the user signs out, the tracing service is invoked`() = runTest {
+        var param: WriteToFilesConfiguration? = null
+        val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {
+            param = it
+        }
+        val sessionStore = InMemorySessionStore(
+            initialList = listOf(aSessionData(sessionId = "@alice:server.org")),
+        )
+        createDefaultBugReporter(
+            buildMeta = aBuildMeta(isEnterpriseBuild = true),
+            tracingService = FakeTracingService(
+                updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
+            ),
+            sessionStore = sessionStore,
+        )
+        sessionStore.removeSession("@alice:server.org")
+        runCurrent()
         updateWriteToFilesConfigurationResult.assertions().isCalledOnce()
         assertThat(param).isNotNull()
         assertThat(param).isInstanceOf(WriteToFilesConfiguration.Enabled::class.java)
@@ -384,66 +497,16 @@ class DefaultBugReporterTest {
     @Test
     fun `foss build - when the log directory is reset, the tracing service is not invoked`() = runTest {
         val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {}
-        val sut = createDefaultBugReporter(
+        val sessionStore = InMemorySessionStore(
+            initialList = listOf(aSessionData(sessionId = "@alice:server.org")),
+        )
+        createDefaultBugReporter(
             tracingService = FakeTracingService(
                 updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
-            )
+            ),
+            sessionStore = sessionStore,
         )
-        sut.setLogDirectorySubfolder(null)
-        updateWriteToFilesConfigurationResult.assertions().isNeverCalled()
-    }
-
-    @Test
-    fun `when a new MatrixClient is created the logs folder is updated`() = runTest {
-        var param: WriteToFilesConfiguration? = null
-        val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {
-            param = it
-        }
-        val matrixAuthenticationService = FakeMatrixAuthenticationService().apply {
-            givenMatrixClient(
-                FakeMatrixClient(
-                    userIdServerNameLambda = { "domain.foo.org" },
-                )
-            )
-        }
-        val sut = createDefaultBugReporter(
-            buildMeta = aBuildMeta(isEnterpriseBuild = true),
-            matrixAuthenticationService = matrixAuthenticationService,
-            tracingService = FakeTracingService(
-                updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
-            )
-        )
-        assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs")
-        matrixAuthenticationService.login("alice", "password")
-        assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs/domain.foo.org")
-        updateWriteToFilesConfigurationResult.assertions().isCalledOnce()
-        assertThat(param).isNotNull()
-        assertThat(param).isInstanceOf(WriteToFilesConfiguration.Enabled::class.java)
-        assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs/domain.foo.org")
-        assertThat((param as WriteToFilesConfiguration.Enabled).filenamePrefix).isEqualTo("logs")
-        assertThat((param as WriteToFilesConfiguration.Enabled).numberOfFiles).isEqualTo(168)
-        assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo("log")
-    }
-
-    @Test
-    fun `foss build - when a new MatrixClient is created the logs folder is not updated`() = runTest {
-        val updateWriteToFilesConfigurationResult = lambdaRecorder<WriteToFilesConfiguration, Unit> {}
-        val matrixAuthenticationService = FakeMatrixAuthenticationService().apply {
-            givenMatrixClient(
-                FakeMatrixClient(
-                    userIdServerNameLambda = { "domain.foo.org" },
-                )
-            )
-        }
-        val sut = createDefaultBugReporter(
-            matrixAuthenticationService = matrixAuthenticationService,
-            tracingService = FakeTracingService(
-                updateWriteToFilesConfigurationResult = updateWriteToFilesConfigurationResult,
-            )
-        )
-        assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs")
-        matrixAuthenticationService.login("alice", "password")
-        assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs")
+        sessionStore.removeSession("@alice:server.org")
         updateWriteToFilesConfigurationResult.assertions().isNeverCalled()
     }
 
@@ -454,10 +517,10 @@ class DefaultBugReporterTest {
         crashDataStore: CrashDataStore = FakeCrashDataStore(),
         server: MockWebServer = MockWebServer(),
         tracingService: TracingService = FakeTracingService(),
-        matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
     ): DefaultBugReporter {
         return DefaultBugReporter(
             context = RuntimeEnvironment.getApplication(),
+            appCoroutineScope = backgroundScope,
             screenshotHolder = FakeScreenshotHolder(),
             crashDataStore = crashDataStore,
             coroutineDispatchers = testCoroutineDispatchers(),
@@ -469,11 +532,10 @@ class DefaultBugReporterTest {
             sdkMetadata = FakeSdkMetadata("123456789"),
             matrixClientProvider = matrixClientProvider,
             tracingService = tracingService,
-            matrixAuthenticationService = matrixAuthenticationService,
         )
     }
 
     companion object {
-        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 17
+        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 18
     }
 }
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProviderTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProviderTest.kt
index fb7464adf7..67af12c19a 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProviderTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterUrlProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,16 +12,19 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.appconfig.RageshakeConfig
 import io.element.android.features.enterprise.api.BugReportUrl
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import kotlinx.coroutines.test.runTest
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.junit.Test
 
 class DefaultBugReporterUrlProviderTest {
     @Test
-    fun `provide return values when there is an rageshake app name`() = runTest {
+    fun `provide returns values when there is an rageshake app name`() = runTest {
         val enterpriseService = FakeEnterpriseService()
-        val sut = DefaultBugReporterUrlProvider(
+        val sut = createDefaultBugReporterUrlProvider(
             bugReportAppNameProvider = { "rageshakeAppName" },
             enterpriseService = enterpriseService,
         )
@@ -36,15 +40,21 @@ class DefaultBugReporterUrlProviderTest {
     }
 
     @Test
-    fun `provide return null when there is no rageshake app name`() = runTest {
-        val enterpriseService = FakeEnterpriseService()
-        val sut = DefaultBugReporterUrlProvider(
-            bugReportAppNameProvider = { "" },
-            enterpriseService = enterpriseService,
-        )
+    fun `provide returns null when there is no rageshake app name`() = runTest {
+        val sut = createDefaultBugReporterUrlProvider()
         sut.provide().test {
             assertThat(awaitItem()).isNull()
             awaitComplete()
         }
     }
 }
+
+private fun createDefaultBugReporterUrlProvider(
+    bugReportAppNameProvider: BugReportAppNameProvider = BugReportAppNameProvider { "" },
+    enterpriseService: EnterpriseService = FakeEnterpriseService(),
+    sessionStore: SessionStore = InMemorySessionStore(),
+) = DefaultBugReporterUrlProvider(
+    bugReportAppNameProvider = bugReportAppNameProvider,
+    enterpriseService = enterpriseService,
+    sessionStore = sessionStore,
+)
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/NoopBugReporterListener.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/NoopBugReporterListener.kt
index 19e5c6304e..557f0c9414 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/NoopBugReporterListener.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/NoopBugReporterListener.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/screenshot/FakeScreenshotHolder.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/screenshot/FakeScreenshotHolder.kt
index 8e37da1910..543f8e505d 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/screenshot/FakeScreenshotHolder.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/screenshot/FakeScreenshotHolder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/rageshake/test/build.gradle.kts b/features/rageshake/test/build.gradle.kts
index d731de03a8..afc5e51499 100644
--- a/features/rageshake/test/build.gradle.kts
+++ b/features/rageshake/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/rageshake/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeLogFilesRemover.kt b/features/rageshake/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeLogFilesRemover.kt
index a7a5ee04d2..9bf00c80c0 100644
--- a/features/rageshake/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeLogFilesRemover.kt
+++ b/features/rageshake/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeLogFilesRemover.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/api/build.gradle.kts b/features/reportroom/api/build.gradle.kts
index f5499b7a74..83318480d5 100644
--- a/features/reportroom/api/build.gradle.kts
+++ b/features/reportroom/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt b/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt
index 1eff7f8206..ea99507346 100644
--- a/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt
+++ b/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,5 +14,9 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 
 fun interface ReportRoomEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        roomId: RoomId,
+    ): Node
 }
diff --git a/features/reportroom/impl/build.gradle.kts b/features/reportroom/impl/build.gradle.kts
index 99d65612bd..c945465aec 100644
--- a/features/reportroom/impl/build.gradle.kts
+++ b/features/reportroom/impl/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt
index e433c70bf6..1d4ee13d00 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,15 +12,17 @@ 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 dev.zacsweers.metro.Inject
 import io.element.android.features.reportroom.api.ReportRoomEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultReportRoomEntryPoint : ReportRoomEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        roomId: RoomId,
+    ): Node {
         return parentNode.createNode<ReportRoomNode>(buildContext, plugins = listOf(ReportRoomNode.Inputs(roomId)))
     }
 }
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt
index dae5c4e272..45f6c30b90 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.reportroom.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -29,7 +29,6 @@ interface ReportRoom {
 }
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultReportRoom(
     private val client: MatrixClient,
 ) : ReportRoom {
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt
index e72f00e2a9..f7185f7fcd 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt
index cd136efcba..ef11730d47 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt
index 42ab1cf08a..422cf42718 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -43,7 +44,7 @@ class ReportRoomPresenter(
 
         val coroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: ReportRoomEvents) {
+        fun handleEvent(event: ReportRoomEvents) {
             when (event) {
                 ReportRoomEvents.Report -> coroutineScope.reportRoom(reason, leaveRoom, reportAction)
                 ReportRoomEvents.ToggleLeaveRoom -> {
@@ -61,7 +62,7 @@ class ReportRoomPresenter(
             reason = reason,
             leaveRoom = leaveRoom,
             reportAction = reportAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt
index a04f24123b..fa09306991 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt
index 1e89a31adb..8baae080f5 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5af0beefcd..4ab1a51336 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/impl/src/main/res/values-bg/translations.xml b/features/reportroom/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..aeb51d316f
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-bg/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_report_room_title">"Докладване на стаята"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-eu/translations.xml b/features/reportroom/impl/src/main/res/values-eu/translations.xml
new file mode 100644
index 0000000000..bc8f50e002
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-eu/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_report_room_title">"Salatu gela"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-hr/translations.xml b/features/reportroom/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..50ecc7a24d
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-hr/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">"Vaša je prijava uspješno poslana, ali naišli smo na problem prilikom pokušaja napuštanja sobe. Pokušajte ponovno."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Sobu nije moguće napustiti"</string>
+  <string name="screen_report_room_reason_footer">"Prijavi ovu sobu svom administratoru. Ako su poruke šifrirane, vaš administrator neće ih moći pročitati."</string>
+  <string name="screen_report_room_reason_placeholder">"Navedite razlog prijave…"</string>
+  <string name="screen_report_room_title">"Prijavi sobu"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-nb/translations.xml b/features/reportroom/impl/src/main/res/values-nb/translations.xml
index bda1334210..5d822223ae 100644
--- a/features/reportroom/impl/src/main/res/values-nb/translations.xml
+++ b/features/reportroom/impl/src/main/res/values-nb/translations.xml
@@ -4,5 +4,5 @@
   <string name="screen_report_room_leave_failed_alert_title">"Kan ikke forlate rommet"</string>
   <string name="screen_report_room_reason_footer">"Rapporter dette rommet til administratoren din. Hvis meldingene er kryptert, vil administratoren ikke kunne lese dem."</string>
   <string name="screen_report_room_reason_placeholder">"Beskriv årsaken…"</string>
-  <string name="screen_report_room_title">"Rapporter rom"</string>
+  <string name="screen_report_room_title">"Rapporter rommet"</string>
 </resources>
diff --git a/features/reportroom/impl/src/main/res/values-nl/translations.xml b/features/reportroom/impl/src/main/res/values-nl/translations.xml
new file mode 100644
index 0000000000..22252f00d1
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-nl/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_report_room_title">"Kamer melden"</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 d413f25b44..6ab5600259 100644
--- a/features/reportroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/reportroom/impl/src/main/res/values-ru/translations.xml
@@ -3,6 +3,6 @@
   <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_placeholder">"Опишите причину жалобы…"</string>
   <string name="screen_report_room_title">"Комната отчетов"</string>
 </resources>
diff --git a/features/reportroom/impl/src/main/res/values-sv/translations.xml b/features/reportroom/impl/src/main/res/values-sv/translations.xml
index 174949b87d..8c824b9675 100644
--- a/features/reportroom/impl/src/main/res/values-sv/translations.xml
+++ b/features/reportroom/impl/src/main/res/values-sv/translations.xml
@@ -4,5 +4,5 @@
   <string name="screen_report_room_leave_failed_alert_title">"Kunde inte lämna rummet"</string>
   <string name="screen_report_room_reason_footer">"Anmäl det här rummet till din administratör. Om meddelandena är krypterade kommer din administratör inte att kunna läsa dem."</string>
   <string name="screen_report_room_reason_placeholder">"Beskriv anledningen …"</string>
-  <string name="screen_report_room_title">"Rapportera rum"</string>
+  <string name="screen_report_room_title">"Anmäl rum"</string>
 </resources>
diff --git a/features/reportroom/impl/src/main/res/values-uz/translations.xml b/features/reportroom/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..e7424ade8f
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-uz/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">"Hisobotingiz muvaffaqiyatli yuborildi, ammo xonadan chiqishda muammo yuzaga keldi. Iltimos, qaytadan urinib ko‘ring."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Xonani tark etish imkonsiz"</string>
+  <string name="screen_report_room_reason_footer">"Bu xona haqida administratoringizga xabar bering. Agar xabarlar shifrlangan bo‘lsa, administratoringiz ularni o‘qiy olmaydi."</string>
+  <string name="screen_report_room_reason_placeholder">"Xabar berish sababini tushuntiring…"</string>
+  <string name="screen_report_room_title">"Xona ustidan shikoyat qilish"</string>
+</resources>
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPointTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPointTest.kt
index c9f850062e..2c8354a0f2 100644
--- a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPointTest.kt
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -32,7 +33,11 @@ class DefaultReportRoomEntryPointTest {
                 }
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null), A_ROOM_ID)
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            roomId = A_ROOM_ID,
+        )
         assertThat(result).isInstanceOf(ReportRoomNode::class.java)
         assertThat(result.plugins).contains(ReportRoomNode.Inputs(A_ROOM_ID))
     }
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt
index fc410ab08f..93cd81056b 100644
--- a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,12 +20,12 @@ import org.junit.Test
 
 class DefaultReportRoomTest {
     private val roomId = A_ROOM_ID
-    private val successLeaveRoomLambda = lambdaRecorder<Result<Unit>> { -> Result.success(Unit) }
+    private val successLeaveRoomLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
     private val successReportRoomLambda =
         lambdaRecorder<String?, Result<Unit>> { _ -> Result.success(Unit) }
 
     private val failureLeaveRoomLambda =
-        lambdaRecorder<Result<Unit>> { -> Result.failure(Exception("Leave room error")) }
+        lambdaRecorder<Result<Unit>> { Result.failure(Exception("Leave room error")) }
     private val failureReportRoomLambda =
         lambdaRecorder<String?, Result<Unit>> { _ -> Result.failure(Exception("Report room error")) }
 
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt
index eb2e94366d..6bcaeac02d 100644
--- a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 13dc5eb204..59d9507571 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt
index 35d2db3ad8..402ff19a00 100644
--- a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/reportroom/test/build.gradle.kts b/features/reportroom/test/build.gradle.kts
new file mode 100644
index 0000000000..049ced1ece
--- /dev/null
+++ b/features/reportroom/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.reportroom.test"
+}
+
+dependencies {
+    implementation(projects.features.reportroom.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/reportroom/test/src/main/kotlin/io/element/android/features/reportroom/test/FakeReportRoomEntryPoint.kt b/features/reportroom/test/src/main/kotlin/io/element/android/features/reportroom/test/FakeReportRoomEntryPoint.kt
new file mode 100644
index 0000000000..02e5020db2
--- /dev/null
+++ b/features/reportroom/test/src/main/kotlin/io/element/android/features/reportroom/test/FakeReportRoomEntryPoint.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.reportroom.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.reportroom.api.ReportRoomEntryPoint
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeReportRoomEntryPoint : ReportRoomEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        roomId: RoomId,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/changeroommemberroles/api/build.gradle.kts b/features/rolesandpermissions/api/build.gradle.kts
similarity index 78%
rename from features/changeroommemberroles/api/build.gradle.kts
rename to features/rolesandpermissions/api/build.gradle.kts
index 655bd5683e..ca29972606 100644
--- a/features/changeroommemberroles/api/build.gradle.kts
+++ b/features/rolesandpermissions/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.features.changeroommemberroles.api"
+    namespace = "io.element.android.features.rolesandpermissions.api"
 }
 
 dependencies {
diff --git a/features/changeroommemberroles/api/src/main/kotlin/io/element/android/features/changeroommemberroes/api/ChangeRoomMemberRolesEntryPoint.kt b/features/rolesandpermissions/api/src/main/kotlin/io/element/android/features/rolesandpermissions/api/ChangeRoomMemberRolesEntryPoint.kt
similarity index 56%
rename from features/changeroommemberroles/api/src/main/kotlin/io/element/android/features/changeroommemberroes/api/ChangeRoomMemberRolesEntryPoint.kt
rename to features/rolesandpermissions/api/src/main/kotlin/io/element/android/features/rolesandpermissions/api/ChangeRoomMemberRolesEntryPoint.kt
index b6f7680b38..7cfdfefae0 100644
--- a/features/changeroommemberroles/api/src/main/kotlin/io/element/android/features/changeroommemberroes/api/ChangeRoomMemberRolesEntryPoint.kt
+++ b/features/rolesandpermissions/api/src/main/kotlin/io/element/android/features/rolesandpermissions/api/ChangeRoomMemberRolesEntryPoint.kt
@@ -1,35 +1,34 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroes.api
+package io.element.android.features.rolesandpermissions.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
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 fun interface ChangeRoomMemberRolesEntryPoint : FeatureEntryPoint {
-    fun builder(parentNode: Node, buildContext: BuildContext): Builder
-
-    interface Builder {
-        fun room(room: JoinedRoom): Builder
-        fun listType(changeRoomMemberRolesListType: ChangeRoomMemberRolesListType): Builder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        room: JoinedRoom,
+        listType: ChangeRoomMemberRolesListType,
+    ): Node
 
     interface NodeProxy {
         val roomId: RoomId
-        suspend fun waitForRoleChanged()
+        suspend fun waitForCompletion(): Boolean
     }
 }
 
-enum class ChangeRoomMemberRolesListType : NodeInputs {
+enum class ChangeRoomMemberRolesListType {
     SelectNewOwnersWhenLeaving,
     Admins,
     Moderators
diff --git a/features/rolesandpermissions/api/src/main/kotlin/io/element/android/features/rolesandpermissions/api/RolesAndPermissionsEntryPoint.kt b/features/rolesandpermissions/api/src/main/kotlin/io/element/android/features/rolesandpermissions/api/RolesAndPermissionsEntryPoint.kt
new file mode 100644
index 0000000000..bd3cea0439
--- /dev/null
+++ b/features/rolesandpermissions/api/src/main/kotlin/io/element/android/features/rolesandpermissions/api/RolesAndPermissionsEntryPoint.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.rolesandpermissions.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import io.element.android.libraries.architecture.FeatureEntryPoint
+
+fun interface RolesAndPermissionsEntryPoint : FeatureEntryPoint {
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
+}
diff --git a/features/changeroommemberroles/impl/build.gradle.kts b/features/rolesandpermissions/impl/build.gradle.kts
similarity index 86%
rename from features/changeroommemberroles/impl/build.gradle.kts
rename to features/rolesandpermissions/impl/build.gradle.kts
index be2bf17979..19820a88d9 100644
--- a/features/changeroommemberroles/impl/build.gradle.kts
+++ b/features/rolesandpermissions/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.features.changeroommemberroles.impl"
+    namespace = "io.element.android.features.rolesandpermissions.impl"
 
     testOptions {
         unitTests {
@@ -26,7 +27,7 @@ android {
 setupDependencyInjection()
 
 dependencies {
-    api(projects.features.changeroommemberroles.api)
+    api(projects.features.rolesandpermissions.api)
     implementation(projects.appnav)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/DefaultRolesAndPermissionsEntryPoint.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/DefaultRolesAndPermissionsEntryPoint.kt
new file mode 100644
index 0000000000..5f27365857
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/DefaultRolesAndPermissionsEntryPoint.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.rolesandpermissions.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.rolesandpermissions.api.RolesAndPermissionsEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.RoomScope
+
+@ContributesBinding(RoomScope::class)
+class DefaultRolesAndPermissionsEntryPoint : RolesAndPermissionsEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: RolesAndPermissionsEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<RolesAndPermissionsFlowNode>(buildContext, listOf(callback))
+    }
+}
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/RolesAndPermissionsFlowNode.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/RolesAndPermissionsFlowNode.kt
new file mode 100644
index 0000000000..4bd88071c3
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/RolesAndPermissionsFlowNode.kt
@@ -0,0 +1,158 @@
+/*
+ * 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.features.rolesandpermissions.impl
+
+import android.os.Parcelable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.coroutineScope
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+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.pop
+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.rolesandpermissions.api.ChangeRoomMemberRolesListType
+import io.element.android.features.rolesandpermissions.api.RolesAndPermissionsEntryPoint
+import io.element.android.features.rolesandpermissions.impl.permissions.ChangeRoomPermissionsNode
+import io.element.android.features.rolesandpermissions.impl.roles.ChangeRolesNode
+import io.element.android.features.rolesandpermissions.impl.root.RolesAndPermissionsNode
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.createNode
+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.AsyncIndicatorState
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.powerlevels.canEditRolesAndPermissions
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsFlow
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(RoomScope::class)
+@AssistedInject
+class RolesAndPermissionsFlowNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val room: JoinedRoom,
+) : BaseFlowNode<RolesAndPermissionsFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins,
+) {
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data object ChangeAdmins : NavTarget
+
+        @Parcelize
+        data object ChangeModerators : NavTarget
+
+        @Parcelize
+        data object ChangeRoomPermissions : NavTarget
+    }
+
+    private val callback: RolesAndPermissionsEntryPoint.Callback = callback()
+    private val asyncIndicatorState = AsyncIndicatorState()
+
+    override fun onBuilt() {
+        super.onBuilt()
+        whenChildAttached { lifecycle, node: ChangeRolesNode ->
+            lifecycle.coroutineScope.launch {
+                val changesSaved = node.waitForCompletion()
+                onChangeComplete(changesSaved)
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                room.permissionsFlow(false) { perms -> perms.canEditRolesAndPermissions() }
+                    .filter { canEdit -> !canEdit }
+                    .first()
+                // If the user can no longer edit roles and permissions, exit the flow
+                callback.onDone()
+            }
+        }
+    }
+
+    private fun onChangeComplete(changesSaved: Boolean) {
+        backstack.pop()
+        if (changesSaved) {
+            asyncIndicatorState.enqueue(durationMs = AsyncIndicator.DURATION_SHORT) {
+                AsyncIndicator.Custom(text = stringResource(CommonStrings.common_saved_changes))
+            }
+        }
+    }
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            is NavTarget.Root -> {
+                val callback = object : RolesAndPermissionsNode.Callback {
+                    override fun openAdminList() {
+                        backstack.push(NavTarget.ChangeAdmins)
+                    }
+
+                    override fun openModeratorList() {
+                        backstack.push(NavTarget.ChangeModerators)
+                    }
+
+                    override fun openEditPermissions() {
+                        backstack.push(NavTarget.ChangeRoomPermissions)
+                    }
+                }
+                createNode<RolesAndPermissionsNode>(
+                    buildContext = buildContext,
+                    plugins = listOf(callback),
+                )
+            }
+            is NavTarget.ChangeAdmins -> {
+                val inputs = ChangeRolesNode.Inputs(ChangeRoomMemberRolesListType.Admins)
+                createNode<ChangeRolesNode>(buildContext = buildContext, plugins = listOf(inputs))
+            }
+            is NavTarget.ChangeModerators -> {
+                val inputs = ChangeRolesNode.Inputs(ChangeRoomMemberRolesListType.Moderators)
+                createNode<ChangeRolesNode>(buildContext = buildContext, plugins = listOf(inputs))
+            }
+            is NavTarget.ChangeRoomPermissions -> {
+                val callback = object : ChangeRoomPermissionsNode.Callback {
+                    override fun onComplete(changesSaved: Boolean) {
+                        onChangeComplete(changesSaved)
+                    }
+                }
+                createNode<ChangeRoomPermissionsNode>(buildContext = buildContext, plugins = listOf(callback))
+            }
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        Box(modifier = modifier) {
+            BackstackView()
+            AsyncIndicatorHost(modifier = Modifier.statusBarsPadding(), asyncIndicatorState)
+        }
+    }
+}
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/RoomMemberListDataSource.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/RoomMemberListDataSource.kt
similarity index 92%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/RoomMemberListDataSource.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/RoomMemberListDataSource.kt
index a27833122a..b7a26917ea 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/RoomMemberListDataSource.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/RoomMemberListDataSource.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl
 
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/analytics/AnalyticUtils.kt
similarity index 89%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/analytics/AnalyticUtils.kt
index 09d57af034..546d54c21a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/analytics/AnalyticUtils.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.analytics
+package io.element.android.features.rolesandpermissions.impl.analytics
 
 import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -33,8 +34,8 @@ internal fun AnalyticsService.trackPermissionChangeAnalytics(initial: RoomPowerL
     if (updated.kick != initial?.kick) {
         capture(RoomModeration(RoomModeration.Action.ChangePermissionsKickMembers, analyticsMemberRoleForPowerLevel(updated.kick)))
     }
-    if (updated.sendEvents != initial?.sendEvents) {
-        capture(RoomModeration(RoomModeration.Action.ChangePermissionsSendMessages, analyticsMemberRoleForPowerLevel(updated.sendEvents)))
+    if (updated.eventsDefault != initial?.eventsDefault) {
+        capture(RoomModeration(RoomModeration.Action.ChangePermissionsSendMessages, analyticsMemberRoleForPowerLevel(updated.eventsDefault)))
     }
     if (updated.redactEvents != initial?.redactEvents) {
         capture(RoomModeration(RoomModeration.Action.ChangePermissionsRedactMessages, analyticsMemberRoleForPowerLevel(updated.redactEvents)))
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsEvent.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsEvent.kt
similarity index 61%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsEvent.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsEvent.kt
index a4c49c7ac3..beb161f900 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsEvent.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsEvent.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions.permissions
-
-import io.element.android.libraries.matrix.api.room.RoomMember
+package io.element.android.features.rolesandpermissions.impl.permissions
 
 interface ChangeRoomPermissionsEvent {
-    data class ChangeMinimumRoleForAction(val action: RoomPermissionType, val role: RoomMember.Role) : ChangeRoomPermissionsEvent
+    data class ChangeMinimumRoleForAction(val action: RoomPermissionType, val role: SelectableRole) : ChangeRoomPermissionsEvent
     data object Save : ChangeRoomPermissionsEvent
     data object Exit : ChangeRoomPermissionsEvent
     data object ResetPendingActions : ChangeRoomPermissionsEvent
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNode.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsNode.kt
similarity index 60%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNode.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsNode.kt
index 15580aab6a..b63ffb9163 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNode.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsNode.kt
@@ -1,40 +1,44 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.rolesandpermissions.impl.permissions
 
 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 com.bumble.appyx.core.plugin.plugins
 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
 
 @ContributesNode(RoomScope::class)
 @AssistedInject
-class SecurityAndPrivacyNode(
+class ChangeRoomPermissionsNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    presenterFactory: SecurityAndPrivacyPresenter.Factory,
+    private val presenter: ChangeRoomPermissionsPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private val navigator = plugins<SecurityAndPrivacyNavigator>().first()
-    private val presenter = presenterFactory.create(navigator)
+    interface Callback : Plugin {
+        fun onComplete(changesSaved: Boolean)
+    }
+
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
-        SecurityAndPrivacyView(
+        ChangeRoomPermissionsView(
+            modifier = modifier,
             state = state,
-            onBackClick = this::navigateUp,
-            modifier = modifier
+            onComplete = callback::onComplete,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
similarity index 57%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
index ec90df1d5e..552f1d0ec6 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
@@ -1,69 +1,84 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions.permissions
+package io.element.android.features.rolesandpermissions.impl.permissions
 
 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.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.roomdetails.impl.analytics.trackPermissionChangeAnalytics
+import dev.zacsweers.metro.Inject
+import io.element.android.features.rolesandpermissions.impl.analytics.trackPermissionChangeAnalytics
 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.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
+import io.element.android.libraries.matrix.ui.model.powerLevelOf
 import io.element.android.services.analytics.api.AnalyticsService
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
-@AssistedInject
+@Inject
 class ChangeRoomPermissionsPresenter(
-    @Assisted private val section: ChangeRoomPermissionsSection,
     private val room: JoinedRoom,
     private val analyticsService: AnalyticsService,
 ) : Presenter<ChangeRoomPermissionsState> {
     companion object {
-        internal fun itemsForSection(section: ChangeRoomPermissionsSection) = when (section) {
-            ChangeRoomPermissionsSection.RoomDetails -> persistentListOf(
+        private fun itemsForSection(section: RoomPermissionsSection) = when (section) {
+            RoomPermissionsSection.EditDetails -> persistentListOf(
                 RoomPermissionType.ROOM_NAME,
                 RoomPermissionType.ROOM_AVATAR,
                 RoomPermissionType.ROOM_TOPIC,
             )
-            ChangeRoomPermissionsSection.MessagesAndContent -> persistentListOf(
+            RoomPermissionsSection.MessagesAndContent -> persistentListOf(
                 RoomPermissionType.SEND_EVENTS,
                 RoomPermissionType.REDACT_EVENTS,
             )
-            ChangeRoomPermissionsSection.MembershipModeration -> persistentListOf(
+            RoomPermissionsSection.ManageMembers -> persistentListOf(
                 RoomPermissionType.INVITE,
                 RoomPermissionType.KICK,
                 RoomPermissionType.BAN,
             )
+            RoomPermissionsSection.ManageSpace -> persistentListOf(
+                RoomPermissionType.SPACE_MANAGE_ROOMS,
+            )
         }
-    }
-    @AssistedFactory
-    interface Factory {
-        fun create(section: ChangeRoomPermissionsSection): ChangeRoomPermissionsPresenter
+
+        private fun RoomPermissionsSection.shouldShow(isSpace: Boolean): Boolean {
+            return when (this) {
+                RoomPermissionsSection.EditDetails -> true
+                RoomPermissionsSection.ManageMembers -> true
+                RoomPermissionsSection.MessagesAndContent -> !isSpace
+                RoomPermissionsSection.ManageSpace -> isSpace
+            }
+        }
+
+        internal fun buildItems(isSpace: Boolean) =
+            RoomPermissionsSection.entries
+                .filter { section -> section.shouldShow(isSpace) }
+                .associateWith { itemsForSection(it) }
+                .toImmutableMap()
     }
 
-    private val items: ImmutableList<RoomPermissionType> = itemsForSection(section)
+    private val itemsBySection = buildItems(isSpace = room.info().isSpace)
 
     private var initialPermissions by mutableStateOf<RoomPowerLevelsValues?>(null)
     private var currentPermissions by mutableStateOf<RoomPowerLevelsValues?>(null)
-    private var saveAction by mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
-    private var confirmExitAction by mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
+    private var saveAction by mutableStateOf<AsyncAction<Boolean>>(AsyncAction.Uninitialized)
 
     @Composable
     override fun present(): ChangeRoomPermissionsState {
@@ -77,42 +92,50 @@ class ChangeRoomPermissionsPresenter(
             derivedStateOf { initialPermissions != currentPermissions }
         }
 
+        val ownPowerLevel by remember {
+            room.roomInfoFlow.mapState { it.powerLevelOf(room.sessionId) }
+        }.collectAsState()
+
         fun handleEvent(event: ChangeRoomPermissionsEvent) {
             when (event) {
                 is ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction -> {
+                    val powerLevel = when (event.role) {
+                        SelectableRole.Admin -> RoomMember.Role.Admin.powerLevel
+                        SelectableRole.Moderator -> RoomMember.Role.Moderator.powerLevel
+                        SelectableRole.Everyone -> RoomMember.Role.User.powerLevel
+                    }
                     currentPermissions = when (event.action) {
-                        RoomPermissionType.BAN -> currentPermissions?.copy(ban = event.role.powerLevel)
-                        RoomPermissionType.INVITE -> currentPermissions?.copy(invite = event.role.powerLevel)
-                        RoomPermissionType.KICK -> currentPermissions?.copy(kick = event.role.powerLevel)
-                        RoomPermissionType.SEND_EVENTS -> currentPermissions?.copy(sendEvents = event.role.powerLevel)
-                        RoomPermissionType.REDACT_EVENTS -> currentPermissions?.copy(redactEvents = event.role.powerLevel)
-                        RoomPermissionType.ROOM_NAME -> currentPermissions?.copy(roomName = event.role.powerLevel)
-                        RoomPermissionType.ROOM_AVATAR -> currentPermissions?.copy(roomAvatar = event.role.powerLevel)
-                        RoomPermissionType.ROOM_TOPIC -> currentPermissions?.copy(roomTopic = event.role.powerLevel)
+                        RoomPermissionType.BAN -> currentPermissions?.copy(ban = powerLevel)
+                        RoomPermissionType.INVITE -> currentPermissions?.copy(invite = powerLevel)
+                        RoomPermissionType.KICK -> currentPermissions?.copy(kick = powerLevel)
+                        RoomPermissionType.SEND_EVENTS -> currentPermissions?.copy(eventsDefault = powerLevel)
+                        RoomPermissionType.REDACT_EVENTS -> currentPermissions?.copy(redactEvents = powerLevel)
+                        RoomPermissionType.ROOM_NAME -> currentPermissions?.copy(roomName = powerLevel)
+                        RoomPermissionType.ROOM_AVATAR -> currentPermissions?.copy(roomAvatar = powerLevel)
+                        RoomPermissionType.ROOM_TOPIC -> currentPermissions?.copy(roomTopic = powerLevel)
+                        RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions?.copy(spaceChild = powerLevel)
                     }
                 }
                 is ChangeRoomPermissionsEvent.Save -> coroutineScope.save()
                 is ChangeRoomPermissionsEvent.Exit -> {
-                    confirmExitAction = if (!hasChanges || confirmExitAction.isConfirming()) {
-                        AsyncAction.Success(Unit)
+                    saveAction = if (!hasChanges || saveAction == AsyncAction.ConfirmingCancellation) {
+                        AsyncAction.Success(false)
                     } else {
-                        AsyncAction.ConfirmingNoParams
+                        AsyncAction.ConfirmingCancellation
                     }
                 }
                 is ChangeRoomPermissionsEvent.ResetPendingActions -> {
                     saveAction = AsyncAction.Uninitialized
-                    confirmExitAction = AsyncAction.Uninitialized
                 }
             }
         }
         return ChangeRoomPermissionsState(
-            section = section,
+            ownPowerLevel = ownPowerLevel,
             currentPermissions = currentPermissions,
-            items = items,
+            itemsBySection = itemsBySection,
             hasChanges = hasChanges,
             saveAction = saveAction,
-            confirmExitAction = confirmExitAction,
-            eventSink = { handleEvent(it) }
+            eventSink = ::handleEvent,
         )
     }
 
@@ -132,7 +155,7 @@ class ChangeRoomPermissionsPresenter(
             .onSuccess {
                 analyticsService.trackPermissionChangeAnalytics(initialPermissions, updatedRoomPowerLevels)
                 initialPermissions = currentPermissions
-                saveAction = AsyncAction.Success(Unit)
+                saveAction = AsyncAction.Success(true)
             }
             .onFailure {
                 saveAction = AsyncAction.Failure(it)
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
new file mode 100644
index 0000000000..535f2b4a71
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt
@@ -0,0 +1,107 @@
+/*
+ * 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.features.rolesandpermissions.impl.permissions
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.res.stringResource
+import io.element.android.features.rolesandpermissions.impl.R
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.components.preferences.DropdownOption
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentListOf
+
+data class ChangeRoomPermissionsState(
+    private val ownPowerLevel: Long,
+    val currentPermissions: RoomPowerLevelsValues?,
+    val itemsBySection: ImmutableMap<RoomPermissionsSection, ImmutableList<RoomPermissionType>>,
+    val hasChanges: Boolean,
+    val saveAction: AsyncAction<Boolean>,
+    val eventSink: (ChangeRoomPermissionsEvent) -> Unit,
+) {
+    private val ownRole = RoomMember.Role.forPowerLevel(ownPowerLevel)
+
+    // Roles that the user can select based on their own role
+    val selectableRoles: ImmutableList<SelectableRole> = when (ownRole) {
+        is RoomMember.Role.Owner,
+        RoomMember.Role.Admin -> persistentListOf(SelectableRole.Admin, SelectableRole.Moderator, SelectableRole.Everyone)
+        RoomMember.Role.Moderator -> persistentListOf(SelectableRole.Moderator, SelectableRole.Everyone)
+        RoomMember.Role.User -> persistentListOf(SelectableRole.Everyone)
+    }
+
+    fun selectedRoleForType(type: RoomPermissionType): SelectableRole? {
+        val powerLevel = currentPowerLevelForType(type = type) ?: return null
+        return when (RoomMember.Role.forPowerLevel(powerLevel)) {
+            is RoomMember.Role.Owner,
+            RoomMember.Role.Admin -> SelectableRole.Admin
+            RoomMember.Role.Moderator -> SelectableRole.Moderator
+            RoomMember.Role.User -> SelectableRole.Everyone
+        }
+    }
+
+    fun canChangePermission(type: RoomPermissionType): Boolean {
+        val currentPowerLevel = currentPowerLevelForType(type) ?: return false
+        return ownPowerLevel >= currentPowerLevel
+    }
+
+    private fun currentPowerLevelForType(type: RoomPermissionType): Long? {
+        if (currentPermissions == null) return null
+        return when (type) {
+            RoomPermissionType.BAN -> currentPermissions.ban
+            RoomPermissionType.INVITE -> currentPermissions.invite
+            RoomPermissionType.KICK -> currentPermissions.kick
+            RoomPermissionType.SEND_EVENTS -> currentPermissions.eventsDefault
+            RoomPermissionType.REDACT_EVENTS -> currentPermissions.redactEvents
+            RoomPermissionType.ROOM_NAME -> currentPermissions.roomName
+            RoomPermissionType.ROOM_AVATAR -> currentPermissions.roomAvatar
+            RoomPermissionType.ROOM_TOPIC -> currentPermissions.roomTopic
+            RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions.spaceChild
+        }
+    }
+}
+
+enum class RoomPermissionsSection {
+    ManageMembers,
+    EditDetails,
+    MessagesAndContent,
+    ManageSpace
+}
+
+enum class SelectableRole : DropdownOption {
+    Admin {
+        @Composable
+        @ReadOnlyComposable
+        override fun getText(): String = stringResource(R.string.screen_room_member_list_role_administrator)
+    },
+    Moderator {
+        @Composable
+        @ReadOnlyComposable
+        override fun getText(): String = stringResource(R.string.screen_room_member_list_role_moderator)
+    },
+    Everyone {
+        @Composable
+        @ReadOnlyComposable
+        override fun getText(): String = stringResource(R.string.screen_room_change_permissions_everyone)
+    }
+}
+
+enum class RoomPermissionType {
+    BAN,
+    INVITE,
+    KICK,
+    SEND_EVENTS,
+    REDACT_EVENTS,
+    ROOM_NAME,
+    ROOM_AVATAR,
+    ROOM_TOPIC,
+    SPACE_MANAGE_ROOMS,
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
similarity index 54%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
index 07d3455a90..2760272d8a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
@@ -1,54 +1,49 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions.permissions
+package io.element.android.features.rolesandpermissions.impl.permissions
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
-import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableMap
 
 class ChangeRoomPermissionsStateProvider : PreviewParameterProvider<ChangeRoomPermissionsState> {
     override val values: Sequence<ChangeRoomPermissionsState>
         get() = sequenceOf(
-            aChangeRoomPermissionsState(section = ChangeRoomPermissionsSection.RoomDetails),
-            aChangeRoomPermissionsState(section = ChangeRoomPermissionsSection.MessagesAndContent),
-            aChangeRoomPermissionsState(section = ChangeRoomPermissionsSection.MembershipModeration),
-            aChangeRoomPermissionsState(section = ChangeRoomPermissionsSection.RoomDetails, hasChanges = true),
-            aChangeRoomPermissionsState(section = ChangeRoomPermissionsSection.RoomDetails, hasChanges = true, saveAction = AsyncAction.Loading),
+            aChangeRoomPermissionsState(),
+            aChangeRoomPermissionsState(ownPowerLevel = RoomMember.Role.Moderator.powerLevel),
+            aChangeRoomPermissionsState(hasChanges = true),
+            aChangeRoomPermissionsState(hasChanges = true, saveAction = AsyncAction.Loading),
             aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
                 saveAction = AsyncAction.Failure(IllegalStateException("Failed to save changes"))
             ),
-            aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
-                hasChanges = true,
-                confirmExitAction = AsyncAction.ConfirmingNoParams,
-            ),
+            aChangeRoomPermissionsState(hasChanges = true, saveAction = AsyncAction.ConfirmingCancellation),
+            aChangeRoomPermissionsState(itemsBySection = ChangeRoomPermissionsPresenter.buildItems(isSpace = true)),
         )
 }
 
 internal fun aChangeRoomPermissionsState(
-    section: ChangeRoomPermissionsSection,
+    ownPowerLevel: Long = RoomMember.Role.Admin.powerLevel,
     currentPermissions: RoomPowerLevelsValues = previewPermissions(),
-    items: List<RoomPermissionType> = ChangeRoomPermissionsPresenter.itemsForSection(section),
+    itemsBySection: Map<RoomPermissionsSection, ImmutableList<RoomPermissionType>> = ChangeRoomPermissionsPresenter.buildItems(false),
     hasChanges: Boolean = false,
-    saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
-    confirmExitAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    saveAction: AsyncAction<Boolean> = AsyncAction.Uninitialized,
     eventSink: (ChangeRoomPermissionsEvent) -> Unit = {},
 ) = ChangeRoomPermissionsState(
-    section = section,
+    ownPowerLevel = ownPowerLevel,
     currentPermissions = currentPermissions,
-    items = items.toImmutableList(),
+    itemsBySection = itemsBySection.toImmutableMap(),
     hasChanges = hasChanges,
     saveAction = saveAction,
-    confirmExitAction = confirmExitAction,
     eventSink = eventSink,
 )
 
@@ -60,10 +55,13 @@ private fun previewPermissions(): RoomPowerLevelsValues {
         ban = RoomMember.Role.User.powerLevel,
         // MessagesAndContent section
         redactEvents = RoomMember.Role.Moderator.powerLevel,
-        sendEvents = RoomMember.Role.Admin.powerLevel,
+        eventsDefault = RoomMember.Role.Admin.powerLevel,
         // RoomDetails section
         roomName = RoomMember.Role.Admin.powerLevel,
         roomAvatar = RoomMember.Role.Moderator.powerLevel,
         roomTopic = RoomMember.Role.User.powerLevel,
+        // SpaceManagement section
+        spaceChild = RoomMember.Role.Moderator.powerLevel,
+        stateDefault = 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
new file mode 100644
index 0000000000..529df0d50d
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt
@@ -0,0 +1,141 @@
+/*
+ * 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.features.rolesandpermissions.impl.permissions
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+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.tooling.preview.PreviewParameter
+import io.element.android.features.rolesandpermissions.impl.R
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.dialogs.SaveChangesDialog
+import io.element.android.libraries.designsystem.components.preferences.PreferenceDropdown
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.ListSectionHeader
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ChangeRoomPermissionsView(
+    state: ChangeRoomPermissionsState,
+    onComplete: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    BackHandler {
+        state.eventSink(ChangeRoomPermissionsEvent.Exit)
+    }
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            TopAppBar(
+                titleStr = stringResource(R.string.screen_room_roles_and_permissions_permissions_header),
+                navigationIcon = {
+                    BackButton(onClick = { state.eventSink(ChangeRoomPermissionsEvent.Exit) })
+                },
+                actions = {
+                    TextButton(
+                        text = stringResource(CommonStrings.action_save),
+                        onClick = { state.eventSink(ChangeRoomPermissionsEvent.Save) },
+                        enabled = state.hasChanges,
+                    )
+                }
+            )
+        }
+    ) { padding ->
+        LazyColumn(
+            modifier = Modifier
+                .padding(padding)
+                .fillMaxSize()
+        ) {
+            state.itemsBySection.onEachIndexed { index, (section, items) ->
+                item {
+                    ListSectionHeader(titleForSection(section), hasDivider = index > 0)
+                }
+                for (permissionType in items) {
+                    item {
+                        PreferenceDropdown(
+                            title = titleForType(permissionType),
+                            selectedOption = state.selectedRoleForType(permissionType),
+                            options = state.selectableRoles,
+                            enabled = state.canChangePermission(permissionType),
+                            onSelectOption = { role ->
+                                state.eventSink(
+                                    ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(
+                                        action = permissionType,
+                                        role = role
+                                    )
+                                )
+                            }
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    AsyncActionView(
+        async = state.saveAction,
+        onSuccess = { onComplete(it) },
+        confirmationDialog = { confirming ->
+            when (confirming) {
+                is AsyncAction.ConfirmingCancellation -> {
+                    SaveChangesDialog(
+                        onSaveClick = { state.eventSink(ChangeRoomPermissionsEvent.Save) },
+                        onDiscardClick = { state.eventSink(ChangeRoomPermissionsEvent.Exit) },
+                        onDismiss = { state.eventSink(ChangeRoomPermissionsEvent.ResetPendingActions) },
+                    )
+                }
+            }
+        },
+        onErrorDismiss = { state.eventSink(ChangeRoomPermissionsEvent.ResetPendingActions) }
+    )
+}
+
+@Composable
+private fun titleForSection(section: RoomPermissionsSection): String = when (section) {
+    RoomPermissionsSection.EditDetails -> stringResource(R.string.screen_room_change_permissions_room_details)
+    RoomPermissionsSection.MessagesAndContent -> stringResource(R.string.screen_room_change_permissions_messages_and_content)
+    RoomPermissionsSection.ManageMembers -> stringResource(R.string.screen_room_change_permissions_member_moderation)
+    RoomPermissionsSection.ManageSpace -> stringResource(R.string.screen_room_change_permissions_manage_space)
+}
+
+@Composable
+private fun titleForType(type: RoomPermissionType): String = when (type) {
+    RoomPermissionType.INVITE -> stringResource(R.string.screen_room_change_permissions_invite_people)
+    RoomPermissionType.KICK -> stringResource(R.string.screen_room_change_permissions_remove_people)
+    RoomPermissionType.BAN -> stringResource(R.string.screen_room_change_permissions_ban_people)
+    RoomPermissionType.SEND_EVENTS -> stringResource(R.string.screen_room_change_permissions_send_messages)
+    RoomPermissionType.REDACT_EVENTS -> stringResource(R.string.screen_room_change_permissions_delete_messages)
+    RoomPermissionType.ROOM_NAME -> stringResource(R.string.screen_room_change_permissions_room_name)
+    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)
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ChangeRoomPermissionsViewPreview(@PreviewParameter(ChangeRoomPermissionsStateProvider::class) state: ChangeRoomPermissionsState) {
+    ElementPreview {
+        ChangeRoomPermissionsView(
+            state = state,
+            onComplete = {},
+        )
+    }
+}
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesEvent.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesEvent.kt
similarity index 68%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesEvent.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesEvent.kt
index ab8dbc8f22..2867273e80 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesEvent.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesEvent.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
@@ -15,7 +16,5 @@ sealed interface ChangeRolesEvent {
     data class UserSelectionToggled(val matrixUser: MatrixUser) : ChangeRolesEvent
     data object Save : ChangeRolesEvent
     data object Exit : ChangeRolesEvent
-    data object CancelExit : ChangeRolesEvent
-    data object ClearError : ChangeRolesEvent
-    data object CancelSave : ChangeRolesEvent
+    data object CloseDialog : ChangeRolesEvent
 }
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNode.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesNode.kt
similarity index 81%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNode.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesNode.kt
index 1b9c790b25..8baa5f589b 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNode.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesNode.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -17,10 +18,11 @@ 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.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.appyx.launchMolecule
 import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.room.RoomMember
 import kotlinx.coroutines.flow.first
@@ -40,17 +42,17 @@ class ChangeRolesNode(
     private val presenter = presenterFactory.create(inputs.listType.toRoomMemberRole())
     private val stateFlow = launchMolecule { presenter.present() }
 
-    suspend fun waitForRoleChanged() {
-        stateFlow.first { it.savingState.isSuccess() }
+    suspend fun waitForCompletion(): Boolean {
+        val successState = stateFlow.first { it.savingState.isSuccess() }
+        return successState.savingState.dataOrNull().orFalse()
     }
 
     @Composable
     override fun View(modifier: Modifier) {
         val state by stateFlow.collectAsState()
         ChangeRolesView(
-            modifier = modifier,
             state = state,
-            navigateUp = this::navigateUp,
+            modifier = modifier,
         )
     }
 }
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
similarity index 56%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenter.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index 632d93f0e0..3989a76df3 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -1,31 +1,34 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 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
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.RoomModeration
+import io.element.android.features.rolesandpermissions.impl.RoomMemberListDataSource
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.di.annotations.RoomCoroutineScope
 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.RoomMember
@@ -33,6 +36,7 @@ import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.room.powerlevels.usersWithRole
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.model.powerLevelOf
 import io.element.android.libraries.matrix.ui.model.roleOf
 import io.element.android.libraries.matrix.ui.room.PowerLevelRoomMemberComparator
 import io.element.android.services.analytics.api.AnalyticsService
@@ -40,6 +44,8 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -49,18 +55,19 @@ import kotlinx.coroutines.launch
 class ChangeRolesPresenter(
     @Assisted private val role: RoomMember.Role,
     private val room: JoinedRoom,
-    private val dispatchers: CoroutineDispatchers,
+    private val dataSource: RoomMemberListDataSource,
     private val analyticsService: AnalyticsService,
+    @RoomCoroutineScope private val roomCoroutineScope: CoroutineScope,
 ) : Presenter<ChangeRolesState> {
     @AssistedFactory
     fun interface Factory {
         fun create(role: RoomMember.Role): ChangeRolesPresenter
     }
 
+    private val powerLevelRoomMemberComparator = PowerLevelRoomMemberComparator()
+
     @Composable
     override fun present(): ChangeRolesState {
-        val coroutineScope = rememberCoroutineScope()
-        val dataSource = remember { RoomMemberListDataSource(room, dispatchers) }
         var query by rememberSaveable { mutableStateOf<String?>(null) }
         var searchActive by rememberSaveable { mutableStateOf(false) }
         var searchResults by remember {
@@ -69,20 +76,30 @@ class ChangeRolesPresenter(
         val selectedUsers = remember {
             mutableStateOf<ImmutableList<MatrixUser>>(persistentListOf())
         }
-        val exitState: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
-        val saveState: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
+        val saveState: MutableState<AsyncAction<Boolean>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val usersWithRole = produceState<ImmutableList<MatrixUser>>(initialValue = persistentListOf()) {
-            room.usersWithRole(role).map { members -> members.map { it.toMatrixUser() } }
-                    .onEach { users ->
-                        val previous = value
-                        value = users.toImmutableList()
-                        // Users who were selected but didn't have the role, so their role change was pending
-                        val toAdd = selectedUsers.value.filter { user -> users.none { it.userId == user.userId } && previous.none { it.userId == user.userId } }
-                        // Users who no longer have the role
-                        val toRemove = previous.filter { user -> users.none { it.userId == user.userId } }.toSet()
-                        selectedUsers.value = (users + toAdd - toRemove).toImmutableList()
-                    }
-                    .launchIn(this)
+            // If the role is admin, we need to include the owners as well since they implicitly have admin role
+            val owners = if (role == RoomMember.Role.Admin) {
+                room.usersWithRole { role -> role is RoomMember.Role.Owner }
+            } else {
+                flowOf(persistentListOf())
+            }
+            combine(
+                owners,
+                room.usersWithRole { it == role },
+            ) { owners, users ->
+                owners + users
+            }.map { members -> members.map { it.toMatrixUser() } }
+                .onEach { users ->
+                    val previous = value
+                    value = users.toImmutableList()
+                    // Users who were selected but didn't have the role, so their role change was pending
+                    val toAdd = selectedUsers.value.filter { user -> users.none { it.userId == user.userId } && previous.none { it.userId == user.userId } }
+                    // Users who no longer have the role
+                    val toRemove = previous.filter { user -> users.none { it.userId == user.userId } }.toSet()
+                    selectedUsers.value = (users + toAdd - toRemove).toImmutableList()
+                }
+                .launchIn(this)
         }
 
         val roomMemberState by room.membersStateFlow.collectAsState()
@@ -100,14 +117,18 @@ class ChangeRolesPresenter(
             }
         }
 
-        val hasPendingChanges = usersWithRole.value != selectedUsers.value
+        val hasPendingChanges by remember {
+            derivedStateOf {
+                usersWithRole.value.toSet() != selectedUsers.value.toSet()
+            }
+        }
 
         val roomInfo by room.roomInfoFlow.collectAsState()
         fun canChangeMemberRole(userId: UserId): Boolean {
-            // This is used to group the
-            val currentUserRole = roomInfo.roleOf(room.sessionId)
-            val otherUserRole = roomInfo.roleOf(userId)
-            return currentUserRole.powerLevel > otherUserRole.powerLevel
+            val currentUserPowerLevel = roomInfo.powerLevelOf(room.sessionId)
+            val otherUserPowerLevel = roomInfo.powerLevelOf(userId)
+            return currentUserPowerLevel > otherUserPowerLevel &&
+                currentUserPowerLevel >= role.powerLevel
         }
 
         fun handleEvent(event: ChangeRolesEvent) {
@@ -131,38 +152,36 @@ class ChangeRolesPresenter(
                 is ChangeRolesEvent.Save -> {
                     val currentUserIsAdmin = roomInfo.roleOf(room.sessionId) == RoomMember.Role.Admin
                     val isModifyingAdmins = role == RoomMember.Role.Admin
-                    val hasChanges = selectedUsers != usersWithRole
                     val isConfirming = saveState.value.isConfirming()
                     val modifyingOwners = role is RoomMember.Role.Owner
-
-                    val needsConfirmation = (modifyingOwners || currentUserIsAdmin && isModifyingAdmins) && hasChanges && !isConfirming
-
+                    val confirmationValue = if (hasPendingChanges && !isConfirming) {
+                        when {
+                            modifyingOwners -> ConfirmingModifyingOwners
+                            currentUserIsAdmin && isModifyingAdmins -> ConfirmingModifyingAdmins
+                            else -> null
+                        }
+                    } else {
+                        null
+                    }
                     when {
-                        needsConfirmation -> {
-                            // Confirm modifying users
-                            saveState.value = AsyncAction.ConfirmingNoParams
+                        confirmationValue != null -> {
+                            saveState.value = confirmationValue
                         }
                         !saveState.value.isLoading() -> {
-                            coroutineScope.save(usersWithRole.value, selectedUsers, saveState)
+                            roomCoroutineScope.save(usersWithRole.value, selectedUsers, saveState)
                         }
                     }
                 }
-                is ChangeRolesEvent.ClearError -> {
-                    saveState.value = AsyncAction.Uninitialized
-                }
                 is ChangeRolesEvent.Exit -> {
-                    exitState.value = if (exitState.value.isUninitialized() && hasPendingChanges) {
+                    saveState.value = if (saveState.value.isUninitialized() && hasPendingChanges) {
                         // Has pending changes, confirm exit
-                        AsyncAction.ConfirmingNoParams
+                        AsyncAction.ConfirmingCancellation
                     } else {
                         // No pending changes, exit immediately
-                        AsyncAction.Success(Unit)
+                        AsyncAction.Success(false)
                     }
                 }
-                is ChangeRolesEvent.CancelExit -> {
-                    exitState.value = AsyncAction.Uninitialized
-                }
-                is ChangeRolesEvent.CancelSave -> {
+                is ChangeRolesEvent.CloseDialog -> {
                     saveState.value = AsyncAction.Uninitialized
                 }
             }
@@ -174,7 +193,6 @@ class ChangeRolesPresenter(
             searchResults = searchResults,
             selectedUsers = selectedUsers.value,
             hasPendingChanges = hasPendingChanges,
-            exitState = exitState.value,
             savingState = saveState.value,
             canChangeMemberRole = ::canChangeMemberRole,
             eventSink = ::handleEvent,
@@ -182,55 +200,35 @@ class ChangeRolesPresenter(
     }
 
     private fun List<RoomMember>.groupedByRole(): MembersByRole {
-        val groupedMembers = MembersByRole(this)
-        return MembersByRole(
-            owners = groupedMembers.owners.sorted(),
-            admins = groupedMembers.admins.sorted(),
-            moderators = groupedMembers.moderators.sorted(),
-            members = groupedMembers.members.sorted(),
-        )
-    }
-
-    private fun Iterable<RoomMember>.sorted(): ImmutableList<RoomMember> {
-        return sortedWith(PowerLevelRoomMemberComparator()).toImmutableList()
+        return MembersByRole(this, powerLevelRoomMemberComparator)
     }
 
     private fun CoroutineScope.save(
         usersWithRole: ImmutableList<MatrixUser>,
         selectedUsers: MutableState<ImmutableList<MatrixUser>>,
-        saveState: MutableState<AsyncAction<Unit>>,
+        saveState: MutableState<AsyncAction<Boolean>>,
     ) = launch {
-        saveState.value = AsyncAction.Loading
-
-        val toAdd = selectedUsers.value - usersWithRole
-        val toRemove = usersWithRole - selectedUsers.value
-
-        val changes: List<UserRoleChange> = buildList {
-            for (selectedUser in toAdd) {
-                analyticsService.capture(RoomModeration(RoomModeration.Action.ChangeMemberRole, role.toAnalyticsMemberRole()))
-                add(UserRoleChange(selectedUser.userId, role))
-            }
-            for (selectedUser in toRemove) {
-                analyticsService.capture(RoomModeration(RoomModeration.Action.ChangeMemberRole, RoomModeration.Role.User))
-                add(UserRoleChange(selectedUser.userId, RoomMember.Role.User))
+        runUpdatingState(saveState) {
+            val toAdd = selectedUsers.value - usersWithRole
+            val toRemove = usersWithRole - selectedUsers.value
+            val changes: List<UserRoleChange> = buildList {
+                for (selectedUser in toAdd) {
+                    analyticsService.capture(RoomModeration(RoomModeration.Action.ChangeMemberRole, role.toAnalyticsMemberRole()))
+                    add(UserRoleChange(selectedUser.userId, role))
+                }
+                for (selectedUser in toRemove) {
+                    analyticsService.capture(RoomModeration(RoomModeration.Action.ChangeMemberRole, RoomModeration.Role.User))
+                    add(UserRoleChange(selectedUser.userId, RoomMember.Role.User))
+                }
             }
+            room.updateUsersRoles(changes).map { true }
         }
+    }
 
-        room.updateUsersRoles(changes)
-            .onFailure {
-                saveState.value = AsyncAction.Failure(it)
-            }
-            .onSuccess {
-                saveState.value = AsyncAction.Success(Unit)
-                // Asynchronously reload the room members
-                launch { room.updateMembers() }
-            }
+    internal fun RoomMember.Role.toAnalyticsMemberRole(): RoomModeration.Role = when (this) {
+        is RoomMember.Role.Owner -> RoomModeration.Role.Administrator // TODO - distinguish creator from admin
+        RoomMember.Role.Admin -> RoomModeration.Role.Administrator
+        RoomMember.Role.Moderator -> RoomModeration.Role.Moderator
+        RoomMember.Role.User -> RoomModeration.Role.User
     }
 }
-
-internal fun RoomMember.Role.toAnalyticsMemberRole(): RoomModeration.Role = when (this) {
-    is RoomMember.Role.Owner -> RoomModeration.Role.Administrator // TODO - distinguish creator from admin
-    RoomMember.Role.Admin -> RoomModeration.Role.Administrator
-    RoomMember.Role.Moderator -> RoomModeration.Role.Moderator
-    RoomMember.Role.User -> RoomModeration.Role.User
-}
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesState.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesState.kt
new file mode 100644
index 0000000000..71fef01fa7
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesState.kt
@@ -0,0 +1,53 @@
+/*
+ * 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.rolesandpermissions.impl.roles
+
+import io.element.android.libraries.architecture.AsyncAction
+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
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+
+data class ChangeRolesState(
+    val role: RoomMember.Role,
+    val query: String?,
+    val isSearchActive: Boolean,
+    val searchResults: SearchBarResultState<MembersByRole>,
+    val selectedUsers: ImmutableList<MatrixUser>,
+    val hasPendingChanges: Boolean,
+    val savingState: AsyncAction<Boolean>,
+    val canChangeMemberRole: (UserId) -> Boolean,
+    val eventSink: (ChangeRolesEvent) -> Unit,
+)
+
+data class MembersByRole(
+    val owners: ImmutableList<RoomMember> = persistentListOf(),
+    val admins: ImmutableList<RoomMember> = persistentListOf(),
+    val moderators: ImmutableList<RoomMember> = persistentListOf(),
+    val members: ImmutableList<RoomMember> = persistentListOf(),
+) {
+    constructor(members: List<RoomMember>, comparator: Comparator<RoomMember>) : this(
+        owners = members.filterAndSort(comparator) { it.role is RoomMember.Role.Owner },
+        admins = members.filterAndSort(comparator) { it.role == RoomMember.Role.Admin },
+        moderators = members.filterAndSort(comparator) { it.role == RoomMember.Role.Moderator },
+        members = members.filterAndSort(comparator) { it.role == RoomMember.Role.User },
+    )
+
+    fun isEmpty() = owners.isEmpty() && admins.isEmpty() && moderators.isEmpty() && members.isEmpty()
+}
+
+private fun Iterable<RoomMember>.filterAndSort(
+    comparator: Comparator<RoomMember>,
+    predicate: (RoomMember) -> Boolean,
+): ImmutableList<RoomMember> {
+    return filter(predicate).sortedWith(comparator).toImmutableList()
+}
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
similarity index 77%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesStateProvider.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
index 2041c0f447..654259c02a 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
@@ -16,6 +17,7 @@ import io.element.android.libraries.matrix.api.room.RoomMembershipState
 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.room.PowerLevelRoomMemberComparator
 import io.element.android.libraries.previewutils.room.aRoomMember
 import io.element.android.libraries.previewutils.room.aRoomMemberList
 import kotlinx.collections.immutable.ImmutableList
@@ -35,16 +37,23 @@ class ChangeRolesStateProvider : PreviewParameterProvider<ChangeRolesState> {
             aChangeRolesStateWithSelectedUsers().copy(
                 query = "Alice",
                 isSearchActive = true,
-                searchResults = SearchBarResultState.Results(MembersByRole(aRoomMemberList().take(1).toImmutableList())),
+                searchResults = SearchBarResultState.Results(
+                    MembersByRole(
+                        members = aRoomMemberList().take(1),
+                        comparator = PowerLevelRoomMemberComparator(),
+                    )
+                ),
                 selectedUsers = aMatrixUserList().take(1).toImmutableList(),
             ),
-            aChangeRolesStateWithSelectedUsers().copy(exitState = AsyncAction.ConfirmingNoParams),
-            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.ConfirmingNoParams),
+            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.ConfirmingCancellation),
+            aChangeRolesStateWithSelectedUsers().copy(savingState = ConfirmingModifyingAdmins),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Loading),
-            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Success(Unit)),
+            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Success(true)),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Failure(Exception("boom"))),
-            aChangeRolesStateWithOwners(),
-            aChangeRolesStateWithOwners().copy(role = RoomMember.Role.Owner(isCreator = false)),
+            aChangeRolesStateWithOwners(role = RoomMember.Role.Admin),
+            aChangeRolesStateWithOwners(role = RoomMember.Role.Owner(isCreator = false)),
+            aChangeRolesStateWithOwners(role = RoomMember.Role.Owner(isCreator = false))
+                .copy(savingState = ConfirmingModifyingOwners),
         )
 }
 
@@ -55,8 +64,7 @@ internal fun aChangeRolesState(
     searchResults: SearchBarResultState<MembersByRole> = SearchBarResultState.NoResultsFound(),
     selectedUsers: ImmutableList<MatrixUser> = persistentListOf(),
     hasPendingChanges: Boolean = false,
-    exitState: AsyncAction<Unit> = AsyncAction.Uninitialized,
-    savingState: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    savingState: AsyncAction<Boolean> = AsyncAction.Uninitialized,
     canRemoveMember: (UserId) -> Boolean = { true },
     eventSink: (ChangeRolesEvent) -> Unit = {},
 ) = ChangeRolesState(
@@ -66,7 +74,6 @@ internal fun aChangeRolesState(
     searchResults = searchResults,
     selectedUsers = selectedUsers,
     hasPendingChanges = hasPendingChanges,
-    exitState = exitState,
     savingState = savingState,
     canChangeMemberRole = canRemoveMember,
     eventSink = eventSink,
@@ -82,15 +89,23 @@ internal fun aChangeRolesStateWithSelectedUsers() = aChangeRolesState(
                 } else {
                     roomMember
                 }
-            }
+            },
+            comparator = PowerLevelRoomMemberComparator(),
         )
     ),
     hasPendingChanges = true,
     canRemoveMember = { it != UserId("@alice:server.org") },
 )
 
-internal fun aChangeRolesStateWithOwners() = aChangeRolesState(
-    role = RoomMember.Role.Admin,
+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"),
+    ),
+) = aChangeRolesState(
+    role = role,
     searchResults = SearchBarResultState.Results(
         MembersByRole(
             members = persistentListOf(
@@ -114,7 +129,8 @@ internal fun aChangeRolesStateWithOwners() = aChangeRolesState(
                     displayName = "David",
                     role = RoomMember.Role.User,
                 ),
-            )
+            ),
+            comparator = PowerLevelRoomMemberComparator(),
         ),
     ),
     canRemoveMember = { userId ->
@@ -126,9 +142,5 @@ internal fun aChangeRolesStateWithOwners() = aChangeRolesState(
             else -> false
         }
     },
-    selectedUsers = persistentListOf(
-        aMatrixUser(id = "@alice:server.org", displayName = "Alice"),
-        aMatrixUser(id = "@bob:server.org", displayName = "Bob"),
-        aMatrixUser(id = "@carol:server.org", displayName = "Carol"),
-    )
+    selectedUsers = selectedUsers.toImmutableList(),
 )
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
similarity index 88%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesView.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
index c6b70a82f4..20abc70bb7 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
@@ -29,9 +30,6 @@ import androidx.compose.foundation.lazy.items
 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.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -40,10 +38,9 @@ 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.features.rolesandpermissions.impl.R
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
-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.Avatar
@@ -52,7 +49,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.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.components.dialogs.SaveChangesDialog
 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
@@ -79,10 +76,8 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun ChangeRolesView(
     state: ChangeRolesState,
-    navigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val latestNavigateUp by rememberUpdatedState(newValue = navigateUp)
     BackHandler(enabled = !state.isSearchActive) {
         state.eventSink(ChangeRolesEvent.Exit)
     }
@@ -148,7 +143,7 @@ fun ChangeRolesView(
                         SearchResultsList(
                             currentRole = state.role,
                             lazyListState = lazyListState,
-                            searchResults = (state.searchResults as? SearchBarResultState.Results)?.results ?: MembersByRole(emptyList()),
+                            searchResults = (state.searchResults as? SearchBarResultState.Results)?.results ?: MembersByRole(),
                             selectedUsers = state.selectedUsers,
                             canRemoveMember = state.canChangeMemberRole,
                             onToggleSelection = { state.eventSink(ChangeRolesEvent.UserSelectionToggled(it.toMatrixUser())) },
@@ -170,63 +165,45 @@ fun ChangeRolesView(
 
         val asyncIndicatorState = rememberAsyncIndicatorState()
         AsyncIndicatorHost(modifier = Modifier.statusBarsPadding(), asyncIndicatorState)
-
         AsyncActionView(
-            async = state.exitState,
-            onSuccess = { latestNavigateUp() },
-            confirmationDialog = {
-                ConfirmationDialog(
-                    title = stringResource(CommonStrings.dialog_unsaved_changes_title),
-                    content = stringResource(CommonStrings.dialog_unsaved_changes_description_android),
-                    onSubmitClick = { state.eventSink(ChangeRolesEvent.Exit) },
-                    onDismiss = { state.eventSink(ChangeRolesEvent.CancelExit) }
-                )
-            },
-            onErrorDismiss = { /* Cannot happen */ },
-        )
-
-        when (state.savingState) {
-            is AsyncAction.Confirming -> {
-                when (state.role) {
-                    is RoomMember.Role.Owner -> {
+            async = state.savingState,
+            onSuccess = {},
+            confirmationDialog = { confirming ->
+                when (confirming) {
+                    is AsyncAction.ConfirmingCancellation -> {
+                        SaveChangesDialog(
+                            onSaveClick = { state.eventSink(ChangeRolesEvent.Save) },
+                            onDiscardClick = { state.eventSink(ChangeRolesEvent.Exit) },
+                            onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) },
+                        )
+                    }
+                    is ConfirmingModifyingOwners -> {
                         ConfirmationDialog(
                             title = stringResource(R.string.screen_room_change_role_confirm_change_owners_title),
                             content = stringResource(R.string.screen_room_change_role_confirm_change_owners_description),
                             submitText = stringResource(CommonStrings.action_continue),
                             onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
-                            onDismiss = { state.eventSink(ChangeRolesEvent.ClearError) },
+                            onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) },
                             destructiveSubmit = true,
                         )
                     }
-                    is RoomMember.Role.Admin -> {
+                    is ConfirmingModifyingAdmins -> {
                         ConfirmationDialog(
                             title = stringResource(R.string.screen_room_change_role_confirm_add_admin_title),
                             content = stringResource(R.string.screen_room_change_role_confirm_add_admin_description),
                             onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
-                            onDismiss = { state.eventSink(ChangeRolesEvent.ClearError) }
+                            onDismiss = { state.eventSink(ChangeRolesEvent.CloseDialog) }
                         )
                     }
-                    else -> Unit // No confirmation needed for Moderator or User roles
                 }
-            }
-            is AsyncAction.Loading -> {
-                ProgressDialog()
-            }
-            is AsyncAction.Failure -> {
-                ErrorDialog(
-                    content = stringResource(CommonStrings.error_unknown),
-                    onSubmit = { state.eventSink(ChangeRolesEvent.ClearError) }
-                )
-            }
-            is AsyncAction.Success -> {
-                LaunchedEffect(state.savingState) {
-                    asyncIndicatorState.enqueue(durationMs = AsyncIndicator.DURATION_SHORT) {
-                        AsyncIndicator.Custom(text = stringResource(CommonStrings.common_saved_changes))
-                    }
-                }
-            }
-            else -> Unit
-        }
+            },
+            errorMessage = {
+                stringResource(CommonStrings.error_unknown)
+            },
+            onErrorDismiss = {
+                state.eventSink(ChangeRolesEvent.CloseDialog)
+            },
+        )
     }
 }
 
@@ -394,7 +371,7 @@ private fun MemberRow(
                 if (isPending) {
                     Text(
                         modifier = Modifier.padding(start = 8.dp),
-                        text = stringResource(id = R.string.screen_room_member_list_pending_header_title),
+                        text = stringResource(id = R.string.screen_room_member_list_pending_status),
                         style = ElementTheme.typography.fontBodySmRegular.copy(fontStyle = FontStyle.Italic),
                         color = ElementTheme.colors.textSecondary
                     )
@@ -420,8 +397,7 @@ private fun MemberRow(
 internal fun ChangeRolesViewPreview(@PreviewParameter(ChangeRolesStateProvider::class) state: ChangeRolesState) {
     ElementPreview {
         ChangeRolesView(
-            state = state,
-            navigateUp = {},
+            state = state
         )
     }
 }
diff --git a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRoomMemberRolesRootNode.kt
similarity index 85%
rename from features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRoomMemberRolesRootNode.kt
index 2c3f77f208..458e8fda23 100644
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRoomMemberRolesRootNode.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import android.os.Parcelable
 import androidx.compose.runtime.Composable
@@ -20,8 +21,8 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.di.RoomGraphFactory
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
@@ -70,7 +71,7 @@ class ChangeRoomMemberRolesRootNode(
 
     override val roomId: RoomId = inputs.joinedRoom.roomId
 
-    override suspend fun waitForRoleChanged() {
-        waitForChildAttached<ChangeRolesNode>().waitForRoleChanged()
+    override suspend fun waitForCompletion(): Boolean {
+        return waitForChildAttached<ChangeRolesNode>().waitForCompletion()
     }
 }
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt
new file mode 100644
index 0000000000..10d46abbc3
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingAdmins.kt
@@ -0,0 +1,12 @@
+/*
+ * 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.rolesandpermissions.impl.roles
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data object ConfirmingModifyingAdmins : AsyncAction.Confirming
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt
new file mode 100644
index 0000000000..9799f68408
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ConfirmingModifyingOwners.kt
@@ -0,0 +1,12 @@
+/*
+ * 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.rolesandpermissions.impl.roles
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data object ConfirmingModifyingOwners : AsyncAction.Confirming
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPoint.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPoint.kt
new file mode 100644
index 0000000000..a56c0d59e7
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPoint.kt
@@ -0,0 +1,35 @@
+/*
+ * 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.rolesandpermissions.impl.roles
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+
+@ContributesBinding(SessionScope::class)
+class DefaultChangeRoomMemberRolesEntyPoint : ChangeRoomMemberRolesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        room: JoinedRoom,
+        listType: ChangeRoomMemberRolesListType,
+    ): Node {
+        return parentNode.createNode<ChangeRoomMemberRolesRootNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ChangeRoomMemberRolesRootNode.Inputs(joinedRoom = room, listType = listType),
+            )
+        )
+    }
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsEvents.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsEvents.kt
similarity index 76%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsEvents.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsEvents.kt
index 8b98f78d97..69fad02c25 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsEvents.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsEvents.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+package io.element.android.features.rolesandpermissions.impl.root
 
 import io.element.android.libraries.matrix.api.room.RoomMember
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt
similarity index 52%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt
index a430b0f6a5..da69ee52a9 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt
@@ -1,32 +1,24 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+package io.element.android.features.rolesandpermissions.impl.root
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 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
-import com.bumble.appyx.core.plugin.plugins
 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.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.ui.model.roleOf
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.launch
 
 @ContributesNode(RoomScope::class)
 @AssistedInject
@@ -34,18 +26,16 @@ class RolesAndPermissionsNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: RolesAndPermissionsPresenter,
-    private val room: BaseRoom,
 ) : Node(buildContext, plugins = plugins), RolesAndPermissionsNavigator {
     interface Callback : Plugin, RolesAndPermissionsNavigator {
         override fun openAdminList()
         override fun openModeratorList()
-        override fun openEditRoomDetailsPermissions()
-        override fun openMessagesAndContentPermissions()
-        override fun openModerationPermissions()
+        override fun openEditPermissions()
+
         override fun onBackClick() {}
     }
 
-    private val callback = plugins<Callback>().first()
+    private val callback: Callback = callback()
 
     @Stable
     private val navigator = object : RolesAndPermissionsNavigator by callback {
@@ -54,22 +44,6 @@ class RolesAndPermissionsNode(
         }
     }
 
-    override fun onBuilt() {
-        super.onBuilt()
-
-        // If the user is not an admin anymore, exit this section since they won't have permissions to use it
-        lifecycleScope.launch {
-            room.roomInfoFlow
-                .filter { info ->
-                    val role = info.roleOf(room.sessionId)
-                    role != RoomMember.Role.Admin && role !is RoomMember.Role.Owner
-                }
-                .take(1)
-                .onEach { navigateUp() }
-                .collect()
-        }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
@@ -85,7 +59,5 @@ interface RolesAndPermissionsNavigator {
     fun onBackClick() {}
     fun openAdminList() {}
     fun openModeratorList() {}
-    fun openEditRoomDetailsPermissions() {}
-    fun openMessagesAndContentPermissions() {}
-    fun openModerationPermissions() {}
+    fun openEditPermissions() {}
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsPresenter.kt
similarity index 69%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsPresenter.kt
index 2ad4c84028..dd3a59b99e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsPresenter.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+package io.element.android.features.rolesandpermissions.impl.root
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -21,14 +22,13 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-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.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
+import io.element.android.libraries.matrix.api.room.powerlevels.userCountWithRole
 import io.element.android.libraries.matrix.ui.model.roleOf
 import io.element.android.services.analytics.api.AnalyticsService
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -42,33 +42,24 @@ class RolesAndPermissionsPresenter(
     override fun present(): RolesAndPermissionsState {
         val coroutineScope = rememberCoroutineScope()
         val roomInfo by room.roomInfoFlow.collectAsState()
-        val roomMembers by room.membersStateFlow.collectAsState()
-        // Get the list of active room members (joined or invited), in order to filter members present in the power
-        // level state Event.
-        val activeRoomMemberIds by remember {
-            derivedStateOf {
-                roomMembers.activeRoomMembers().map { it.userId }
-            }
-        }
         val moderatorCount by remember {
-            derivedStateOf {
-                roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Moderator)
-            }
-        }
+            room.userCountWithRole { role -> role is RoomMember.Role.Moderator }
+        }.collectAsState(null)
+
         val adminCount by remember {
+            room.userCountWithRole { role -> role is RoomMember.Role.Admin || role is RoomMember.Role.Owner }
+        }.collectAsState(null)
+
+        val availableDemoteActions by remember {
             derivedStateOf {
-                val admins = roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Admin)
-                val ownersCount = if (roomInfo.privilegedCreatorRole) {
-                    val superAdmins = roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Owner(isCreator = false))
-                    val creators = roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Owner(isCreator = true))
-                    superAdmins + creators
-                } else {
-                    0
+                val currentRole = roomInfo.roleOf(room.sessionId)
+                when (currentRole) {
+                    is RoomMember.Role.Admin -> persistentListOf(SelfDemoteAction.ToModerator, SelfDemoteAction.ToMember)
+                    is RoomMember.Role.Moderator -> persistentListOf(SelfDemoteAction.ToMember)
+                    else -> persistentListOf()
                 }
-                admins + ownersCount
             }
         }
-        val canDemoteSelf = remember { derivedStateOf { roomInfo.roleOf(room.sessionId) !is RoomMember.Role.Owner } }
         val changeOwnRoleAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
         val resetPermissionsAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
 
@@ -97,10 +88,10 @@ class RolesAndPermissionsPresenter(
             roomSupportsOwnerRole = roomInfo.privilegedCreatorRole,
             adminCount = adminCount,
             moderatorCount = moderatorCount,
-            canDemoteSelf = canDemoteSelf.value,
+            availableSelfDemoteActions = availableDemoteActions,
             changeOwnRoleAction = changeOwnRoleAction.value,
             resetPermissionsAction = resetPermissionsAction.value,
-            eventSink = { handleEvent(it) },
+            eventSink = ::handleEvent,
         )
     }
 
@@ -121,8 +112,4 @@ class RolesAndPermissionsPresenter(
             room.resetPowerLevels()
         }
     }
-
-    private fun RoomInfo.userCountWithRole(userIds: List<UserId>, role: RoomMember.Role): Int {
-        return usersWithRole(role).filter { it in userIds }.size
-    }
 }
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsState.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsState.kt
new file mode 100644
index 0000000000..626ad3b699
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsState.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.features.rolesandpermissions.impl.root
+
+import io.element.android.features.rolesandpermissions.impl.R
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.room.RoomMember
+import kotlinx.collections.immutable.ImmutableList
+
+data class RolesAndPermissionsState(
+    val roomSupportsOwnerRole: Boolean,
+    val adminCount: Int?,
+    val moderatorCount: Int?,
+    val availableSelfDemoteActions: ImmutableList<SelfDemoteAction>,
+    val changeOwnRoleAction: AsyncAction<Unit>,
+    val resetPermissionsAction: AsyncAction<Unit>,
+    val eventSink: (RolesAndPermissionsEvents) -> Unit,
+) {
+    val canSelfDemote = availableSelfDemoteActions.isNotEmpty()
+}
+
+enum class SelfDemoteAction(val role: RoomMember.Role, val titleRes: Int) {
+    ToModerator(RoomMember.Role.Moderator, R.string.screen_room_roles_and_permissions_change_role_demote_to_moderator),
+    ToMember(RoomMember.Role.User, R.string.screen_room_roles_and_permissions_change_role_demote_to_member)
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsStateProvider.kt
similarity index 83%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsStateProvider.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsStateProvider.kt
index 211a16d7d1..45bd72db19 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsStateProvider.kt
@@ -1,14 +1,16 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+package io.element.android.features.rolesandpermissions.impl.root
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
+import kotlinx.collections.immutable.toImmutableList
 
 class RolesAndPermissionsStateProvider : PreviewParameterProvider<RolesAndPermissionsState> {
     override val values: Sequence<RolesAndPermissionsState>
@@ -45,7 +47,7 @@ class RolesAndPermissionsStateProvider : PreviewParameterProvider<RolesAndPermis
                 moderatorCount = 2,
                 resetPermissionsAction = AsyncAction.Failure(IllegalStateException("Failed to reset permissions")),
             ),
-            aRolesAndPermissionsState(canDemoteSelf = false),
+            aRolesAndPermissionsState(availableSelfDemoteActions = emptyList()),
         )
 }
 
@@ -53,14 +55,14 @@ internal fun aRolesAndPermissionsState(
     roomSupportsOwners: Boolean = true,
     adminCount: Int = 0,
     moderatorCount: Int = 0,
-    canDemoteSelf: Boolean = true,
+    availableSelfDemoteActions: List<SelfDemoteAction> = listOf(SelfDemoteAction.ToModerator, SelfDemoteAction.ToMember),
     changeOwnRoleAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     resetPermissionsAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (RolesAndPermissionsEvents) -> Unit = {},
 ) = RolesAndPermissionsState(
     roomSupportsOwnerRole = roomSupportsOwners,
     adminCount = adminCount,
-    canDemoteSelf = canDemoteSelf,
+    availableSelfDemoteActions = availableSelfDemoteActions.toImmutableList(),
     moderatorCount = moderatorCount,
     changeOwnRoleAction = changeOwnRoleAction,
     resetPermissionsAction = resetPermissionsAction,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt
similarity index 78%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt
rename to features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt
index b581554a92..269fdee664 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+package io.element.android.features.rolesandpermissions.impl.root
 
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
@@ -20,7 +21,7 @@ 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.roomdetails.impl.R
+import io.element.android.features.rolesandpermissions.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
@@ -38,8 +39,8 @@ import io.element.android.libraries.designsystem.theme.components.ListSectionHea
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.hide
-import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun RolesAndPermissionsView(
@@ -62,41 +63,36 @@ fun RolesAndPermissionsView(
         ListItem(
             headlineContent = { Text(adminsTitle) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
-            trailingContent = ListItemContent.Text("${state.adminCount}"),
+            trailingContent = state.adminCount?.let { adminCount ->
+                ListItemContent.Text("$adminCount")
+            },
             onClick = { rolesAndPermissionsNavigator.openAdminList() },
         )
         ListItem(
             headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_moderators)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChatProblem())),
-            trailingContent = ListItemContent.Text("${state.moderatorCount}"),
+            trailingContent = state.moderatorCount?.let { moderationCount ->
+                ListItemContent.Text("$moderationCount")
+            },
             onClick = { rolesAndPermissionsNavigator.openModeratorList() },
         )
-        if (state.canDemoteSelf) {
+        if (state.canSelfDemote) {
             ListItem(
                 headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_my_role)) },
                 onClick = { state.eventSink(RolesAndPermissionsEvents.ChangeOwnRole) },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Edit()))
             )
         }
-        ListSectionHeader(title = stringResource(R.string.screen_room_roles_and_permissions_permissions_header), hasDivider = true)
+        HorizontalDivider()
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_room_details)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Info())),
-            onClick = { rolesAndPermissionsNavigator.openEditRoomDetailsPermissions() },
-        )
-        ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_messages_and_content)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Chat())),
-            onClick = { rolesAndPermissionsNavigator.openMessagesAndContentPermissions() },
-        )
-        ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_member_moderation)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.User())),
-            onClick = { rolesAndPermissionsNavigator.openModerationPermissions() },
+            headlineContent = { 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)) },
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
             onClick = { state.eventSink(RolesAndPermissionsEvents.ResetPermissions) },
             style = ListItemStyle.Destructive,
         )
@@ -121,6 +117,7 @@ fun RolesAndPermissionsView(
     when (state.changeOwnRoleAction) {
         is AsyncAction.Confirming -> {
             ChangeOwnRoleBottomSheet(
+                availableDemoteActions = state.availableSelfDemoteActions,
                 eventSink = state.eventSink,
             )
         }
@@ -140,6 +137,7 @@ fun RolesAndPermissionsView(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ChangeOwnRoleBottomSheet(
+    availableDemoteActions: ImmutableList<SelfDemoteAction>,
     eventSink: (RolesAndPermissionsEvents) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -168,24 +166,17 @@ private fun ChangeOwnRoleBottomSheet(
             style = ElementTheme.typography.fontBodyLgRegular,
             color = ElementTheme.colors.textPrimary,
         )
-        ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_role_demote_to_moderator)) },
-            onClick = {
-                sheetState.hide(coroutineScope) {
-                    eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.Moderator))
-                }
-            },
-            style = ListItemStyle.Destructive,
-        )
-        ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_role_demote_to_member)) },
-            onClick = {
-                sheetState.hide(coroutineScope) {
-                    eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.User))
-                }
-            },
-            style = ListItemStyle.Destructive,
-        )
+        for (demoteAction in availableDemoteActions) {
+            ListItem(
+                headlineContent = { Text(stringResource(demoteAction.titleRes)) },
+                onClick = {
+                    sheetState.hide(coroutineScope) {
+                        eventSink(RolesAndPermissionsEvents.DemoteSelfTo(demoteAction.role))
+                    }
+                },
+                style = ListItemStyle.Destructive,
+            )
+        }
         ListItem(
             headlineContent = { Text(stringResource(CommonStrings.action_cancel)) },
             onClick = ::dismiss,
diff --git a/features/changeroommemberroles/impl/src/main/res/values-be/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-be/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
index 6d16b23bcc..44841d1207 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-be/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -39,12 +37,10 @@
   <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>
-  <string name="screen_room_member_list_pending_header_title">"У чаканні"</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>
@@ -54,7 +50,6 @@
   <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_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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-bg/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml
similarity index 85%
rename from features/changeroommemberroles/impl/src/main/res/values-bg/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml
index 2b4718f078..b1ca5f9718 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-bg/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-bg/translations.xml
@@ -2,13 +2,11 @@
 <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_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_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>
@@ -24,17 +22,17 @@
     <item quantity="other">"%1$d души"</item>
   </plurals>
   <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_roles_and_permissions_admins">"Администратори"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"Промяна на моята роля"</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_permissions_header">"Разрешения"</string>
   <string name="screen_room_roles_and_permissions_reset">"Нулиране на разрешенията"</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/changeroommemberroles/impl/src/main/res/values-cs/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
similarity index 79%
rename from features/changeroommemberroles/impl/src/main/res/values-cs/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
index a66795ea7e..87936de3a7 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-cs/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-cs/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="screen_room_change_permissions_administrators">"Pouze správci"</string>
+  <string name="screen_room_change_permissions_administrators">"Správce"</string>
   <string name="screen_room_change_permissions_ban_people">"Vykázat lidi"</string>
+  <string name="screen_room_change_permissions_change_settings">"Změnit nastavení"</string>
   <string name="screen_room_change_permissions_delete_messages">"Odstranit zprávy"</string>
-  <string name="screen_room_change_permissions_everyone">"Všichni"</string>
-  <string name="screen_room_change_permissions_invite_people">"Pozvěte lidi a přijímejte žádosti o připojení"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderování členů"</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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Zprávy a obsah"</string>
-  <string name="screen_room_change_permissions_moderators">"Správci a moderátoři"</string>
-  <string name="screen_room_change_permissions_remove_people">"Odeberte lidi a odmítněte žádosti o připojení"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Odebrat osoby"</string>
   <string name="screen_room_change_permissions_room_avatar">"Změnit avatar místnosti"</string>
-  <string name="screen_room_change_permissions_room_details">"Podrobnosti místnosti"</string>
+  <string name="screen_room_change_permissions_room_details">"Upravit podrobnosti"</string>
   <string name="screen_room_change_permissions_room_name">"Změnit název místnosti"</string>
   <string name="screen_room_change_permissions_room_topic">"Změnit téma místnosti"</string>
   <string name="screen_room_change_permissions_send_messages">"Odeslat zprávy"</string>
+  <string name="screen_room_change_permissions_title">"Oprávnění"</string>
   <string name="screen_room_change_role_administrators_title">"Upravit správce"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Tuto akci nebudete moci vrátit zpět. Upravujete oprávnění uživatele, tak aby měl stejnou úroveň jako vy."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Přidat správce?"</string>
@@ -34,6 +38,13 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Máte neuložené změny."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Uložit změny?"</string>
   <string name="screen_room_member_list_banned_empty">"V této místnosti nejsou žádní vykázaní uživatelé."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d vykázán(a)"</item>
+    <item quantity="few">"%1$d vykázáni"</item>
+    <item quantity="other">"%1$d vykázáných"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Zkontrolujte pravopis nebo zkuste nové vyhledávání"</string>
+  <string name="screen_room_member_list_empty_search_title">"Žádné výsledky pro “%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>
@@ -43,10 +54,15 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Pouze odebrat člena"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Zrušit vykázání"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Pokud budou pozváni, budou se moci do této místnosti znovu připojit."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání uživatele"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání z místnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Vykázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členové"</string>
-  <string name="screen_room_member_list_pending_header_title">"Nevyřízeno"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozván(a)"</item>
+    <item quantity="few">"%1$d pozváni"</item>
+    <item quantity="other">"%1$d pozvaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Čekající"</string>
   <string name="screen_room_member_list_role_administrator">"Správce"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
@@ -67,5 +83,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Obnovit oprávnění?"</string>
   <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_room_roles_and_permissions_space_details">"Detaily prostoru"</string>
+  <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-cy/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml
similarity index 94%
rename from features/changeroommemberroles/impl/src/main/res/values-cy/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml
index 4740c15888..f75f908d43 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-cy/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-cy/translations.xml
@@ -10,7 +10,7 @@
   <string name="screen_room_change_permissions_moderators">"Gweinyddwyr a chymedrolwyr"</string>
   <string name="screen_room_change_permissions_remove_people">"Dileu pobl a gwrthod ceisiadau i ymuno"</string>
   <string name="screen_room_change_permissions_room_avatar">"Newid afatar ystafell"</string>
-  <string name="screen_room_change_permissions_room_details">"Manylion yr ystafell"</string>
+  <string name="screen_room_change_permissions_room_details">"Ystafell Golygu"</string>
   <string name="screen_room_change_permissions_room_name">"Newid enw\'r ystafell"</string>
   <string name="screen_room_change_permissions_room_topic">"Newid pwnc yr ystafell"</string>
   <string name="screen_room_change_permissions_send_messages">"Anfon negeseuon"</string>
@@ -46,12 +46,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Dileu aelod yn unig"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Adfer"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Fyddan nhw yn gallu ymuno â\'r ystafell hon eto os cân nhw wahoddiad."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Gwahardd defnyddiwr"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Dad-wahardd o\'r ystafell"</string>
   <string name="screen_room_member_list_mode_banned">"Wedi\'i wahardd"</string>
   <string name="screen_room_member_list_mode_members">"Aelodau"</string>
-  <string name="screen_room_member_list_pending_header_title">"Dan ystyriaeth"</string>
-  <string name="screen_room_member_list_role_administrator">"Gweinyddwr"</string>
-  <string name="screen_room_member_list_role_moderator">"Cymedrolwr"</string>
+  <string name="screen_room_member_list_role_administrator">"Gweinyddwyr yn unig"</string>
+  <string name="screen_room_member_list_role_moderator">"Gweinyddwyr a chymedrolwyr"</string>
   <string name="screen_room_member_list_role_owner">"Perchennog"</string>
   <string name="screen_room_member_list_room_members_header_title">"Aelodau\'r ystafell"</string>
   <string name="screen_room_member_list_unbanning_user">"Dad-wahardd %1$s"</string>
@@ -64,7 +63,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Negeseuon a chynnwys"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Cymedrolwyr"</string>
   <string name="screen_room_roles_and_permissions_owners">"Perchnogion"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Caniatâd"</string>
   <string name="screen_room_roles_and_permissions_reset">"Ailosod caniatâd"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ar ôl i chi ailosod caniatâd, byddwch yn colli\'r gosodiadau cyfredol."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ailosod caniatâd?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-da/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-da/translations.xml
similarity index 80%
rename from features/changeroommemberroles/impl/src/main/res/values-da/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-da/translations.xml
index 122453e121..31aee3436e 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-da/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-da/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="screen_room_change_permissions_administrators">"Kun admins"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
   <string name="screen_room_change_permissions_ban_people">"Spær brugere"</string>
+  <string name="screen_room_change_permissions_change_settings">"Skift indstillinger"</string>
   <string name="screen_room_change_permissions_delete_messages">"Fjern beskeder"</string>
-  <string name="screen_room_change_permissions_everyone">"Alle"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invitér personer og acceptér anmodninger om at deltage"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderation af medlemmer"</string>
+  <string name="screen_room_change_permissions_everyone">"Medlem"</string>
+  <string name="screen_room_change_permissions_invite_people">"Invitér andre"</string>
+  <string name="screen_room_change_permissions_manage_space">"Administrér gruppe"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Administrer rum"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Administrer medlemmer"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Beskeder og indhold"</string>
-  <string name="screen_room_change_permissions_moderators">"Admins og moderatorer"</string>
-  <string name="screen_room_change_permissions_remove_people">"Fjern personer og afvis anmodninger om at deltage"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Fjern personer"</string>
   <string name="screen_room_change_permissions_room_avatar">"Skift rummets avatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Detaljer om rummet"</string>
+  <string name="screen_room_change_permissions_room_details">"Redigér detaljer"</string>
   <string name="screen_room_change_permissions_room_name">"Skift rummets navn"</string>
   <string name="screen_room_change_permissions_room_topic">"Skift emne for rummet"</string>
   <string name="screen_room_change_permissions_send_messages">"Send beskeder"</string>
+  <string name="screen_room_change_permissions_title">"Tilladelser"</string>
   <string name="screen_room_change_role_administrators_title">"Redigér admins"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Du kan ikke fortryde denne handling. Du forfremmer brugeren til at have samme magtniveau som dig."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Tilføj Admin?"</string>
@@ -34,6 +38,12 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Du har ændringer, der ikke er gemt."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Gem ændringer?"</string>
   <string name="screen_room_member_list_banned_empty">"Der er ingen spærrede brugere i dette rum."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Spærret"</item>
+    <item quantity="other">"%1$d Spærret"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Tjek stavningen eller prøv en ny søgning"</string>
+  <string name="screen_room_member_list_empty_search_title">"Ingen resultater for \"%1$s\""</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d person"</item>
     <item quantity="other">"%1$d personer"</item>
@@ -42,11 +52,15 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Fjern kun medlem"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Fjern spærring af"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"De vil være i stand til at deltage i dette rum igen, hvis de inviteres."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Ophæv blokering af bruger fra rum"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Fjern brugerens spærring fra rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Spærret"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Afventer"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Inviteret"</item>
+    <item quantity="other">"%1$d Inviteret"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Afventer"</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">"Ejeren"</string>
   <string name="screen_room_member_list_room_members_header_title">"Medlemmer af rummet"</string>
@@ -66,5 +80,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Nulstil tilladelser?"</string>
   <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_space_details">"Detaljer om gruppe"</string>
   <string name="screen_room_roles_and_permissions_title">"Roller og tilladelser"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-de/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-de/translations.xml
similarity index 90%
rename from features/changeroommemberroles/impl/src/main/res/values-de/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-de/translations.xml
index 88d795d614..2767781d2b 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-de/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-de/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Nur Admins"</string>
   <string name="screen_room_change_permissions_ban_people">"Mitglieder sperren"</string>
   <string name="screen_room_change_permissions_delete_messages">"Nachrichten entfernen"</string>
-  <string name="screen_room_change_permissions_everyone">"Alle"</string>
   <string name="screen_room_change_permissions_invite_people">"Personen einladen und Beitrittsanfragen annehmen"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderation der Mitglieder"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Nachrichten senden &amp; löschen"</string>
   <string name="screen_room_change_permissions_moderators">"Admins und Moderatoren"</string>
   <string name="screen_room_change_permissions_remove_people">"Personen entfernen und Beitrittsanfragen ablehnen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Avatar ändern"</string>
-  <string name="screen_room_change_permissions_room_details">"Chat-Details anpassen"</string>
+  <string name="screen_room_change_permissions_room_details">"Chat bearbeiten"</string>
   <string name="screen_room_change_permissions_room_name">"Chat-Namen ändern"</string>
   <string name="screen_room_change_permissions_room_topic">"Chat Thema ändern"</string>
   <string name="screen_room_change_permissions_send_messages">"Nachrichten senden"</string>
@@ -33,7 +31,7 @@
   <string name="screen_room_change_role_section_users">"Mitglieder"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Du hast nicht gespeicherte Änderungen."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Änderungen speichern?"</string>
-  <string name="screen_room_member_list_banned_empty">"In diesem Chat gibt es keine gesperrten Nutzer."</string>
+  <string name="screen_room_member_list_banned_empty">"Es gibt keine gesperrten Nutzer."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d Person"</item>
     <item quantity="other">"%1$d Personen"</item>
@@ -42,12 +40,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Mitglied nur entfernen"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Sperre aufheben"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Die Nutzer können dem Chat wieder beitreten, wenn sie eingeladen werden."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Nutzer entsperren"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Sperre für diesen Chat aufheben"</string>
   <string name="screen_room_member_list_mode_banned">"Gesperrt"</string>
   <string name="screen_room_member_list_mode_members">"Mitglieder"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ausstehend"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Nur Admins"</string>
+  <string name="screen_room_member_list_role_moderator">"Admins und Moderatoren"</string>
   <string name="screen_room_member_list_role_owner">"Eigentümer"</string>
   <string name="screen_room_member_list_room_members_header_title">"Mitglieder"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s wird entsperrt."</string>
@@ -60,7 +57,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Nachrichten senden &amp; löschen"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatoren"</string>
   <string name="screen_room_roles_and_permissions_owners">"Eigentümer"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Berechtigungen"</string>
   <string name="screen_room_roles_and_permissions_reset">"Rollen und Berechtigungen zurücksetzen"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Sobald du die Berechtigungen zurücksetzt, verlierst du die aktuellen Einstellungen."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Berechtigungen zurücksetzen?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-el/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-el/translations.xml
similarity index 90%
rename from features/changeroommemberroles/impl/src/main/res/values-el/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-el/translations.xml
index fbb7e6952f..8cd14feb47 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-el/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-el/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -38,12 +36,11 @@
   <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_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_pending_header_title">"Σε αναμονή"</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>
@@ -53,7 +50,6 @@
   <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_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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-es/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-es/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-es/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-es/translations.xml
index 128435bbc2..383ffba1eb 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-es/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-es/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Solo administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Vetar personas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Eliminar mensajes"</string>
-  <string name="screen_room_change_permissions_everyone">"Todos"</string>
   <string name="screen_room_change_permissions_invite_people">"Invitar personas y aceptar solicitudes de unión"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderación de miembros"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensajes y contenido"</string>
   <string name="screen_room_change_permissions_moderators">"Administradores y moderadores"</string>
   <string name="screen_room_change_permissions_remove_people">"Eliminar personas y rechazar solicitudes de unión"</string>
   <string name="screen_room_change_permissions_room_avatar">"Cambiar el avatar de la sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Detalles de la sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar sala"</string>
   <string name="screen_room_change_permissions_room_name">"Cambiar el nombre de la sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Cambiar el tema de la sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensajes"</string>
@@ -38,12 +36,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Solo eliminar miembro"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Quitar veto"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Podrá volver a unirse a esta sala si se le invita."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Quitar veto al usuario"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Eliminar veto en la sala"</string>
   <string name="screen_room_member_list_mode_banned">"Vetados"</string>
   <string name="screen_room_member_list_mode_members">"Miembros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendiente"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderador"</string>
+  <string name="screen_room_member_list_role_administrator">"Solo administradores"</string>
+  <string name="screen_room_member_list_role_moderator">"Administradores y moderadores"</string>
   <string name="screen_room_member_list_room_members_header_title">"Miembros de la sala"</string>
   <string name="screen_room_member_list_unbanning_user">"Levantando veto a %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"Administradores"</string>
@@ -53,7 +50,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Moderación de miembros"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mensajes y contenido"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderadores"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Permisos"</string>
   <string name="screen_room_roles_and_permissions_reset">"Restablecer permisos"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Una vez que restablezca los permisos, perderá la configuración actual."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"¿Restablecer los permisos?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-et/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
similarity index 76%
rename from features/changeroommemberroles/impl/src/main/res/values-et/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
index a43a9a89d0..1c1f490580 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-et/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-et/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="screen_room_change_permissions_administrators">"Vaid peakasutajad"</string>
+  <string name="screen_room_change_permissions_administrators">"Peakasutajad"</string>
   <string name="screen_room_change_permissions_ban_people">"Suhtluskeelu seadmine"</string>
+  <string name="screen_room_change_permissions_change_settings">"Muuda seadistusi"</string>
   <string name="screen_room_change_permissions_delete_messages">"Eemalda sõnumid"</string>
-  <string name="screen_room_change_permissions_everyone">"Kõik"</string>
-  <string name="screen_room_change_permissions_invite_people">"Kutsu teisi osalejaid ja vasta ise liitumiskutsetele"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Jututoas osalejate modereerimine"</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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Sõnumid ja sisu"</string>
-  <string name="screen_room_change_permissions_moderators">"Peakasutajad ja moderaatorid"</string>
-  <string name="screen_room_change_permissions_remove_people">"Eemalda osalejaid jututoast ja lükka liitumiskutsed tagasi"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderaatorid"</string>
+  <string name="screen_room_change_permissions_remove_people">"Osalejate eemaldamine"</string>
   <string name="screen_room_change_permissions_room_avatar">"Jututoa tunnuspildi muutmine"</string>
-  <string name="screen_room_change_permissions_room_details">"Jututoa üksikasjad"</string>
+  <string name="screen_room_change_permissions_room_details">"Muuda üksikasju"</string>
   <string name="screen_room_change_permissions_room_name">"Jututoa nime muutmine"</string>
   <string name="screen_room_change_permissions_room_topic">"Jututoa teema muutmine"</string>
   <string name="screen_room_change_permissions_send_messages">"Sõnumite saatmine"</string>
+  <string name="screen_room_change_permissions_title">"Õigused"</string>
   <string name="screen_room_change_role_administrators_title">"Muuda peakasutajaid"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Kuna sa annad teisele kasutajale sinu õigustega võrreldes samad õigused, siis sa ei saa seda muudatust hiljem tagasi pöörata."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Lisame peakasutaja?"</string>
@@ -33,7 +37,13 @@
   <string name="screen_room_change_role_section_users">"Liikmed"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Sul on salvestamata muudatusi"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Kas salvestame muudatused?"</string>
-  <string name="screen_room_member_list_banned_empty">"Jututoas pole suhtluskeeluga kasutajaid"</string>
+  <string name="screen_room_member_list_banned_empty">"Suhtluskeeluga kasutajaid pole"</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d suhtluskeeluga kasutaja"</item>
+    <item quantity="other">"%1$d suhtluskeeluga kasutajat"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Palun kontrolli otsingusõna korrektsust ja proovi siis uuesti"</string>
+  <string name="screen_room_member_list_empty_search_title">"Otsingul „%1$s“ pole tulemusi"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osaleja"</item>
     <item quantity="other">"%1$d osalejat"</item>
@@ -42,12 +52,16 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Ainult eemalda kasutaja"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Eemalda suhtluskeeld"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Kutse olemasolul saab ta nüüd jututoaga uuesti liituda"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Eemalda kasutaja suhtluskeeld"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Eemalda suhtluskeeld jututoas"</string>
   <string name="screen_room_member_list_mode_banned">"Suhtluskeeluga kasutajad"</string>
   <string name="screen_room_member_list_mode_members">"Liikmed"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ootel"</string>
-  <string name="screen_room_member_list_role_administrator">"Peakasutaja"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderaator"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d saatis kutse"</item>
+    <item quantity="other">"%1$d saatis kutse"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Ootel"</string>
+  <string name="screen_room_member_list_role_administrator">"Peakasutajad"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderaatorid"</string>
   <string name="screen_room_member_list_role_owner">"Omanik"</string>
   <string name="screen_room_member_list_room_members_header_title">"Jututoas osalejad"</string>
   <string name="screen_room_member_list_unbanning_user">"Eemaldame suhtluskeelu kasutajalt %1$s"</string>
@@ -66,5 +80,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Kas lähtestame õigused?"</string>
   <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_space_details">"Kogukonna üksikasjad"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollid ja õigused"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-eu/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml
similarity index 88%
rename from features/changeroommemberroles/impl/src/main/res/values-eu/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml
index 47210a0ca6..03766f73f2 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-eu/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-eu/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Administratzaileak soilik"</string>
   <string name="screen_room_change_permissions_ban_people">"Jarri debekua jendeari"</string>
   <string name="screen_room_change_permissions_delete_messages">"Kendu mezuak"</string>
-  <string name="screen_room_change_permissions_everyone">"Guztiak"</string>
   <string name="screen_room_change_permissions_invite_people">"Gonbidatu jendea"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Kideen moderazioa"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mezuak eta edukiak"</string>
   <string name="screen_room_change_permissions_moderators">"Administratzaileak eta moderatzaileak"</string>
   <string name="screen_room_change_permissions_remove_people">"Kendu jendea"</string>
   <string name="screen_room_change_permissions_room_avatar">"Aldatu gelaren abatarra"</string>
-  <string name="screen_room_change_permissions_room_details">"Gelaren xehetasunak"</string>
+  <string name="screen_room_change_permissions_room_details">"Editatu gela"</string>
   <string name="screen_room_change_permissions_room_name">"Aldatu gelaren izena"</string>
   <string name="screen_room_change_permissions_room_topic">"Aldatu gelako mintzagaia"</string>
   <string name="screen_room_change_permissions_send_messages">"Bidali mezuak"</string>
@@ -38,12 +36,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Kendu kidea eta ezarri debekua"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Kendu kidea soilik"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Kendu debekua"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Kendu debekua erabiltzaileari"</string>
   <string name="screen_room_member_list_mode_banned">"Debekatuta"</string>
   <string name="screen_room_member_list_mode_members">"Kideak"</string>
-  <string name="screen_room_member_list_pending_header_title">"Zain"</string>
-  <string name="screen_room_member_list_role_administrator">"Kudeatzailea"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderatzailea"</string>
+  <string name="screen_room_member_list_role_administrator">"Administratzaileak soilik"</string>
+  <string name="screen_room_member_list_role_moderator">"Administratzaileak eta moderatzaileak"</string>
   <string name="screen_room_member_list_role_owner">"Jabea"</string>
   <string name="screen_room_member_list_room_members_header_title">"Gelako kideak"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s(r)i debekua kentzen"</string>
@@ -56,7 +52,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mezuak eta edukiak"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatzaileak"</string>
   <string name="screen_room_roles_and_permissions_owners">"Jabeak"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Baimenak"</string>
   <string name="screen_room_roles_and_permissions_reset">"Berrezarri baimenak"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Baimenak berrezarritakoan, uneko ezarpenak galduko dituzu."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Baimenak berrezarri?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-fa/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
similarity index 85%
rename from features/changeroommemberroles/impl/src/main/res/values-fa/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
index c5bbc9d3ff..c526d059bc 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-fa/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
@@ -10,25 +10,29 @@
   <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>
   <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_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_header_title">
     <item quantity="one">"%1$d نفر"</item>
     <item quantity="other">"%1$d نفر"</item>
@@ -37,23 +41,23 @@
   <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_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_pending_header_title">"منتظر"</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>
   <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_permissions_header">"اجازه‌ها"</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_title">"بازنشانی اجازه‌ها؟"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"نقش‌ها"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-fi/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
similarity index 87%
rename from features/changeroommemberroles/impl/src/main/res/values-fi/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
index 1279d466e2..29331bcd13 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-fi/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fi/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="screen_room_change_permissions_administrators">"Vain ylläpitäjät"</string>
+  <string name="screen_room_change_permissions_administrators">"Ylläpitäjä"</string>
   <string name="screen_room_change_permissions_ban_people">"Porttikieltojen antaminen"</string>
+  <string name="screen_room_change_permissions_change_settings">"Asetusten muuttaminen"</string>
   <string name="screen_room_change_permissions_delete_messages">"Viestien poistaminen"</string>
-  <string name="screen_room_change_permissions_everyone">"Kaikki"</string>
+  <string name="screen_room_change_permissions_everyone">"Jäsen"</string>
   <string name="screen_room_change_permissions_invite_people">"Ihmisten kutsuminen ja liittymispyyntöjen hyväksyminen"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Jäsenten valvonta"</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 hallinta"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Viestit ja sisältö"</string>
-  <string name="screen_room_change_permissions_moderators">"Ylläpitäjät ja valvojat"</string>
+  <string name="screen_room_change_permissions_moderators">"Valvoja"</string>
   <string name="screen_room_change_permissions_remove_people">"Henkilöiden poistaminen ja liittymispyyntöjen hylkääminen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Huoneen avatarin vaihtaminen"</string>
-  <string name="screen_room_change_permissions_room_details">"Huoneen tiedot"</string>
+  <string name="screen_room_change_permissions_room_details">"Muokkaa tietoja"</string>
   <string name="screen_room_change_permissions_room_name">"Huoneen nimen vaihtaminen"</string>
   <string name="screen_room_change_permissions_room_topic">"Huoneen aiheen vaihtaminen"</string>
   <string name="screen_room_change_permissions_send_messages">"Viestien lähettäminen"</string>
+  <string name="screen_room_change_permissions_title">"Oikeudet"</string>
   <string name="screen_room_change_role_administrators_title">"Muokkaa ylläpitäjiä"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Et voi peruuttaa tätä toimenpidettä. Ylennät käyttäjän samalle oikeustasolle kuin sinä."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Lisätäänkö ylläpitäjä?"</string>
@@ -33,7 +37,7 @@
   <string name="screen_room_change_role_section_users">"Jäsenet"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Sinulla on tallentamattomia muutoksia"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Tallennetaanko muutokset?"</string>
-  <string name="screen_room_member_list_banned_empty">"Tässä huoneessa ei ole porttikieltoja"</string>
+  <string name="screen_room_member_list_banned_empty">"Porttikiellettyjä käyttäjiä ei ole."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d henkilö"</item>
     <item quantity="other">"%1$d henkilöä"</item>
@@ -42,10 +46,9 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Poista vain jäsen huoneesta"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Poista porttikielto"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"He voivat liittyä tähän huoneeseen uudelleen, jos heidät kutsutaan."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Poista käyttäjän porttikielto"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Poista porttikielto huoneesta"</string>
   <string name="screen_room_member_list_mode_banned">"Porttikiellot"</string>
   <string name="screen_room_member_list_mode_members">"Jäsenet"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutsuttu"</string>
   <string name="screen_room_member_list_role_administrator">"Ylläpitäjä"</string>
   <string name="screen_room_member_list_role_moderator">"Valvoja"</string>
   <string name="screen_room_member_list_role_owner">"Omistaja"</string>
@@ -66,5 +69,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Nollataanko oikeudet?"</string>
   <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_space_details">"Tilan tiedot"</string>
   <string name="screen_room_roles_and_permissions_title">"Roolit ja oikeudet"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-fr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
similarity index 78%
rename from features/changeroommemberroles/impl/src/main/res/values-fr/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
index a708c9ffb5..874b6710cd 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-fr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fr/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="screen_room_change_permissions_administrators">"Administrateurs seulement"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrateurs"</string>
   <string name="screen_room_change_permissions_ban_people">"Bannir des participants"</string>
+  <string name="screen_room_change_permissions_change_settings">"Changer les paramètres"</string>
   <string name="screen_room_change_permissions_delete_messages">"Supprimer des messages"</string>
-  <string name="screen_room_change_permissions_everyone">"Tout le monde"</string>
-  <string name="screen_room_change_permissions_invite_people">"Inviter des personnes et accepter les demandes pour rejoindre"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Administration des membres"</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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Messages et contenus"</string>
-  <string name="screen_room_change_permissions_moderators">"Administrateurs et modérateurs"</string>
-  <string name="screen_room_change_permissions_remove_people">"Retirer des personnes et refuser les demandes pour rejoindre"</string>
+  <string name="screen_room_change_permissions_moderators">"Modérateurs"</string>
+  <string name="screen_room_change_permissions_remove_people">"Retirer des personnes"</string>
   <string name="screen_room_change_permissions_room_avatar">"Changer l’avatar du salon"</string>
-  <string name="screen_room_change_permissions_room_details">"Détails du salon"</string>
+  <string name="screen_room_change_permissions_room_details">"Modifier les détails"</string>
   <string name="screen_room_change_permissions_room_name">"Changer le nom du salon"</string>
   <string name="screen_room_change_permissions_room_topic">"Changer le sujet du salon"</string>
   <string name="screen_room_change_permissions_send_messages">"Envoyer des messages"</string>
+  <string name="screen_room_change_permissions_title">"Autorisations"</string>
   <string name="screen_room_change_role_administrators_title">"Modifier les administrateurs"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Vous ne pourrez pas annuler cette action. Vous êtes en train de promouvoir l’utilisateur pour qu’il ait le même niveau que vous."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Ajouter un administrateur ?"</string>
@@ -33,21 +37,31 @@
   <string name="screen_room_change_role_section_users">"Membres"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Vous avez des modifications non-enregistrées."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Enregistrer les changements ?"</string>
-  <string name="screen_room_member_list_banned_empty">"Il n’y a pas d’utilisateur banni dans ce salon."</string>
+  <string name="screen_room_member_list_banned_empty">"Il n’y a pas d’utilisateur banni."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banni(e)"</item>
+    <item quantity="other">"%1$d Banni(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Vérifiez la saisie ou effectuez une nouvelle recherche"</string>
+  <string name="screen_room_member_list_empty_search_title">"Aucun résultat pour «%1$s»"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d personne"</item>
-    <item quantity="other">"%1$d personnes"</item>
+    <item quantity="one">"%1$d Personne"</item>
+    <item quantity="other">"%1$d Personnes"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Bannir du salon"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Retirer le membre uniquement"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Débannir"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Il pourra rejoindre le salon à nouveau si il est invité."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Débannir l’utilisateur"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Débannir du salon"</string>
   <string name="screen_room_member_list_mode_banned">"Bannis"</string>
   <string name="screen_room_member_list_mode_members">"Membres"</string>
-  <string name="screen_room_member_list_pending_header_title">"En attente"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrateur"</string>
-  <string name="screen_room_member_list_role_moderator">"Modérateur"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invité(e)"</item>
+    <item quantity="other">"%1$d Invité(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"En attente"</string>
+  <string name="screen_room_member_list_role_administrator">"Administrateurs"</string>
+  <string name="screen_room_member_list_role_moderator">"Modérateurs"</string>
   <string name="screen_room_member_list_role_owner">"Propriétaire"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membres du salon"</string>
   <string name="screen_room_member_list_unbanning_user">"Débannissement de %1$s"</string>
@@ -66,5 +80,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Réinitialisation des autorisations ?"</string>
   <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 et autorisations"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Détails de l’espace"</string>
+  <string name="screen_room_roles_and_permissions_title">"Rôles &amp; autorisations"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..7f24535124
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,88 @@
+<?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">"Administrator"</string>
+  <string name="screen_room_change_permissions_ban_people">"Zabrana pristupa osobama"</string>
+  <string name="screen_room_change_permissions_change_settings">"Promijeni postavke"</string>
+  <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_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>
+  <string name="screen_room_change_permissions_messages_and_content">"Poruke i sadržaj"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Uklanjanje osoba"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Promjena avatara"</string>
+  <string name="screen_room_change_permissions_room_details">"Uredi pojedinosti"</string>
+  <string name="screen_room_change_permissions_room_name">"Promjena imena"</string>
+  <string name="screen_room_change_permissions_room_topic">"Promjena teme"</string>
+  <string name="screen_room_change_permissions_send_messages">"Slanje poruka"</string>
+  <string name="screen_room_change_permissions_title">"Dopuštenja"</string>
+  <string name="screen_room_change_role_administrators_title">"Uredi administratore"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Nećete moći poništiti ovu radnju. Postavit ćete da korisnik ima isti položaj kao i vi."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Dodati administratora?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Nećete moći poništiti ovu radnju. Prenosite vlasništvo na odabrane korisnike. Nakon što odete, to će biti trajno."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Želite li prenijeti vlasništvo?"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"Degradiraj"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"Nećete moći poništiti ovu promjenu jer sami sebe degradirate. Ako ste posljednji privilegirani korisnik u sobi, nećete moći ponovno dobiti privilegije."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Želite li se degradirati?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (na čekanju)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(na čekanju)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Administratori automatski imaju moderatorske ovlasti"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Vlasnici automatski imaju administratorske ovlasti."</string>
+  <string name="screen_room_change_role_moderators_title">"Uredi moderatore"</string>
+  <string name="screen_room_change_role_owners_title">"Odaberi vlasnike"</string>
+  <string name="screen_room_change_role_section_administrators">"Administratori"</string>
+  <string name="screen_room_change_role_section_moderators">"Moderatori"</string>
+  <string name="screen_room_change_role_section_users">"Članovi"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Niste spremili sve promjene."</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"Želite li spremiti promjene?"</string>
+  <string name="screen_room_member_list_banned_empty">"Nema zabranjenih korisnika."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d zabranjen"</item>
+    <item quantity="few">"%1$d zabranjena"</item>
+    <item quantity="other">"%1$d zabranjenih"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Provjerite pravopis ili pokušajte s novim pretraživanjem"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nema rezultata za “%1$s”"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d osoba"</item>
+    <item quantity="few">"%1$d osobe"</item>
+    <item quantity="other">"%1$d ljudi"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Zabrani korisnika"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Samo ukloni člana"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"Poništi zabranu"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Moći će se ponovno pridružiti ovoj sobi ako budu pozvani."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Poništi zabranu pristupa korisniku"</string>
+  <string name="screen_room_member_list_mode_banned">"Zabranjeni"</string>
+  <string name="screen_room_member_list_mode_members">"Članovi"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozvan"</item>
+    <item quantity="few">"%1$d pozvana"</item>
+    <item quantity="other">"%1$d pozvanih"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Na čekanju"</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">"Vlasnik"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Članovi sobe"</string>
+  <string name="screen_room_member_list_unbanning_user">"Uklanja se zabrana korisniku %1$s"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Administratori"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Administratori i vlasnici"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Promijeni moju ulogu"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Degradiraj u člana"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Degradiraj u moderatora"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Moderiranje članova"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Poruke i sadržaj"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Moderatori"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Vlasnici"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Dopuštenja"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Poništi dopuštenja"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Nakon što poništite dopuštenja, izgubit ćete trenutačne postavke."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Želite li poništiti dopuštenja?"</string>
+  <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_space_details">"Pojedinosti o prostoru"</string>
+  <string name="screen_room_roles_and_permissions_title">"Uloge i dopuštenja"</string>
+</resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-hu/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
similarity index 83%
rename from features/changeroommemberroles/impl/src/main/res/values-hu/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
index 29e45978e1..4160039a0a 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-hu/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-hu/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="screen_room_change_permissions_administrators">"Csak adminisztrátorok"</string>
+  <string name="screen_room_change_permissions_administrators">"Adminisztrátor"</string>
   <string name="screen_room_change_permissions_ban_people">"Emberek kitiltása"</string>
+  <string name="screen_room_change_permissions_change_settings">"Beállítások módosítása"</string>
   <string name="screen_room_change_permissions_delete_messages">"Üzenetek eltávolítása"</string>
-  <string name="screen_room_change_permissions_everyone">"Mindenki"</string>
-  <string name="screen_room_change_permissions_invite_people">"Személyek meghívása és csatlakozási kérések elfogadása"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Tagok moderálá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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Üzenetek és tartalom"</string>
-  <string name="screen_room_change_permissions_moderators">"Adminisztrátorok és moderátorok"</string>
-  <string name="screen_room_change_permissions_remove_people">"Emberek eltávolítása és a csatlakozási kérések elutasítása"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Emberek eltávolítása"</string>
   <string name="screen_room_change_permissions_room_avatar">"Szoba profilképének módosítása"</string>
-  <string name="screen_room_change_permissions_room_details">"Szoba részletei"</string>
+  <string name="screen_room_change_permissions_room_details">"Részletek szerkesztése"</string>
   <string name="screen_room_change_permissions_room_name">"Szoba nevének módosítása"</string>
   <string name="screen_room_change_permissions_room_topic">"Szoba témájának módosítása"</string>
   <string name="screen_room_change_permissions_send_messages">"Üzenetek küldése"</string>
+  <string name="screen_room_change_permissions_title">"Jogosultságok"</string>
   <string name="screen_room_change_role_administrators_title">"Adminisztrátorok szerkesztése"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Ezt a műveletet nem fogja tudja visszavonni. Ugyanarra a szintre lépteti elő a felhasználót, mint amellyel Ön is rendelkezik."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Adminisztrátor hozzáadása?"</string>
@@ -34,6 +38,8 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Mentetlen módosításai vannak."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Menti a módosításokat?"</string>
   <string name="screen_room_member_list_banned_empty">"Ebben a szobában nincsenek kitiltott felhasználók."</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Ellenőrizze a helyesírást, vagy próbáljon meg egy új keresést"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nincs találat a következőre: „%1$s\""</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d személy"</item>
     <item quantity="other">"%1$d személy"</item>
@@ -42,10 +48,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Csak a tag eltávolítása"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Tiltás feloldása"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Ehhez a szobához is csatlakozhat, ha meghívják."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Felhasználó tiltásának feloldása"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Visszaengedés a szobába"</string>
   <string name="screen_room_member_list_mode_banned">"Kitiltva"</string>
   <string name="screen_room_member_list_mode_members">"Tagok"</string>
-  <string name="screen_room_member_list_pending_header_title">"Függőben"</string>
+  <string name="screen_room_member_list_pending_status">"Függőben"</string>
   <string name="screen_room_member_list_role_administrator">"Adminisztrátor"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Tulajdonos"</string>
@@ -66,5 +72,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Jogosultságok visszaállítása?"</string>
   <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_space_details">"Tér részletei"</string>
   <string name="screen_room_roles_and_permissions_title">"Szerepkörök és jogosultságok"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-in/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-in/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
index 3bc68c154e..2a1cd15ac0 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-in/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
@@ -3,14 +3,12 @@
   <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_delete_messages">"Hilangkan pesan"</string>
-  <string name="screen_room_change_permissions_everyone">"Semua orang"</string>
   <string name="screen_room_change_permissions_invite_people">"Undang orang-orang dan terima permintaan untuk bergabung"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderasi 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>
   <string name="screen_room_change_permissions_remove_people">"Keluarkan orang-orang dan tolak permintaan untuk bergabung"</string>
   <string name="screen_room_change_permissions_room_avatar">"Ubah avatar ruangan"</string>
-  <string name="screen_room_change_permissions_room_details">"Detail ruangan"</string>
+  <string name="screen_room_change_permissions_room_details">"Sunting Ruangan"</string>
   <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>
@@ -37,12 +35,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Hanya keluarkan anggota"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Batalkan pencekalan"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Pengguna dapat bergabung ke ruangan ini lagi jika diundang."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Batalkan pencekalan pengguna"</string>
+  <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>
-  <string name="screen_room_member_list_pending_header_title">"Tertunda"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</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_room_members_header_title">"Anggota ruangan"</string>
   <string name="screen_room_member_list_unbanning_user">"Membatalkan cekalan %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"Admin"</string>
@@ -52,7 +49,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Moderasi anggota"</string>
   <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_permissions_header">"Perizinan"</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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-it/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
similarity index 79%
rename from features/changeroommemberroles/impl/src/main/res/values-it/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
index c6ea02ebb8..b1dea12151 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-it/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-it/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="screen_room_change_permissions_administrators">"Solo amministratori"</string>
+  <string name="screen_room_change_permissions_administrators">"Amministratore"</string>
   <string name="screen_room_change_permissions_ban_people">"Escludi membri"</string>
+  <string name="screen_room_change_permissions_change_settings">"Modifica impostazioni"</string>
   <string name="screen_room_change_permissions_delete_messages">"Rimuovi messaggi"</string>
-  <string name="screen_room_change_permissions_everyone">"Tutti"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invita persone e accetta richieste di partecipazione"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderazione dei membri"</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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Messaggi e contenuti"</string>
-  <string name="screen_room_change_permissions_moderators">"Amministratori e moderatori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Rimuovi le persone e rifiuta le richieste di partecipazione"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderatore"</string>
+  <string name="screen_room_change_permissions_remove_people">"Rimuovi membri"</string>
   <string name="screen_room_change_permissions_room_avatar">"Cambia avatar della stanza"</string>
-  <string name="screen_room_change_permissions_room_details">"Dettagli della stanza"</string>
+  <string name="screen_room_change_permissions_room_details">"Modifica dettagli"</string>
   <string name="screen_room_change_permissions_room_name">"Cambia il nome della stanza"</string>
   <string name="screen_room_change_permissions_room_topic">"Cambiare l\'argomento della stanza"</string>
   <string name="screen_room_change_permissions_send_messages">"Inviare messaggi"</string>
+  <string name="screen_room_change_permissions_title">"Autorizzazioni"</string>
   <string name="screen_room_change_role_administrators_title">"Modifica amministratori"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Non potrai annullare questa azione. Stai promuovendo l\'utente al tuo stesso livello di potere."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Aggiungi amministratore?"</string>
@@ -33,19 +37,29 @@
   <string name="screen_room_change_role_section_users">"Membri"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Hai delle modifiche non salvate."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Salvare le modifiche?"</string>
-  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti esclusi in questa stanza."</string>
+  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti bannati."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Bannato"</item>
+    <item quantity="other">"%1$d Bannati"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Controlla l\'ortografia o prova una nuova ricerca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nessun risultato per “%1$s ”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d persona"</item>
-    <item quantity="other">"%1$d persone"</item>
+    <item quantity="one">"%1$d Persona"</item>
+    <item quantity="other">"%1$d Persone"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Rimuovi ed escludi"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Rimuovi soltanto"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Riammetti"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Potrà entrare nuovamente in questa stanza se invitato."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Riammetti utente"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Riammetti nella stanza"</string>
   <string name="screen_room_member_list_mode_banned">"Esclusi"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"In attesa"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invitato"</item>
+    <item quantity="other">"%1$d Invitati"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"In attesa"</string>
   <string name="screen_room_member_list_role_administrator">"Amministratore"</string>
   <string name="screen_room_member_list_role_moderator">"Moderatore"</string>
   <string name="screen_room_member_list_role_owner">"Proprietario"</string>
@@ -66,5 +80,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Reimpostare autorizzazioni?"</string>
   <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_space_details">"Dettagli dello spazio"</string>
   <string name="screen_room_roles_and_permissions_title">"Ruoli e autorizzazioni"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-ka/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml
similarity index 90%
rename from features/changeroommemberroles/impl/src/main/res/values-ka/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml
index 17d80ba10b..8af9ecbe99 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-ka/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ka/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -37,12 +35,10 @@
   <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>
-  <string name="screen_room_member_list_pending_header_title">"მომლოდინე"</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>
@@ -52,7 +48,6 @@
   <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_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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-ko/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
similarity index 92%
rename from features/changeroommemberroles/impl/src/main/res/values-ko/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
index fd9d38664c..89b3e0baf5 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-ko/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -41,12 +39,11 @@
   <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_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_pending_header_title">"보류 중"</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,7 +56,6 @@
   <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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-lt/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-lt/translations.xml
similarity index 82%
rename from features/changeroommemberroles/impl/src/main/res/values-lt/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-lt/translations.xml
index 80a91ac742..b82e8822f5 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-lt/translations.xml
+++ b/features/rolesandpermissions/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_room_change_permissions_room_details">"Redaguoti kambarį"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d asmuo"</item>
     <item quantity="few">"%1$d asmenys"</item>
     <item quantity="other">"%1$d asmenų"</item>
   </plurals>
-  <string name="screen_room_member_list_pending_header_title">"Laukiama"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kambario nariai"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-nb/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-nb/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
index 2e3379b98a..41f475012f 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-nb/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-nb/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">"Kun for administratorer"</string>
+  <string name="screen_room_change_permissions_administrators">"Admin"</string>
   <string name="screen_room_change_permissions_ban_people">"Forby folk"</string>
   <string name="screen_room_change_permissions_delete_messages">"Fjern meldinger"</string>
-  <string name="screen_room_change_permissions_everyone">"Alle"</string>
-  <string name="screen_room_change_permissions_invite_people">"Inviter folk og godta forespørsler om å bli med"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderering av medlemmer"</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_member_moderation">"Administrer medlemmer"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Meldinger og innhold"</string>
-  <string name="screen_room_change_permissions_moderators">"Administratorer og moderatorer"</string>
-  <string name="screen_room_change_permissions_remove_people">"Fjern folk og avslå forespørsler om å bli med"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Fjern folk"</string>
   <string name="screen_room_change_permissions_room_avatar">"Endre romavatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Romdetaljer"</string>
+  <string name="screen_room_change_permissions_room_details">"Rediger detaljer"</string>
   <string name="screen_room_change_permissions_room_name">"Endre romnavn"</string>
   <string name="screen_room_change_permissions_room_topic">"Endre temaet til rommet"</string>
   <string name="screen_room_change_permissions_send_messages">"Send meldinger"</string>
@@ -33,7 +33,7 @@
   <string name="screen_room_change_role_section_users">"Medlemmer"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Du har endringer som ikke er lagret."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Lagre endringer?"</string>
-  <string name="screen_room_member_list_banned_empty">"Det er ingen utestengte brukere i dette rommet."</string>
+  <string name="screen_room_member_list_banned_empty">"Det er ingen utestengte brukere."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d person"</item>
     <item quantity="other">"%1$d personer"</item>
@@ -42,11 +42,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Bare fjern medlem"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Opphev utestengelse"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"De vil kunne bli med i dette rommet igjen hvis de blir invitert."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Opphev utestengelse av bruker"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Fjern utestengelsen fra rommet"</string>
   <string name="screen_room_member_list_mode_banned">"Utestengt"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Venter"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrator"</string>
+  <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Eier"</string>
   <string name="screen_room_member_list_room_members_header_title">"Medlemmer av rommet"</string>
@@ -60,7 +59,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Meldinger og innhold"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorer"</string>
   <string name="screen_room_roles_and_permissions_owners">"Eiere"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Tillatelser"</string>
   <string name="screen_room_roles_and_permissions_reset">"Tilbakestill tillatelser"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Når du har tilbakestilt tillatelsene, mister du gjeldende innstillinger."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Vil du tilbakestille tillatelsene?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-nl/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-nl/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml
index b8cdd89620..2973341189 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-nl/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-nl/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Alleen beheerders"</string>
   <string name="screen_room_change_permissions_ban_people">"Personen verbannen"</string>
   <string name="screen_room_change_permissions_delete_messages">"Berichten verwijderen"</string>
-  <string name="screen_room_change_permissions_everyone">"Iedereen"</string>
   <string name="screen_room_change_permissions_invite_people">"Nodig personen uit en accepteer verzoeken om deel te nemen"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderatie van leden"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Berichten en inhoud"</string>
   <string name="screen_room_change_permissions_moderators">"Beheerders en moderators"</string>
   <string name="screen_room_change_permissions_remove_people">"Verwijder personen en weiger verzoeken om deel te nemen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Kamerafbeelding wijzigen"</string>
-  <string name="screen_room_change_permissions_room_details">"Kamergegevens"</string>
+  <string name="screen_room_change_permissions_room_details">"Kamer bewerken"</string>
   <string name="screen_room_change_permissions_room_name">"Kamernaam wijzigen"</string>
   <string name="screen_room_change_permissions_room_topic">"Kameronderwerp wijzigen"</string>
   <string name="screen_room_change_permissions_send_messages">"Berichten verzenden"</string>
@@ -38,12 +36,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Alleen lid verwijderen"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Ontbannen"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Ze kunnen opnieuw tot de kamer toetreden als ze worden uitgenodigd."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Ontban gebruiker"</string>
   <string name="screen_room_member_list_mode_banned">"Verbannen"</string>
   <string name="screen_room_member_list_mode_members">"Leden"</string>
-  <string name="screen_room_member_list_pending_header_title">"In behandeling"</string>
-  <string name="screen_room_member_list_role_administrator">"Beheerder"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Alleen beheerders"</string>
+  <string name="screen_room_member_list_role_moderator">"Beheerders en moderators"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kamerleden"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s ontbannen"</string>
   <string name="screen_room_roles_and_permissions_admins">"Beheerders"</string>
@@ -53,7 +49,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Moderatie van leden"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Berichten en inhoud"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderators"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Rechten"</string>
   <string name="screen_room_roles_and_permissions_reset">"Rechten opnieuw instellen"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Als je de rechten opnieuw instelt, raak je de huidige instellingen kwijt."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Rechten opnieuw instellen?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-pl/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
similarity index 90%
rename from features/changeroommemberroles/impl/src/main/res/values-pl/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
index ad4c7239d7..44659c47cd 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-pl/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
@@ -2,15 +2,13 @@
 <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_ban_people">"Banowanie osób"</string>
-  <string name="screen_room_change_permissions_delete_messages">"Usuwanie wiadomości"</string>
-  <string name="screen_room_change_permissions_everyone">"Wszyscy"</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_member_moderation">"Moderacja członków"</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_room_avatar">"Zmień awatar pokoju"</string>
-  <string name="screen_room_change_permissions_room_details">"Szczegóły pokoju"</string>
+  <string name="screen_room_change_permissions_room_details">"Edytuj pokój"</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>
@@ -43,12 +41,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Tylko usuń członka"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Odbanuj"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Będą mogli ponownie dołączyć do tego pokoju, jeśli zostaną zaproszeni."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Odbanuj użytkownika"</string>
+  <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_pending_header_title">"Oczekujące"</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_administrator">"Tylko administratorzy"</string>
+  <string name="screen_room_member_list_role_moderator">"Administratorzy i moderatorzy"</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>
@@ -61,7 +58,6 @@
   <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_permissions_header">"Uprawnienia"</string>
   <string name="screen_room_roles_and_permissions_reset">"Resetuj 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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-pt-rBR/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
similarity index 80%
rename from features/changeroommemberroles/impl/src/main/res/values-pt-rBR/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-pt-rBR/translations.xml
index 6d062e5a20..43fa8d83f2 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pt-rBR/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="screen_room_change_permissions_administrators">"Somente administradores"</string>
+  <string name="screen_room_change_permissions_administrators">"Administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Banir pessoas"</string>
+  <string name="screen_room_change_permissions_change_settings">"Alterar configurações"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remover mensagens"</string>
-  <string name="screen_room_change_permissions_everyone">"Todos"</string>
-  <string name="screen_room_change_permissions_invite_people">"Convide pessoas e aceite solicitações de entrada"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderação de membros"</string>
+  <string name="screen_room_change_permissions_everyone">"Membro"</string>
+  <string name="screen_room_change_permissions_invite_people">"Convidar pessoas"</string>
+  <string name="screen_room_change_permissions_manage_space">"Gerenciar espaço"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Gerenciar salas"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gerenciar membros"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensagens e conteúdo"</string>
-  <string name="screen_room_change_permissions_moderators">"Administradores e moderadores"</string>
-  <string name="screen_room_change_permissions_remove_people">"Remover pessoas e recusar solicitações de entrada"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderador"</string>
+  <string name="screen_room_change_permissions_remove_people">"Remover pessoas"</string>
   <string name="screen_room_change_permissions_room_avatar">"Alterar avatar da sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Detalhes da sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar detalhes"</string>
   <string name="screen_room_change_permissions_room_name">"Alterar nome da sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Alterar tópico da sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensagens"</string>
+  <string name="screen_room_change_permissions_title">"Permissões"</string>
   <string name="screen_room_change_role_administrators_title">"Editar administradores"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Você não poderá desfazer essa ação. Você está promovendo o usuário a ter o mesmo nível de poder que você."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Adicionar administrador?"</string>
@@ -33,7 +37,13 @@
   <string name="screen_room_change_role_section_users">"Membros"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Você tem alterações não salvas."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Salvar alterações?"</string>
-  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos nesta sala."</string>
+  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d banido"</item>
+    <item quantity="other">"%1$d banidos"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Confira a ortografia ou tente uma nova busca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nenhum resultado para “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d pessoa"</item>
     <item quantity="other">"%1$d pessoas"</item>
@@ -42,11 +52,15 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Somente remover o membro"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Desbanir"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Esta pessoa poderá entrar nesta sala novamente se for convidada."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Desbanir usuário"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Membros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrador"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d convidado"</item>
+    <item quantity="other">"%1$d convidados"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pendente"</string>
+  <string name="screen_room_member_list_role_administrator">"Administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Moderador"</string>
   <string name="screen_room_member_list_role_owner">"Proprietário"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membros da sala"</string>
@@ -66,5 +80,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Redefinir permissões?"</string>
   <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_space_details">"Detalhes do espaço"</string>
   <string name="screen_room_roles_and_permissions_title">"Cargos e permissões"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-pt/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml
similarity index 90%
rename from features/changeroommemberroles/impl/src/main/res/values-pt/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml
index f7e93f359a..32db66ee12 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-pt/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pt/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Apenas administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Banir pessoas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remover mensagens"</string>
-  <string name="screen_room_change_permissions_everyone">"Toda a gente"</string>
   <string name="screen_room_change_permissions_invite_people">"Convidar pessoas e aceitar pedidos de entrada"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderação de participantes"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensagens e conteúdo"</string>
   <string name="screen_room_change_permissions_moderators">"Administradores e moderadores"</string>
   <string name="screen_room_change_permissions_remove_people">"Remover pessoas e rejeitar pedidos de entrada"</string>
   <string name="screen_room_change_permissions_room_avatar">"Alterar o ícone da sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Detalhes da sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar sala"</string>
   <string name="screen_room_change_permissions_room_name">"Altera o nome da sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Alterar a descrição da sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensagens"</string>
@@ -42,12 +40,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Remover apenas"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Anular banimento"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Poderão juntar-se novamente a esta sala se forem convidados."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Anular banimento do utilizador"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Participantes"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrador"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderador"</string>
+  <string name="screen_room_member_list_role_administrator">"Apenas administradores"</string>
+  <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
   <string name="screen_room_member_list_role_owner">"Dono / Dona"</string>
   <string name="screen_room_member_list_room_members_header_title">"Participantes"</string>
   <string name="screen_room_member_list_unbanning_user">"A anular banimento de %1$s"</string>
@@ -60,7 +57,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mensagens e conteúdo"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderadores"</string>
   <string name="screen_room_roles_and_permissions_owners">"Donos"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Permissões"</string>
   <string name="screen_room_roles_and_permissions_reset">"Repor permissões"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ao repores as permissões, perderás as configurações atuais."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Repor as permissões?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-ro/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
similarity index 78%
rename from features/changeroommemberroles/impl/src/main/res/values-ro/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
index c9e20f5a42..ac9ec710a2 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-ro/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ro/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="screen_room_change_permissions_administrators">"Doar administratori"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
   <string name="screen_room_change_permissions_ban_people">"Interziceți persoane"</string>
+  <string name="screen_room_change_permissions_change_settings">"Modificați setările"</string>
   <string name="screen_room_change_permissions_delete_messages">"Ștergeți mesajele"</string>
-  <string name="screen_room_change_permissions_everyone">"Toți"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invitați persoane și acceptați cereri de alaturare"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderarea membrilor"</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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Mesaje și conținut"</string>
-  <string name="screen_room_change_permissions_moderators">"Administratori și moderatori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Îndepărtați persoane și refuzați cereri de alăturare"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Îndepărtați persoane"</string>
   <string name="screen_room_change_permissions_room_avatar">"Schimbați avatarul camerei"</string>
-  <string name="screen_room_change_permissions_room_details">"Detaliile camerei"</string>
+  <string name="screen_room_change_permissions_room_details">"Editați detaliile"</string>
   <string name="screen_room_change_permissions_room_name">"Schimbă numele camerei"</string>
   <string name="screen_room_change_permissions_room_topic">"Schimbați subiectul camerei"</string>
   <string name="screen_room_change_permissions_send_messages">"Trimiteți mesaje"</string>
+  <string name="screen_room_change_permissions_title">"Permisiuni"</string>
   <string name="screen_room_change_role_administrators_title">"Editați administratorii"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Promovați utilizatorul să aibă același nivel de putere ca dumneavoastră. Nu veți putea anula această acțiune."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Adăugați administrator?"</string>
@@ -33,19 +37,32 @@
   <string name="screen_room_change_role_section_users">"Membri"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Aveți modificări nesalvate."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Salvați modificările?"</string>
-  <string name="screen_room_member_list_banned_empty">"Nu există utilizatori interziși în această cameră."</string>
+  <string name="screen_room_member_list_banned_empty">"Nu există utilizatori interziși."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Interzis"</item>
+    <item quantity="few">"%1$d Interziși"</item>
+    <item quantity="other">"%1$d Interziși"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Verificați ortografia sau încercați o căutare nouă"</string>
+  <string name="screen_room_member_list_empty_search_title">"Niciun rezultat pentru “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"o persoană"</item>
+    <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_room_member_list_manage_member_remove_confirmation_ban">"Îndepărtați și interziceți membrul"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Doar înlăturare"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Anulare excludere"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Se vor putea alătura din nou acestei săli dacă sunt invitați."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Anulați interzicerea utilizatorului"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Revocati excluderea din camera"</string>
   <string name="screen_room_member_list_mode_banned">"Excluși"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"În așteptare"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invitat"</item>
+    <item quantity="few">"%1$d Invitați"</item>
+    <item quantity="other">"%1$d Invitați"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"În așteptare"</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">"Proprietar"</string>
@@ -66,5 +83,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Resetați permisiunile?"</string>
   <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_space_details">"Detalii spațiu"</string>
   <string name="screen_room_roles_and_permissions_title">"Roluri și permisiuni"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-ru/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
similarity index 83%
rename from features/changeroommemberroles/impl/src/main/res/values-ru/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
index 8f5e30433d..d922e58550 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-ru/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
@@ -2,18 +2,22 @@
 <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_member_moderation">"Модерация участников"</string>
+  <string name="screen_room_change_permissions_everyone">"Участник"</string>
+  <string name="screen_room_change_permissions_invite_people">"Пригласить людей"</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_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>
+  <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>
@@ -34,6 +38,8 @@
   <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_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="one">"%1$d пользователь"</item>
     <item quantity="few">"%1$d пользователя"</item>
@@ -43,11 +49,11 @@
   <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_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_pending_header_title">"В ожидании"</string>
-  <string name="screen_room_member_list_role_administrator">"Администратор"</string>
+  <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>
@@ -67,5 +73,6 @@
   <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/changeroommemberroles/impl/src/main/res/values-sk/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-sk/translations.xml
similarity index 76%
rename from features/changeroommemberroles/impl/src/main/res/values-sk/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-sk/translations.xml
index 8d5c6e8502..d159fb03f9 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-sk/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-sk/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="screen_room_change_permissions_administrators">"Iba správcovia"</string>
+  <string name="screen_room_change_permissions_administrators">"Správca"</string>
   <string name="screen_room_change_permissions_ban_people">"Zakázať ľudí"</string>
+  <string name="screen_room_change_permissions_change_settings">"Zmeniť nastavenia"</string>
   <string name="screen_room_change_permissions_delete_messages">"Odstrániť správy"</string>
-  <string name="screen_room_change_permissions_everyone">"Všetci"</string>
-  <string name="screen_room_change_permissions_invite_people">"Pozvite ľudí a prijmite žiadosti o pripojenie"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderovanie členov"</string>
+  <string name="screen_room_change_permissions_everyone">"Člen"</string>
+  <string name="screen_room_change_permissions_invite_people">"Pozvať ľudí"</string>
+  <string name="screen_room_change_permissions_manage_space">"Spravovať priestor"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Spravovať miestnosti"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Spravovať členov"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Správy a obsah"</string>
-  <string name="screen_room_change_permissions_moderators">"Správcovia a moderátori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Odstrániť ľudí a odmietnuť žiadosti o pripojenie"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Odstrániť ľudí"</string>
   <string name="screen_room_change_permissions_room_avatar">"Zmeniť obrázok miestnosti"</string>
-  <string name="screen_room_change_permissions_room_details">"Podrobnosti o miestnosti"</string>
+  <string name="screen_room_change_permissions_room_details">"Upraviť podrobnosti"</string>
   <string name="screen_room_change_permissions_room_name">"Zmeniť názov miestnosti"</string>
   <string name="screen_room_change_permissions_room_topic">"Zmeniť tému miestnosti"</string>
   <string name="screen_room_change_permissions_send_messages">"Odoslať správy"</string>
+  <string name="screen_room_change_permissions_title">"Povolenia"</string>
   <string name="screen_room_change_role_administrators_title">"Upraviť správcov"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Túto akciu nebudete môcť vrátiť späť. Zvyšujete úroveň používateľa na rovnakú úroveň výkonu ako máte vy."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Pridať správcu?"</string>
@@ -33,7 +37,14 @@
   <string name="screen_room_change_role_section_users">"Členovia"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Máte neuložené zmeny."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Uložiť zmeny?"</string>
-  <string name="screen_room_member_list_banned_empty">"V tejto miestnosti nie sú žiadni zakázaní používatelia."</string>
+  <string name="screen_room_member_list_banned_empty">"Neexistujú žiadni zablokovaní používatelia."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d zakázaný"</item>
+    <item quantity="few">"%1$d zakázaní"</item>
+    <item quantity="other">"%1$d zakázaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Skontrolujte preklepy alebo skúste nové vyhľadávanie"</string>
+  <string name="screen_room_member_list_empty_search_title">"Žiadne výsledky pre „%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>
@@ -43,11 +54,16 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Iba odstrániť člena"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Zrušiť zákaz"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"V prípade pozvania sa budú môcť znova pripojiť k tejto miestnosti."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Zrušiť zákaz používateľa"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Zrušiť zákaz prístupu do miestnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Zakázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členovia"</string>
-  <string name="screen_room_member_list_pending_header_title">"Čaká sa"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrátor"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozvaný"</item>
+    <item quantity="few">"%1$d pozvaní"</item>
+    <item quantity="other">"%1$d pozvaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Čaká na schválenie"</string>
+  <string name="screen_room_member_list_role_administrator">"Správca"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
   <string name="screen_room_member_list_room_members_header_title">"Členovia miestnosti"</string>
@@ -61,11 +77,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Správy a obsah"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderátori"</string>
   <string name="screen_room_roles_and_permissions_owners">"Vlastníci"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Oprávnenia"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Povolenia"</string>
   <string name="screen_room_roles_and_permissions_reset">"Obnoviť povolenia"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Po obnovení oprávnení prídete o aktuálne nastavenia."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Obnoviť oprávnenia?"</string>
   <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_space_details">"Podrobnosti o priestore"</string>
   <string name="screen_room_roles_and_permissions_title">"Roly a povolenia"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-sv/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml
similarity index 90%
rename from features/changeroommemberroles/impl/src/main/res/values-sv/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml
index a94b7384fa..d52c85de14 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-sv/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-sv/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Endast administratörer"</string>
   <string name="screen_room_change_permissions_ban_people">"Banna personer"</string>
   <string name="screen_room_change_permissions_delete_messages">"Ta bort meddelanden"</string>
-  <string name="screen_room_change_permissions_everyone">"Alla"</string>
   <string name="screen_room_change_permissions_invite_people">"Bjuda in personer och acceptera förfrågningar om att gå med"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Medlemsmoderering"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Meddelanden och innehåll"</string>
   <string name="screen_room_change_permissions_moderators">"Administratörer och moderatorer"</string>
   <string name="screen_room_change_permissions_remove_people">"Ta bort personer och avslå förfrågningar om att gå med"</string>
   <string name="screen_room_change_permissions_room_avatar">"Byt rumsavatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Rumsdetaljer"</string>
+  <string name="screen_room_change_permissions_room_details">"Redigera rummet"</string>
   <string name="screen_room_change_permissions_room_name">"Byt rumsnamn"</string>
   <string name="screen_room_change_permissions_room_topic">"Byt rumsämne"</string>
   <string name="screen_room_change_permissions_send_messages">"Skicka meddelanden"</string>
@@ -42,12 +40,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Ta bara bort medlem"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Avbanna"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Denne kommer kunna gå med i rummet igen om denne bjuds in"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Avbanna användare"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Avbanna från rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Bannade"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Väntar"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Endast administratörer"</string>
+  <string name="screen_room_member_list_role_moderator">"Administratörer och moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Ägare"</string>
   <string name="screen_room_member_list_room_members_header_title">"Rumsmedlemmar"</string>
   <string name="screen_room_member_list_unbanning_user">"Avbannar %1$s"</string>
@@ -60,7 +57,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Meddelanden och innehåll"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorer"</string>
   <string name="screen_room_roles_and_permissions_owners">"Ägare"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Behörigheter"</string>
   <string name="screen_room_roles_and_permissions_reset">"Återställ behörigheter"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"När du har återställt behörigheterna kommer du att förlora de aktuella inställningarna."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Återställ behörigheter?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-tr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-tr/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml
index 923320e8de..6e53f48610 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-tr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-tr/translations.xml
@@ -3,14 +3,12 @@
   <string name="screen_room_change_permissions_administrators">"Yalnızca yöneticiler"</string>
   <string name="screen_room_change_permissions_ban_people">"İnsanları yasakla"</string>
   <string name="screen_room_change_permissions_delete_messages">"Mesajları kaldır"</string>
-  <string name="screen_room_change_permissions_everyone">"Herkes"</string>
   <string name="screen_room_change_permissions_invite_people">"Kişileri davet etme ve katılma isteklerini kabul etme"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Üye moderasyonu"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mesajlar ve içerik"</string>
   <string name="screen_room_change_permissions_moderators">"Yöneticiler ve moderatörler"</string>
   <string name="screen_room_change_permissions_remove_people">"Kişileri kaldırma ve katılma isteklerini reddetme"</string>
   <string name="screen_room_change_permissions_room_avatar">"Oda resmini değiştir"</string>
-  <string name="screen_room_change_permissions_room_details">"Oda bilgileri"</string>
+  <string name="screen_room_change_permissions_room_details">"Odayı Düzenle"</string>
   <string name="screen_room_change_permissions_room_name">"Oda adını değiştir"</string>
   <string name="screen_room_change_permissions_room_topic">"Oda konusunu değiştir"</string>
   <string name="screen_room_change_permissions_send_messages">"Mesaj gönder"</string>
@@ -38,12 +36,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Yalnızca üyeyi kaldır"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Yasağı Kaldır"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Davet edildikleri takdirde bu odaya tekrar katılabileceklerdir."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Kullanıcının yasağını kaldır"</string>
   <string name="screen_room_member_list_mode_banned">"Yasaklandı"</string>
   <string name="screen_room_member_list_mode_members">"Üyeler"</string>
-  <string name="screen_room_member_list_pending_header_title">"Beklemede"</string>
-  <string name="screen_room_member_list_role_administrator">"Yönetici"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderatör"</string>
+  <string name="screen_room_member_list_role_administrator">"Yalnızca yöneticiler"</string>
+  <string name="screen_room_member_list_role_moderator">"Yöneticiler ve moderatörler"</string>
   <string name="screen_room_member_list_room_members_header_title">"Oda üyeleri"</string>
   <string name="screen_room_member_list_unbanning_user">"Yasak kaldırılıyor %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"Yöneticiler"</string>
@@ -53,7 +49,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Üye moderasyonu"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mesajlar ve içerik"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatörler"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"İzinler"</string>
   <string name="screen_room_roles_and_permissions_reset">"İzinleri sıfırla"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"İzinleri sıfırladığınızda, mevcut ayarları kaybedersiniz."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"İzinleri sıfırla?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-uk/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
similarity index 91%
rename from features/changeroommemberroles/impl/src/main/res/values-uk/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
index 9c7b3c74f6..9eae3a94e6 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-uk/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -43,12 +41,11 @@
   <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_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_pending_header_title">"На розгляді"</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>
@@ -61,7 +58,6 @@
   <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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-ur/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml
similarity index 89%
rename from features/changeroommemberroles/impl/src/main/res/values-ur/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml
index db49a1493b..8e6e47f4aa 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-ur/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ur/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -38,12 +36,10 @@
   <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>
-  <string name="screen_room_member_list_pending_header_title">"زیر التواء"</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>
@@ -53,7 +49,6 @@
   <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_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>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-uz/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
similarity index 82%
rename from features/changeroommemberroles/impl/src/main/res/values-uz/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
index 7d3d6d5727..03f94969b5 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-uz/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
@@ -3,27 +3,30 @@
   <string name="screen_room_change_permissions_administrators">"Faqat adminlar"</string>
   <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">"Har kim"</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_member_moderation">"Aʻzo moderatsiyasi"</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">"Adminlar va moderatorlar"</string>
   <string name="screen_room_change_permissions_remove_people">"Odamlarni olib tashlash va qoʻshilish soʻrovlarini rad etish"</string>
   <string name="screen_room_change_permissions_room_avatar">"Xona avatarini oʻzgartirish"</string>
-  <string name="screen_room_change_permissions_room_details">"Xona tafsilotlari"</string>
+  <string name="screen_room_change_permissions_room_details">"Tafsilotlarni tahrirlash"</string>
   <string name="screen_room_change_permissions_room_name">"Xona nomini oʻzgartirish"</string>
   <string name="screen_room_change_permissions_room_topic">"Xona mavzusini almashtirish"</string>
   <string name="screen_room_change_permissions_send_messages">"Xabarlar yuborish"</string>
   <string name="screen_room_change_role_administrators_title">"Administratorlarni tahrirlash"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Bu amalni bekor qila olmaysiz. Siz foydalanuvchini o‘zingiz bilan bir xil quvvat darajasiga ega bo‘lishga undayapsiz."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Admin qo‘shilsinmi?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Bu amalni bekor qila olmaysiz. Siz egalikni tanlangan foydalanuvchilarga o‘tkazmoqdasiz. Tark etsangiz, bu doimiy bo‘ladi."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Egalik huquqini o‘tkazasizmi?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Pastga tushirish"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Siz oʻzingizni imtiyozlardan mahrum qilayotganingiz sababli, bu o‘zgarishni bekor qila olmaysiz. Agar xonadagi so‘nggi imtiyozli foydalanuvchi bo‘lsangiz, imtiyozlarni qayta tiklash imkonsiz bo‘ladi."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"O‘z darajangizni pasaytirmoqchimisiz?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Jarayonda)"</string>
   <string name="screen_room_change_role_invited_member_name_android">"(Kutilmoqda)"</string>
   <string name="screen_room_change_role_moderators_admin_section_footer">"Administratorlar avtomatik ravishda moderator imtiyozlariga ega"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Egalar avtomatik ravishda administrator huquqlariga ega."</string>
   <string name="screen_room_change_role_moderators_title">"Moderatorlarni tahrirlash"</string>
+  <string name="screen_room_change_role_owners_title">"Egalarni tanlang"</string>
   <string name="screen_room_change_role_section_administrators">"Adminlar"</string>
   <string name="screen_room_change_role_section_moderators">"Moderatorlar"</string>
   <string name="screen_room_change_role_section_users">"Azolar"</string>
@@ -38,22 +41,23 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Faqat aʻzoni olib tashlash"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Taqiqni bekor qilish"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Foydalanuvchini blokdan chiqarish"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Xonadan taqiqni olib tashlash"</string>
   <string name="screen_room_member_list_mode_banned">"Taqiqlangan"</string>
   <string name="screen_room_member_list_mode_members">"Azolar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutilmoqda"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Faqat adminlar"</string>
+  <string name="screen_room_member_list_role_moderator">"Adminlar va moderatorlar"</string>
+  <string name="screen_room_member_list_role_owner">"Egasi"</string>
   <string name="screen_room_member_list_room_members_header_title">"Xona a\'zolari"</string>
   <string name="screen_room_member_list_unbanning_user">"Taqiqni bekor qilish %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"Adminlar"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Adminlar va egalari"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"Rolimni o‘zgartirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Aʼzolikka tushirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Moderatorga pasaytirish"</string>
   <string name="screen_room_roles_and_permissions_member_moderation">"Aʻzo moderatsiyasi"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Xabarlar va kontent"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorlar"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Ruxsatlar"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Egalari"</string>
   <string name="screen_room_roles_and_permissions_reset">"Ruxsatlarni tiklash"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ruxsatlarni asliga qaytargach, joriy sozlamalarni yoʻqotasiz."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ruxsatlar asliga qaytarilsinmi?"</string>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
similarity index 81%
rename from features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
index 2ec5ec64c5..7bc662e2fc 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/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="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_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_member_moderation">"成員管理"</string>
+  <string name="screen_room_change_permissions_everyone">"成員"</string>
+  <string name="screen_room_change_permissions_invite_people">"邀請夥伴"</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_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>
+  <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>
@@ -33,18 +37,20 @@
   <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>
+  <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>
+    <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_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_pending_header_title">"待定"</string>
+  <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>
@@ -65,5 +71,6 @@
   <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_space_details">"空間詳細資訊"</string>
+  <string name="screen_room_roles_and_permissions_title">"角色與權限"</string>
 </resources>
diff --git a/features/changeroommemberroles/impl/src/main/res/values-zh/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
similarity index 88%
rename from features/changeroommemberroles/impl/src/main/res/values-zh/translations.xml
rename to features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
index eeea0a7b35..d2882d8ab4 100644
--- a/features/changeroommemberroles/impl/src/main/res/values-zh/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
@@ -3,14 +3,12 @@
   <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_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>
@@ -33,7 +31,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="other">"%1$d 人"</item>
   </plurals>
@@ -41,12 +39,11 @@
   <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_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_pending_header_title">"待处理"</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,11 +56,11 @@
   <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/changeroommemberroles/impl/src/main/res/values/localazy.xml b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
similarity index 77%
rename from features/changeroommemberroles/impl/src/main/res/values/localazy.xml
rename to features/rolesandpermissions/impl/src/main/res/values/localazy.xml
index 6e4918cde2..e5ab3f1cd7 100644
--- a/features/changeroommemberroles/impl/src/main/res/values/localazy.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values/localazy.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="screen_room_change_permissions_administrators">"Admins only"</string>
+  <string name="screen_room_change_permissions_administrators">"Admin"</string>
   <string name="screen_room_change_permissions_ban_people">"Ban people"</string>
+  <string name="screen_room_change_permissions_change_settings">"Change settings"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remove messages"</string>
-  <string name="screen_room_change_permissions_everyone">"Everyone"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invite people and accept requests to join"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Member moderation"</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_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>
   <string name="screen_room_change_permissions_messages_and_content">"Messages and content"</string>
-  <string name="screen_room_change_permissions_moderators">"Admins and moderators"</string>
-  <string name="screen_room_change_permissions_remove_people">"Remove people and decline requests to join"</string>
-  <string name="screen_room_change_permissions_room_avatar">"Change room avatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Room details"</string>
-  <string name="screen_room_change_permissions_room_name">"Change room name"</string>
-  <string name="screen_room_change_permissions_room_topic">"Change room topic"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Remove people"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Change avatar"</string>
+  <string name="screen_room_change_permissions_room_details">"Edit details"</string>
+  <string name="screen_room_change_permissions_room_name">"Change name"</string>
+  <string name="screen_room_change_permissions_room_topic">"Change topic"</string>
   <string name="screen_room_change_permissions_send_messages">"Send messages"</string>
+  <string name="screen_room_change_permissions_title">"Permissions"</string>
   <string name="screen_room_change_role_administrators_title">"Edit Admins"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"You will not be able to undo this action. You are promoting the user to have the same power level as you."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Add Admin?"</string>
@@ -33,19 +37,29 @@
   <string name="screen_room_change_role_section_users">"Members"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"You have unsaved changes."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Save changes?"</string>
-  <string name="screen_room_member_list_banned_empty">"There are no banned users in this room."</string>
-  <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d person"</item>
-    <item quantity="other">"%1$d people"</item>
+  <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banned"</item>
+    <item quantity="other">"%1$d Banned"</item>
   </plurals>
-  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban from room"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Check the spelling or try a new search"</string>
+  <string name="screen_room_member_list_empty_search_title">"No results for “%1$s”"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d Person"</item>
+    <item quantity="other">"%1$d People"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban user"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Unban"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"They will be able to join this room again if invited."</string>
   <string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string>
   <string name="screen_room_member_list_mode_banned">"Banned"</string>
   <string name="screen_room_member_list_mode_members">"Members"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invited"</item>
+    <item quantity="other">"%1$d Invited"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pending"</string>
   <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Owner"</string>
@@ -66,5 +80,6 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Reset permissions?"</string>
   <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 and permissions"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Space details"</string>
+  <string name="screen_room_roles_and_permissions_title">"Roles &amp; permissions"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
similarity index 68%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsPresenterTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
index c59931140a..ba7d47adb2 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions.permissions
+package io.element.android.features.rolesandpermissions.impl.permissions
 
 import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
@@ -15,33 +16,34 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMember.Role.Admin
 import io.element.android.libraries.matrix.api.room.RoomMember.Role.Moderator
-import io.element.android.libraries.matrix.api.room.RoomMember.Role.User
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
+import io.element.android.libraries.matrix.test.A_SESSION_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.defaultRoomPowerLevelValues
 import io.element.android.services.analytics.test.FakeAnalyticsService
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class ChangeBaseRoomPermissionsPresenterTest {
+class ChangeRoomPermissionsPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
-        val section = ChangeRoomPermissionsSection.RoomDetails
-        val presenter = createChangeRoomPermissionsPresenter(section = section)
+        val presenter = createChangeRoomPermissionsPresenter()
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
             // Initial state, no permissions loaded
             awaitItem().run {
-                assertThat(this.section).isEqualTo(section)
                 assertThat(this.currentPermissions).isNull()
-                assertThat(this.items).isNotEmpty()
+                assertThat(this.itemsBySection).isNotEmpty()
                 assertThat(this.hasChanges).isFalse()
                 assertThat(this.saveAction).isEqualTo(AsyncAction.Uninitialized)
-                assertThat(this.confirmExitAction).isEqualTo(AsyncAction.Uninitialized)
             }
 
             // Updated state, permissions loaded
@@ -50,42 +52,22 @@ class ChangeBaseRoomPermissionsPresenterTest {
     }
 
     @Test
-    fun `present - RoomDetails section contains the right items`() = runTest {
-        val section = ChangeRoomPermissionsSection.RoomDetails
-        val presenter = createChangeRoomPermissionsPresenter(section = section)
+    fun `present - items by section are correct for room`() = runTest {
+        val presenter = createChangeRoomPermissionsPresenter()
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            assertThat(awaitUpdatedItem().items).containsExactly(
+            val itemsBySection = awaitUpdatedItem().itemsBySection
+            assertThat(itemsBySection[RoomPermissionsSection.EditDetails]).containsExactly(
                 RoomPermissionType.ROOM_NAME,
                 RoomPermissionType.ROOM_AVATAR,
                 RoomPermissionType.ROOM_TOPIC,
             )
-        }
-    }
-
-    @Test
-    fun `present - MessagesAndContent section contains the right items`() = runTest {
-        val section = ChangeRoomPermissionsSection.MessagesAndContent
-        val presenter = createChangeRoomPermissionsPresenter(section = section)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            assertThat(awaitUpdatedItem().items).containsExactly(
+            assertThat(itemsBySection[RoomPermissionsSection.MessagesAndContent]).containsExactly(
                 RoomPermissionType.SEND_EVENTS,
                 RoomPermissionType.REDACT_EVENTS,
             )
-        }
-    }
-
-    @Test
-    fun `present - MembershipModeration section contains the right items`() = runTest {
-        val section = ChangeRoomPermissionsSection.MembershipModeration
-        val presenter = createChangeRoomPermissionsPresenter(section = section)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            assertThat(awaitUpdatedItem().items).containsExactly(
+            assertThat(itemsBySection[RoomPermissionsSection.ManageMembers]).containsExactly(
                 RoomPermissionType.INVITE,
                 RoomPermissionType.KICK,
                 RoomPermissionType.BAN,
@@ -93,6 +75,28 @@ class ChangeBaseRoomPermissionsPresenterTest {
         }
     }
 
+    @Test
+    fun `present - check canChangePermissions and selectableOptions for moderator`() = runTest {
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                initialRoomInfo = initialRoomInfo(role = Moderator),
+                powerLevelsResult = { Result.success(defaultPermissions()) }
+            ),
+        )
+        val presenter = createChangeRoomPermissionsPresenter(room = room)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            val state = awaitUpdatedItem()
+            assertThat(state.selectableRoles).containsExactly(SelectableRole.Moderator, SelectableRole.Everyone)
+            for (sectionItems in state.itemsBySection.values) {
+                for (permissionType in sectionItems) {
+                    assertThat(state.canChangePermission(permissionType)).isTrue()
+                }
+            }
+        }
+    }
+
     @Test
     fun `present - ChangeMinimumRoleForAction updates the current permissions and hasChanges`() = runTest {
         val presenter = createChangeRoomPermissionsPresenter()
@@ -100,13 +104,13 @@ class ChangeBaseRoomPermissionsPresenterTest {
             presenter.present()
         }.test {
             val state = awaitUpdatedItem()
-            assertThat(state.currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
+            assertThat(state.currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
             assertThat(state.hasChanges).isFalse()
 
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Admin))
 
             awaitItem().run {
-                assertThat(currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
+                assertThat(currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
                 assertThat(hasChanges).isTrue()
             }
         }
@@ -119,29 +123,32 @@ class ChangeBaseRoomPermissionsPresenterTest {
             presenter.present()
         }.test {
             val state = awaitUpdatedItem()
+            val initialPermissions = defaultPermissions()
 
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.INVITE, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.KICK, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.BAN, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.SEND_EVENTS, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.REDACT_EVENTS, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_AVATAR, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_TOPIC, Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.INVITE, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.KICK, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.BAN, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.SEND_EVENTS, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.REDACT_EVENTS, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_AVATAR, SelectableRole.Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_TOPIC, SelectableRole.Moderator))
 
-            val items = cancelAndConsumeRemainingEvents()
+            val itemsBySection = cancelAndConsumeRemainingEvents()
 
-            (items.last() as? Event.Item<ChangeRoomPermissionsState>)?.value?.run {
+            (itemsBySection.last() as? Event.Item<ChangeRoomPermissionsState>)?.value?.run {
                 assertThat(currentPermissions).isEqualTo(
                     RoomPowerLevelsValues(
                         invite = Moderator.powerLevel,
                         kick = Moderator.powerLevel,
                         ban = Moderator.powerLevel,
+                        stateDefault = Moderator.powerLevel,
                         redactEvents = Moderator.powerLevel,
-                        sendEvents = Moderator.powerLevel,
+                        eventsDefault = Moderator.powerLevel,
                         roomName = Moderator.powerLevel,
                         roomAvatar = Moderator.powerLevel,
                         roomTopic = Moderator.powerLevel,
+                        spaceChild = initialPermissions.spaceChild
                     )
                 )
             }
@@ -162,17 +169,17 @@ class ChangeBaseRoomPermissionsPresenterTest {
             presenter.present()
         }.test {
             val state = awaitUpdatedItem()
-            assertThat(state.currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
+            assertThat(state.currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
             assertThat(state.hasChanges).isFalse()
 
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_AVATAR, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_TOPIC, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.SEND_EVENTS, Moderator))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.REDACT_EVENTS, User))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.KICK, Admin))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.BAN, Admin))
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.INVITE, Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_AVATAR, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_TOPIC, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.SEND_EVENTS, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.REDACT_EVENTS, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.KICK, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.BAN, SelectableRole.Admin))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.INVITE, SelectableRole.Admin))
             skipItems(7)
             assertThat(awaitItem().hasChanges).isTrue()
 
@@ -181,16 +188,16 @@ class ChangeBaseRoomPermissionsPresenterTest {
             assertThat(awaitItem().saveAction).isEqualTo(AsyncAction.Loading)
             assertThat(awaitItem().hasChanges).isFalse()
             awaitItem().run {
-                assertThat(currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
-                assertThat(saveAction).isEqualTo(AsyncAction.Success(Unit))
+                assertThat(currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
+                assertThat(saveAction).isEqualTo(AsyncAction.Success(true))
             }
             assertThat(analyticsService.capturedEvents).containsExactlyElementsIn(
                 listOf(
-                    RoomModeration(RoomModeration.Action.ChangePermissionsRoomName, RoomModeration.Role.Moderator),
-                    RoomModeration(RoomModeration.Action.ChangePermissionsRoomAvatar, RoomModeration.Role.Moderator),
-                    RoomModeration(RoomModeration.Action.ChangePermissionsRoomTopic, RoomModeration.Role.Moderator),
-                    RoomModeration(RoomModeration.Action.ChangePermissionsSendMessages, RoomModeration.Role.Moderator),
-                    RoomModeration(RoomModeration.Action.ChangePermissionsRedactMessages, RoomModeration.Role.User),
+                    RoomModeration(RoomModeration.Action.ChangePermissionsRoomName, RoomModeration.Role.Administrator),
+                    RoomModeration(RoomModeration.Action.ChangePermissionsRoomAvatar, RoomModeration.Role.Administrator),
+                    RoomModeration(RoomModeration.Action.ChangePermissionsRoomTopic, RoomModeration.Role.Administrator),
+                    RoomModeration(RoomModeration.Action.ChangePermissionsSendMessages, RoomModeration.Role.Administrator),
+                    RoomModeration(RoomModeration.Action.ChangePermissionsRedactMessages, RoomModeration.Role.Administrator),
                     RoomModeration(RoomModeration.Action.ChangePermissionsKickMembers, RoomModeration.Role.Administrator),
                     RoomModeration(RoomModeration.Action.ChangePermissionsBanMembers, RoomModeration.Role.Administrator),
                     RoomModeration(RoomModeration.Action.ChangePermissionsInviteUsers, RoomModeration.Role.Administrator),
@@ -227,17 +234,17 @@ class ChangeBaseRoomPermissionsPresenterTest {
             presenter.present()
         }.test {
             val state = awaitUpdatedItem()
-            assertThat(state.currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
+            assertThat(state.currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
             assertThat(state.hasChanges).isFalse()
 
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Admin))
             assertThat(awaitItem().hasChanges).isTrue()
 
             state.eventSink(ChangeRoomPermissionsEvent.Save)
 
             assertThat(awaitItem().saveAction).isEqualTo(AsyncAction.Loading)
             awaitItem().run {
-                assertThat(currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
+                assertThat(currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
                 // Couldn't save the changes, so they're still pending
                 assertThat(hasChanges).isTrue()
                 assertThat(saveAction).isInstanceOf(AsyncAction.Failure::class.java)
@@ -245,7 +252,7 @@ class ChangeBaseRoomPermissionsPresenterTest {
 
             state.eventSink(ChangeRoomPermissionsEvent.ResetPendingActions)
             awaitItem().run {
-                assertThat(currentPermissions?.roomName).isEqualTo(Moderator.powerLevel)
+                assertThat(currentPermissions?.roomName).isEqualTo(Admin.powerLevel)
                 assertThat(saveAction).isEqualTo(AsyncAction.Uninitialized)
                 assertThat(hasChanges).isTrue()
             }
@@ -259,14 +266,14 @@ class ChangeBaseRoomPermissionsPresenterTest {
             presenter.present()
         }.test {
             val state = awaitUpdatedItem()
-            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, Moderator))
+            state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Admin))
             assertThat(awaitItem().hasChanges).isTrue()
 
             state.eventSink(ChangeRoomPermissionsEvent.Exit)
-            assertThat(awaitItem().confirmExitAction).isEqualTo(AsyncAction.ConfirmingNoParams)
+            assertThat(awaitItem().saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
 
             state.eventSink(ChangeRoomPermissionsEvent.Exit)
-            assertThat(awaitItem().confirmExitAction).isEqualTo(AsyncAction.Success(Unit))
+            assertThat(awaitItem().saveAction).isEqualTo(AsyncAction.Success(false))
         }
     }
 
@@ -280,22 +287,30 @@ class ChangeBaseRoomPermissionsPresenterTest {
 
             state.eventSink(ChangeRoomPermissionsEvent.Exit)
 
-            assertThat(awaitItem().confirmExitAction).isEqualTo(AsyncAction.Success(Unit))
+            assertThat(awaitItem().saveAction).isEqualTo(AsyncAction.Success(false))
         }
     }
 
     private fun createChangeRoomPermissionsPresenter(
-        section: ChangeRoomPermissionsSection = ChangeRoomPermissionsSection.RoomDetails,
         room: FakeJoinedRoom = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(powerLevelsResult = { Result.success(defaultPermissions()) }),
+            baseRoom = FakeBaseRoom(
+                initialRoomInfo = initialRoomInfo(),
+                powerLevelsResult = { Result.success(defaultPermissions()) }
+            ),
         ),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
     ) = ChangeRoomPermissionsPresenter(
-        section = section,
         room = room,
         analyticsService = analyticsService,
     )
 
+    private fun initialRoomInfo(role: RoomMember.Role = Admin) = aRoomInfo(
+        roomPowerLevels = RoomPowerLevels(
+            values = defaultPermissions(),
+            users = persistentMapOf(A_SESSION_ID to role.powerLevel),
+        )
+    )
+
     private fun defaultPermissions() = defaultRoomPowerLevelValues()
 
     private suspend fun TurbineTestContext<ChangeRoomPermissionsState>.awaitUpdatedItem(): ChangeRoomPermissionsState {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt
similarity index 61%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsViewTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt
index f4ab1ef1a9..f28c9c150f 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt
@@ -1,44 +1,44 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions.permissions
+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.compose.ui.test.onAllNodesWithText
-import androidx.compose.ui.test.onFirst
-import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.features.rolesandpermissions.impl.R
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.matrix.api.room.RoomMember
 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.clickOnFirst
-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.pressBackKey
+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 ChangeBaseRoomPermissionsViewTest {
+class ChangeRoomPermissionsViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
     fun `click on back icon invokes Exit`() {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
-            eventsRecorder = recorder,
+            state = aChangeRoomPermissionsState(
+                eventSink = recorder
+            )
         )
         rule.pressBack()
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
@@ -48,7 +48,9 @@ class ChangeBaseRoomPermissionsViewTest {
     fun `click on back key invokes Exit`() {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
-            eventsRecorder = recorder,
+            state = aChangeRoomPermissionsState(
+                eventSink = recorder
+            )
         )
         rule.pressBackKey()
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
@@ -59,11 +61,9 @@ class ChangeBaseRoomPermissionsViewTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
                 eventSink = recorder,
             ),
-            eventsRecorder = recorder,
         )
         rule.pressBackKey()
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
@@ -74,12 +74,10 @@ class ChangeBaseRoomPermissionsViewTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
-                confirmExitAction = AsyncAction.ConfirmingNoParams,
+                saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = recorder,
             ),
-            eventsRecorder = recorder,
         )
         rule.clickOn(CommonStrings.action_discard)
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
@@ -90,14 +88,12 @@ class ChangeBaseRoomPermissionsViewTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
-                confirmExitAction = AsyncAction.ConfirmingNoParams,
+                saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = recorder,
             ),
-            eventsRecorder = recorder,
         )
-        rule.clickOnFirst(CommonStrings.action_save)
+        rule.clickOn(CommonStrings.action_save, inDialog = true)
         recorder.assertSingle(ChangeRoomPermissionsEvent.Save)
     }
 
@@ -105,21 +101,19 @@ class ChangeBaseRoomPermissionsViewTest {
     fun `click on a role item triggers ChangeRole event`() {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
-            eventsRecorder = recorder,
-        )
-        val admins = rule.activity.getText(R.string.screen_room_change_permissions_administrators).toString()
-        val moderators = rule.activity.getText(R.string.screen_room_change_permissions_moderators).toString()
-        val users = rule.activity.getText(R.string.screen_room_change_permissions_everyone).toString()
-        rule.onAllNodesWithText(admins).onFirst().performClick()
-        rule.onAllNodesWithText(moderators).onFirst().performClick()
-        rule.onAllNodesWithText(users).onFirst().performClick()
-        recorder.assertList(
-            listOf(
-                ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, RoomMember.Role.Admin),
-                ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, RoomMember.Role.Moderator),
-                ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, RoomMember.Role.User),
+            state = aChangeRoomPermissionsState(
+                itemsBySection = persistentMapOf(
+                    // Makes sure there is only one item to click on
+                    RoomPermissionsSection.EditDetails to persistentListOf(RoomPermissionType.ROOM_NAME)
+                ),
+                eventSink = recorder,
             )
         )
+        rule.clickOn(R.string.screen_room_change_permissions_room_name)
+        rule.clickOn(R.string.screen_room_change_permissions_everyone)
+        recorder.assertSingle(
+            ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Everyone),
+        )
     }
 
     @Test
@@ -127,11 +121,9 @@ class ChangeBaseRoomPermissionsViewTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
                 eventSink = recorder,
             ),
-            eventsRecorder = recorder,
         )
         rule.clickOn(CommonStrings.action_save)
         recorder.assertSingle(ChangeRoomPermissionsEvent.Save)
@@ -139,14 +131,27 @@ class ChangeBaseRoomPermissionsViewTest {
 
     @Test
     fun `a successful save exits the screen`() {
-        ensureCalledOnce { callback ->
+        ensureCalledOnceWithParam(true) { callback ->
             rule.setChangeRoomPermissionsRule(
                 state = aChangeRoomPermissionsState(
-                    section = ChangeRoomPermissionsSection.RoomDetails,
                     hasChanges = true,
-                    saveAction = AsyncAction.Success(Unit),
+                    saveAction = AsyncAction.Success(true),
                 ),
-                onBackClick = callback
+                onComplete = callback,
+            )
+            rule.clickOn(CommonStrings.action_save)
+        }
+    }
+
+    @Test
+    fun `a cancellation exits the screen`() {
+        ensureCalledOnceWithParam(false) { callback ->
+            rule.setChangeRoomPermissionsRule(
+                state = aChangeRoomPermissionsState(
+                    hasChanges = true,
+                    saveAction = AsyncAction.Success(false),
+                ),
+                onComplete = callback,
             )
             rule.clickOn(CommonStrings.action_save)
         }
@@ -157,12 +162,10 @@ class ChangeBaseRoomPermissionsViewTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
         rule.setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
-                section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
                 saveAction = AsyncAction.Failure(IllegalStateException("Failed to set room power levels")),
                 eventSink = recorder,
             ),
-            eventsRecorder = recorder,
         )
         rule.clickOn(CommonStrings.action_ok)
         recorder.assertSingle(ChangeRoomPermissionsEvent.ResetPendingActions)
@@ -170,17 +173,13 @@ class ChangeBaseRoomPermissionsViewTest {
 }
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChangeRoomPermissionsRule(
-    eventsRecorder: EventsRecorder<ChangeRoomPermissionsEvent> = EventsRecorder(expectEvents = false),
-    state: ChangeRoomPermissionsState = aChangeRoomPermissionsState(
-        section = ChangeRoomPermissionsSection.RoomDetails,
-        eventSink = eventsRecorder,
-    ),
-    onBackClick: () -> Unit = EnsureNeverCalled(),
+    state: ChangeRoomPermissionsState = aChangeRoomPermissionsState(),
+    onComplete: (Boolean) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setContent {
         ChangeRoomPermissionsView(
             state = state,
-            onBackClick = onBackClick,
+            onComplete = onComplete,
         )
     }
 }
diff --git a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNodeTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesNodeTest.kt
similarity index 78%
rename from features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNodeTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesNodeTest.kt
index 5a47f52e89..f47869e20d 100644
--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNodeTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesNodeTest.kt
@@ -1,14 +1,15 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.matrix.api.room.RoomMember
 import org.junit.Test
 
diff --git a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
similarity index 66%
rename from features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenterTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
index 41b6acd60c..8747585354 100644
--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenterTest.kt
@@ -1,17 +1,16 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.RoomModeration
+import io.element.android.features.rolesandpermissions.impl.RoomMemberListDataSource
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
@@ -19,7 +18,9 @@ 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.RoomMembersState
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.user.MatrixUser
+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.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID_3
@@ -27,10 +28,13 @@ 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.anAlice
 import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
 import io.element.android.libraries.previewutils.room.aRoomMemberList
 import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
@@ -42,9 +46,7 @@ class ChangeRolesPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createChangeRolesPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             with(awaitItem()) {
                 assertThat(role).isEqualTo(RoomMember.Role.Admin)
                 assertThat(query).isNull()
@@ -52,7 +54,6 @@ class ChangeRolesPresenterTest {
                 assertThat(searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
                 assertThat(selectedUsers).isEmpty()
                 assertThat(hasPendingChanges).isFalse()
-                assertThat(exitState).isEqualTo(AsyncAction.Uninitialized)
                 assertThat(savingState).isEqualTo(AsyncAction.Uninitialized)
             }
             cancelAndIgnoreRemainingEvents()
@@ -65,16 +66,14 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
+            skipItems(2)
             assertThat(awaitItem().searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
         }
     }
 
     @Test
-    fun `present - canChangeRole of users with lower power level unless they are owners`() = runTest {
+    fun `present - canChangeRole of users with lower power level unless they are owners - privilegedCreatorRole is true`() = runTest {
         val creatorUserId = UserId("@creator:matrix.org")
         val superAdminUserId = UserId("@super_admin:matrix.org")
 
@@ -82,6 +81,7 @@ class ChangeRolesPresenterTest {
             // User is a creator, so they can change roles of other members. So is `creatorUserId`.
             givenRoomInfo(
                 aRoomInfo(
+                    privilegedCreatorRole = true,
                     roomCreators = listOf(sessionId, creatorUserId),
                     roomPowerLevels = RoomPowerLevels(
                         defaultRoomPowerLevelValues(),
@@ -99,40 +99,84 @@ class ChangeRolesPresenterTest {
 
             val roomMemberList = aRoomMemberList() + listOf(
                 // Owner - superadmin
-                aRoomMember(userId = superAdminUserId, role = RoomMember.Role.Owner(isCreator = true)),
+                aRoomMember(userId = superAdminUserId, role = RoomMember.Role.Owner(isCreator = false)),
                 // Owner - creator
                 aRoomMember(userId = creatorUserId, role = RoomMember.Role.Owner(isCreator = true))
             )
             givenRoomMembersState(RoomMembersState.Ready(roomMemberList.toImmutableList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().run {
                 assertThat(canChangeMemberRole(A_USER_ID_2)).isTrue() // Admin
                 assertThat(canChangeMemberRole(A_USER_ID_3)).isTrue() // Moderator
+                assertThat(canChangeMemberRole(superAdminUserId)).isTrue() // Super admin
+                assertThat(canChangeMemberRole(creatorUserId)).isFalse() // Owner
+            }
+        }
+    }
+
+    @Test
+    fun `present - canChangeRole of users with lower power level unless they are owners - privilegedCreatorRole is false`() = runTest {
+        val creatorUserId = UserId("@creator:matrix.org")
+        val superAdminUserId = UserId("@super_admin:matrix.org")
+
+        val room = FakeJoinedRoom().apply {
+            // User is a creator, so they can change roles of other members. So is `creatorUserId`.
+            givenRoomInfo(
+                aRoomInfo(
+                    privilegedCreatorRole = false,
+                    roomCreators = listOf(sessionId, creatorUserId),
+                    roomPowerLevels = RoomPowerLevels(
+                        defaultRoomPowerLevelValues(),
+                        users = persistentMapOf(
+                            // Creator is an admin
+                            sessionId to RoomMember.Role.Admin.powerLevel,
+                            creatorUserId to RoomMember.Role.Admin.powerLevel,
+                            // bob is Admin
+                            A_USER_ID_2 to RoomMember.Role.Admin.powerLevel,
+                            // carol is Moderator
+                            A_USER_ID_3 to RoomMember.Role.Moderator.powerLevel,
+                            // super_admin is Owner - Superadmin
+                            superAdminUserId to RoomMember.Role.Owner(isCreator = false).powerLevel,
+                        )
+                    )
+                )
+            )
+
+            val roomMemberList = aRoomMemberList() + listOf(
+                // Owner - superadmin
+                aRoomMember(userId = superAdminUserId, role = RoomMember.Role.Owner(isCreator = false)),
+                // Owner - creator
+                aRoomMember(userId = creatorUserId, role = RoomMember.Role.Owner(isCreator = true))
+            )
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList.toImmutableList()))
+        }
+        val presenter = createChangeRolesPresenter(room = room)
+        presenter.test {
+            skipItems(1)
+            awaitItem().run {
+                assertThat(canChangeMemberRole(A_USER_ID_2)).isFalse() // Creator cannot update Admin in this case
+                assertThat(canChangeMemberRole(A_USER_ID_3)).isTrue() // Moderator
                 assertThat(canChangeMemberRole(creatorUserId)).isFalse() // Owner
             }
         }
     }
 
     @Test
-    fun `present - when modifying admins, creators are displayed too`() = runTest {
+    fun `present - when modifying admins, creators are displayed too - privilegedCreatorRole is true`() = runTest {
         val room = FakeJoinedRoom().apply {
             val creatorUserId = UserId("@creator:matrix.org")
             val memberList = aRoomMemberList()
                 .plus(aRoomMember(displayName = "CREATOR", role = RoomMember.Role.Owner(isCreator = true), userId = creatorUserId))
                 .toImmutableList()
-            givenRoomInfo(aRoomInfo(roomCreators = listOf(creatorUserId)))
+            givenRoomInfo(aRoomInfo(roomCreators = listOf(creatorUserId), privilegedCreatorRole = true))
             givenRoomMembersState(RoomMembersState.Ready(memberList))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
+            skipItems(2)
             awaitItem().searchResults.run {
                 assertThat(this).isInstanceOf(SearchBarResultState.Results::class.java)
                 val results = (this as SearchBarResultState.Results).results
@@ -149,9 +193,8 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
 
             initialState.eventSink(ChangeRolesEvent.ToggleSearchActive)
@@ -168,9 +211,8 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             val initialResults = (awaitItem().searchResults as? SearchBarResultState.Results)?.results
             assertThat(initialResults?.members).hasSize(8)
@@ -194,10 +236,8 @@ class ChangeRolesPresenterTest {
             givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
+            skipItems(2)
             val initialResults = (awaitItem().searchResults as? SearchBarResultState.Results)?.results
             assertThat(initialResults?.members).hasSize(8)
             assertThat(initialResults?.moderators).hasSize(1)
@@ -216,48 +256,48 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - UserSelectionToggle adds and removes users from the selected user list`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom().apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val userMember = roomMemberList.first { it.role == RoomMember.Role.User }
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
 
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(userMember.toMatrixUser()))
             assertThat(awaitItem().selectedUsers).hasSize(2)
 
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(userMember.toMatrixUser()))
             assertThat(awaitItem().selectedUsers).hasSize(1)
         }
     }
 
     @Test
     fun `present - hasPendingChanges is true when the initial selected users don't match the new ones`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom().apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val userMember = roomMemberList.first { it.role == RoomMember.Role.User }
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
             assertThat(initialState.selectedUsers).hasSize(1)
 
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(userMember.toMatrixUser()))
             with(awaitItem()) {
                 assertThat(selectedUsers).hasSize(2)
                 assertThat(hasPendingChanges).isTrue()
             }
 
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(userMember.toMatrixUser()))
             with(awaitItem()) {
                 assertThat(selectedUsers).hasSize(1)
                 assertThat(hasPendingChanges).isFalse()
@@ -266,65 +306,62 @@ class ChangeRolesPresenterTest {
     }
 
     @Test
-    fun `present - Exit will display success if no pending changes`() = runTest {
+    fun `present - Exit will display success false if no pending changes`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom().apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
-            assertThat(initialState.exitState).isEqualTo(AsyncAction.Uninitialized)
+            assertThat(initialState.savingState).isEqualTo(AsyncAction.Uninitialized)
 
             initialState.eventSink(ChangeRolesEvent.Exit)
-            assertThat(awaitItem().exitState).isEqualTo(AsyncAction.Success(Unit))
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(false))
         }
     }
 
     @Test
-    fun `present - CancelExit will remove exit confirmation`() = runTest {
+    fun `present - CloseDialog will remove exit confirmation`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom().apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
-            assertThat(initialState.exitState).isEqualTo(AsyncAction.Uninitialized)
+            assertThat(initialState.savingState).isEqualTo(AsyncAction.Uninitialized)
 
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
 
             awaitItem().eventSink(ChangeRolesEvent.Exit)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.exitState).isEqualTo(AsyncAction.ConfirmingNoParams)
+            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingCancellation)
 
-            confirmingState.eventSink(ChangeRolesEvent.CancelExit)
-            assertThat(awaitItem().exitState).isEqualTo(AsyncAction.Uninitialized)
+            confirmingState.eventSink(ChangeRolesEvent.CloseDialog)
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Uninitialized)
         }
     }
 
     @Test
     fun `present - Exit will display a confirmation dialog if there are pending changes, calling it again will actually exit`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom().apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.hasPendingChanges).isFalse()
-            assertThat(initialState.exitState).isEqualTo(AsyncAction.Uninitialized)
+            assertThat(initialState.savingState).isEqualTo(AsyncAction.Uninitialized)
 
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
             val updatedState = awaitItem()
@@ -332,55 +369,47 @@ class ChangeRolesPresenterTest {
             skipItems(1)
 
             updatedState.eventSink(ChangeRolesEvent.Exit)
-            assertThat(awaitItem().exitState).isEqualTo(AsyncAction.ConfirmingNoParams)
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.ConfirmingCancellation)
 
             updatedState.eventSink(ChangeRolesEvent.Exit)
-            assertThat(awaitItem().exitState).isEqualTo(AsyncAction.Success(Unit))
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(false))
         }
     }
 
     @Test
     fun `present - Save will display a confirmation when adding admins`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.success(Unit) },
             baseRoom = FakeBaseRoom(updateMembersResult = { Result.success(Unit) }),
         ).apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Admin, room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
+            skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
-
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
             awaitItem().eventSink(ChangeRolesEvent.Save)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
-
+            assertThat(confirmingState.savingState).isEqualTo(ConfirmingModifyingAdmins)
             confirmingState.eventSink(ChangeRolesEvent.Save)
-
-            val loadingState = awaitItem()
-            assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
-            skipItems(1)
-
-            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(Unit))
+            assertThat(awaitItem().savingState).isInstanceOf(AsyncAction.Loading::class.java)
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(true))
         }
     }
 
     @Test
-    fun `present - CancelSave will remove the confirmation dialog`() = runTest {
+    fun `present - CloseDialog will remove the confirmation dialog`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom().apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Admin)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Admin, room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
@@ -389,9 +418,9 @@ class ChangeRolesPresenterTest {
 
             awaitItem().eventSink(ChangeRolesEvent.Save)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
+            assertThat(confirmingState.savingState).isEqualTo(ConfirmingModifyingAdmins)
 
-            confirmingState.eventSink(ChangeRolesEvent.CancelSave)
+            confirmingState.eventSink(ChangeRolesEvent.CloseDialog)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Uninitialized)
         }
     }
@@ -399,34 +428,31 @@ class ChangeRolesPresenterTest {
     @Test
     fun `present - Save will just save the data for moderators`() = runTest {
         val analyticsService = FakeAnalyticsService()
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.success(Unit) },
             baseRoom = FakeBaseRoom(updateMembersResult = { Result.success(Unit) }),
         ).apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(RoomMember.Role.Moderator)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(
             role = RoomMember.Role.Moderator,
             room = room,
             analyticsService = analyticsService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        val userMember = roomMemberList.first { it.role == RoomMember.Role.User }
+        presenter.test {
+            skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
-
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
-
-            val loadingState = awaitItem()
-            assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
-            skipItems(1)
-
-            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(Unit))
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(userMember.toMatrixUser()))
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(2)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
+            assertThat(awaitItem().savingState).isInstanceOf(AsyncAction.Loading::class.java)
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(true))
             assertThat(analyticsService.capturedEvents.last()).isEqualTo(RoomModeration(RoomModeration.Action.ChangeMemberRole, RoomModeration.Role.Moderator))
         }
     }
@@ -454,17 +480,14 @@ class ChangeRolesPresenterTest {
             room = room,
             analyticsService = analyticsService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
             val initialState = awaitItem()
-            assertThat(initialState.selectedUsers).hasSize(1)
-
+            assertThat(initialState.selectedUsers).isEmpty()
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
-
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(1)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             assertThat(awaitItem().savingState.isConfirming()).isTrue()
         }
     }
@@ -472,80 +495,83 @@ class ChangeRolesPresenterTest {
     @Test
     fun `present - Save will just save the changes if the current user is a room creator and the selected users are not`() = runTest {
         val analyticsService = FakeAnalyticsService()
+        val alice = anAlice()
+        val me = aRoomMember(displayName = "CREATOR", role = RoomMember.Role.Owner(isCreator = true), userId = A_SESSION_ID)
         val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.success(Unit) },
             baseRoom = FakeBaseRoom(updateMembersResult = { Result.success(Unit) }),
         ).apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(
-                aRoomInfo(
-                    roomCreators = listOf(sessionId),
-                    roomPowerLevels = roomPowerLevelsWithRole(role = RoomMember.Role.Admin, userId = A_USER_ID_2)
-                )
-            )
+            val roomMemberList = persistentListOf(alice, me)
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
         }
         val presenter = createChangeRolesPresenter(
             role = RoomMember.Role.Admin,
             room = room,
             analyticsService = analyticsService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
+            skipItems(2)
             val initialState = awaitItem()
-            assertThat(initialState.selectedUsers).hasSize(1)
-
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
-
+            assertThat(initialState.selectedUsers).hasSize(2)
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(alice.toMatrixUser()))
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(1)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             val loadingState = awaitItem()
             assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
-            skipItems(1)
-
-            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(Unit))
+            assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(true))
             assertThat(analyticsService.capturedEvents.last()).isEqualTo(RoomModeration(RoomModeration.Action.ChangeMemberRole, RoomModeration.Role.User))
         }
     }
 
     @Test
-    fun `present - Save can handle failures and ClearError clears them`() = runTest {
+    fun `present - Save can handle failures and CloseDialog clears them`() = runTest {
+        val roomMemberList = aRoomMemberList()
         val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.failure(IllegalStateException("Failed")) }
         ).apply {
-            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsWithRole(role = RoomMember.Role.Moderator, userId = A_USER_ID)))
+            givenRoomMembersState(RoomMembersState.Ready(roomMemberList))
+            givenRoomInfo(aRoomInfo(roomPowerLevels = roomPowerLevelsFromRoomMemberList(roomMemberList)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.Moderator, room = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        val userMember = roomMemberList.first { it.role == RoomMember.Role.User }
+        presenter.test {
+            skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.selectedUsers).hasSize(1)
-
-            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
-
-            awaitItem().eventSink(ChangeRolesEvent.Save)
+            initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(userMember.toMatrixUser()))
+            awaitItem().also {
+                assertThat(it.selectedUsers).hasSize(2)
+                it.eventSink(ChangeRolesEvent.Save)
+            }
             val loadingState = awaitItem()
             assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
-            skipItems(1)
             val failedState = awaitItem()
             assertThat(failedState.savingState).isInstanceOf(AsyncAction.Failure::class.java)
-
-            failedState.eventSink(ChangeRolesEvent.ClearError)
+            failedState.eventSink(ChangeRolesEvent.CloseDialog)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Uninitialized)
         }
     }
 
-    private fun roomPowerLevelsWithRole(
-        role: RoomMember.Role,
-        userId: UserId = A_USER_ID,
+    @Test
+    fun `test analytics mapping`() = runTest {
+        val presenter = createChangeRolesPresenter()
+        with(presenter) {
+            assertThat(RoomMember.Role.User.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.User)
+            assertThat(RoomMember.Role.Moderator.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Moderator)
+            assertThat(RoomMember.Role.Admin.toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Administrator)
+            assertThat(RoomMember.Role.Owner(isCreator = false).toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Administrator)
+            assertThat(RoomMember.Role.Owner(isCreator = true).toAnalyticsMemberRole()).isEqualTo(RoomModeration.Role.Administrator)
+        }
+    }
+
+    private fun roomPowerLevelsFromRoomMemberList(
+        roomMemberList: List<RoomMember>,
     ): RoomPowerLevels {
         return RoomPowerLevels(
             values = defaultRoomPowerLevelValues(),
-            users = persistentMapOf(userId to role.powerLevel)
+            users = roomMemberList.associate { it.userId to it.role.powerLevel }.toImmutableMap()
         )
     }
 
@@ -566,7 +592,8 @@ internal fun TestScope.createChangeRolesPresenter(
     return ChangeRolesPresenter(
         role = role,
         room = room,
-        dispatchers = dispatchers,
+        dataSource = RoomMemberListDataSource(room, dispatchers),
         analyticsService = analyticsService,
+        roomCoroutineScope = this,
     )
 }
diff --git a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
similarity index 86%
rename from features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesViewTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
index fb1dc38aae..39967f9160 100644
--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -23,7 +24,6 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 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
@@ -50,7 +50,6 @@ class ChangeRolesViewTest {
                 ),
             )
         }.exceptionOrNull()
-
         assertThat(exception).isNotNull()
     }
 
@@ -63,9 +62,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.pressBackKey()
-
         eventsRecorder.assertSingle(ChangeRolesEvent.ToggleSearchActive)
     }
 
@@ -78,9 +75,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.pressBackKey()
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged(""), ChangeRolesEvent.Exit))
     }
 
@@ -93,9 +88,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.pressBack()
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged(""), ChangeRolesEvent.Exit))
     }
 
@@ -108,9 +101,7 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_save)
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged(""), ChangeRolesEvent.Save))
     }
 
@@ -123,58 +114,50 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_save)
-
         eventsRecorder.assertList(listOf(ChangeRolesEvent.QueryChanged("")))
     }
 
     @Test
-    fun `exit confirmation dialog - submit exits the screen`() {
+    fun `exit confirmation dialog - discard exits the screen`() {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
-                exitState = AsyncAction.ConfirmingNoParams,
+                savingState = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-
-        rule.clickOn(CommonStrings.action_ok)
-
+        rule.clickOn(CommonStrings.action_discard)
         eventsRecorder.assertSingle(ChangeRolesEvent.Exit)
     }
 
     @Test
-    fun `exit confirmation dialog - cancel removes the dialog`() {
+    fun `exit confirmation dialog - save emits the save event`() {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
-                exitState = AsyncAction.ConfirmingNoParams,
+                savingState = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-
-        rule.clickOn(CommonStrings.action_cancel)
-
-        eventsRecorder.assertSingle(ChangeRolesEvent.CancelExit)
+        rule.clickOn(CommonStrings.action_save)
+        eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save confirmation dialog - submit saves the changes`() {
+    fun `save admins confirmation dialog - submit saves the changes`() {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Admin,
                 isSearchActive = true,
-                savingState = AsyncAction.ConfirmingNoParams,
+                savingState = ConfirmingModifyingAdmins,
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_ok)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
@@ -185,31 +168,42 @@ class ChangeRolesViewTest {
             state = aChangeRolesState(
                 role = RoomMember.Role.Owner(isCreator = false),
                 isSearchActive = true,
-                savingState = AsyncAction.ConfirmingNoParams,
+                savingState = ConfirmingModifyingOwners,
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_continue)
-
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save confirmation dialog - cancel removes the dialog`() {
+    fun `save admins confirmation dialog - cancel removes the dialog`() {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Admin,
                 isSearchActive = true,
-                savingState = AsyncAction.ConfirmingNoParams,
+                savingState = ConfirmingModifyingAdmins,
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_cancel)
+        eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
+    }
 
-        eventsRecorder.assertSingle(ChangeRolesEvent.ClearError)
+    @Test
+    fun `save owners confirmation dialog - cancel removes the dialog`() {
+        val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
+        rule.setChangeRolesContent(
+            state = aChangeRolesState(
+                role = RoomMember.Role.Owner(isCreator = false),
+                isSearchActive = true,
+                savingState = ConfirmingModifyingOwners,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_cancel)
+        eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
     @Test
@@ -222,10 +216,8 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-
         rule.clickOn(CommonStrings.action_ok)
-
-        eventsRecorder.assertSingle(ChangeRolesEvent.ClearError)
+        eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
     @Test
@@ -306,12 +298,10 @@ class ChangeRolesViewTest {
 
     private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChangeRolesContent(
         state: ChangeRolesState,
-        onBackClick: () -> Unit = EnsureNeverCalled(),
     ) {
         setContent {
             ChangeRolesView(
                 state = state,
-                navigateUp = onBackClick,
             )
         }
     }
diff --git a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPointTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt
similarity index 77%
rename from features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPointTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt
index 621af8edaf..7d190b85f4 100644
--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPointTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt
@@ -1,16 +1,17 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+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.changeroommemberroes.api.ChangeRoomMemberRolesListType
+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 kotlinx.coroutines.test.runTest
@@ -31,10 +32,12 @@ class DefaultChangeRoomMemberRolesEntyPointTest {
         }
         val room = FakeJoinedRoom()
         val listType = ChangeRoomMemberRolesListType.Admins
-        val result = entryPoint.builder(parentNode, BuildContext.root(null))
-            .room(FakeJoinedRoom())
-            .listType(listType)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            room = FakeJoinedRoom(),
+            listType = listType,
+        )
         assertThat(result).isInstanceOf(ChangeRoomMemberRolesRootNode::class.java)
         // Search for the Inputs plugin
         val input = result.plugins.filterIsInstance<ChangeRoomMemberRolesRootNode.Inputs>().single()
diff --git a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/MembersByRoleTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/MembersByRoleTest.kt
similarity index 83%
rename from features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/MembersByRoleTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/MembersByRoleTest.kt
index a2e134f807..66a06cddc3 100644
--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/MembersByRoleTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/MembersByRoleTest.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.changeroommemberroles.impl
+package io.element.android.features.rolesandpermissions.impl.roles
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -17,6 +18,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID_5
 import io.element.android.libraries.matrix.test.A_USER_ID_6
 import io.element.android.libraries.matrix.test.A_USER_ID_7
 import io.element.android.libraries.matrix.test.room.aRoomMember
+import io.element.android.libraries.matrix.ui.room.PowerLevelRoomMemberComparator
 import kotlinx.collections.immutable.persistentListOf
 import org.junit.Test
 
@@ -32,7 +34,7 @@ class MembersByRoleTest {
             aRoomMember(A_USER_ID_6, displayName = "Justin", role = RoomMember.Role.Owner(isCreator = true)),
             aRoomMember(A_USER_ID_7, displayName = "Mallory", role = RoomMember.Role.Owner(isCreator = false)),
         )
-        val membersByRole = MembersByRole(members = members)
+        val membersByRole = MembersByRole(members = members, comparator = PowerLevelRoomMemberComparator())
         assertThat(membersByRole.owners).containsExactly(
             aRoomMember(A_USER_ID_6, displayName = "Justin", role = RoomMember.Role.Owner(isCreator = true)),
             aRoomMember(A_USER_ID_7, displayName = "Mallory", role = RoomMember.Role.Owner(isCreator = false)),
@@ -51,37 +53,25 @@ class MembersByRoleTest {
 
     @Test
     fun `isEmpty - only returns true with no members of any role`() {
-        val emptyMembersByRole = MembersByRole(emptyList())
+        val emptyMembersByRole = MembersByRole()
         assertThat(emptyMembersByRole.isEmpty()).isTrue()
 
         val membersByRoleWithOwners = MembersByRole(
             owners = persistentListOf(aRoomMember(A_USER_ID, role = RoomMember.Role.Admin)),
-            admins = persistentListOf(),
-            moderators = persistentListOf(),
-            members = persistentListOf(),
         )
         assertThat(membersByRoleWithOwners.isEmpty()).isFalse()
 
         val membersByRoleWithAdmins = MembersByRole(
-            owners = persistentListOf(),
             admins = persistentListOf(aRoomMember(A_USER_ID, role = RoomMember.Role.Admin)),
-            moderators = persistentListOf(),
-            members = persistentListOf(),
         )
         assertThat(membersByRoleWithAdmins.isEmpty()).isFalse()
 
         val membersByRoleWithModerators = MembersByRole(
-            owners = persistentListOf(),
-            admins = persistentListOf(),
             moderators = persistentListOf(aRoomMember(A_USER_ID, role = RoomMember.Role.Moderator)),
-            members = persistentListOf(),
         )
         assertThat(membersByRoleWithModerators.isEmpty()).isFalse()
 
         val membersByRoleWithMembers = MembersByRole(
-            owners = persistentListOf(),
-            admins = persistentListOf(),
-            moderators = persistentListOf(),
             members = persistentListOf(aRoomMember(A_USER_ID, role = RoomMember.Role.User)),
         )
         assertThat(membersByRoleWithMembers.isEmpty()).isFalse()
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionPresenterTest.kt
similarity index 76%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionPresenterTest.kt
index 734cf4696a..54bd6b7987 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionPresenterTest.kt
@@ -1,22 +1,24 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+package io.element.android.features.rolesandpermissions.impl.root
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
+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.aRoomMemberList
 import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -29,12 +31,10 @@ class RolesAndPermissionPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createRolesAndPermissionsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             with(awaitItem()) {
-                assertThat(adminCount).isEqualTo(0)
-                assertThat(moderatorCount).isEqualTo(0)
+                assertThat(adminCount).isNull()
+                assertThat(moderatorCount).isNull()
                 assertThat(changeOwnRoleAction).isEqualTo(AsyncAction.Uninitialized)
             }
         }
@@ -43,12 +43,9 @@ class RolesAndPermissionPresenterTest {
     @Test
     fun `present - ChangeOwnRole presents a confirmation dialog`() = runTest {
         val presenter = createRolesAndPermissionsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.ChangeOwnRole)
-
             assertThat(awaitItem().changeOwnRoleAction).isEqualTo(AsyncAction.ConfirmingNoParams)
         }
     }
@@ -59,12 +56,11 @@ class RolesAndPermissionPresenterTest {
         val presenter = createRolesAndPermissionsPresenter(
             dispatchers = testCoroutineDispatchers(),
             room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(updateMembersResult = {}),
                 updateUserRoleResult = { Result.success(Unit) }
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.Moderator))
 
@@ -80,12 +76,11 @@ class RolesAndPermissionPresenterTest {
     @Test
     fun `present - DemoteSelfTo can handle failures and clean them`() = runTest(StandardTestDispatcher()) {
         val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(updateMembersResult = {}),
             updateUserRoleResult = { Result.failure(Exception("Failed to update role")) }
         )
         val presenter = createRolesAndPermissionsPresenter(room = room, dispatchers = testCoroutineDispatchers())
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.Moderator))
 
@@ -103,9 +98,7 @@ class RolesAndPermissionPresenterTest {
     @Test
     fun `present - CancelPendingAction dismisses confirmation dialog too`() = runTest {
         val presenter = createRolesAndPermissionsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.ChangeOwnRole)
             awaitItem().eventSink(RolesAndPermissionsEvents.CancelPendingAction)
@@ -120,12 +113,11 @@ class RolesAndPermissionPresenterTest {
         val presenter = createRolesAndPermissionsPresenter(
             analyticsService = analyticsService,
             room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(updateMembersResult = {}),
                 resetPowerLevelsResult = { Result.success(Unit) }
             )
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.ResetPermissions)
             // Confirmation
@@ -140,9 +132,7 @@ class RolesAndPermissionPresenterTest {
     @Test
     fun `present - ResetPermissions confirmation can be cancelled`() = runTest {
         val presenter = createRolesAndPermissionsPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.ResetPermissions)
             awaitItem().eventSink(RolesAndPermissionsEvents.CancelPendingAction)
@@ -151,8 +141,26 @@ class RolesAndPermissionPresenterTest {
         }
     }
 
+    @Test
+    fun `present - admins and moderator counts are updated when members changes`() = runTest {
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(updateMembersResult = {}),
+        )
+        val presenter = createRolesAndPermissionsPresenter(room = room)
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.adminCount).isNull()
+            assertThat(initialState.moderatorCount).isNull()
+            room.givenRoomMembersState(state = RoomMembersState.Ready(aRoomMemberList()))
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.adminCount).isEqualTo(1)
+            assertThat(finalState.moderatorCount).isEqualTo(1)
+        }
+    }
+
     private fun TestScope.createRolesAndPermissionsPresenter(
-        room: FakeJoinedRoom = FakeJoinedRoom(),
+        room: FakeJoinedRoom = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {})),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService()
     ): RolesAndPermissionsPresenter {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt
similarity index 89%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsViewTest.kt
rename to features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt
index 4aa68bc047..e08ae205b7 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt
@@ -1,17 +1,18 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.rolesandpermissions
+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 io.element.android.features.roomdetails.impl.R
+import io.element.android.features.rolesandpermissions.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -83,14 +84,12 @@ class RolesAndPermissionsViewTest {
 
     @Test
     @Config(qualifiers = "h640dp")
-    fun `tapping on any of the permission items open the change permissions screen`() {
-        ensureCalledTimes(3) { callback ->
+    fun `tapping permission item open the change permissions screen`() {
+        ensureCalledTimes(1) { callback ->
             rule.setRolesAndPermissionsView(
-                openPermissionScreens = callback,
+                openEditPermissions = callback,
             )
-            rule.clickOn(R.string.screen_room_roles_and_permissions_room_details)
-            rule.clickOn(R.string.screen_room_roles_and_permissions_messages_and_content)
-            rule.clickOn(R.string.screen_room_roles_and_permissions_member_moderation)
+            rule.clickOn(R.string.screen_room_roles_and_permissions_permissions_header)
         }
     }
 
@@ -184,7 +183,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoles
     goBack: () -> Unit = EnsureNeverCalled(),
     openAdminList: () -> Unit = EnsureNeverCalled(),
     openModeratorList: () -> Unit = EnsureNeverCalled(),
-    openPermissionScreens: () -> Unit = EnsureNeverCalled(),
+    openEditPermissions: () -> Unit = EnsureNeverCalled(),
 ) {
     setSafeContent {
         RolesAndPermissionsView(
@@ -193,9 +192,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoles
                 override fun onBackClick() = goBack()
                 override fun openAdminList() = openAdminList()
                 override fun openModeratorList() = openModeratorList()
-                override fun openEditRoomDetailsPermissions() = openPermissionScreens()
-                override fun openModerationPermissions() = openPermissionScreens()
-                override fun openMessagesAndContentPermissions() = openPermissionScreens()
+                override fun openEditPermissions() = openEditPermissions()
             }
         )
     }
diff --git a/features/rolesandpermissions/test/build.gradle.kts b/features/rolesandpermissions/test/build.gradle.kts
new file mode 100644
index 0000000000..f2b5d05133
--- /dev/null
+++ b/features/rolesandpermissions/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.rolesandpermissions.test"
+}
+
+dependencies {
+    implementation(projects.features.rolesandpermissions.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/rolesandpermissions/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeChangeRoomMemberRolesEntryPoint.kt b/features/rolesandpermissions/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeChangeRoomMemberRolesEntryPoint.kt
new file mode 100644
index 0000000000..0526afc938
--- /dev/null
+++ b/features/rolesandpermissions/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeChangeRoomMemberRolesEntryPoint.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.changeroommemberroles.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeChangeRoomMemberRolesEntryPoint : ChangeRoomMemberRolesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        room: JoinedRoom,
+        listType: ChangeRoomMemberRolesListType,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/rolesandpermissions/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeRolesAndPermissionsEntryPoint.kt b/features/rolesandpermissions/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeRolesAndPermissionsEntryPoint.kt
new file mode 100644
index 0000000000..62cf3285f3
--- /dev/null
+++ b/features/rolesandpermissions/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeRolesAndPermissionsEntryPoint.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.changeroommemberroles.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.rolesandpermissions.api.RolesAndPermissionsEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeRolesAndPermissionsEntryPoint : RolesAndPermissionsEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: RolesAndPermissionsEntryPoint.Callback): Node {
+        lambdaError()
+    }
+}
diff --git a/features/roomaliasresolver/api/build.gradle.kts b/features/roomaliasresolver/api/build.gradle.kts
index e21d7e7862..2c4184e534 100644
--- a/features/roomaliasresolver/api/build.gradle.kts
+++ b/features/roomaliasresolver/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomaliasresolver/api/src/main/kotlin/io/element/android/features/roomaliasesolver/api/RoomAliasResolverEntryPoint.kt b/features/roomaliasresolver/api/src/main/kotlin/io/element/android/features/roomaliasesolver/api/RoomAliasResolverEntryPoint.kt
index 420bcfa97c..ce0270033c 100644
--- a/features/roomaliasresolver/api/src/main/kotlin/io/element/android/features/roomaliasesolver/api/RoomAliasResolverEntryPoint.kt
+++ b/features/roomaliasresolver/api/src/main/kotlin/io/element/android/features/roomaliasesolver/api/RoomAliasResolverEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,13 +17,12 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 
 interface RoomAliasResolverEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onAliasResolved(data: ResolvedRoomAlias)
diff --git a/features/roomaliasresolver/impl/build.gradle.kts b/features/roomaliasresolver/impl/build.gradle.kts
index 45cf32f661..1860c77017 100644
--- a/features/roomaliasresolver/impl/build.gradle.kts
+++ b/features/roomaliasresolver/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPoint.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPoint.kt
index 9c2d3d2cdf..c6f8966131 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPoint.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,22 @@ package io.element.android.features.roomaliasresolver.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRoomAliasResolverEntryPoint : RoomAliasResolverEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomAliasResolverEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : RoomAliasResolverEntryPoint.NodeBuilder {
-            override fun callback(callback: RoomAliasResolverEntryPoint.Callback): RoomAliasResolverEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun params(params: RoomAliasResolverEntryPoint.Params): RoomAliasResolverEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<RoomAliasResolverNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: RoomAliasResolverEntryPoint.Params,
+        callback: RoomAliasResolverEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<RoomAliasResolverNode>(
+            buildContext = buildContext,
+            plugins = listOf(params, callback),
+        )
     }
 }
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt
index 34a96eaeb8..11b92ba244 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt
index d7b3242def..041d43cb26 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,14 +13,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -28,22 +28,19 @@ class RoomAliasResolverNode(
     @Assisted plugins: List<Plugin>,
     presenterFactory: RoomAliasResolverPresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
+    private val callback: RoomAliasResolverEntryPoint.Callback = callback()
     private val inputs = inputs<RoomAliasResolverEntryPoint.Params>()
 
     private val presenter = presenterFactory.create(
         inputs.roomAlias
     )
 
-    private fun onAliasResolved(data: ResolvedRoomAlias) {
-        plugins<RoomAliasResolverEntryPoint.Callback>().forEach { it.onAliasResolved(data) }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         RoomAliasResolverView(
             state = state,
-            onSuccess = ::onAliasResolved,
+            onSuccess = callback::onAliasResolved,
             onBackClick = ::navigateUp,
             modifier = modifier
         )
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt
index c8a8d18fbc..78be168e53 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -44,7 +45,7 @@ class RoomAliasResolverPresenter(
             resolveAlias(resolveState)
         }
 
-        fun handleEvents(event: RoomAliasResolverEvents) {
+        fun handleEvent(event: RoomAliasResolverEvents) {
             when (event) {
                 RoomAliasResolverEvents.Retry -> coroutineScope.resolveAlias(resolveState)
                 RoomAliasResolverEvents.DismissError -> resolveState.value = AsyncData.Uninitialized
@@ -54,7 +55,7 @@ class RoomAliasResolverPresenter(
         return RoomAliasResolverState(
             roomAlias = roomAlias,
             resolveState = resolveState.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt
index dc858621f7..82d13f16a5 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt
@@ -1,18 +1,17 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.roomaliasresolver.impl
 
-import androidx.compose.runtime.Immutable
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 
-@Immutable
 data class RoomAliasResolverState(
     val roomAlias: RoomAlias,
     val resolveState: AsyncData<ResolvedRoomAlias>,
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStateProvider.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStateProvider.kt
index 49786b6436..c3152bc303 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStateProvider.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
index 9d7536b2f5..a068ac7a7f 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/di/RoomAliasResolverModule.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/di/RoomAliasResolverModule.kt
index cce26ec602..8f5c9d733b 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/di/RoomAliasResolverModule.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/di/RoomAliasResolverModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomaliasresolver/impl/src/main/res/values-hr/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..2d1e42c405
--- /dev/null
+++ b/features/roomaliasresolver/impl/src/main/res/values-hr/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">"Nismo mogli prikazati pregled ove sobe"</string>
+  <string name="screen_room_alias_resolver_resolve_alias_failure">"Nije uspjelo razrješavanje aliasa sobe."</string>
+</resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml
index 0499fed4f5..d79cdadcc2 100644
--- a/features/roomaliasresolver/impl/src/main/res/values-uz/translations.xml
+++ b/features/roomaliasresolver/impl/src/main/res/values-uz/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_join_room_loading_alert_title">"Biz bu xonani oldindan ko‘rishni ko‘rsata olmadik "</string>
   <string name="screen_room_alias_resolver_resolve_alias_failure">"Xona taxalluslari yechilmadi."</string>
 </resources>
diff --git a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPointTest.kt b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPointTest.kt
index 238b35017b..a519032ed2 100644
--- a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPointTest.kt
+++ b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -43,10 +44,12 @@ class DefaultRoomAliasResolverEntryPointTest {
         val params = RoomAliasResolverEntryPoint.Params(
             roomAlias = A_ROOM_ALIAS
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(RoomAliasResolverNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
diff --git a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt
index f90b07c91b..df8b8058be 100644
--- a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt
+++ b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 717380d23d..4b37f993f9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomcall/api/build.gradle.kts b/features/roomcall/api/build.gradle.kts
index 2b9a9124a3..54bb7bbd02 100644
--- a/features/roomcall/api/build.gradle.kts
+++ b/features/roomcall/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallState.kt b/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallState.kt
index 725915b91a..1a6b17ec89 100644
--- a/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallState.kt
+++ b/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallStateProvider.kt b/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallStateProvider.kt
index de3bc4ade8..be86c2441d 100644
--- a/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallStateProvider.kt
+++ b/features/roomcall/api/src/main/kotlin/io/element/android/features/roomcall/api/RoomCallStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomcall/impl/build.gradle.kts b/features/roomcall/impl/build.gradle.kts
index 7a6a3cf0a6..069c890874 100644
--- a/features/roomcall/impl/build.gradle.kts
+++ b/features/roomcall/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2401606f34..b18a2772a3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,7 +21,8 @@ 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.room.JoinedRoom
-import io.element.android.libraries.matrix.ui.room.canCall
+import io.element.android.libraries.matrix.api.room.powerlevels.canCall
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 
 @Inject
 class RoomCallStatePresenter(
@@ -34,8 +36,7 @@ class RoomCallStatePresenter(
             value = sessionEnterpriseService.isElementCallAvailable()
         }
         val roomInfo by room.roomInfoFlow.collectAsState()
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
-        val canJoinCall by room.canCall(updateKey = syncUpdateFlow.value)
+        val canJoinCall by room.permissionsAsState(false) { perms -> perms.canCall() }
         val isUserInTheCall by remember {
             derivedStateOf {
                 room.sessionId in roomInfo.activeRoomCallParticipants
diff --git a/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/di/RoomCallModule.kt b/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/di/RoomCallModule.kt
index 3a8ac51ef6..fc649dd1f2 100644
--- a/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/di/RoomCallModule.kt
+++ b/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/di/RoomCallModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9647fddc1d..bdececf584 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,9 +15,12 @@ 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.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.StateEventType
 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.powerlevels.FakeRoomPermissions
+import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
@@ -27,7 +31,7 @@ class RoomCallStatePresenterTest {
     fun `present - initial state`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(false) },
+                roomPermissions = roomPermissions(false),
             )
         )
         val presenter = createRoomCallStatePresenter(joinedRoom = room)
@@ -46,7 +50,7 @@ class RoomCallStatePresenterTest {
     fun `present - element call not available`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(false) },
+                roomPermissions = roomPermissions(false),
             )
         )
         val presenter = createRoomCallStatePresenter(
@@ -65,7 +69,7 @@ class RoomCallStatePresenterTest {
     fun `present - initial state - user can join call`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(true) },
+                roomPermissions = roomPermissions(true),
             )
         )
         val presenter = createRoomCallStatePresenter(joinedRoom = room)
@@ -84,7 +88,7 @@ class RoomCallStatePresenterTest {
     fun `present - call is disabled if user cannot join it even if there is an ongoing call`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(false) },
+                roomPermissions = roomPermissions(false),
                 initialRoomInfo = aRoomInfo(hasRoomCall = true),
             )
         )
@@ -105,7 +109,7 @@ class RoomCallStatePresenterTest {
     fun `present - user has joined the call on another session`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(true) },
+                roomPermissions = roomPermissions(true),
             ).apply {
                 givenRoomInfo(
                     aRoomInfo(
@@ -132,7 +136,7 @@ class RoomCallStatePresenterTest {
     fun `present - user has joined the call locally`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(true) },
+                roomPermissions = roomPermissions(true),
             ).apply {
                 givenRoomInfo(
                     aRoomInfo(
@@ -162,7 +166,7 @@ class RoomCallStatePresenterTest {
     fun `present - user leaves the call`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canUserJoinCallResult = { Result.success(true) },
+                roomPermissions = roomPermissions(true),
             ).apply {
                 givenRoomInfo(
                     aRoomInfo(
@@ -222,6 +226,17 @@ class RoomCallStatePresenterTest {
         }
     }
 
+    private fun roomPermissions(canJoinCall: Boolean): FakeRoomPermissions {
+        return FakeRoomPermissions(
+            canSendState = { stateEvent ->
+                when (stateEvent) {
+                    StateEventType.CallMember -> canJoinCall
+                    else -> lambdaError()
+                }
+            }
+        )
+    }
+
     private fun createRoomCallStatePresenter(
         joinedRoom: JoinedRoom,
         currentCallService: CurrentCallService = FakeCurrentCallService(),
diff --git a/features/roomdetails/api/build.gradle.kts b/features/roomdetails/api/build.gradle.kts
index f4977a938c..ce393840f8 100644
--- a/features/roomdetails/api/build.gradle.kts
+++ b/features/roomdetails/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 803002d642..928c08324d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.architecture.NodeInputs
+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.permalink.PermalinkData
@@ -23,6 +25,9 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {
         @Parcelize
         data object RoomDetails : InitialTarget
 
+        @Parcelize
+        data object RoomMemberList : InitialTarget
+
         @Parcelize
         data class RoomMemberDetails(val roomMemberId: UserId) : InitialTarget
 
@@ -33,17 +38,16 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {
     data class Params(val initialElement: InitialTarget) : NodeInputs
 
     interface Callback : Plugin {
-        fun onOpenGlobalNotificationSettings()
-        fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
-        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
-        fun onForwardedToSingleRoom(roomId: RoomId)
+        fun navigateToGlobalNotificationSettings()
+        fun navigateToRoom(roomId: RoomId, serverNames: List<String>)
+        fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
+        fun startForwardEventFlow(eventId: EventId, fromPinnedEvents: Boolean)
     }
 
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
-
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 }
diff --git a/features/roomdetails/impl/build.gradle.kts b/features/roomdetails/impl/build.gradle.kts
index 882058ef48..2765a95a1e 100644
--- a/features/roomdetails/impl/build.gradle.kts
+++ b/features/roomdetails/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,17 +57,29 @@ dependencies {
     implementation(projects.features.verifysession.api)
     implementation(projects.features.reportroom.api)
     implementation(projects.features.roommembermoderation.api)
-    implementation(projects.features.changeroommemberroles.api)
+    implementation(projects.features.rolesandpermissions.api)
+    implementation(projects.features.securityandprivacy.api)
+    implementation(projects.features.roomdetailsedit.api)
     implementation(projects.features.invitepeople.api)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.mediaupload.test)
     testImplementation(projects.libraries.mediapickers.test)
+    testImplementation(projects.libraries.mediaviewer.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.usersearch.test)
     testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.features.call.test)
+    testImplementation(projects.features.rolesandpermissions.test)
+    testImplementation(projects.features.securityandprivacy.test)
+    testImplementation(projects.features.roomdetailsedit.test)
+    testImplementation(projects.features.knockrequests.test)
+    testImplementation(projects.features.messages.test)
+    testImplementation(projects.features.poll.test)
+    testImplementation(projects.features.reportroom.test)
     testImplementation(projects.features.startchat.test)
+    testImplementation(projects.features.verifysession.test)
     testImplementation(projects.services.analytics.test)
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPoint.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPoint.kt
index 6d26ef32a1..7b2269c52c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPoint.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,36 +10,25 @@ package io.element.android.features.roomdetails.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint.InitialTarget
 import io.element.android.features.roomdetails.impl.RoomDetailsFlowNode.NavTarget
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRoomDetailsEntryPoint : RoomDetailsEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomDetailsEntryPoint.NodeBuilder {
-        return object : RoomDetailsEntryPoint.NodeBuilder {
-            val plugins = ArrayList<Plugin>()
-
-            override fun params(params: RoomDetailsEntryPoint.Params): RoomDetailsEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun callback(callback: RoomDetailsEntryPoint.Callback): RoomDetailsEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<RoomDetailsFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: RoomDetailsEntryPoint.Params,
+        callback: RoomDetailsEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<RoomDetailsFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(params, callback)
+        )
     }
 }
 
@@ -46,4 +36,5 @@ internal fun InitialTarget.toNavTarget() = when (this) {
     is InitialTarget.RoomDetails -> NavTarget.RoomDetails
     is InitialTarget.RoomMemberDetails -> NavTarget.RoomMemberDetails(roomMemberId)
     is InitialTarget.RoomNotificationSettings -> NavTarget.RoomNotificationSettings(showUserDefinedSettingStyle = true)
+    InitialTarget.RoomMemberList -> NavTarget.RoomMemberList
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsAction.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsAction.kt
index dcceead9bf..262eb37650 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsAction.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 09c4119ac1..de801e8aae 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2b4bf10d67..03adbded1b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,6 @@ import androidx.lifecycle.coroutineScope
 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -27,24 +27,25 @@ 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.ElementCallEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
 import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.poll.api.history.PollHistoryEntryPoint
 import io.element.android.features.reportroom.api.ReportRoomEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
+import io.element.android.features.rolesandpermissions.api.RolesAndPermissionsEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
-import io.element.android.features.roomdetails.impl.edit.RoomDetailsEditNode
 import io.element.android.features.roomdetails.impl.invite.RoomInviteMembersNode
 import io.element.android.features.roomdetails.impl.members.RoomMemberListNode
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsNode
 import io.element.android.features.roomdetails.impl.notificationsettings.RoomNotificationSettingsNode
-import io.element.android.features.roomdetails.impl.rolesandpermissions.RolesAndPermissionsFlowNode
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyFlowNode
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditEntryPoint
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
 import io.element.android.features.userprofile.shared.UserProfileNodeHelper
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackWithOverlayBox
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.overlay.operation.hide
 import io.element.android.libraries.architecture.overlay.operation.show
@@ -82,6 +83,9 @@ class RoomDetailsFlowNode(
     private val outgoingVerificationEntryPoint: OutgoingVerificationEntryPoint,
     private val reportRoomEntryPoint: ReportRoomEntryPoint,
     private val changeRoomMemberRolesEntryPoint: ChangeRoomMemberRolesEntryPoint,
+    private val rolesAndPermissionsEntryPoint: RolesAndPermissionsEntryPoint,
+    private val securityAndPrivacyEntryPoint: SecurityAndPrivacyEntryPoint,
+    private val roomDetailsEditEntryPoint: RoomDetailsEditEntryPoint,
 ) : BaseFlowNode<RoomDetailsFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = plugins.filterIsInstance<RoomDetailsEntryPoint.Params>().first().initialElement.toNavTarget(),
@@ -146,16 +150,22 @@ class RoomDetailsFlowNode(
         data object SelectNewOwnersWhenLeaving : NavTarget
     }
 
+    private val callback: RoomDetailsEntryPoint.Callback = callback()
+
     override fun onBuilt() {
         super.onBuilt()
-        whenChildrenAttached { commonLifecycle: Lifecycle,
-                               roomDetailsNode: RoomDetailsNode,
-                               changeRoomMemberRolesNode: ChangeRoomMemberRolesEntryPoint.NodeProxy ->
+        whenChildrenAttached {
+            commonLifecycle: Lifecycle,
+            roomDetailsNode: RoomDetailsNode,
+            changeRoomMemberRolesNode: ChangeRoomMemberRolesEntryPoint.NodeProxy,
+            ->
             commonLifecycle.coroutineScope.launch {
-                changeRoomMemberRolesNode.waitForRoleChanged()
+                val isNewOwnerSelected = changeRoomMemberRolesNode.waitForCompletion()
                 withContext(NonCancellable) {
                     backstack.pop()
-                    roomDetailsNode.onNewOwnersSelected()
+                    if (isNewOwnerSelected) {
+                        roomDetailsNode.onNewOwnersSelected()
+                    }
                 }
             }
         }
@@ -165,55 +175,55 @@ class RoomDetailsFlowNode(
         return when (navTarget) {
             NavTarget.RoomDetails -> {
                 val roomDetailsCallback = object : RoomDetailsNode.Callback {
-                    override fun openRoomMemberList() {
+                    override fun navigateToRoomMemberList() {
                         backstack.push(NavTarget.RoomMemberList)
                     }
 
-                    override fun editRoomDetails() {
+                    override fun navigateToRoomDetailsEdit() {
                         backstack.push(NavTarget.RoomDetailsEdit)
                     }
 
-                    override fun openInviteMembers() {
+                    override fun navigateToInviteMembers() {
                         backstack.push(NavTarget.InviteMembers)
                     }
 
-                    override fun openRoomNotificationSettings() {
+                    override fun navigateToRoomNotificationSettings() {
                         backstack.push(NavTarget.RoomNotificationSettings(showUserDefinedSettingStyle = false))
                     }
 
-                    override fun openAvatarPreview(name: String, url: String) {
+                    override fun navigateToAvatarPreview(name: String, url: String) {
                         overlay.show(NavTarget.AvatarPreview(name, url))
                     }
 
-                    override fun openPollHistory() {
+                    override fun navigateToPollHistory() {
                         backstack.push(NavTarget.PollHistory)
                     }
 
-                    override fun openMediaGallery() {
+                    override fun navigateToMediaGallery() {
                         backstack.push(NavTarget.MediaGallery)
                     }
 
-                    override fun openAdminSettings() {
+                    override fun navigateToAdminSettings() {
                         backstack.push(NavTarget.AdminSettings)
                     }
 
-                    override fun openPinnedMessagesList() {
+                    override fun navigateToPinnedMessagesList() {
                         backstack.push(NavTarget.PinnedMessagesList)
                     }
 
-                    override fun openKnockRequestsList() {
+                    override fun navigateToKnockRequestsList() {
                         backstack.push(NavTarget.KnockRequestsList)
                     }
 
-                    override fun openSecurityAndPrivacy() {
+                    override fun navigateToSecurityAndPrivacy() {
                         backstack.push(NavTarget.SecurityAndPrivacy)
                     }
 
-                    override fun openDmUserProfile(userId: UserId) {
+                    override fun navigateToRoomMemberDetails(userId: UserId) {
                         backstack.push(NavTarget.RoomMemberDetails(userId))
                     }
 
-                    override fun onJoinCall() {
+                    override fun navigateToRoomCall() {
                         val inputs = CallType.RoomCall(
                             sessionId = room.sessionId,
                             roomId = room.roomId,
@@ -222,11 +232,11 @@ class RoomDetailsFlowNode(
                         elementCallEntryPoint.startCall(inputs)
                     }
 
-                    override fun openReportRoom() {
+                    override fun navigateToReportRoom() {
                         backstack.push(NavTarget.ReportRoom)
                     }
 
-                    override fun onSelectNewOwnersWhenLeaving() {
+                    override fun navigateToSelectNewOwnersWhenLeaving() {
                         backstack.push(NavTarget.SelectNewOwnersWhenLeaving)
                     }
                 }
@@ -235,11 +245,11 @@ class RoomDetailsFlowNode(
 
             NavTarget.RoomMemberList -> {
                 val roomMemberListCallback = object : RoomMemberListNode.Callback {
-                    override fun openRoomMemberDetails(roomMemberId: UserId) {
+                    override fun navigateToRoomMemberDetails(roomMemberId: UserId) {
                         backstack.push(NavTarget.RoomMemberDetails(roomMemberId))
                     }
 
-                    override fun openInviteMembers() {
+                    override fun navigateToInviteMembers() {
                         backstack.push(NavTarget.InviteMembers)
                     }
                 }
@@ -247,7 +257,7 @@ class RoomDetailsFlowNode(
             }
 
             NavTarget.RoomDetailsEdit -> {
-                createNode<RoomDetailsEditNode>(buildContext)
+                roomDetailsEditEntryPoint.createNode(this, buildContext)
             }
 
             NavTarget.InviteMembers -> {
@@ -257,8 +267,8 @@ class RoomDetailsFlowNode(
             is NavTarget.RoomNotificationSettings -> {
                 val input = RoomNotificationSettingsNode.RoomNotificationSettingInput(navTarget.showUserDefinedSettingStyle)
                 val callback = object : RoomNotificationSettingsNode.Callback {
-                    override fun openGlobalNotificationSettings() {
-                        plugins<RoomDetailsEntryPoint.Callback>().forEach { it.onOpenGlobalNotificationSettings() }
+                    override fun navigateToGlobalNotificationSettings() {
+                        callback.navigateToGlobalNotificationSettings()
                     }
                 }
                 createNode<RoomNotificationSettingsNode>(buildContext, listOf(input, callback))
@@ -266,19 +276,19 @@ class RoomDetailsFlowNode(
 
             is NavTarget.RoomMemberDetails -> {
                 val callback = object : UserProfileNodeHelper.Callback {
-                    override fun openAvatarPreview(username: String, avatarUrl: String) {
+                    override fun navigateToAvatarPreview(username: String, avatarUrl: String) {
                         overlay.show(NavTarget.AvatarPreview(username, avatarUrl))
                     }
 
-                    override fun onStartDM(roomId: RoomId) {
-                        plugins<RoomDetailsEntryPoint.Callback>().forEach { it.onOpenRoom(roomId, emptyList()) }
+                    override fun navigateToRoom(roomId: RoomId) {
+                        callback.navigateToRoom(roomId, emptyList())
                     }
 
-                    override fun onStartCall(dmRoomId: RoomId) {
+                    override fun startCall(dmRoomId: RoomId) {
                         elementCallEntryPoint.startCall(CallType.RoomCall(roomId = dmRoomId, sessionId = room.sessionId))
                     }
 
-                    override fun onVerifyUser(userId: UserId) {
+                    override fun startVerifyUserFlow(userId: UserId) {
                         backstack.push(NavTarget.VerifyUser(userId))
                     }
                 }
@@ -291,17 +301,24 @@ class RoomDetailsFlowNode(
                         overlay.hide()
                     }
 
-                    override fun onViewInTimeline(eventId: EventId) {
+                    override fun viewInTimeline(eventId: EventId) {
+                        // Cannot happen
+                    }
+
+                    override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
                         // Cannot happen
                     }
                 }
-                mediaViewerEntryPoint.nodeBuilder(this, buildContext)
-                    .avatar(
-                        navTarget.name,
-                        navTarget.avatarUrl,
-                    )
-                    .callback(callback)
-                    .build()
+                val params = mediaViewerEntryPoint.createParamsForAvatar(
+                    filename = navTarget.name,
+                    avatarUrl = navTarget.avatarUrl,
+                )
+                mediaViewerEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
             }
             is NavTarget.PollHistory -> {
                 pollHistoryEntryPoint.createNode(this, buildContext)
@@ -312,60 +329,90 @@ class RoomDetailsFlowNode(
                         backstack.pop()
                     }
 
-                    override fun onViewInTimeline(eventId: EventId) {
+                    override fun viewInTimeline(eventId: EventId) {
                         val permalinkData = PermalinkData.RoomLink(
                             roomIdOrAlias = room.roomId.toRoomIdOrAlias(),
                             eventId = eventId,
                         )
-                        plugins<RoomDetailsEntryPoint.Callback>().forEach {
-                            it.onPermalinkClick(permalinkData, pushToBackstack = false)
-                        }
+                        callback.handlePermalinkClick(permalinkData, pushToBackstack = false)
+                    }
+
+                    override fun forward(eventId: EventId, fromPinnedEvents: Boolean) {
+                        callback.startForwardEventFlow(eventId, fromPinnedEvents)
                     }
                 }
-                mediaGalleryEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
+                mediaGalleryEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
 
             is NavTarget.AdminSettings -> {
-                createNode<RolesAndPermissionsFlowNode>(buildContext)
+                val callback = object : RolesAndPermissionsEntryPoint.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                rolesAndPermissionsEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
             NavTarget.PinnedMessagesList -> {
                 val params = MessagesEntryPoint.Params(
                     MessagesEntryPoint.InitialTarget.PinnedMessages
                 )
                 val callback = object : MessagesEntryPoint.Callback {
-                    override fun onRoomDetailsClick() = Unit
+                    override fun navigateToRoomDetails() = Unit
 
-                    override fun onUserDataClick(userId: UserId) = Unit
+                    override fun navigateToRoomMemberDetails(userId: UserId) = Unit
 
-                    override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
-                        plugins<RoomDetailsEntryPoint.Callback>().forEach { it.onPermalinkClick(data, pushToBackstack) }
+                    override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                        callback.handlePermalinkClick(data, pushToBackstack)
                     }
 
-                    override fun onForwardedToSingleRoom(roomId: RoomId) {
-                        plugins<RoomDetailsEntryPoint.Callback>().forEach { it.onForwardedToSingleRoom(roomId) }
+                    override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
+                        callback.startForwardEventFlow(eventId, fromPinnedEvents)
+                    }
+
+                    override fun navigateToRoom(roomId: RoomId) {
+                        callback.navigateToRoom(roomId, emptyList())
                     }
                 }
-                return messagesEntryPoint.nodeBuilder(this, buildContext)
-                    .params(params)
-                    .callback(callback)
-                    .build()
+                return messagesEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
             }
             NavTarget.KnockRequestsList -> {
                 knockRequestsListEntryPoint.createNode(this, buildContext)
             }
             NavTarget.SecurityAndPrivacy -> {
-                createNode<SecurityAndPrivacyFlowNode>(buildContext)
+                val callback = object : SecurityAndPrivacyEntryPoint.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                securityAndPrivacyEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
             is NavTarget.VerifyUser -> {
                 val params = OutgoingVerificationEntryPoint.Params(
                     showDeviceVerifiedScreen = true,
                     verificationRequest = VerificationRequest.Outgoing.User(userId = navTarget.userId)
                 )
-                outgoingVerificationEntryPoint.nodeBuilder(this, buildContext)
-                    .params(params)
-                    .callback(object : OutgoingVerificationEntryPoint.Callback {
+                outgoingVerificationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = object : OutgoingVerificationEntryPoint.Callback {
                         override fun onDone() {
                             backstack.pop()
                         }
@@ -374,21 +421,27 @@ class RoomDetailsFlowNode(
                             backstack.pop()
                         }
 
-                        override fun onLearnMoreAboutEncryption() {
+                        override fun navigateToLearnMoreAboutEncryption() {
                             learnMoreUrl.value = LearnMoreConfig.ENCRYPTION_URL
                         }
-                    })
-                    .build()
+                    },
+                )
             }
             is NavTarget.ReportRoom -> {
-                reportRoomEntryPoint.createNode(this, buildContext, room.roomId)
+                reportRoomEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    roomId = room.roomId,
+                )
             }
 
             is NavTarget.SelectNewOwnersWhenLeaving -> {
-                changeRoomMemberRolesEntryPoint.builder(this, buildContext)
-                    .room(room)
-                    .listType(ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving)
-                    .build()
+                changeRoomMemberRolesEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    room = room,
+                    listType = ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving,
+                )
             }
         }
     }
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 2ada71dbc8..d7b4e0d813 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,6 @@ 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.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -26,6 +26,7 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.features.leaveroom.api.LeaveRoomRenderer
 import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
 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.api.room.BaseRoom
@@ -46,24 +47,24 @@ class RoomDetailsNode(
     private val leaveRoomRenderer: LeaveRoomRenderer,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun openRoomMemberList()
-        fun openInviteMembers()
-        fun editRoomDetails()
-        fun openRoomNotificationSettings()
-        fun openAvatarPreview(name: String, url: String)
-        fun openPollHistory()
-        fun openMediaGallery()
-        fun openAdminSettings()
-        fun openPinnedMessagesList()
-        fun openKnockRequestsList()
-        fun openSecurityAndPrivacy()
-        fun openDmUserProfile(userId: UserId)
-        fun onJoinCall()
-        fun openReportRoom()
-        fun onSelectNewOwnersWhenLeaving()
+        fun navigateToRoomMemberList()
+        fun navigateToInviteMembers()
+        fun navigateToRoomDetailsEdit()
+        fun navigateToRoomNotificationSettings()
+        fun navigateToAvatarPreview(name: String, url: String)
+        fun navigateToPollHistory()
+        fun navigateToMediaGallery()
+        fun navigateToAdminSettings()
+        fun navigateToPinnedMessagesList()
+        fun navigateToKnockRequestsList()
+        fun navigateToSecurityAndPrivacy()
+        fun navigateToRoomMemberDetails(userId: UserId)
+        fun navigateToRoomCall()
+        fun navigateToReportRoom()
+        fun navigateToSelectNewOwnersWhenLeaving()
     }
 
-    private val callback = plugins<Callback>().first()
+    private val callback: Callback = callback()
 
     init {
         lifecycle.subscribe(
@@ -73,30 +74,6 @@ class RoomDetailsNode(
         )
     }
 
-    private fun openRoomMemberList() {
-        callback.openRoomMemberList()
-    }
-
-    private fun openRoomNotificationSettings() {
-        callback.openRoomNotificationSettings()
-    }
-
-    private fun invitePeople() {
-        callback.openInviteMembers()
-    }
-
-    private fun openPollHistory() {
-        callback.openPollHistory()
-    }
-
-    private fun openMediaGallery() {
-        callback.openMediaGallery()
-    }
-
-    private fun onJoinCall() {
-        callback.onJoinCall()
-    }
-
     private fun CoroutineScope.onShareRoom(context: Context) = launch {
         room.getPermalink()
             .onSuccess { permalink ->
@@ -112,42 +89,6 @@ class RoomDetailsNode(
             }
     }
 
-    private fun onEditRoomDetails() {
-        callback.editRoomDetails()
-    }
-
-    private fun openAvatarPreview(name: String, url: String) {
-        callback.openAvatarPreview(name, url)
-    }
-
-    private fun openAdminSettings() {
-        callback.openAdminSettings()
-    }
-
-    private fun openPinnedMessages() {
-        callback.openPinnedMessagesList()
-    }
-
-    private fun openKnockRequestsLists() {
-        callback.openKnockRequestsList()
-    }
-
-    private fun openSecurityAndPrivacy() {
-        callback.openSecurityAndPrivacy()
-    }
-
-    private fun onProfileClick(userId: UserId) {
-        callback.openDmUserProfile(userId)
-    }
-
-    private fun onReportRoomClick() {
-        callback.openReportRoom()
-    }
-
-    private fun onSelectNewOwnersWhenLeaving() {
-        return callback.onSelectNewOwnersWhenLeaving()
-    }
-
     private val stateFlow = launchMolecule { presenter.present() }
 
     fun onNewOwnersSelected() {
@@ -165,34 +106,38 @@ class RoomDetailsNode(
 
         fun onActionClick(action: RoomDetailsAction) {
             when (action) {
-                RoomDetailsAction.Edit -> onEditRoomDetails()
-                RoomDetailsAction.AddTopic -> onEditRoomDetails()
+                RoomDetailsAction.Edit -> {
+                    callback.navigateToRoomDetailsEdit()
+                }
+                RoomDetailsAction.AddTopic -> {
+                    callback.navigateToRoomDetailsEdit()
+                }
             }
         }
 
         RoomDetailsView(
             state = state,
             modifier = modifier,
-            goBack = this::navigateUp,
+            goBack = ::navigateUp,
             onActionClick = ::onActionClick,
             onShareRoom = ::onShareRoom,
-            openRoomMemberList = ::openRoomMemberList,
-            openRoomNotificationSettings = ::openRoomNotificationSettings,
-            invitePeople = ::invitePeople,
-            openAvatarPreview = ::openAvatarPreview,
-            openPollHistory = ::openPollHistory,
-            openMediaGallery = ::openMediaGallery,
-            openAdminSettings = this::openAdminSettings,
-            onJoinCallClick = ::onJoinCall,
-            onPinnedMessagesClick = ::openPinnedMessages,
-            onKnockRequestsClick = ::openKnockRequestsLists,
-            onSecurityAndPrivacyClick = ::openSecurityAndPrivacy,
-            onProfileClick = ::onProfileClick,
-            onReportRoomClick = ::onReportRoomClick,
+            openRoomMemberList = callback::navigateToRoomMemberList,
+            openRoomNotificationSettings = callback::navigateToRoomNotificationSettings,
+            invitePeople = callback::navigateToInviteMembers,
+            openAvatarPreview = callback::navigateToAvatarPreview,
+            openPollHistory = callback::navigateToPollHistory,
+            openMediaGallery = callback::navigateToMediaGallery,
+            openAdminSettings = callback::navigateToAdminSettings,
+            onJoinCallClick = callback::navigateToRoomCall,
+            onPinnedMessagesClick = callback::navigateToPinnedMessagesList,
+            onKnockRequestsClick = callback::navigateToKnockRequestsList,
+            onSecurityAndPrivacyClick = callback::navigateToSecurityAndPrivacy,
+            onProfileClick = callback::navigateToRoomMemberDetails,
+            onReportRoomClick = callback::navigateToReportRoom,
             leaveRoomView = {
                 leaveRoomRenderer.Render(
                     state = state.leaveRoomState,
-                    onSelectNewOwners = { onSelectNewOwnersWhenLeaving() },
+                    onSelectNewOwners = { callback.navigateToSelectNewOwnersWhenLeaving() },
                     modifier = Modifier
                 )
             }
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 4408deab1e..07b76d41b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.features.roomdetails.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -17,11 +19,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.Interaction
+import io.element.android.features.knockrequests.api.KnockRequestPermissions
+import io.element.android.features.knockrequests.api.knockRequestPermissions
 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.roomdetails.impl.members.details.RoomMemberDetailsPresenter
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.securityAndPrivacyPermissionsAsState
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditPermissions
+import io.element.android.features.roomdetailsedit.api.roomDetailsEditPermissions
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissions
 import io.element.android.libraries.androidutils.clipboard.ClipboardHelper
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -35,17 +42,13 @@ 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.RoomMembersState
-import io.element.android.libraries.matrix.api.room.StateEventType
+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.canInvite
-import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
+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.canHandleKnockRequestsAsState
 import io.element.android.libraries.matrix.ui.room.getCurrentRoomMember
 import io.element.android.libraries.matrix.ui.room.getDirectRoomMember
-import io.element.android.libraries.matrix.ui.room.isDmAsState
-import io.element.android.libraries.matrix.ui.room.isOwnUserAdmin
 import io.element.android.libraries.matrix.ui.room.roomMemberIdentityStateChange
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -76,8 +79,6 @@ class RoomDetailsPresenter(
         val scope = rememberCoroutineScope()
         val leaveRoomState = leaveRoomPresenter.present()
         val roomInfo by room.roomInfoFlow.collectAsState()
-        val isUserAdmin = room.isOwnUserAdmin()
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val roomAvatar by remember { derivedStateOf { roomInfo.avatarUrl } }
 
         val roomName by remember { derivedStateOf { roomInfo.name?.trim().orEmpty() } }
@@ -92,15 +93,11 @@ class RoomDetailsPresenter(
             observeNotificationSettings()
         }
 
+        val isDm = roomInfo.isDm
         val membersState by room.membersStateFlow.collectAsState()
-        val canInvite by getCanInvite(membersState)
-
+        val permissions by getPermissions()
         val canonicalAlias by remember { derivedStateOf { roomInfo.canonicalAlias } }
         val isEncrypted by remember { derivedStateOf { roomInfo.isEncrypted == true } }
-        val isDm by room.isDmAsState()
-        val canEditName by getCanSendState(membersState, StateEventType.ROOM_NAME)
-        val canEditAvatar by getCanSendState(membersState, StateEventType.ROOM_AVATAR)
-        val canEditTopic by getCanSendState(membersState, StateEventType.ROOM_TOPIC)
         val dmMember by room.getDirectRoomMember(membersState)
         val currentMember by room.getCurrentRoomMember(membersState)
         val roomMemberDetailsPresenter = roomMemberDetailsPresenter(dmMember)
@@ -108,16 +105,15 @@ class RoomDetailsPresenter(
         val roomCallState = roomCallStatePresenter.present()
         val joinedMemberCount by remember { derivedStateOf { roomInfo.joinedMembersCount } }
 
-        val topicState = remember(canEditTopic, roomTopic, roomType) {
+        val topicState = remember(permissions.editDetailsPermissions.canEditTopic, roomTopic, roomType) {
             val topic = roomTopic
             when {
                 !topic.isNullOrBlank() -> RoomTopicState.ExistingTopic(topic)
-                canEditTopic && roomType is RoomDetailsType.Room -> RoomTopicState.CanAddTopic
+                permissions.editDetailsPermissions.canEditTopic && roomType is RoomDetailsType.Room -> RoomTopicState.CanAddTopic
                 else -> RoomTopicState.Hidden
             }
         }
 
-        val canHandleKnockRequests by room.canHandleKnockRequestsAsState(syncUpdateFlow.value)
         val isKnockRequestsEnabled by remember {
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
         }.collectAsState(false)
@@ -125,7 +121,10 @@ class RoomDetailsPresenter(
             room.knockRequestsFlow.collect { value = it.size }
         }
         val canShowKnockRequests by remember {
-            derivedStateOf { isKnockRequestsEnabled && canHandleKnockRequests && joinRule == JoinRule.Knock }
+            derivedStateOf { isKnockRequestsEnabled && permissions.knockRequestsPermissions.hasAny && joinRule == JoinRule.Knock }
+        }
+        val canShowSecurityAndPrivacy by remember {
+            derivedStateOf { !isDm && permissions.securityAndPrivacyPermissions.hasAny(isSpace = false, joinRule = joinRule) }
         }
         val isDeveloperModeEnabled by remember {
             appPreferencesStore.isDeveloperModeEnabledFlow()
@@ -136,7 +135,7 @@ class RoomDetailsPresenter(
         val snackbarDispatcher = LocalSnackbarDispatcher.current
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
 
-        fun handleEvents(event: RoomDetailsEvent) {
+        fun handleEvent(event: RoomDetailsEvent) {
             when (event) {
                 is RoomDetailsEvent.LeaveRoom -> {
                     leaveRoomState.eventSink(LeaveRoomEvent.LeaveRoom(room.roomId, needsConfirmation = event.needsConfirmation))
@@ -161,13 +160,6 @@ class RoomDetailsPresenter(
 
         val roomMemberDetailsState = roomMemberDetailsPresenter?.present()
 
-        val securityAndPrivacyPermissions = room.securityAndPrivacyPermissionsAsState(syncUpdateFlow.value)
-        val canShowSecurityAndPrivacy by remember {
-            derivedStateOf {
-                isKnockRequestsEnabled && roomType is RoomDetailsType.Room && securityAndPrivacyPermissions.value.hasAny
-            }
-        }
-
         val hasMemberVerificationViolations by produceState(false) {
             room.roomMemberIdentityStateChange(waitForEncryption = true)
                 .onEach { identities -> value = identities.any { it.identityState == IdentityState.VerificationViolation } }
@@ -184,15 +176,15 @@ class RoomDetailsPresenter(
             roomTopic = topicState,
             memberCount = joinedMemberCount,
             isEncrypted = isEncrypted,
-            canInvite = canInvite,
-            canEdit = (canEditAvatar || canEditName || canEditTopic) && roomType == RoomDetailsType.Room,
+            canInvite = permissions.canInvite,
+            canEdit = roomType == RoomDetailsType.Room && permissions.editDetailsPermissions.hasAny,
             roomCallState = roomCallState,
             roomType = roomType,
             roomMemberDetailsState = roomMemberDetailsState,
             leaveRoomState = leaveRoomState,
             roomNotificationSettings = roomNotificationSettingsState.roomNotificationSettings(),
             isFavorite = isFavorite,
-            displayRolesAndPermissionsSettings = !isDm && isUserAdmin,
+            displayRolesAndPermissionsSettings = !isDm && permissions.canEditRolesAndPermissions,
             isPublic = joinRule == JoinRule.Public,
             heroes = roomInfo.heroes.toImmutableList(),
             pinnedMessagesCount = pinnedMessagesCount,
@@ -204,7 +196,8 @@ class RoomDetailsPresenter(
             canReportRoom = canReportRoom,
             isTombstoned = roomInfo.successorRoom != null,
             showDebugInfo = isDeveloperModeEnabled,
-            eventSink = ::handleEvents,
+            roomVersion = roomInfo.roomVersion,
+            eventSink = ::handleEvent,
         )
     }
 
@@ -230,14 +223,25 @@ class RoomDetailsPresenter(
         }
     }
 
-    @Composable
-    private fun getCanInvite(membersState: RoomMembersState) = produceState(false, membersState) {
-        value = room.canInvite().getOrElse { false }
-    }
+    private data class Permissions(
+        val canInvite: Boolean = false,
+        val editDetailsPermissions: RoomDetailsEditPermissions = RoomDetailsEditPermissions.DEFAULT,
+        val knockRequestsPermissions: KnockRequestPermissions = KnockRequestPermissions.DEFAULT,
+        val securityAndPrivacyPermissions: SecurityAndPrivacyPermissions = SecurityAndPrivacyPermissions.DEFAULT,
+        val canEditRolesAndPermissions: Boolean = false,
+    )
 
     @Composable
-    private fun getCanSendState(membersState: RoomMembersState, type: StateEventType) = produceState(false, membersState) {
-        value = room.canSendState(type).getOrElse { false }
+    private fun getPermissions(): State<Permissions> {
+        return room.permissionsAsState(Permissions()) { perms ->
+            Permissions(
+                canInvite = perms.canOwnUserInvite(),
+                editDetailsPermissions = perms.roomDetailsEditPermissions(),
+                knockRequestsPermissions = perms.knockRequestPermissions(),
+                canEditRolesAndPermissions = perms.canEditRolesAndPermissions(),
+                securityAndPrivacyPermissions = perms.securityAndPrivacyPermissions(),
+            )
+        }
     }
 
     private fun CoroutineScope.observeNotificationSettings() {
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 43566b86a8..2332776e96 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -48,6 +49,7 @@ data class RoomDetailsState(
     val canReportRoom: Boolean,
     val isTombstoned: Boolean,
     val showDebugInfo: Boolean,
+    val roomVersion: String?,
     val eventSink: (RoomDetailsEvent) -> Unit
 ) {
     val roomBadges = buildList {
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 96d19c5ecf..783fcfaf10 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -145,6 +146,7 @@ fun aRoomDetailsState(
     canReportRoom = canReportRoom,
     isTombstoned = isTombstoned,
     showDebugInfo = showDebugInfo,
+    roomVersion = "12",
     eventSink = eventSink,
 )
 
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 3f20985ab8..046c64d906 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -263,6 +264,7 @@ fun RoomDetailsView(
             if (state.showDebugInfo) {
                 DebugInfoSection(
                     roomId = state.roomId,
+                    roomVersion = state.roomVersion,
                 )
             }
         }
@@ -713,9 +715,13 @@ private fun OtherActionsSection(
 }
 
 @Composable
-private fun DebugInfoSection(roomId: RoomId) {
+private fun DebugInfoSection(
+    roomId: RoomId,
+    roomVersion: String?,
+) {
     val context = LocalContext.current
     PreferenceCategory(showTopDivider = true) {
+        val toastMessage = stringResource(CommonStrings.common_copied_to_clipboard)
         ListItem(
             headlineContent = {
                 Text("Internal room ID")
@@ -731,11 +737,24 @@ private fun DebugInfoSection(roomId: RoomId) {
             trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Copy())),
             onClick = {
                 context.copyToClipboard(
-                    roomId.value,
-                    context.getString(CommonStrings.common_copied_to_clipboard)
+                    text = roomId.value,
+                    toastMessage = toastMessage,
                 )
             },
         )
+        ListItem(
+            headlineContent = {
+                Text("Room version")
+            },
+            supportingContent = {
+                Text(
+                    text = roomVersion ?: "Unknown",
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            },
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Info())),
+        )
     }
 }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt
index 9ca7b87c00..479f23f90d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3c3acc7b4d..ea0ed1bb72 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
index f7991a6e44..cb305426bc 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelRoomMemberComparator.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelRoomMemberComparator.kt
deleted file mode 100644
index 2359f809ac..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelRoomMemberComparator.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.roomdetails.impl.members
-
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.ui.room.sortingName
-import java.text.Collator
-
-// Comparator used to sort room members by power level (descending) and then by name (ascending)
-internal class PowerLevelRoomMemberComparator : Comparator<RoomMember> {
-    // Used to simplify and compare unicode and ASCII chars (á == a)
-    private val collator = Collator.getInstance().apply {
-        decomposition = Collator.CANONICAL_DECOMPOSITION
-    }
-    override fun compare(o1: RoomMember, o2: RoomMember): Int {
-        return when {
-            o1.powerLevel > o2.powerLevel -> return -1
-            o1.powerLevel < o2.powerLevel -> return 1
-            else -> {
-                collator.compare(o1.sortingName(), o2.sortingName())
-            }
-        }
-    }
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
deleted file mode 100644
index bbb231ccb9..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.features.roomdetails.impl.members
-
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-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.roomMembers
-import kotlinx.coroutines.withContext
-
-@Inject
-class RoomMemberListDataSource(
-    private val room: BaseRoom,
-    private val coroutineDispatchers: CoroutineDispatchers,
-) {
-    suspend fun search(query: String): List<RoomMember> = withContext(coroutineDispatchers.io) {
-        val roomMembersState = room.membersStateFlow.value
-        val activeRoomMembers = roomMembersState.roomMembers()
-            ?.filter { it.membership.isActive() }
-            .orEmpty()
-        val filteredMembers = if (query.isBlank()) {
-            activeRoomMembers
-        } else {
-            activeRoomMembers.filter { member ->
-                member.userId.value.contains(query, ignoreCase = true) ||
-                    member.displayName?.contains(query, ignoreCase = true).orFalse()
-            }
-        }
-        filteredMembers
-    }
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
index 1e9f4eb82c..ec1b130b3e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,7 @@ package io.element.android.features.roomdetails.impl.members
 import io.element.android.libraries.matrix.api.room.RoomMember
 
 sealed interface RoomMemberListEvents {
+    data class ChangeSelectedSection(val section: SelectedSection) : RoomMemberListEvents
     data class UpdateSearchQuery(val query: String) : RoomMemberListEvents
-    data class OnSearchActiveChanged(val active: Boolean) : RoomMemberListEvents
     data class RoomMemberSelected(val roomMember: RoomMember) : RoomMemberListEvents
 }
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 cc7a6e2151..750b111fc3 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
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.members
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 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.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -21,6 +23,8 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.features.roommembermoderation.api.ModerationAction
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationRenderer
+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.services.analytics.api.AnalyticsService
@@ -35,11 +39,12 @@ class RoomMemberListNode(
     private val roomMemberModerationRenderer: RoomMemberModerationRenderer,
 ) : Node(buildContext, plugins = plugins), RoomMemberListNavigator {
     interface Callback : Plugin {
-        fun openRoomMemberDetails(roomMemberId: UserId)
-        fun openInviteMembers()
+        fun navigateToRoomMemberDetails(roomMemberId: UserId)
+        fun navigateToInviteMembers()
     }
 
-    private val callbacks = plugins<Callback>()
+    private val callback: Callback = callback()
+    private val stateFlow = launchMolecule { presenter.present() }
 
     init {
         lifecycle.subscribe(
@@ -50,15 +55,11 @@ class RoomMemberListNode(
     }
 
     override fun openRoomMemberDetails(roomMemberId: UserId) {
-        callbacks.forEach {
-            it.openRoomMemberDetails(roomMemberId)
-        }
+        callback.navigateToRoomMemberDetails(roomMemberId)
     }
 
     override fun openInviteMembers() {
-        callbacks.forEach {
-            it.openInviteMembers()
-        }
+        callback.navigateToInviteMembers()
     }
 
     override fun exitRoomMemberList() {
@@ -67,7 +68,7 @@ class RoomMemberListNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        val state = presenter.present()
+        val state by stateFlow.collectAsState()
         RoomMemberListView(
             state = state,
             modifier = modifier,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index 69efd04b9e..6917057a06 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.features.roomdetails.impl.members
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -17,13 +19,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
-import io.element.android.features.roommembermoderation.api.ModerationAction
-import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
+import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents.ShowActionsForUser
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.map
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-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.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
@@ -31,42 +32,33 @@ 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.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+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.room.toMatrixUser
-import io.element.android.libraries.matrix.ui.room.canInviteAsState
+import io.element.android.libraries.matrix.ui.room.PowerLevelRoomMemberComparator
 import io.element.android.libraries.matrix.ui.room.roomMemberIdentityStateChange
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 
 @Inject
 class RoomMemberListPresenter(
     private val room: JoinedRoom,
-    private val roomMemberListDataSource: RoomMemberListDataSource,
     private val coroutineDispatchers: CoroutineDispatchers,
     private val roomMembersModerationPresenter: Presenter<RoomMemberModerationState>,
     private val encryptionService: EncryptionService,
 ) : Presenter<RoomMemberListState> {
+    private val powerLevelRoomMemberComparator = PowerLevelRoomMemberComparator()
+
     @Composable
     override fun present(): RoomMemberListState {
-        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
         var searchQuery by rememberSaveable { mutableStateOf("") }
-        var searchResults by remember {
-            mutableStateOf<SearchBarResultState<AsyncData<RoomMembers>>>(SearchBarResultState.Initial())
-        }
-        var isSearchActive by rememberSaveable { mutableStateOf(false) }
-
         val membersState by room.membersStateFlow.collectAsState()
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
-        val canInvite by room.canInviteAsState(syncUpdateFlow.value)
+        val canInvite by room.permissionsAsState(false) { perms -> perms.canOwnUserInvite() }
         val roomModerationState = roomMembersModerationPresenter.present()
 
         val roomMemberIdentityStates by produceState(persistentMapOf()) {
@@ -77,13 +69,13 @@ class RoomMemberListPresenter(
                 .launchIn(this)
         }
 
-        // Update the room members when the screen is loaded or the active member count changes
+        var selectedSection by remember { mutableStateOf(SelectedSection.MEMBERS) }
+        var roomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
+        var filteredRoomMembers: AsyncData<RoomMembers> by remember { mutableStateOf(AsyncData.Loading()) }
+
+        // Update the room members when the screen is loaded
         LaunchedEffect(Unit) {
-            room.roomInfoFlow.map { it.activeMembersCount }
-                .distinctUntilChanged()
-                .collectLatest {
-                    room.updateMembers()
-                }
+            room.updateMembers()
         }
 
         LaunchedEffect(membersState, roomMemberIdentityStates) {
@@ -98,7 +90,7 @@ class RoomMemberListPresenter(
             }
             withContext(coroutineDispatchers.io) {
                 val members = membersState.roomMembers().orEmpty().groupBy { it.membership }
-                val info = room.roomInfoFlow.first()
+                val info = room.info()
                 if (members.getOrDefault(RoomMembershipState.JOIN, emptyList()).size < info.joinedMembersCount / 2) {
                     // Don't display initial room member list if we have less than half of the joined members:
                     // This result will come from the timeline loading membership events and it'll be wrong.
@@ -109,7 +101,7 @@ class RoomMemberListPresenter(
                         .map { it.withIdentityState(roomMemberIdentityStates) }
                         .toImmutableList(),
                     joined = members.getOrDefault(RoomMembershipState.JOIN, emptyList())
-                        .sortedWith(PowerLevelRoomMemberComparator())
+                        .sortedWith(powerLevelRoomMemberComparator)
                         .map { it.withIdentityState(roomMemberIdentityStates) }
                         .toImmutableList(),
                     banned = members.getOrDefault(RoomMembershipState.BAN, emptyList())
@@ -125,69 +117,45 @@ class RoomMemberListPresenter(
             }
         }
 
-        LaunchedEffect(membersState, searchQuery, isSearchActive) {
-            withContext(coroutineDispatchers.io) {
-                searchResults = if (searchQuery.isEmpty() || !isSearchActive) {
-                    SearchBarResultState.Initial()
-                } else {
-                    val results = roomMemberListDataSource.search(searchQuery).groupBy { it.membership }
-                    if (results.isEmpty()) {
-                        SearchBarResultState.NoResultsFound()
-                    } else {
-                        val result = RoomMembers(
-                            invited = results.getOrDefault(RoomMembershipState.INVITE, emptyList())
-                                .map { it.withIdentityState(roomMemberIdentityStates) }
-                                .toImmutableList(),
-                            joined = results.getOrDefault(RoomMembershipState.JOIN, emptyList())
-                                .sortedWith(PowerLevelRoomMemberComparator())
-                                .map { it.withIdentityState(roomMemberIdentityStates) }
-                                .toImmutableList(),
-                            banned = results.getOrDefault(RoomMembershipState.BAN, emptyList())
-                                .sortedBy { it.userId.value }
-                                .map { it.withIdentityState(roomMemberIdentityStates) }
-                                .toImmutableList(),
-                        )
-                        SearchBarResultState.Results(
-                            if (membersState is RoomMembersState.Pending) {
-                                AsyncData.Loading(result)
-                            } else {
-                                AsyncData.Success(result)
-                            }
-                        )
-                    }
+        LaunchedEffect(searchQuery, roomMembers) {
+            filteredRoomMembers = roomMembers.map { members ->
+                withContext(coroutineDispatchers.io) {
+                    members.filter(searchQuery)
                 }
             }
         }
 
-        fun handleEvents(event: RoomMemberListEvents) {
+        fun handleEvent(event: RoomMemberListEvents) {
             when (event) {
-                is RoomMemberListEvents.OnSearchActiveChanged -> isSearchActive = event.active
                 is RoomMemberListEvents.UpdateSearchQuery -> searchQuery = event.query
                 is RoomMemberListEvents.RoomMemberSelected ->
-                    if (event.roomMember.membership == RoomMembershipState.BAN) {
-                        roomModerationState.eventSink(RoomMemberModerationEvents.ProcessAction(ModerationAction.UnbanUser, event.roomMember.toMatrixUser()))
-                    } else {
-                        roomModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(event.roomMember.toMatrixUser()))
-                    }
+                    roomModerationState.eventSink(ShowActionsForUser(event.roomMember.toMatrixUser()))
+                is RoomMemberListEvents.ChangeSelectedSection -> selectedSection = event.section
             }
         }
 
-        return RoomMemberListState(
+        val state = RoomMemberListState(
             roomMembers = roomMembers,
+            filteredRoomMembers = filteredRoomMembers,
             searchQuery = searchQuery,
-            searchResults = searchResults,
-            isSearchActive = isSearchActive,
             canInvite = canInvite,
             moderationState = roomModerationState,
-            eventSink = { handleEvents(it) },
+            selectedSection = selectedSection,
+            eventSink = ::handleEvent,
         )
+        if (!state.showBannedSection && selectedSection == SelectedSection.BANNED) {
+            SideEffect {
+                selectedSection = SelectedSection.MEMBERS
+            }
+        }
+        return state
     }
 
     private suspend fun RoomMember.withIdentityState(identityStates: ImmutableMap<UserId, IdentityState>): RoomMemberWithIdentityState {
         return if (room.info().isEncrypted != true) {
             RoomMemberWithIdentityState(this, null)
         } else {
-            val identityState = identityStates[userId] ?: encryptionService.getUserIdentity(userId).getOrNull()
+            val identityState = identityStates[userId] ?: encryptionService.getUserIdentity(userId, fallbackToServer = false).getOrNull()
             RoomMemberWithIdentityState(this, identityState)
         }
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
index 8e492e5371..7c928fb27a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,26 +10,57 @@ package io.element.android.features.roomdetails.impl.members
 
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 data class RoomMemberListState(
-    val roomMembers: AsyncData<RoomMembers>,
+    // Only used to know if we can show the banned section
+    private val roomMembers: AsyncData<RoomMembers>,
+    val filteredRoomMembers: AsyncData<RoomMembers>,
     val searchQuery: String,
-    val searchResults: SearchBarResultState<AsyncData<RoomMembers>>,
-    val isSearchActive: Boolean,
     val canInvite: Boolean,
+    val selectedSection: SelectedSection,
     val moderationState: RoomMemberModerationState,
     val eventSink: (RoomMemberListEvents) -> Unit,
-)
+) {
+    val showBannedSection: Boolean = moderationState.permissions.canBan && roomMembers.dataOrNull()?.banned?.isNotEmpty() == true
+}
+
+enum class SelectedSection {
+    MEMBERS,
+    BANNED
+}
 
 data class RoomMembers(
     val invited: ImmutableList<RoomMemberWithIdentityState>,
     val joined: ImmutableList<RoomMemberWithIdentityState>,
     val banned: ImmutableList<RoomMemberWithIdentityState>,
-)
+) {
+    fun isEmpty(section: SelectedSection): Boolean {
+        return when (section) {
+            SelectedSection.MEMBERS -> invited.isEmpty() && joined.isEmpty()
+            SelectedSection.BANNED -> banned.isEmpty()
+        }
+    }
+
+    fun filter(query: String): RoomMembers {
+        if (query.isBlank()) {
+            return this
+        }
+        val filterPredicate = { member: RoomMemberWithIdentityState ->
+            member.roomMember.userId.value.contains(query, ignoreCase = true) ||
+                member.roomMember.displayName?.contains(query, ignoreCase = true).orFalse()
+        }
+        return RoomMembers(
+            invited = invited.filter(filterPredicate).toImmutableList(),
+            joined = joined.filter(filterPredicate).toImmutableList(),
+            banned = banned.filter(filterPredicate).toImmutableList(),
+        )
+    }
+}
 
 data class RoomMemberWithIdentityState(
     val roomMember: RoomMember,
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 a1cc9c3b92..b37738c30f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,9 +10,10 @@ package io.element.android.features.roomdetails.impl.members
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
+import io.element.android.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.architecture.map
 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
@@ -22,112 +24,75 @@ internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMember
     override val values: Sequence<RoomMemberListState>
         get() = sequenceOf(
             aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
-                        joined = persistentListOf(anAlice().withIdentity(), aBob().withIdentity(), aWalter().withIdentity()),
-                        banned = persistentListOf(),
-                    )
-                )
-            ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(aVictor().withIdentity(), aWalter().withIdentity()),
-                        joined = persistentListOf(
-                            anAlice().withIdentity(identityState = IdentityState.Verified),
-                            aBob().withIdentity(identityState = IdentityState.PinViolation),
-                            aWalter().withIdentity(identityState = IdentityState.VerificationViolation)
-                        ),
-                        banned = persistentListOf(),
-                    )
-                )
-            ),
-            aRoomMemberListState(roomMembers = AsyncData.Loading()),
-            aRoomMemberListState().copy(canInvite = true),
-            aRoomMemberListState().copy(isSearchActive = false),
-            aRoomMemberListState().copy(isSearchActive = true),
-            aRoomMemberListState().copy(isSearchActive = true, searchQuery = "someone"),
-            aRoomMemberListState().copy(
-                isSearchActive = true,
-                searchQuery = "@someone:matrix.org",
-                searchResults = SearchBarResultState.Results(
-                    AsyncData.Success(
-                        RoomMembers(
-                            invited = persistentListOf(aVictor().withIdentity()),
-                            joined = persistentListOf(anAlice().withIdentity()),
-                            banned = persistentListOf(),
-                        )
-                    )
-                ),
-            ),
-            aRoomMemberListState().copy(
-                isSearchActive = true,
-                searchQuery = "something-with-no-results",
-                searchResults = SearchBarResultState.NoResultsFound()
+                roomMembers = AsyncData.Loading(),
+                selectedSection = SelectedSection.MEMBERS,
             ),
             aRoomMemberListState(
                 roomMembers = AsyncData.Failure(Exception("Error details")),
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                selectedSection = SelectedSection.BANNED,
+                moderationState = aRoomMemberModerationState(canBan = true),
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                canInvite = true,
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                searchQuery = "alice",
+                selectedSection = SelectedSection.MEMBERS,
+            ),
+            aRoomMemberListState(
+                roomMembers = aLoadedRoomMembers(),
+                searchQuery = "something-with-no-results",
+                selectedSection = SelectedSection.MEMBERS,
             ),
         )
 }
 
-internal class RoomMemberListStateBannedProvider : PreviewParameterProvider<RoomMemberListState> {
-    override val values: Sequence<RoomMemberListState>
-        get() = sequenceOf(
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(),
-                        joined = persistentListOf(),
-                        banned = persistentListOf(
-                            aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
-                            aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
-                            aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
-                        ),
-                    )
-                ),
-                moderationState = aRoomMemberModerationState(),
-            ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Loading(
-                    RoomMembers(
-                        invited = persistentListOf(),
-                        joined = persistentListOf(),
-                        banned = persistentListOf(
-                            aRoomMember(userId = UserId("@alice:example.com"), displayName = "Alice").withIdentity(),
-                            aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob").withIdentity(),
-                            aRoomMember(userId = UserId("@charlie:example.com"), displayName = "Charlie").withIdentity(),
-                        ),
-                    )
-                ),
-                moderationState = aRoomMemberModerationState(),
-            ),
-            aRoomMemberListState(
-                roomMembers = AsyncData.Success(
-                    RoomMembers(
-                        invited = persistentListOf(),
-                        joined = persistentListOf(),
-                        banned = persistentListOf(),
-                    )
-                ),
-                moderationState = aRoomMemberModerationState(),
-            )
-        )
-}
+private fun aLoadedRoomMembers() = AsyncData.Success(
+    RoomMembers(
+        invited = persistentListOf(
+            anInvitedVictor().withIdentity(),
+            anInvitedWalter().withIdentity(),
+        ),
+        joined = persistentListOf(
+            anAlice().withIdentity(identityState = IdentityState.Verified),
+            aBob().withIdentity(identityState = IdentityState.PinViolation),
+            aCarol().withIdentity(),
+            aDavid().withIdentity(),
+            anEve().withIdentity(identityState = IdentityState.VerificationViolation)
+        ),
+        banned = persistentListOf(
+            aBannedMallory().withIdentity(),
+            aBannedSusie().withIdentity()
+        ),
+    )
+)
 
 internal fun aRoomMemberListState(
     roomMembers: AsyncData<RoomMembers> = AsyncData.Loading(),
-    searchResults: SearchBarResultState<AsyncData<RoomMembers>> = SearchBarResultState.Initial(),
     moderationState: RoomMemberModerationState = aRoomMemberModerationState(),
+    selectedSection: SelectedSection = SelectedSection.MEMBERS,
+    searchQuery: String = "",
+    canInvite: Boolean = false,
+    eventSink: (RoomMemberListEvents) -> Unit = {},
 ) = RoomMemberListState(
     roomMembers = roomMembers,
-    searchQuery = "",
-    searchResults = searchResults,
-    isSearchActive = false,
-    canInvite = false,
+    filteredRoomMembers = roomMembers.map { it.filter(searchQuery) },
+    searchQuery = searchQuery,
+    canInvite = canInvite,
     moderationState = moderationState,
-    eventSink = {}
+    selectedSection = selectedSection,
+    eventSink = eventSink
 )
 
 fun aRoomMemberModerationState(
@@ -135,8 +100,10 @@ fun aRoomMemberModerationState(
     canKick: Boolean = false,
 ): RoomMemberModerationState {
     return object : RoomMemberModerationState {
-        override val canKick: Boolean = canKick
-        override val canBan: Boolean = canBan
+        override val permissions: RoomMemberModerationPermissions = RoomMemberModerationPermissions(
+            canBan = canBan,
+            canKick = canKick,
+        )
         override val eventSink: (RoomMemberModerationEvents) -> Unit = {}
     }
 }
@@ -166,21 +133,30 @@ fun aRoomMember(
 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"),
-    aVictor(),
-    aWalter(),
+    aCarol(),
+    aDavid(),
+    anEve(),
+    anInvitedVictor(),
+    anInvitedWalter(),
+    aBannedSusie(),
+    aBannedMallory(),
 )
 
+fun anEve(): RoomMember = aRoomMember(UserId("@eve:server.org"), "Eve")
+
+fun aDavid(): RoomMember = aRoomMember(UserId("@david:server.org"), "David")
+
+fun aCarol(): RoomMember = aRoomMember(UserId("@carol:server.org"), "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 aVictor() = aRoomMember(UserId("@victor:server.org"), "Victor", membership = RoomMembershipState.INVITE)
+fun anInvitedVictor() = aRoomMember(UserId("@victor:server.org"), "Victor", membership = RoomMembershipState.INVITE)
 
-fun aWalter() = aRoomMember(UserId("@walter:server.org"), "Walter", membership = RoomMembershipState.INVITE)
+fun anInvitedWalter() = aRoomMember(UserId("@walter:server.org"), "Walter", membership = RoomMembershipState.INVITE)
+
+fun aBannedSusie(): RoomMember = aRoomMember(UserId("@susie:server.org"), "Susie", membership = RoomMembershipState.BAN)
+
+fun aBannedMallory(): RoomMember = aRoomMember(UserId("@mallory:server.org"), "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 c28cdda62c..7c83f74f00 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
@@ -1,21 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.members
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-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.consumeWindowInsets
@@ -29,10 +25,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 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
@@ -45,15 +38,17 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.architecture.AsyncData
+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.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.form.textFieldState
 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.LinearProgressIndicator
 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
+import io.element.android.libraries.designsystem.theme.components.SearchField
 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.TextButton
@@ -67,17 +62,11 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
-private enum class SelectedSection {
-    MEMBERS,
-    BANNED
-}
-
 @Composable
 fun RoomMemberListView(
     state: RoomMemberListState,
     navigator: RoomMemberListNavigator,
     modifier: Modifier = Modifier,
-    initialSelectedSectionIndex: Int = 0,
 ) {
     fun onSelectUser(roomMember: RoomMember) {
         state.eventSink(RoomMemberListEvents.RoomMemberSelected(roomMember))
@@ -86,21 +75,13 @@ fun RoomMemberListView(
     Scaffold(
         modifier = modifier,
         topBar = {
-            if (!state.isSearchActive) {
-                RoomMemberListTopBar(
-                    canInvite = state.canInvite,
-                    onBackClick = navigator::exitRoomMemberList,
-                    onInviteClick = navigator::openInviteMembers,
-                )
-            }
+            RoomMemberListTopBar(
+                canInvite = state.canInvite,
+                onBackClick = navigator::exitRoomMemberList,
+                onInviteClick = navigator::openInviteMembers,
+            )
         }
     ) { padding ->
-        var selectedSection by remember { mutableStateOf(SelectedSection.entries[initialSelectedSectionIndex]) }
-        if (!state.moderationState.canBan && selectedSection == SelectedSection.BANNED) {
-            SideEffect {
-                selectedSection = SelectedSection.MEMBERS
-            }
-        }
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -108,45 +89,43 @@ fun RoomMemberListView(
                 .consumeWindowInsets(padding),
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
-            RoomMemberSearchBar(
-                query = state.searchQuery,
-                state = state.searchResults,
-                active = state.isSearchActive,
-                placeHolderTitle = stringResource(CommonStrings.common_search_for_someone),
-                onActiveChange = { state.eventSink(RoomMemberListEvents.OnSearchActiveChanged(it)) },
-                onTextChange = { state.eventSink(RoomMemberListEvents.UpdateSearchQuery(it)) },
-                onSelectUser = ::onSelectUser,
-                selectedSection = selectedSection,
-                modifier = Modifier.fillMaxWidth(),
+            var searchQuery by textFieldState(state.searchQuery)
+            SearchField(
+                value = searchQuery,
+                onValueChange = { newQuery ->
+                    searchQuery = newQuery
+                    state.eventSink(RoomMemberListEvents.UpdateSearchQuery(newQuery))
+                },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                placeholder = stringResource(CommonStrings.common_search_for_someone),
+            )
+            RoomMemberList(
+                roomMembersData = state.filteredRoomMembers,
+                selectedSection = state.selectedSection,
+                showBannedSection = state.showBannedSection,
+                searchQuery = state.searchQuery,
+                onSelectedSectionChange = { state.eventSink(RoomMemberListEvents.ChangeSelectedSection(it)) },
+                onSelectUser = ::onSelectUser,
             )
-
-            if (!state.isSearchActive) {
-                RoomMemberList(
-                    roomMembers = state.roomMembers,
-                    showMembersCount = true,
-                    canDisplayBannedUsersControls = state.moderationState.canBan,
-                    selectedSection = selectedSection,
-                    onSelectedSectionChange = { selectedSection = it },
-                    onSelectUser = ::onSelectUser,
-                )
-            }
         }
     }
 }
 
 @Composable
 private fun RoomMemberList(
-    roomMembers: AsyncData<RoomMembers>,
-    showMembersCount: Boolean,
+    roomMembersData: AsyncData<RoomMembers>,
     selectedSection: SelectedSection,
+    showBannedSection: Boolean,
+    searchQuery: String,
     onSelectedSectionChange: (SelectedSection) -> Unit,
-    canDisplayBannedUsersControls: Boolean,
     onSelectUser: (RoomMember) -> Unit,
 ) {
     LazyColumn(modifier = Modifier.fillMaxWidth(), state = rememberLazyListState()) {
         stickyHeader {
             Column {
-                if (canDisplayBannedUsersControls) {
+                AnimatedVisibility(visible = showBannedSection) {
                     val segmentedButtonTitles = persistentListOf(
                         stringResource(id = R.string.screen_room_member_list_mode_members),
                         stringResource(id = R.string.screen_room_member_list_mode_banned),
@@ -168,24 +147,26 @@ private fun RoomMemberList(
                         }
                     }
                 }
-                AnimatedVisibility(
-                    visible = roomMembers.isLoading(),
-                    enter = fadeIn() + expandVertically(),
-                    exit = fadeOut() + shrinkVertically(),
-                ) {
+                AnimatedVisibility(visible = roomMembersData.isLoading()) {
                     LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
                 }
             }
         }
-        when (roomMembers) {
-            is AsyncData.Failure -> failureItem(roomMembers.error)
+        when (roomMembersData) {
+            is AsyncData.Failure -> failureItem(roomMembersData.error)
             is AsyncData.Loading,
-            is AsyncData.Success -> memberItems(
-                roomMembers = roomMembers.dataOrNull() ?: return@LazyColumn,
-                selectedSection = selectedSection,
-                onSelectUser = onSelectUser,
-                showMembersCount = showMembersCount,
-            )
+            is AsyncData.Success -> {
+                val roomMembers = roomMembersData.dataOrNull() ?: return@LazyColumn
+                if (roomMembers.isEmpty(selectedSection)) {
+                    emptySearchItem(searchQuery)
+                } else {
+                    memberItems(
+                        roomMembers = roomMembers,
+                        selectedSection = selectedSection,
+                        onSelectUser = onSelectUser,
+                    )
+                }
+            }
             AsyncData.Uninitialized -> Unit
         }
     }
@@ -195,56 +176,47 @@ private fun LazyListScope.memberItems(
     roomMembers: RoomMembers,
     selectedSection: SelectedSection,
     onSelectUser: (RoomMember) -> Unit,
-    showMembersCount: Boolean,
 ) {
     when (selectedSection) {
         SelectedSection.MEMBERS -> {
             if (roomMembers.invited.isNotEmpty()) {
-                roomMemberListSection(
-                    headerText = { stringResource(id = R.string.screen_room_member_list_pending_header_title) },
+                roomMemberListSectionHeader(
+                    text = {
+                        val memberCount = roomMembers.invited.count()
+                        pluralStringResource(id = R.plurals.screen_room_member_list_pending_header_title, memberCount, memberCount)
+                    },
+                )
+                roomMemberListSectionItems(
                     members = roomMembers.invited,
                     onMemberSelected = { onSelectUser(it) }
                 )
             }
             if (roomMembers.joined.isNotEmpty()) {
-                roomMemberListSection(
-                    headerText = {
-                        if (showMembersCount) {
-                            val memberCount = roomMembers.joined.count()
-                            pluralStringResource(id = R.plurals.screen_room_member_list_header_title, count = memberCount, memberCount)
-                        } else {
-                            stringResource(id = R.string.screen_room_member_list_room_members_header_title)
-                        }
+                roomMemberListSectionHeader(
+                    text = {
+                        val memberCount = roomMembers.joined.count()
+                        pluralStringResource(id = R.plurals.screen_room_member_list_header_title, count = memberCount, memberCount)
                     },
+                )
+                roomMemberListSectionItems(
                     members = roomMembers.joined,
                     onMemberSelected = { onSelectUser(it) }
                 )
             }
         }
-        SelectedSection.BANNED -> { // Banned users
+        SelectedSection.BANNED -> {
             if (roomMembers.banned.isNotEmpty()) {
-                roomMemberListSection(
-                    headerText = null,
+                roomMemberListSectionHeader(
+                    text = {
+                        val memberCount = roomMembers.banned.count()
+                        pluralStringResource(id = R.plurals.screen_room_member_list_banned_header_title, memberCount, memberCount)
+                    },
+                    isCritical = true,
+                )
+                roomMemberListSectionItems(
                     members = roomMembers.banned,
                     onMemberSelected = { onSelectUser(it) }
                 )
-            } else {
-                item {
-                    Box(
-                        Modifier
-                            .fillParentMaxSize()
-                            .padding(horizontal = 16.dp)
-                    ) {
-                        Text(
-                            modifier = Modifier
-                                .padding(bottom = 56.dp)
-                                .align(Alignment.Center),
-                            text = stringResource(id = R.string.screen_room_member_list_banned_empty),
-                            color = ElementTheme.colors.textSecondary,
-                            textAlign = TextAlign.Center,
-                        )
-                    }
-                }
             }
         }
     }
@@ -263,21 +235,25 @@ private fun LazyListScope.failureItem(failure: Throwable) {
     }
 }
 
-private fun LazyListScope.roomMemberListSection(
-    headerText: @Composable (() -> String)?,
+private fun LazyListScope.roomMemberListSectionHeader(
+    text: @Composable (() -> String),
+    modifier: Modifier = Modifier,
+    isCritical: Boolean = false,
+) {
+    item {
+        Text(
+            modifier = modifier.padding(horizontal = 16.dp, vertical = 12.dp),
+            text = text(),
+            style = ElementTheme.typography.fontBodyLgMedium,
+            color = if (isCritical) ElementTheme.colors.textCriticalPrimary else ElementTheme.colors.textPrimary,
+        )
+    }
+}
+
+private fun LazyListScope.roomMemberListSectionItems(
     members: ImmutableList<RoomMemberWithIdentityState>?,
     onMemberSelected: (RoomMember) -> Unit,
 ) {
-    headerText?.let {
-        item {
-            Text(
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp),
-                text = it(),
-                style = ElementTheme.typography.fontBodyLgRegular,
-                color = ElementTheme.colors.textSecondary,
-            )
-        }
-    }
     items(members.orEmpty()) { matrixUser ->
         RoomMemberListItem(
             modifier = Modifier.fillMaxWidth(),
@@ -287,6 +263,22 @@ private fun LazyListScope.roomMemberListSection(
     }
 }
 
+private fun LazyListScope.emptySearchItem(searchQuery: String) {
+    item {
+        IconTitleSubtitleMolecule(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 32.dp),
+            iconStyle = BigIcon.Style.Default(
+                vectorIcon = CompoundIcons.Search(),
+                contentDescription = null,
+            ),
+            title = stringResource(R.string.screen_room_member_list_empty_search_title, searchQuery),
+            subTitle = stringResource(R.string.screen_room_member_list_empty_search_subtitle),
+        )
+    }
+}
+
 @Composable
 private fun RoomMemberListItem(
     roomMemberWithIdentity: RoomMemberWithIdentityState,
@@ -366,40 +358,6 @@ private fun RoomMemberListTopBar(
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun RoomMemberSearchBar(
-    query: String,
-    state: SearchBarResultState<AsyncData<RoomMembers>>,
-    active: Boolean,
-    placeHolderTitle: String,
-    onActiveChange: (Boolean) -> Unit,
-    onTextChange: (String) -> Unit,
-    onSelectUser: (RoomMember) -> Unit,
-    selectedSection: SelectedSection,
-    modifier: Modifier = Modifier,
-) {
-    SearchBar(
-        query = query,
-        onQueryChange = onTextChange,
-        active = active,
-        onActiveChange = onActiveChange,
-        modifier = modifier,
-        placeHolderTitle = placeHolderTitle,
-        resultState = state,
-        resultHandler = { results ->
-            RoomMemberList(
-                roomMembers = results,
-                showMembersCount = false,
-                onSelectUser = { onSelectUser(it) },
-                canDisplayBannedUsersControls = false,
-                selectedSection = selectedSection,
-                onSelectedSectionChange = {},
-            )
-        },
-    )
-}
-
 @PreviewsDayNight
 @Composable
 internal fun RoomMemberListViewPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) = ElementPreview {
@@ -408,13 +366,3 @@ internal fun RoomMemberListViewPreview(@PreviewParameter(RoomMemberListStateProv
         navigator = object : RoomMemberListNavigator {},
     )
 }
-
-@PreviewsDayNight
-@Composable
-internal fun RoomMemberListViewBannedPreview(@PreviewParameter(RoomMemberListStateBannedProvider::class) state: RoomMemberListState) = ElementPreview {
-    RoomMemberListView(
-        initialSelectedSectionIndex = 1,
-        state = state,
-        navigator = object : RoomMemberListNavigator {},
-    )
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
index 3b364c6f92..ce798e5da9 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -62,12 +63,12 @@ class RoomMemberDetailsNode(
             userProfileNodeHelper.onShareUser(context, permalinkBuilder)
         }
 
-        fun onStartDM(roomId: RoomId) {
-            callback.onStartDM(roomId)
+        fun navigateToRoom(roomId: RoomId) {
+            callback.navigateToRoom(roomId)
         }
 
         fun onStartCall(roomId: RoomId) {
-            callback.onStartCall(roomId)
+            callback.startCall(roomId)
         }
 
         val state = presenter.present()
@@ -77,10 +78,10 @@ class RoomMemberDetailsNode(
             modifier = modifier,
             goBack = this::navigateUp,
             onShareUser = ::onShareUser,
-            onOpenDm = ::onStartDM,
+            onOpenDm = ::navigateToRoom,
             onStartCall = ::onStartCall,
-            openAvatarPreview = callback::openAvatarPreview,
-            onVerifyClick = callback::onVerifyUser,
+            openAvatarPreview = callback::navigateToAvatarPreview,
+            onVerifyClick = callback::startVerifyUserFlow,
         )
     }
 }
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 d5cf9e85cb..f47ea0e8b3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -111,7 +112,7 @@ class RoomMemberDetailsPresenter(
             }
         }
 
-        fun eventSink(event: UserProfileEvents) {
+        fun handleEvent(event: UserProfileEvents) {
             when (event) {
                 UserProfileEvents.WithdrawVerification -> coroutineScope.launch {
                     encryptionService.withdrawVerification(roomMemberId)
@@ -129,7 +130,7 @@ class RoomMemberDetailsPresenter(
             avatarUrl = roomUserAvatar ?: userProfileState.avatarUrl,
             verificationState = verificationState,
             snackbarMessage = snackbarMessage,
-            eventSink = ::eventSink
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsEvents.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsEvents.kt
index 3fd468d6c5..81bfd86f82 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsEvents.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
index 700088053a..2d5418afdc 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
index 0e5a9b23b1..fd3ce00a79 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,12 @@ 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.core.plugin.plugins
 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.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.RoomScope
 import io.element.android.services.analytics.api.AnalyticsService
@@ -34,17 +35,16 @@ class RoomNotificationSettingsNode(
     data class RoomNotificationSettingInput(
         val showUserDefinedSettingStyle: Boolean
     ) : NodeInputs
-    interface Callback : Plugin {
-        fun openGlobalNotificationSettings()
-    }
-    private val inputs = inputs<RoomNotificationSettingInput>()
-    private val callbacks = plugins<Callback>()
 
-    private fun openGlobalNotificationSettings() {
-        callbacks.forEach { it.openGlobalNotificationSettings() }
+    interface Callback : Plugin {
+        fun navigateToGlobalNotificationSettings()
     }
 
+    private val callback: Callback = callback()
+    private val inputs = inputs<RoomNotificationSettingInput>()
+
     private val presenter = presenterFactory.create(inputs.showUserDefinedSettingStyle)
+
     init {
         lifecycle.subscribe(
             onResume = {
@@ -59,8 +59,8 @@ class RoomNotificationSettingsNode(
         RoomNotificationSettingsView(
             state = state,
             modifier = modifier,
-            onShowGlobalNotifications = this::openGlobalNotificationSettings,
-            onBackClick = this::navigateUp,
+            onShowGlobalNotifications = callback::navigateToGlobalNotificationSettings,
+            onBackClick = ::navigateUp,
         )
     }
 }
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 9a9b611958..8ff1be538f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt
index 1b875bb81b..b721138714 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 413e71169a..b3a88d3f6f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -99,7 +100,7 @@ class RoomNotificationSettingsPresenter(
                 !notificationSettingsService.canHomeServerPushEncryptedEventsToDevice().getOrDefault(true)
         }
 
-        fun handleEvents(event: RoomNotificationSettingsEvents) {
+        fun handleEvent(event: RoomNotificationSettingsEvents) {
             when (event) {
                 is RoomNotificationSettingsEvents.ChangeRoomNotificationMode -> {
                     localCoroutineScope.setRoomNotificationMode(event.mode, pendingRoomNotificationMode, pendingSetDefault, setNotificationSettingAction)
@@ -135,7 +136,7 @@ class RoomNotificationSettingsPresenter(
             setNotificationSettingAction = setNotificationSettingAction.value,
             restoreDefaultAction = restoreDefaultAction.value,
             displayMentionsOnlyDisclaimer = shouldDisplayMentionsOnlyDisclaimer,
-            eventSink = { handleEvents(it) },
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsState.kt
index 48689ad607..a2ea5e8fa7 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsStateProvider.kt
index 18e95f6ab7..603d22b502 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
index bcd2e59d3b..5a33066d1d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsStateProvider.kt
index 7512b465cb..039f489bbf 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 00c545b853..f66316b737 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsFlowNode.kt
deleted file mode 100644
index 62689489eb..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsFlowNode.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.roomdetails.impl.rolesandpermissions
-
-import android.os.Parcelable
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.coroutineScope
-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.pop
-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.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
-import io.element.android.features.roomdetails.impl.rolesandpermissions.permissions.ChangeRoomPermissionsNode
-import io.element.android.features.roomdetails.impl.rolesandpermissions.permissions.ChangeRoomPermissionsSection
-import io.element.android.libraries.architecture.BackstackView
-import io.element.android.libraries.architecture.BaseFlowNode
-import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.matrix.api.room.JoinedRoom
-import kotlinx.coroutines.launch
-import kotlinx.parcelize.Parcelize
-
-@ContributesNode(RoomScope::class)
-@AssistedInject
-class RolesAndPermissionsFlowNode(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-    private val changeRoomMemberRolesEntryPoint: ChangeRoomMemberRolesEntryPoint,
-    private val joinedRoom: JoinedRoom,
-) : BaseFlowNode<RolesAndPermissionsFlowNode.NavTarget>(
-    backstack = BackStack(
-        initialElement = NavTarget.AdminSettings,
-        savedStateMap = buildContext.savedStateMap,
-    ),
-    buildContext = buildContext,
-    plugins = plugins,
-) {
-    sealed interface NavTarget : Parcelable {
-        @Parcelize
-        data object AdminSettings : NavTarget
-
-        @Parcelize
-        data object AdminList : NavTarget
-
-        @Parcelize
-        data object ModeratorList : NavTarget
-
-        @Parcelize
-        data class ChangeRoomPermissions(val section: ChangeRoomPermissionsSection) : NavTarget
-    }
-
-    override fun onBuilt() {
-        super.onBuilt()
-        whenChildAttached { lifecycle, node: ChangeRoomMemberRolesEntryPoint.NodeProxy ->
-            lifecycle.coroutineScope.launch {
-                node.waitForRoleChanged()
-                backstack.pop()
-            }
-        }
-    }
-
-    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
-        return when (navTarget) {
-            is NavTarget.AdminSettings -> {
-                val callback = object : RolesAndPermissionsNode.Callback {
-                    override fun openAdminList() {
-                        backstack.push(NavTarget.AdminList)
-                    }
-
-                    override fun openModeratorList() {
-                        backstack.push(NavTarget.ModeratorList)
-                    }
-
-                    override fun openEditRoomDetailsPermissions() {
-                        backstack.push(NavTarget.ChangeRoomPermissions(ChangeRoomPermissionsSection.RoomDetails))
-                    }
-
-                    override fun openMessagesAndContentPermissions() {
-                        backstack.push(NavTarget.ChangeRoomPermissions(ChangeRoomPermissionsSection.MessagesAndContent))
-                    }
-
-                    override fun openModerationPermissions() {
-                        backstack.push(NavTarget.ChangeRoomPermissions(ChangeRoomPermissionsSection.MembershipModeration))
-                    }
-                }
-                createNode<RolesAndPermissionsNode>(
-                    buildContext = buildContext,
-                    plugins = listOf(callback),
-                )
-            }
-            is NavTarget.AdminList -> {
-                changeRoomMemberRolesEntryPoint.builder(this, buildContext)
-                    .room(joinedRoom)
-                    .listType(ChangeRoomMemberRolesListType.Admins)
-                    .build()
-            }
-            is NavTarget.ModeratorList -> {
-                changeRoomMemberRolesEntryPoint.builder(this, buildContext)
-                    .room(joinedRoom)
-                    .listType(ChangeRoomMemberRolesListType.Moderators)
-                    .build()
-            }
-            is NavTarget.ChangeRoomPermissions -> {
-                val inputs = ChangeRoomPermissionsNode.Inputs(navTarget.section)
-                createNode<ChangeRoomPermissionsNode>(
-                    buildContext = buildContext,
-                    plugins = listOf(inputs),
-                )
-            }
-        }
-    }
-
-    @Composable
-    override fun View(modifier: Modifier) {
-        BackstackView()
-    }
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsState.kt
deleted file mode 100644
index 24f645a309..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsState.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.roomdetails.impl.rolesandpermissions
-
-import io.element.android.libraries.architecture.AsyncAction
-
-data class RolesAndPermissionsState(
-    val roomSupportsOwnerRole: Boolean,
-    val adminCount: Int,
-    val moderatorCount: Int,
-    val canDemoteSelf: Boolean,
-    val changeOwnRoleAction: AsyncAction<Unit>,
-    val resetPermissionsAction: AsyncAction<Unit>,
-    val eventSink: (RolesAndPermissionsEvents) -> Unit,
-)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt
deleted file mode 100644
index cebcc56e7f..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.roomdetails.impl.rolesandpermissions.permissions
-
-import android.os.Parcelable
-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.inputs
-import io.element.android.libraries.di.RoomScope
-import kotlinx.parcelize.Parcelize
-
-@ContributesNode(RoomScope::class)
-@AssistedInject
-class ChangeRoomPermissionsNode(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-    presenterFactory: ChangeRoomPermissionsPresenter.Factory,
-) : Node(buildContext, plugins = plugins) {
-    @Parcelize
-    data class Inputs(
-        val section: ChangeRoomPermissionsSection,
-    ) : NodeInputs, Parcelable
-
-    private val inputs: Inputs = inputs()
-    private val presenter = presenterFactory.create(inputs.section)
-
-    @Composable
-    override fun View(modifier: Modifier) {
-        val state = presenter.present()
-        ChangeRoomPermissionsView(
-            modifier = modifier,
-            state = state,
-            onBackClick = this::navigateUp,
-        )
-    }
-}
-
-@Parcelize
-enum class ChangeRoomPermissionsSection : Parcelable {
-    RoomDetails,
-    MessagesAndContent,
-    MembershipModeration,
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt
deleted file mode 100644
index 5e7b77560a..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.roomdetails.impl.rolesandpermissions.permissions
-
-import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
-import kotlinx.collections.immutable.ImmutableList
-
-data class ChangeRoomPermissionsState(
-    val section: ChangeRoomPermissionsSection,
-    val currentPermissions: RoomPowerLevelsValues?,
-    val items: ImmutableList<RoomPermissionType>,
-    val hasChanges: Boolean,
-    val saveAction: AsyncAction<Unit>,
-    val confirmExitAction: AsyncAction<Unit>,
-    val eventSink: (ChangeRoomPermissionsEvent) -> Unit,
-)
-
-enum class RoomPermissionType {
-    BAN,
-    INVITE,
-    KICK,
-    SEND_EVENTS,
-    REDACT_EVENTS,
-    ROOM_NAME,
-    ROOM_AVATAR,
-    ROOM_TOPIC
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
deleted file mode 100644
index 6acf4935dc..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.features.roomdetails.impl.rolesandpermissions.permissions
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-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.tooling.preview.PreviewParameter
-import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.roomdetails.impl.R
-import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.designsystem.components.async.AsyncActionView
-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.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.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.ListSectionHeader
-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.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
-import io.element.android.libraries.ui.strings.CommonStrings
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun ChangeRoomPermissionsView(
-    state: ChangeRoomPermissionsState,
-    onBackClick: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    BackHandler {
-        state.eventSink(ChangeRoomPermissionsEvent.Exit)
-    }
-    Scaffold(
-        modifier = modifier,
-        topBar = {
-            val title = when (state.section) {
-                ChangeRoomPermissionsSection.RoomDetails -> stringResource(R.string.screen_room_change_permissions_room_details)
-                ChangeRoomPermissionsSection.MessagesAndContent -> stringResource(R.string.screen_room_change_permissions_messages_and_content)
-                ChangeRoomPermissionsSection.MembershipModeration -> stringResource(R.string.screen_room_change_permissions_member_moderation)
-            }
-            TopAppBar(
-                titleStr = title,
-                navigationIcon = {
-                    BackButton(onClick = { state.eventSink(ChangeRoomPermissionsEvent.Exit) })
-                },
-                actions = {
-                    TextButton(
-                        text = stringResource(CommonStrings.action_save),
-                        onClick = { state.eventSink(ChangeRoomPermissionsEvent.Save) },
-                        enabled = state.hasChanges,
-                    )
-                }
-            )
-        }
-    ) { padding ->
-        LazyColumn(
-            modifier = Modifier
-                .padding(padding)
-                .fillMaxSize()
-        ) {
-            for ((index, permissionItem) in state.items.withIndex()) {
-                item {
-                    ListSectionHeader(titleForSection(item = permissionItem), hasDivider = index > 0)
-                    SelectRoleItem(
-                        permissionsItem = permissionItem,
-                        role = RoomMember.Role.Admin,
-                        currentPermissions = state.currentPermissions
-                    ) { item, role ->
-                        state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
-                    }
-                    SelectRoleItem(
-                        permissionsItem = permissionItem,
-                        role = RoomMember.Role.Moderator,
-                        currentPermissions = state.currentPermissions
-                    ) { item, role ->
-                        state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
-                    }
-                    SelectRoleItem(
-                        permissionsItem = permissionItem,
-                        role = RoomMember.Role.User,
-                        currentPermissions = state.currentPermissions
-                    ) { item, role ->
-                        state.eventSink(ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(item, role))
-                    }
-                }
-            }
-        }
-    }
-
-    AsyncActionView(
-        async = state.saveAction,
-        onSuccess = { onBackClick() },
-        onErrorDismiss = { state.eventSink(ChangeRoomPermissionsEvent.ResetPendingActions) }
-    )
-
-    AsyncActionView(
-        async = state.confirmExitAction,
-        onSuccess = { onBackClick() },
-        confirmationDialog = {
-            ConfirmationDialog(
-                title = stringResource(R.string.screen_room_change_role_unsaved_changes_title),
-                content = stringResource(R.string.screen_room_change_role_unsaved_changes_description),
-                submitText = stringResource(CommonStrings.action_save),
-                cancelText = stringResource(CommonStrings.action_discard),
-                onSubmitClick = { state.eventSink(ChangeRoomPermissionsEvent.Save) },
-                onDismiss = { state.eventSink(ChangeRoomPermissionsEvent.Exit) }
-            )
-        },
-        onErrorDismiss = {},
-    )
-}
-
-@Composable
-private fun SelectRoleItem(
-    permissionsItem: RoomPermissionType,
-    role: RoomMember.Role,
-    currentPermissions: RoomPowerLevelsValues?,
-    onClick: (RoomPermissionType, RoomMember.Role) -> Unit
-) {
-    val title = when (role) {
-        RoomMember.Role.Admin -> stringResource(R.string.screen_room_change_permissions_administrators)
-        RoomMember.Role.Moderator -> stringResource(R.string.screen_room_change_permissions_moderators)
-        RoomMember.Role.User -> stringResource(R.string.screen_room_change_permissions_everyone)
-        else -> error("Unsupported role selected: $role")
-    }
-    ListItem(
-        headlineContent = { Text(text = title) },
-        trailingContent = if (currentPermissions?.isSelected(permissionsItem, role).orFalse()) {
-            ListItemContent.Icon(IconSource.Vector(CompoundIcons.Check()))
-        } else {
-            null
-        },
-        style = ListItemStyle.Primary,
-        onClick = { onClick(permissionsItem, role) },
-    )
-}
-
-private fun RoomPowerLevelsValues.isSelected(item: RoomPermissionType, role: RoomMember.Role): Boolean {
-    return when (item) {
-        RoomPermissionType.BAN -> RoomMember.Role.forPowerLevel(ban) == role
-        RoomPermissionType.INVITE -> RoomMember.Role.forPowerLevel(invite) == role
-        RoomPermissionType.KICK -> RoomMember.Role.forPowerLevel(kick) == role
-        RoomPermissionType.SEND_EVENTS -> RoomMember.Role.forPowerLevel(sendEvents) == role
-        RoomPermissionType.REDACT_EVENTS -> RoomMember.Role.forPowerLevel(redactEvents) == role
-        RoomPermissionType.ROOM_NAME -> RoomMember.Role.forPowerLevel(roomName) == role
-        RoomPermissionType.ROOM_AVATAR -> RoomMember.Role.forPowerLevel(roomAvatar) == role
-        RoomPermissionType.ROOM_TOPIC -> RoomMember.Role.forPowerLevel(roomTopic) == role
-    }
-}
-
-@Composable
-private fun titleForSection(item: RoomPermissionType): String = when (item) {
-    RoomPermissionType.INVITE -> stringResource(R.string.screen_room_change_permissions_invite_people)
-    RoomPermissionType.KICK -> stringResource(R.string.screen_room_change_permissions_remove_people)
-    RoomPermissionType.BAN -> stringResource(R.string.screen_room_change_permissions_ban_people)
-    RoomPermissionType.SEND_EVENTS -> stringResource(R.string.screen_room_change_permissions_send_messages)
-    RoomPermissionType.REDACT_EVENTS -> stringResource(R.string.screen_room_change_permissions_delete_messages)
-    RoomPermissionType.ROOM_NAME -> stringResource(R.string.screen_room_change_permissions_room_name)
-    RoomPermissionType.ROOM_AVATAR -> stringResource(R.string.screen_room_change_permissions_room_avatar)
-    RoomPermissionType.ROOM_TOPIC -> stringResource(R.string.screen_room_change_permissions_room_topic)
-}
-
-@PreviewsDayNight
-@Composable
-internal fun ChangeRoomPermissionsViewPreview(@PreviewParameter(ChangeRoomPermissionsStateProvider::class) state: ChangeRoomPermissionsState) {
-    ElementPreview {
-        ChangeRoomPermissionsView(
-            state = state,
-            onBackClick = {},
-        )
-    }
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyEvents.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyEvents.kt
deleted file mode 100644
index 5e09405998..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyEvents.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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.roomdetails.impl.securityandprivacy
-
-sealed interface SecurityAndPrivacyEvents {
-    data object EditRoomAddress : SecurityAndPrivacyEvents
-    data object Save : SecurityAndPrivacyEvents
-    data class ChangeRoomAccess(val roomAccess: SecurityAndPrivacyRoomAccess) : SecurityAndPrivacyEvents
-    data object ToggleEncryptionState : SecurityAndPrivacyEvents
-    data object CancelEnableEncryption : SecurityAndPrivacyEvents
-    data object ConfirmEnableEncryption : SecurityAndPrivacyEvents
-    data class ChangeHistoryVisibility(val historyVisibility: SecurityAndPrivacyHistoryVisibility) : SecurityAndPrivacyEvents
-    data object ToggleRoomVisibility : SecurityAndPrivacyEvents
-    data object DismissSaveError : SecurityAndPrivacyEvents
-}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyStateProvider.kt
deleted file mode 100644
index 00001ff69d..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyStateProvider.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.roomdetails.impl.securityandprivacy
-
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions
-import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.AsyncData
-
-open class SecurityAndPrivacyStateProvider : PreviewParameterProvider<SecurityAndPrivacyState> {
-    override val values: Sequence<SecurityAndPrivacyState>
-        get() = sequenceOf(
-            aSecurityAndPrivacyState(),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
-                    isEncrypted = false,
-                )
-            ),
-            aSecurityAndPrivacyState(
-                savedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.SpaceMember
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
-                    address = "#therapy:myserver.xyz"
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    isVisibleInRoomDirectory = AsyncData.Loading()
-                )
-            ),
-            aSecurityAndPrivacyState(
-                editedSettings = aSecurityAndPrivacySettings(
-                    isVisibleInRoomDirectory = AsyncData.Success(true)
-                )
-            ),
-            aSecurityAndPrivacyState(
-                showEncryptionConfirmation = true
-            ),
-            aSecurityAndPrivacyState(
-                saveAction = AsyncAction.Loading
-            ),
-        )
-}
-
-fun aSecurityAndPrivacySettings(
-    roomAccess: SecurityAndPrivacyRoomAccess = SecurityAndPrivacyRoomAccess.InviteOnly,
-    isEncrypted: Boolean = true,
-    address: String? = null,
-    historyVisibility: SecurityAndPrivacyHistoryVisibility = SecurityAndPrivacyHistoryVisibility.SinceSelection,
-    isVisibleInRoomDirectory: AsyncData<Boolean> = AsyncData.Uninitialized,
-) = SecurityAndPrivacySettings(
-    roomAccess = roomAccess,
-    isEncrypted = isEncrypted,
-    address = address,
-    historyVisibility = historyVisibility,
-    isVisibleInRoomDirectory = isVisibleInRoomDirectory
-)
-
-fun aSecurityAndPrivacyState(
-    savedSettings: SecurityAndPrivacySettings = aSecurityAndPrivacySettings(),
-    editedSettings: SecurityAndPrivacySettings = savedSettings,
-    homeserverName: String = "myserver.xyz",
-    showEncryptionConfirmation: Boolean = false,
-    saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
-    permissions: SecurityAndPrivacyPermissions = SecurityAndPrivacyPermissions(
-        canChangeRoomAccess = true,
-        canChangeHistoryVisibility = true,
-        canChangeEncryption = true,
-        canChangeRoomVisibility = true
-    ),
-    eventSink: (SecurityAndPrivacyEvents) -> Unit = {}
-) = SecurityAndPrivacyState(
-    editedSettings = editedSettings,
-    savedSettings = savedSettings,
-    homeserverName = homeserverName,
-    showEnableEncryptionConfirmation = showEncryptionConfirmation,
-    saveAction = saveAction,
-    permissions = permissions,
-    eventSink = eventSink
-)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
deleted file mode 100644
index cc052b19b1..0000000000
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.roomdetails.impl.securityandprivacy.permissions
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.produceState
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions.Companion.DEFAULT
-import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.StateEventType
-import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
-
-data class SecurityAndPrivacyPermissions(
-    val canChangeRoomAccess: Boolean,
-    val canChangeHistoryVisibility: Boolean,
-    val canChangeEncryption: Boolean,
-    val canChangeRoomVisibility: Boolean,
-) {
-    val hasAny = canChangeRoomAccess ||
-        canChangeHistoryVisibility ||
-        canChangeEncryption ||
-        canChangeRoomVisibility
-
-    companion object {
-        val DEFAULT = SecurityAndPrivacyPermissions(
-            canChangeRoomAccess = false,
-            canChangeHistoryVisibility = false,
-            canChangeEncryption = false,
-            canChangeRoomVisibility = false,
-        )
-    }
-}
-
-@Composable
-fun BaseRoom.securityAndPrivacyPermissionsAsState(updateKey: Long): State<SecurityAndPrivacyPermissions> {
-    return produceState(DEFAULT, key1 = updateKey) {
-        value = SecurityAndPrivacyPermissions(
-            canChangeRoomAccess = canSendState(type = StateEventType.ROOM_JOIN_RULES).getOrElse { false },
-            canChangeHistoryVisibility = canSendState(type = StateEventType.ROOM_HISTORY_VISIBILITY).getOrElse { false },
-            canChangeEncryption = canSendState(type = StateEventType.ROOM_ENCRYPTION).getOrElse { false },
-            canChangeRoomVisibility = canSendState(type = StateEventType.ROOM_CANONICAL_ALIAS).getOrElse { false },
-        )
-    }
-}
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 8ab30212b7..a986cd9789 100644
--- a/features/roomdetails/impl/src/main/res/values-be/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-be/translations.xml
@@ -6,14 +6,12 @@
   <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_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>
@@ -69,12 +67,10 @@
   <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>
-  <string name="screen_room_member_list_pending_header_title">"У чаканні"</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>
@@ -98,7 +94,6 @@
   <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_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>
@@ -107,5 +102,4 @@
   <string name="screen_room_roles_and_permissions_title">"Ролі і дазволы"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Папрасіце далучыцца"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Хто заўгодна"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Хто заўгодна"</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 cfe719f190..340f14a8f1 100644
--- a/features/roomdetails/impl/src/main/res/values-bg/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-bg/translations.xml
@@ -5,13 +5,11 @@
   <string name="screen_polls_history_title">"Анкети"</string>
   <string name="screen_room_change_permissions_administrators">"Само администратори"</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_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>
@@ -56,8 +54,8 @@
     <item quantity="other">"%1$d души"</item>
   </plurals>
   <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_notification_settings_allow_custom">"Разрешаване на персонализирана настройка"</string>
   <string name="screen_room_notification_settings_allow_custom_footnote">"Включването на това ще замени вашата настройка по подразбиране"</string>
@@ -77,7 +75,6 @@
   <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_permissions_header">"Разрешения"</string>
   <string name="screen_room_roles_and_permissions_reset">"Нулиране на разрешенията"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Роли"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Подробности за стаята"</string>
@@ -93,14 +90,11 @@
   <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_description">"Пространствата в момента не се поддържат"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Членове на пространството"</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_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_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_visibility_section_header">"Видимост на стаята"</string>
   <string name="screen_security_and_privacy_title">"Защита и поверителност"</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 e5186f1d4f..fc19bf400e 100644
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@@ -1,21 +1,21 @@
 <?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 byla místnost v adresáři viditelná, je třeba zadat její adresu."</string>
-  <string name="screen_edit_room_address_title">"Adresa místnosti"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_edit_room_address_title">"Upravit adresu"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Při aktualizaci nastavení oznámení došlo k chybě."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Váš domovský server tuto možnost v zašifrovaných místnostech nepodporuje, v některých místnostech nemusíte být upozorněni."</string>
   <string name="screen_polls_history_title">"Hlasování"</string>
-  <string name="screen_room_change_permissions_administrators">"Pouze správci"</string>
+  <string name="screen_room_change_permissions_administrators">"Správce"</string>
   <string name="screen_room_change_permissions_ban_people">"Vykázat lidi"</string>
   <string name="screen_room_change_permissions_delete_messages">"Odstranit zprávy"</string>
-  <string name="screen_room_change_permissions_everyone">"Všichni"</string>
-  <string name="screen_room_change_permissions_invite_people">"Pozvěte lidi a přijímejte žádosti o připojení"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderování členů"</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_member_moderation">"Spravovat členy"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Zprávy a obsah"</string>
-  <string name="screen_room_change_permissions_moderators">"Správci a moderátoři"</string>
-  <string name="screen_room_change_permissions_remove_people">"Odeberte lidi a odmítněte žádosti o připojení"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Odebrat osoby"</string>
   <string name="screen_room_change_permissions_room_avatar">"Změnit avatar místnosti"</string>
-  <string name="screen_room_change_permissions_room_details">"Podrobnosti místnosti"</string>
+  <string name="screen_room_change_permissions_room_details">"Upravit podrobnosti"</string>
   <string name="screen_room_change_permissions_room_name">"Změnit název místnosti"</string>
   <string name="screen_room_change_permissions_room_topic">"Změnit téma místnosti"</string>
   <string name="screen_room_change_permissions_send_messages">"Odeslat zprávy"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Šifrováno"</string>
   <string name="screen_room_details_badge_not_encrypted">"Není šifrováno"</string>
   <string name="screen_room_details_badge_public">"Veřejná místnost"</string>
-  <string name="screen_room_details_edit_room_title">"Upravit místnost"</string>
+  <string name="screen_room_details_edit_room_title">"Upravit podrobnosti"</string>
   <string name="screen_room_details_edition_error">"Došlo k neznámé chybě a informace nebylo možné změnit."</string>
   <string name="screen_room_details_edition_error_title">"Nelze aktualizovat místnost"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Zprávy jsou zabezpečeny zámky. Pouze vy a příjemci máte jedinečné klíče k jejich odemčení."</string>
@@ -62,7 +62,7 @@
   <string name="screen_room_details_pinned_events_row_title">"Připnuté zprávy"</string>
   <string name="screen_room_details_profile_row_title">"Profil"</string>
   <string name="screen_room_details_requests_to_join_title">"Žádosti o vstup"</string>
-  <string name="screen_room_details_roles_and_permissions">"Role a oprávnění"</string>
+  <string name="screen_room_details_roles_and_permissions">"Role a oprávnění"</string>
   <string name="screen_room_details_room_name_label">"Název místnosti"</string>
   <string name="screen_room_details_security_and_privacy_title">"Zabezpečení a soukromí"</string>
   <string name="screen_room_details_security_title">"Zabezpečení"</string>
@@ -71,6 +71,13 @@
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Aktualizace místnosti…"</string>
   <string name="screen_room_member_list_banned_empty">"V této místnosti nejsou žádní vykázaní uživatelé."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d vykázán(a)"</item>
+    <item quantity="few">"%1$d vykázáni"</item>
+    <item quantity="other">"%1$d vykázáných"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Zkontrolujte pravopis nebo zkuste nové vyhledávání"</string>
+  <string name="screen_room_member_list_empty_search_title">"Žádné výsledky pro “%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,10 +87,15 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Pouze odebrat člena"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Zrušit vykázání"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Pokud budou pozváni, budou se moci do této místnosti znovu připojit."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání uživatele"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Zrušit vykázání z místnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Vykázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členové"</string>
-  <string name="screen_room_member_list_pending_header_title">"Nevyřízeno"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozván(a)"</item>
+    <item quantity="few">"%1$d pozváni"</item>
+    <item quantity="other">"%1$d pozvaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Čekající"</string>
   <string name="screen_room_member_list_role_administrator">"Správce"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
@@ -118,9 +130,9 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Obnovit oprávnění?"</string>
   <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_security_and_privacy_add_room_address_action">"Přidat adresu místnosti"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kdokoli může požádat o vstup do místnosti, ale správce nebo moderátor bude muset žádost přijmout."</string>
+  <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Všichni musí požádat o přístup."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Požádat o připojení"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ano, povolit šifrování"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivaci nelze šifrování místnosti deaktivovat. Historie zpráv bude viditelná pouze pro členy místnosti od doby, kdy byli pozváni nebo od té doby, co do místnosti vstoupili.
@@ -130,17 +142,21 @@ Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli naj
   <string name="screen_security_and_privacy_encryption_section_footer">"Jakmile je povoleno, šifrování nelze zakázat."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Šifrování"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Povolit koncové šifrování"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Každý může najít a vstoupit"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vstoupit může kdokoli."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kdokoliv"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Lidé mohou vstoupit, pouze pokud jsou pozváni"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vyberte, kteří členové prostorů se k této místnosti mohou připojit bez pozvánky. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vstoupit mohou pouze pozvaní lidé."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Pouze pro zvané"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Přístup do místnosti"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Prostory nejsou aktuálně podporovány"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Přístup"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Vstoupit může kdokoli z autorizovaných prostorů."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Vstoupit může kdokoli v %1$s."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členové prostoru"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Prostory nejsou aktuálně podporovány"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresa místnosti"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožněte nalezení této místnosti prohledáním adresáře veřejných místností na %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné v adresáři veřejných místností"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umožnit nalezení vyhledáváním ve veřejném adresáři."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné ve veřejném adresáři"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kdokoliv"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kdo může číst historii"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Pouze členové od té doby, co byli pozváni"</string>
@@ -148,8 +164,7 @@ Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli naj
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
 Můžete se rozhodnout publikovat svou místnost ve veřejném adresáři místnosti vašeho domovského serveru."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikování místnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
-Adresa je také vyžadována pro zobrazení místnosti v adresáři veřejných místností %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost místnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy slouží k vyhledávání a přístupu do místností a prostorů. Díky tomu je také můžete snadno sdílet s ostatními."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost"</string>
   <string name="screen_security_and_privacy_title">"Zabezpečení a soukromí"</string>
 </resources>
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 40c404d69b..97d39509fa 100644
--- a/features/roomdetails/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
@@ -15,7 +15,7 @@
   <string name="screen_room_change_permissions_moderators">"Gweinyddwyr a chymedrolwyr"</string>
   <string name="screen_room_change_permissions_remove_people">"Dileu pobl a gwrthod ceisiadau i ymuno"</string>
   <string name="screen_room_change_permissions_room_avatar">"Newid afatar ystafell"</string>
-  <string name="screen_room_change_permissions_room_details">"Manylion yr ystafell"</string>
+  <string name="screen_room_change_permissions_room_details">"Ystafell Golygu"</string>
   <string name="screen_room_change_permissions_room_name">"Newid enw\'r ystafell"</string>
   <string name="screen_room_change_permissions_room_topic">"Newid pwnc yr ystafell"</string>
   <string name="screen_room_change_permissions_send_messages">"Anfon negeseuon"</string>
@@ -83,12 +83,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Dileu aelod yn unig"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Adfer"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Fyddan nhw yn gallu ymuno â\'r ystafell hon eto os cân nhw wahoddiad."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Gwahardd defnyddiwr"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Dad-wahardd o\'r ystafell"</string>
   <string name="screen_room_member_list_mode_banned">"Wedi\'i wahardd"</string>
   <string name="screen_room_member_list_mode_members">"Aelodau"</string>
-  <string name="screen_room_member_list_pending_header_title">"Dan ystyriaeth"</string>
-  <string name="screen_room_member_list_role_administrator">"Gweinyddwr"</string>
-  <string name="screen_room_member_list_role_moderator">"Cymedrolwr"</string>
+  <string name="screen_room_member_list_role_administrator">"Gweinyddwyr yn unig"</string>
+  <string name="screen_room_member_list_role_moderator">"Gweinyddwyr a chymedrolwyr"</string>
   <string name="screen_room_member_list_role_owner">"Perchennog"</string>
   <string name="screen_room_member_list_room_members_header_title">"Aelodau\'r ystafell"</string>
   <string name="screen_room_member_list_unbanning_user">"Dad-wahardd %1$s"</string>
@@ -115,7 +114,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Negeseuon a chynnwys"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Cymedrolwyr"</string>
   <string name="screen_room_roles_and_permissions_owners">"Perchnogion"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Caniatâd"</string>
   <string name="screen_room_roles_and_permissions_reset">"Ailosod caniatâd"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ar ôl i chi ailosod caniatâd, byddwch yn colli\'r gosodiadau cyfredol."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ailosod caniatâd?"</string>
@@ -138,9 +136,9 @@ Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un d
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Dim ond os cawn nhw wahoddiad gall pobl ymuno"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gwahoddiad yn unig"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Mynediad ystafell"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Aelodau gofod"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch er mwyn ei wneud yn weladwy yn y cyfeiriadur ystafelloedd."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Cyfeiriad yr ystafell"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Caniatáu i\'r ystafell hon gael ei chanfod trwy chwilio cyfeiriadur ystafelloedd cyhoeddus %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gweladwy yn y cyfeiriadur ystafelloedd cyhoeddus"</string>
@@ -151,8 +149,6 @@ Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un d
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
 Gallwch ddewis cyhoeddi eich ystafell yng ngweinydd cartref eich cyfeiriadur ystafelloedd cyhoeddus."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Cyhoeddi ystafell"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
-Mae angen y cyfeiriad hefyd i wneud yr ystafell yn weladwy yng nghyfeiriadur ystafell gyhoeddus %1$s."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Gwelededd yr ystafell"</string>
   <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
 </resources>
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 77e34d87dc..9da1c66904 100644
--- a/features/roomdetails/impl/src/main/res/values-da/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-da/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Du skal bruge en rum-adresse for at gøre den synlig i kataloget."</string>
-  <string name="screen_edit_room_address_title">"Rummets adresse"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Du skal bruge en adresse for at gøre det synligt i det offentlige register."</string>
+  <string name="screen_edit_room_address_title">"Redigér adresse"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Der opstod en fejl under opdatering af notifikationsindstillingen."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Din hjemmeserver understøtter ikke denne mulighed i krypterede rum, og derfor er det muligt at du ikke får besked i alle rum."</string>
   <string name="screen_polls_history_title">"Afstemninger"</string>
-  <string name="screen_room_change_permissions_administrators">"Kun admins"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
   <string name="screen_room_change_permissions_ban_people">"Spær brugere"</string>
   <string name="screen_room_change_permissions_delete_messages">"Fjern beskeder"</string>
-  <string name="screen_room_change_permissions_everyone">"Alle"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invitér personer og acceptér anmodninger om at deltage"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderation af medlemmer"</string>
+  <string name="screen_room_change_permissions_everyone">"Medlem"</string>
+  <string name="screen_room_change_permissions_invite_people">"Invitér andre"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Administrer medlemmer"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Beskeder og indhold"</string>
-  <string name="screen_room_change_permissions_moderators">"Admins og moderatorer"</string>
-  <string name="screen_room_change_permissions_remove_people">"Fjern personer og afvis anmodninger om at deltage"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Fjern personer"</string>
   <string name="screen_room_change_permissions_room_avatar">"Skift rummets avatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Detaljer om rummet"</string>
+  <string name="screen_room_change_permissions_room_details">"Redigér detaljer"</string>
   <string name="screen_room_change_permissions_room_name">"Skift rummets navn"</string>
   <string name="screen_room_change_permissions_room_topic">"Skift emne for rummet"</string>
   <string name="screen_room_change_permissions_send_messages">"Send beskeder"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Krypteret"</string>
   <string name="screen_room_details_badge_not_encrypted">"Ikke krypteret"</string>
   <string name="screen_room_details_badge_public">"Offentligt rum"</string>
-  <string name="screen_room_details_edit_room_title">"Rediger rum"</string>
+  <string name="screen_room_details_edit_room_title">"Redigér detaljer"</string>
   <string name="screen_room_details_edition_error">"Der opstod en ukendt fejl, og oplysningerne kunne ikke ændres."</string>
   <string name="screen_room_details_edition_error_title">"Rummet kunne ikke opdateres"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Beskeder er sikret med låse. Kun du og modtagerne har de unikke nøgler til at låse dem op."</string>
@@ -71,6 +71,12 @@
   <string name="screen_room_details_topic_title">"Emne"</string>
   <string name="screen_room_details_updating_room">"Opdaterer rum…"</string>
   <string name="screen_room_member_list_banned_empty">"Der er ingen spærrede brugere i dette rum."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Spærret"</item>
+    <item quantity="other">"%1$d Spærret"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Tjek stavningen eller prøv en ny søgning"</string>
+  <string name="screen_room_member_list_empty_search_title">"Ingen resultater for \"%1$s\""</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d person"</item>
     <item quantity="other">"%1$d personer"</item>
@@ -79,11 +85,15 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Fjern kun medlem"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Fjern spærring af"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"De vil være i stand til at deltage i dette rum igen, hvis de inviteres."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Ophæv blokering af bruger fra rum"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Fjern brugerens spærring fra rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Spærret"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Afventer"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Inviteret"</item>
+    <item quantity="other">"%1$d Inviteret"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Afventer"</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">"Ejeren"</string>
   <string name="screen_room_member_list_room_members_header_title">"Medlemmer af rummet"</string>
@@ -118,8 +128,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_security_and_privacy_add_room_address_action">"Tilføj adresse på rum"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle kan bede om at deltage i lokalet, men en administrator eller moderator skal acceptere anmodningen."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Tilføj adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle skal anmode om adgang."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Spørg om at deltage"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivér kryptering"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når det først er aktiveret, kan kryptering for et rum ikke deaktiveres igen. Beskedhistorik vil kun være synlig for rummedlemmer, siden de blev inviteret, eller siden de blev medlem af rummet.
@@ -129,26 +139,24 @@ Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage
   <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering først er aktiveret, kan den ikke deaktiveres igen."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivér end-to-end-kryptering"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan finde og deltage"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan være med."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Enhver"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Andre kan kun deltage, hvis de bliver inviteret"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun med invitation"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Adgang til rummet"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Klynger understøttes ikke i øjeblikket"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af klyngen"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en adresse til rummet, for at gøre den synlig i rum-registeret."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Rummets adresse"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Kun inviterede personer kan deltage i dette rum."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun inviterede"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Adgang"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af gruppen"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Grupper 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>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillad, at dette rum kan findes ved at søge i %1$s fortegnelse over offentlige rum"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i det offentlige register over rum"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Enhver"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Gør det muligt at blive fundet ved søgninger i det offentlige register."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i det offentlige register"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan læse historikken?"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kun medlemmer, efter de blev inviteret"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden valg af denne mulighed"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Rum-adresser er en måde at finde og få adgang til værelser på. Dette sikrer også, at du nemt kan dele dit rum med andre.
 Du kan vælge at offentliggøre dit rum i din hjemmeservers offentlige katalog over rum."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Udgivelse af rum"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rum-adresser er måder at finde og få adgang til rum på. Dette sikrer også, at du nemt kan dele dit rum med andre.
-Adressen er også påkrævet for at gøre rummet synligt i det %1$s offentlige register."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Rummets synlighed"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Synlighed"</string>
   <string name="screen_security_and_privacy_title">"Sikkerhed og privatliv"</string>
 </resources>
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 4a4f8a44b6..89ef69c173 100644
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@@ -8,14 +8,12 @@
   <string name="screen_room_change_permissions_administrators">"Nur Admins"</string>
   <string name="screen_room_change_permissions_ban_people">"Mitglieder sperren"</string>
   <string name="screen_room_change_permissions_delete_messages">"Nachrichten entfernen"</string>
-  <string name="screen_room_change_permissions_everyone">"Alle"</string>
   <string name="screen_room_change_permissions_invite_people">"Personen einladen und Beitrittsanfragen annehmen"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderation der Mitglieder"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Nachrichten senden &amp; löschen"</string>
   <string name="screen_room_change_permissions_moderators">"Admins und Moderatoren"</string>
   <string name="screen_room_change_permissions_remove_people">"Personen entfernen und Beitrittsanfragen ablehnen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Avatar ändern"</string>
-  <string name="screen_room_change_permissions_room_details">"Chat-Details anpassen"</string>
+  <string name="screen_room_change_permissions_room_details">"Chat bearbeiten"</string>
   <string name="screen_room_change_permissions_room_name">"Chat-Namen ändern"</string>
   <string name="screen_room_change_permissions_room_topic">"Chat Thema ändern"</string>
   <string name="screen_room_change_permissions_send_messages">"Nachrichten senden"</string>
@@ -70,7 +68,7 @@
   <string name="screen_room_details_title">"Informationen"</string>
   <string name="screen_room_details_topic_title">"Thema"</string>
   <string name="screen_room_details_updating_room">"Chat wird aktualisiert…"</string>
-  <string name="screen_room_member_list_banned_empty">"In diesem Chat gibt es keine gesperrten Nutzer."</string>
+  <string name="screen_room_member_list_banned_empty">"Es gibt keine gesperrten Nutzer."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d Person"</item>
     <item quantity="other">"%1$d Personen"</item>
@@ -79,12 +77,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Mitglied nur entfernen"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Sperre aufheben"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Die Nutzer können dem Chat wieder beitreten, wenn sie eingeladen werden."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Nutzer entsperren"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Sperre für diesen Chat aufheben"</string>
   <string name="screen_room_member_list_mode_banned">"Gesperrt"</string>
   <string name="screen_room_member_list_mode_members">"Mitglieder"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ausstehend"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Nur Admins"</string>
+  <string name="screen_room_member_list_role_moderator">"Admins und Moderatoren"</string>
   <string name="screen_room_member_list_role_owner">"Eigentümer"</string>
   <string name="screen_room_member_list_room_members_header_title">"Mitglieder"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s wird entsperrt."</string>
@@ -111,7 +108,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Nachrichten senden &amp; löschen"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatoren"</string>
   <string name="screen_room_roles_and_permissions_owners">"Eigentümer"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Berechtigungen"</string>
   <string name="screen_room_roles_and_permissions_reset">"Rollen und Berechtigungen zurücksetzen"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Sobald du die Berechtigungen zurücksetzt, verlierst du die aktuellen Einstellungen."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Berechtigungen zurücksetzen?"</string>
@@ -134,10 +130,10 @@ Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Personen können nur beitreten, wenn sie eingeladen werden."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Nur auf Einladung"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Chat Zugang"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Spacemitglieder"</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 Verzeichnis sichtbar zu machen."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Chat-Adresse"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Chatroomadresse"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Erlaube das Auffinden dieses Chats durch Suche im öffentlichen Verzeichnis von %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Sichtbar im öffentlichen Verzeichnis"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Jeder"</string>
@@ -147,8 +143,6 @@ Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
 Auf Wunsch kannst du deinen Chat im öffentlichen Verzeichnis deines Homeservers veröffentlichen."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Veröffentlichung von Chats"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
-Die Adresse ist auch erforderlich, um den Chat im öffentlichen Verzeichnis von %1$s zu veröffentlichen."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">" Sichtbarkeit des Chats"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Chatroomsichtbarkeit."</string>
   <string name="screen_security_and_privacy_title">"Sicherheit &amp; Datenschutz"</string>
 </resources>
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 678dad15c9..9f481e8d46 100644
--- a/features/roomdetails/impl/src/main/res/values-el/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-el/translations.xml
@@ -8,14 +8,12 @@
   <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_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>
@@ -73,12 +71,11 @@
   <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_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_pending_header_title">"Σε αναμονή"</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>
@@ -102,7 +99,6 @@
   <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_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>
@@ -125,21 +121,16 @@
   <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_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Μέλη χώρου"</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_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_directory_visibility_section_footer">"Επιστρέψτε την εύρεση αυτής της αίθουσας με αναζήτηση στον κατάλογο %1$s δημοσίων αιθουσών"</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_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">"Οι διευθύνσεις αιθουσών είναι τρόποι εύρεσης και πρόσβασης σε αίθουσες. Αυτό εξασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε την αίθουσα με άλλους.
-Η διεύθυνση απαιτείται επίσης για να γίνει η αίθουσα ορατή στον δημόσιο κατάλογο αιθουσών %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Ορατότητα αίθουσας"</string>
   <string name="screen_security_and_privacy_title">"Ασφάλεια &amp; απόρρητο"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-en-rUS/translations.xml b/features/roomdetails/impl/src/main/res/values-en-rUS/translations.xml
new file mode 100644
index 0000000000..9a4b56e287
--- /dev/null
+++ b/features/roomdetails/impl/src/main/res/values-en-rUS/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_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Anyone in authorized spaces can join, but everyone else must request access."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Anyone in authorized spaces can join."</string>
+</resources>
diff --git a/features/roomdetails/impl/src/main/res/values-eo/translations.xml b/features/roomdetails/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index 46471ca4f3..0000000000
--- a/features/roomdetails/impl/src/main/res/values-eo/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_room_details_encryption_enabled_subtitle">"Messages are secured with locks. Only you and the recipients can unlock them."</string>
-</resources>
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 96e31eb5c5..43a42bb274 100644
--- a/features/roomdetails/impl/src/main/res/values-es/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-es/translations.xml
@@ -8,14 +8,12 @@
   <string name="screen_room_change_permissions_administrators">"Solo administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Vetar personas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Eliminar mensajes"</string>
-  <string name="screen_room_change_permissions_everyone">"Todos"</string>
   <string name="screen_room_change_permissions_invite_people">"Invitar personas y aceptar solicitudes de unión"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderación de miembros"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensajes y contenido"</string>
   <string name="screen_room_change_permissions_moderators">"Administradores y moderadores"</string>
   <string name="screen_room_change_permissions_remove_people">"Eliminar personas y rechazar solicitudes de unión"</string>
   <string name="screen_room_change_permissions_room_avatar">"Cambiar el avatar de la sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Detalles de la sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar sala"</string>
   <string name="screen_room_change_permissions_room_name">"Cambiar el nombre de la sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Cambiar el tema de la sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensajes"</string>
@@ -73,12 +71,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Solo eliminar miembro"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Quitar veto"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Podrá volver a unirse a esta sala si se le invita."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Quitar veto al usuario"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Eliminar veto en la sala"</string>
   <string name="screen_room_member_list_mode_banned">"Vetados"</string>
   <string name="screen_room_member_list_mode_members">"Miembros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendiente"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderador"</string>
+  <string name="screen_room_member_list_role_administrator">"Solo administradores"</string>
+  <string name="screen_room_member_list_role_moderator">"Administradores y moderadores"</string>
   <string name="screen_room_member_list_room_members_header_title">"Miembros de la sala"</string>
   <string name="screen_room_member_list_unbanning_user">"Levantando veto a %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Permitir configuración personalizada"</string>
@@ -102,7 +99,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Moderación de miembros"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mensajes y contenido"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderadores"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Permisos"</string>
   <string name="screen_room_roles_and_permissions_reset">"Restablecer permisos"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Una vez que restablezca los permisos, perderá la configuración actual."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"¿Restablecer los permisos?"</string>
@@ -125,21 +121,16 @@ No recomendamos habilitar el cifrado para las salas que cualquiera pueda encontr
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Las personas solo pueden unirse si están invitadas"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo por invitación"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acceso a la sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No se admiten los espacios por el momento."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Miembros del espacio"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que esta sea visible en el directorio de salas."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Dirección de la sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No se admiten los espacios por el momento."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que sea visible en el directorio."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite encontrar esta sala buscando en el directorio de salas públicas de %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible en el directorio de salas públicas"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Cualquiera"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Quién puede leer el historial"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo participantes desde que fueron invitados"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo participantes desde que se selecciona esta opción"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Las direcciones de sala son formas de buscar salas y acceder a ellas. Esto también garantiza que puedas compartir fácilmente tu sala con otras personas.
 Puedes optar por publicar tu sala en el directorio de salas públicas de tu servidor base."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicación de la sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Las direcciones de sala son un medio para buscar y acceder a salas. También te permiten compartir fácilmente tu sala con otras personas.
-La dirección también es necesaria para hacer visible la sala en el directorio de salas públicas de %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidad de la sala"</string>
   <string name="screen_security_and_privacy_title">"Seguridad y privacidad"</string>
 </resources>
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 6de3107def..1c45e12cef 100644
--- a/features/roomdetails/impl/src/main/res/values-et/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-et/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Selleks, et jututuba oleks nähtav jututubade kataloogis, vajab ta aadressi."</string>
-  <string name="screen_edit_room_address_title">"Jututoa aadress"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
+  <string name="screen_edit_room_address_title">"Muuda aadressi"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Teavituste seadistamisel tekkis viga"</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_polls_history_title">"Küsitlused"</string>
-  <string name="screen_room_change_permissions_administrators">"Vaid peakasutajad"</string>
+  <string name="screen_room_change_permissions_administrators">"Peakasutajad"</string>
   <string name="screen_room_change_permissions_ban_people">"Suhtluskeelu seadmine"</string>
   <string name="screen_room_change_permissions_delete_messages">"Eemalda sõnumid"</string>
-  <string name="screen_room_change_permissions_everyone">"Kõik"</string>
-  <string name="screen_room_change_permissions_invite_people">"Kutsu teisi osalejaid ja vasta ise liitumiskutsetele"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Jututoas osalejate modereerimine"</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_member_moderation">"Liikmete haldus"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Sõnumid ja sisu"</string>
-  <string name="screen_room_change_permissions_moderators">"Peakasutajad ja moderaatorid"</string>
-  <string name="screen_room_change_permissions_remove_people">"Eemalda osalejaid jututoast ja lükka liitumiskutsed tagasi"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderaatorid"</string>
+  <string name="screen_room_change_permissions_remove_people">"Osalejate eemaldamine"</string>
   <string name="screen_room_change_permissions_room_avatar">"Jututoa tunnuspildi muutmine"</string>
-  <string name="screen_room_change_permissions_room_details">"Jututoa üksikasjad"</string>
+  <string name="screen_room_change_permissions_room_details">"Muuda üksikasju"</string>
   <string name="screen_room_change_permissions_room_name">"Jututoa nime muutmine"</string>
   <string name="screen_room_change_permissions_room_topic">"Jututoa teema muutmine"</string>
   <string name="screen_room_change_permissions_send_messages">"Sõnumite saatmine"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Krüptitud jututuba"</string>
   <string name="screen_room_details_badge_not_encrypted">"Krüptimata jututuba"</string>
   <string name="screen_room_details_badge_public">"Avalik jututuba"</string>
-  <string name="screen_room_details_edit_room_title">"Muuda jututuba"</string>
+  <string name="screen_room_details_edit_room_title">"Muuda üksikasju"</string>
   <string name="screen_room_details_edition_error">"Tekkis tundmatu viga ja andmed jäid muutmata."</string>
   <string name="screen_room_details_edition_error_title">"Jututoa andmete muutmine ei õnnestu"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Sõnumid on turvatud krüptimise abil. Ainult sinul ja sõnumite saajatel on vajalikud võtmed nende lugemiseks."</string>
@@ -70,7 +70,13 @@
   <string name="screen_room_details_title">"Jututoa teave"</string>
   <string name="screen_room_details_topic_title">"Teema"</string>
   <string name="screen_room_details_updating_room">"Uuendame jututuba…"</string>
-  <string name="screen_room_member_list_banned_empty">"Jututoas pole suhtluskeeluga kasutajaid"</string>
+  <string name="screen_room_member_list_banned_empty">"Suhtluskeeluga kasutajaid pole"</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d suhtluskeeluga kasutaja"</item>
+    <item quantity="other">"%1$d suhtluskeeluga kasutajat"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Palun kontrolli otsingusõna korrektsust ja proovi siis uuesti"</string>
+  <string name="screen_room_member_list_empty_search_title">"Otsingul „%1$s“ pole tulemusi"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osaleja"</item>
     <item quantity="other">"%1$d osalejat"</item>
@@ -79,12 +85,16 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Ainult eemalda kasutaja"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Eemalda suhtluskeeld"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Kutse olemasolul saab ta nüüd jututoaga uuesti liituda"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Eemalda kasutaja suhtluskeeld"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Eemalda suhtluskeeld jututoas"</string>
   <string name="screen_room_member_list_mode_banned">"Suhtluskeeluga kasutajad"</string>
   <string name="screen_room_member_list_mode_members">"Liikmed"</string>
-  <string name="screen_room_member_list_pending_header_title">"Ootel"</string>
-  <string name="screen_room_member_list_role_administrator">"Peakasutaja"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderaator"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d saatis kutse"</item>
+    <item quantity="other">"%1$d saatis kutse"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Ootel"</string>
+  <string name="screen_room_member_list_role_administrator">"Peakasutajad"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderaatorid"</string>
   <string name="screen_room_member_list_role_owner">"Omanik"</string>
   <string name="screen_room_member_list_room_members_header_title">"Jututoas osalejad"</string>
   <string name="screen_room_member_list_unbanning_user">"Eemaldame suhtluskeelu kasutajalt %1$s"</string>
@@ -118,9 +128,11 @@
   <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_security_and_privacy_add_room_address_action">"Lisa jututoa aadress"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist, kuid peakasutaja või moderaator peavad sellega nõustuma."</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>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Küsi võimalust liitumiseks"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Liituda saavad kõik „%1$s“ kogukonna liikmed, kuid kõik teised peavad küsima võimalust ligipääsuks."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Jah, lülita krüptimine sisse"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kui jututoa krüptimine on kord sisse lülitatud, siis seda välja lülitada ei saa. Sõnumite ajalugu on nähtav vaid jututoa liikmetele alates kutse saamise või liitumise hetkest.
 Keegi teine peale jututoa liikmete ei saa sõnumeid lugeda. See võib takistada suhtlusrobotite ja/või võrgusildade toimimist.
@@ -129,26 +141,31 @@ Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega
   <string name="screen_security_and_privacy_encryption_section_footer">"Kui krüptimine on kasutusel, siis seda enam väljalülitada ei saa."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Krüptimine"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Võta läbiv krüptimine kasutusele"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kõik võivad jututuba leida ja sellega liituda"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kõik"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Huvilised võivad liituda vaid kutse olemasolul"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vaid kutse alusel"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs jututuppa"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Kogukondade tugi veel puudub"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kõik võivad jututoaga liituda"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kõik kasutajad"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vali kogukonnad, mille liikmed saavad selle jututoaga liituda ilma kutseta. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Halda kogukondi"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Liituda saab vaid kutse olemasolul"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vaid kutsega"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Liituda saavad kõik volitatud kogukondade liikmed."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Liituda võivad kõik „%1$s“ liikmed."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Kogukonna liikmed"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade kataloogis, vajab ta aadressi."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Jututoa aadress"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Kogukondade tugi veel puudub"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Aadress"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Võimalda leida seda jututuba avalikust kataloogist otsides „%1$s“"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Nähtav jututubade avalikus kataloogis"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kõik"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Luba leitavus avaliku kataloogi otsingust."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Nähtav avalikus kataloogis"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kõik (ajalugu on avalik)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Muudatused ei mõjuta varasemaid sõnumeid, ainult uusi. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kes võivad lugeda jututoa ajalugu"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Liikmed peale kutse saamist"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Liikmed peale selle valiku sisselülitamist"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Liikmed (terviklik ajalugu)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
 Lisaks võid sa jututoa avaldada oma koduserveri avalikus jututubade kataloogis."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Jututoa avaldamine"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
-Lisaks on aadress vajalik, et jututuba oleks %1$s serveri avalikus jututubade kataloogis nähtav."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Jututoa nähtavus"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Aadressid on mugav viis jututubade ja kogukondade leidmiseks ning tagab mugava võimaluse nende jagamiseks."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Nähtavus"</string>
   <string name="screen_security_and_privacy_title">"Turvalisus ja privaatsus"</string>
 </resources>
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 64ec4ad928..95d6b17daf 100644
--- a/features/roomdetails/impl/src/main/res/values-eu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
@@ -7,14 +7,12 @@
   <string name="screen_room_change_permissions_administrators">"Administratzaileak soilik"</string>
   <string name="screen_room_change_permissions_ban_people">"Jarri debekua jendeari"</string>
   <string name="screen_room_change_permissions_delete_messages">"Kendu mezuak"</string>
-  <string name="screen_room_change_permissions_everyone">"Guztiak"</string>
   <string name="screen_room_change_permissions_invite_people">"Gonbidatu jendea"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Kideen moderazioa"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mezuak eta edukiak"</string>
   <string name="screen_room_change_permissions_moderators">"Administratzaileak eta moderatzaileak"</string>
   <string name="screen_room_change_permissions_remove_people">"Kendu jendea"</string>
   <string name="screen_room_change_permissions_room_avatar">"Aldatu gelaren abatarra"</string>
-  <string name="screen_room_change_permissions_room_details">"Gelaren xehetasunak"</string>
+  <string name="screen_room_change_permissions_room_details">"Editatu gela"</string>
   <string name="screen_room_change_permissions_room_name">"Aldatu gelaren izena"</string>
   <string name="screen_room_change_permissions_room_topic">"Aldatu gelako mintzagaia"</string>
   <string name="screen_room_change_permissions_send_messages">"Bidali mezuak"</string>
@@ -70,12 +68,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Kendu kidea eta ezarri debekua"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Kendu kidea soilik"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Kendu debekua"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Kendu debekua erabiltzaileari"</string>
   <string name="screen_room_member_list_mode_banned">"Debekatuta"</string>
   <string name="screen_room_member_list_mode_members">"Kideak"</string>
-  <string name="screen_room_member_list_pending_header_title">"Zain"</string>
-  <string name="screen_room_member_list_role_administrator">"Kudeatzailea"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderatzailea"</string>
+  <string name="screen_room_member_list_role_administrator">"Administratzaileak soilik"</string>
+  <string name="screen_room_member_list_role_moderator">"Administratzaileak eta moderatzaileak"</string>
   <string name="screen_room_member_list_role_owner">"Jabea"</string>
   <string name="screen_room_member_list_room_members_header_title">"Gelako kideak"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s(r)i debekua kentzen"</string>
@@ -98,7 +94,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mezuak eta edukiak"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatzaileak"</string>
   <string name="screen_room_roles_and_permissions_owners">"Jabeak"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Baimenak"</string>
   <string name="screen_room_roles_and_permissions_reset">"Berrezarri baimenak"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Baimenak berrezarritakoan, uneko ezarpenak galduko dituzu."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Baimenak berrezarri?"</string>
@@ -113,12 +108,10 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Gonbidatutako pertsonak bakarrik sartu ahal izango dira"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gonbidapen bidez"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Gelarako sarbidea"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Guneko kideak"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Gelarako helbideren bat beharko duzu gelen direktorioan ikusgai egon dadila nahi baduzu."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Gelaren helbidea"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gela publikoen direktorioan ikusgai"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Edonork"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Nork irakur dezake historia"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kideek bakarrik, gonbidatu zituztenetik"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kideek bakarrik, aukera hau hautatu zenetik"</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 2de731b612..c04650417c 100644
--- a/features/roomdetails/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
@@ -14,20 +14,23 @@
   <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>
   <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_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>
@@ -45,6 +48,8 @@
   <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_leave_conversation_title">"ترک گفت‌وگو"</string>
   <string name="screen_room_details_leave_room_title">"ترک اتاق"</string>
@@ -63,6 +68,7 @@
   <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_header_title">
     <item quantity="one">"%1$d نفر"</item>
     <item quantity="other">"%1$d نفر"</item>
@@ -71,12 +77,11 @@
   <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_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_pending_header_title">"منتظر"</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>
@@ -90,17 +95,19 @@
   <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_permissions_header">"اجازه‌ها"</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_title">"بازنشانی اجازه‌ها؟"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"نقش‌ها"</string>
@@ -117,8 +124,8 @@
   <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_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</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_header">"نشانی اتاق"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"هرکسی"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</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 e77b0ab2c6..b696660b62 100644
--- a/features/roomdetails/impl/src/main/res/values-fi/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Tarvitset huoneen osoitteen, jotta se näkyy hakemistossa."</string>
-  <string name="screen_edit_room_address_title">"Huoneen osoite"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_edit_room_address_title">"Muokkaa osoitetta"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Ilmoitusasetusten muokkaamisessa tapahtui virhe."</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_polls_history_title">"Kyselyt"</string>
-  <string name="screen_room_change_permissions_administrators">"Vain ylläpitäjät"</string>
+  <string name="screen_room_change_permissions_administrators">"Ylläpitäjä"</string>
   <string name="screen_room_change_permissions_ban_people">"Porttikieltojen antaminen"</string>
   <string name="screen_room_change_permissions_delete_messages">"Viestien poistaminen"</string>
-  <string name="screen_room_change_permissions_everyone">"Kaikki"</string>
+  <string name="screen_room_change_permissions_everyone">"Jäsen"</string>
   <string name="screen_room_change_permissions_invite_people">"Ihmisten kutsuminen ja liittymispyyntöjen hyväksyminen"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Jäsenten valvonta"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Jäsenien hallinta"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Viestit ja sisältö"</string>
-  <string name="screen_room_change_permissions_moderators">"Ylläpitäjät ja valvojat"</string>
+  <string name="screen_room_change_permissions_moderators">"Valvoja"</string>
   <string name="screen_room_change_permissions_remove_people">"Henkilöiden poistaminen ja liittymispyyntöjen hylkääminen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Huoneen avatarin vaihtaminen"</string>
-  <string name="screen_room_change_permissions_room_details">"Huoneen tiedot"</string>
+  <string name="screen_room_change_permissions_room_details">"Muokkaa tietoja"</string>
   <string name="screen_room_change_permissions_room_name">"Huoneen nimen vaihtaminen"</string>
   <string name="screen_room_change_permissions_room_topic">"Huoneen aiheen vaihtaminen"</string>
   <string name="screen_room_change_permissions_send_messages">"Viestien lähettäminen"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Salattu"</string>
   <string name="screen_room_details_badge_not_encrypted">"Ei salattu"</string>
   <string name="screen_room_details_badge_public">"Julkinen huone"</string>
-  <string name="screen_room_details_edit_room_title">"Muokkaa huonetta"</string>
+  <string name="screen_room_details_edit_room_title">"Muokkaa tietoja"</string>
   <string name="screen_room_details_edition_error">"Tuntematon virhe tapahtui, eikä tietoja voitu muuttaa."</string>
   <string name="screen_room_details_edition_error_title">"Huoneen muokkaaminen ei onnistunut"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Viestisi suojataan lukoilla. Vain sinulla ja viesiten vastaanottajilla on uniikit avaimet niiden avaamiseen."</string>
@@ -52,7 +52,7 @@
   <string name="screen_room_details_error_unmuting">"Tämän huoneen mykistyksen poistaminen epäonnistui, yritä uudelleen."</string>
   <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 ihmisiä"</string>
+  <string name="screen_room_details_invite_people_title">"Kutsu henkilöitä"</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>
@@ -70,7 +70,7 @@
   <string name="screen_room_details_title">"Huoneen tiedot"</string>
   <string name="screen_room_details_topic_title">"Aihe"</string>
   <string name="screen_room_details_updating_room">"Muokataan huonetta…"</string>
-  <string name="screen_room_member_list_banned_empty">"Tässä huoneessa ei ole porttikieltoja"</string>
+  <string name="screen_room_member_list_banned_empty">"Porttikiellettyjä käyttäjiä ei ole."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d henkilö"</item>
     <item quantity="other">"%1$d henkilöä"</item>
@@ -79,10 +79,9 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Poista vain jäsen huoneesta"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Poista porttikielto"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"He voivat liittyä tähän huoneeseen uudelleen, jos heidät kutsutaan."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Poista käyttäjän porttikielto"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Poista porttikielto huoneesta"</string>
   <string name="screen_room_member_list_mode_banned">"Porttikiellot"</string>
   <string name="screen_room_member_list_mode_members">"Jäsenet"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutsuttu"</string>
   <string name="screen_room_member_list_role_administrator">"Ylläpitäjä"</string>
   <string name="screen_room_member_list_role_moderator">"Valvoja"</string>
   <string name="screen_room_member_list_role_owner">"Omistaja"</string>
@@ -118,8 +117,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_security_and_privacy_add_room_address_action">"Lisää huoneen osoite"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kuka tahansa voi pyytää saada liittyä huoneeseen, mutta ylläpitäjän tai valvojan on hyväksyttävä pyyntö."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisää osoite"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kaikkien on pyydettävä pääsyä."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Pyydä liittymistä"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Kyllä, ota salaus käyttöön"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä. Viestihistoria näkyy vain huoneen jäsenille kutsusta tai liittymisestä lähtien.
@@ -129,17 +128,18 @@ Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa vo
   <string name="screen_security_and_privacy_encryption_section_footer">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Salaus"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ota päästä päähän -salaus käyttöön"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi löytää ja liittyä."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi liittyä."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kuka tahansa"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vain kutsutut"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Huoneeseen pääsy"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Pääsy"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Tilan jäsenet"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset huoneen osoitteen, jotta se näkyy huonehakemistossa."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Huoneen osoite"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Osoite"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Salli tämän huoneen löytäminen hakemalla %1$s -palvelimen julkisesta huonehakemistosta."</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa huonehakemistossa"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Anna muiden löytää tämä julkisen hakemiston kautta."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa hakemistossa"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kuka tahansa"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kuka voi lukea viestihistoriaa"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Jäsenet vasta kutsusta lähtien"</string>
@@ -147,8 +147,6 @@ Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa vo
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
 Voit halutessasi julkaista huoneesi kotipalvelimesi julkisessa huonehakemistossa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Huoneen julkaiseminen"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
-Osoitetta tarvitaan myös, jotta huone näkyy %1$s -palvelimen julkisessa huonehakemistossa."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Huoneen näkyvyys"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Näkyvyys"</string>
   <string name="screen_security_and_privacy_title">"Turvallisuus ja yksityisyys"</string>
 </resources>
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 c30bb2c8c9..75c8592d0e 100644
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Vous aurez besoin d’une adresse de salon pour le rendre visible dans le répertoire."</string>
-  <string name="screen_edit_room_address_title">"Adresse du salon"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
+  <string name="screen_edit_room_address_title">"Modifier l’adresse"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Une erreur s’est produite lors de la mise à jour du paramètre de notification."</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_polls_history_title">"Sondages"</string>
-  <string name="screen_room_change_permissions_administrators">"Administrateurs seulement"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrateurs"</string>
   <string name="screen_room_change_permissions_ban_people">"Bannir des participants"</string>
   <string name="screen_room_change_permissions_delete_messages">"Supprimer des messages"</string>
-  <string name="screen_room_change_permissions_everyone">"Tout le monde"</string>
-  <string name="screen_room_change_permissions_invite_people">"Inviter des personnes et accepter les demandes pour rejoindre"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Administration des membres"</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_member_moderation">"Gérer les membres"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Messages et contenus"</string>
-  <string name="screen_room_change_permissions_moderators">"Administrateurs et modérateurs"</string>
-  <string name="screen_room_change_permissions_remove_people">"Retirer des personnes et refuser les demandes pour rejoindre"</string>
+  <string name="screen_room_change_permissions_moderators">"Modérateurs"</string>
+  <string name="screen_room_change_permissions_remove_people">"Retirer des personnes"</string>
   <string name="screen_room_change_permissions_room_avatar">"Changer l’avatar du salon"</string>
-  <string name="screen_room_change_permissions_room_details">"Détails du salon"</string>
+  <string name="screen_room_change_permissions_room_details">"Modifier les détails"</string>
   <string name="screen_room_change_permissions_room_name">"Changer le nom du salon"</string>
   <string name="screen_room_change_permissions_room_topic">"Changer le sujet du salon"</string>
   <string name="screen_room_change_permissions_send_messages">"Envoyer des messages"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Chiffré"</string>
   <string name="screen_room_details_badge_not_encrypted">"Non chiffré"</string>
   <string name="screen_room_details_badge_public">"Salon public"</string>
-  <string name="screen_room_details_edit_room_title">"Modifier le salon"</string>
+  <string name="screen_room_details_edit_room_title">"Modifier les détails"</string>
   <string name="screen_room_details_edition_error">"Une erreur inconnue s’est produite et les informations n’ont pas pu être modifiées."</string>
   <string name="screen_room_details_edition_error_title">"Impossible de mettre à jour le salon"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Les messages sont sécurisés par des clés de chiffrement. Seuls vous et les destinataires possédez les clés uniques pour les déverrouiller."</string>
@@ -62,7 +62,7 @@
   <string name="screen_room_details_pinned_events_row_title">"Messages épinglés"</string>
   <string name="screen_room_details_profile_row_title">"Profil"</string>
   <string name="screen_room_details_requests_to_join_title">"Demandes en attente"</string>
-  <string name="screen_room_details_roles_and_permissions">"Rôles et autorisations"</string>
+  <string name="screen_room_details_roles_and_permissions">"Rôles &amp; autorisations"</string>
   <string name="screen_room_details_room_name_label">"Nom du salon"</string>
   <string name="screen_room_details_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
   <string name="screen_room_details_security_title">"Sécurité"</string>
@@ -70,21 +70,31 @@
   <string name="screen_room_details_title">"Informations du salon"</string>
   <string name="screen_room_details_topic_title">"Sujet"</string>
   <string name="screen_room_details_updating_room">"Mise à jour du salon…"</string>
-  <string name="screen_room_member_list_banned_empty">"Il n’y a pas d’utilisateur banni dans ce salon."</string>
+  <string name="screen_room_member_list_banned_empty">"Il n’y a pas d’utilisateur banni."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banni(e)"</item>
+    <item quantity="other">"%1$d Banni(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Vérifiez la saisie ou effectuez une nouvelle recherche"</string>
+  <string name="screen_room_member_list_empty_search_title">"Aucun résultat pour «%1$s»"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d personne"</item>
-    <item quantity="other">"%1$d personnes"</item>
+    <item quantity="one">"%1$d Personne"</item>
+    <item quantity="other">"%1$d Personnes"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Bannir du salon"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Retirer le membre uniquement"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Débannir"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Il pourra rejoindre le salon à nouveau si il est invité."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Débannir l’utilisateur"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Débannir du salon"</string>
   <string name="screen_room_member_list_mode_banned">"Bannis"</string>
   <string name="screen_room_member_list_mode_members">"Membres"</string>
-  <string name="screen_room_member_list_pending_header_title">"En attente"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrateur"</string>
-  <string name="screen_room_member_list_role_moderator">"Modérateur"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invité(e)"</item>
+    <item quantity="other">"%1$d Invité(e)s"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"En attente"</string>
+  <string name="screen_room_member_list_role_administrator">"Administrateurs"</string>
+  <string name="screen_room_member_list_role_moderator">"Modérateurs"</string>
   <string name="screen_room_member_list_role_owner">"Propriétaire"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membres du salon"</string>
   <string name="screen_room_member_list_unbanning_user">"Débannissement de %1$s"</string>
@@ -117,9 +127,9 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Réinitialisation des autorisations ?"</string>
   <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 et autorisations"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Ajouter l’adresse du salon"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"N’importe qui peut demander à rejoindre le salon, mais un administrateur ou un modérateur devra accepter la demande."</string>
+  <string name="screen_room_roles_and_permissions_title">"Rôles &amp; autorisations"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Ajouter une adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Tout le monde doit demander un accès."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Demander à rejoindre"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Oui, activer le chiffrement"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Une fois activé, le chiffrement d’un salon ne peut pas être désactivé. L’historique des messages ne sera visible que pour les membres depuis qu’ils ont été invités ou depuis qu’ils ont rejoint le salon.
@@ -129,17 +139,22 @@ Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le
   <string name="screen_security_and_privacy_encryption_section_footer">"Une fois activé, le chiffrement ne peut pas être désactivé."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Chiffrement"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Activer le chiffrement de bout en bout"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tout le monde peut le trouver et le rejoindre"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tout le monde peut rejoindre."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tout le monde"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Le salon ne peut être joint que par les personnes invitées"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Choisissez les espaces dont les membres peuvent rejoindre ce salon sans invitation. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gérer les espaces"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Seules les personnes invitées peuvent rejoindre."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Sur invitation uniquement"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Accès au salon"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Les Espaces ne sont pas encore supportés"</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_multiple_parents_description">"Toute personne se trouvant dans un espace autorisé peut joindre le salon."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Toute personne de l’espace %1$s peut joindre le salon."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membres de l’espace"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin de l’adresse du salon pour le rendre visible dans le répertoire des salons."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresse du salon"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Les Espaces ne sont pas encore supportés"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Autoriser le salon à apparaître dans les résultats de recherche dans le répertoire %1$s des salons publics"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible dans le répertoire des salons publics"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permet d’être trouvé en recherchant dans l’annuaire public."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible dans l’annuaire public"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Tout le monde"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Qui peux lire l’historique"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Les membres uniquement depuis qu’ils ont été invités"</string>
@@ -147,8 +162,7 @@ Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes.
 Vous pouvez choisir de publier votre salon dans l’annuaire des salons publics de votre serveur d’accueil."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes.
-L’adresse est également requise pour que le salon soit visible dans le répertoire %1$s des salons publics."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité du salon"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses permettent de trouver et d’accéder aux salons et aux espaces. Elles facilitent également leur partage avec d’autres personnes."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité"</string>
   <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-hr/translations.xml b/features/roomdetails/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..0edf4dadbb
--- /dev/null
+++ b/features/roomdetails/impl/src/main/res/values-hr/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="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>
+  <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_polls_history_title">"Ankete"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
+  <string name="screen_room_change_permissions_ban_people">"Zabrana pristupa osobama"</string>
+  <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_member_moderation">"Upravljanje članovima"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"Poruke i sadržaj"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Uklanjanje osoba"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Promjena avatara"</string>
+  <string name="screen_room_change_permissions_room_details">"Uredi pojedinosti"</string>
+  <string name="screen_room_change_permissions_room_name">"Promjena imena"</string>
+  <string name="screen_room_change_permissions_room_topic">"Promjena teme"</string>
+  <string name="screen_room_change_permissions_send_messages">"Slanje poruka"</string>
+  <string name="screen_room_change_role_administrators_title">"Uredi administratore"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Nećete moći poništiti ovu radnju. Postavit ćete da korisnik ima isti položaj kao i vi."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Dodati administratora?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Nećete moći poništiti ovu radnju. Prenosite vlasništvo na odabrane korisnike. Nakon što odete, to će biti trajno."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Želite li prenijeti vlasništvo?"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"Degradiraj"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"Nećete moći poništiti ovu promjenu jer sami sebe degradirate. Ako ste posljednji privilegirani korisnik u sobi, nećete moći ponovno dobiti privilegije."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Želite li se degradirati?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (na čekanju)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(na čekanju)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Administratori automatski imaju moderatorske ovlasti"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Vlasnici automatski imaju administratorske ovlasti."</string>
+  <string name="screen_room_change_role_moderators_title">"Uredi moderatore"</string>
+  <string name="screen_room_change_role_owners_title">"Odaberi vlasnike"</string>
+  <string name="screen_room_change_role_section_administrators">"Administratori"</string>
+  <string name="screen_room_change_role_section_moderators">"Moderatori"</string>
+  <string name="screen_room_change_role_section_users">"Članovi"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Niste spremili sve promjene."</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"Želite li spremiti promjene?"</string>
+  <string name="screen_room_details_add_topic_title">"Dodaj temu"</string>
+  <string name="screen_room_details_badge_encrypted">"Šifrirano"</string>
+  <string name="screen_room_details_badge_not_encrypted">"Nije šifrirano"</string>
+  <string name="screen_room_details_badge_public">"Javna soba"</string>
+  <string name="screen_room_details_edit_room_title">"Uredi pojedinosti"</string>
+  <string name="screen_room_details_edition_error">"Došlo je do nepoznate pogreške i podatci se nisu mogli promijeniti."</string>
+  <string name="screen_room_details_edition_error_title">"Nije moguće ažurirati sobu"</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Poruke su zaključane. Samo vi i primatelji imate jedinstvene ključeve za njihovo otključavanje."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Omogućeno je šifriranje poruka"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"Došlo je do pogreške prilikom učitavanja postavki obavijesti."</string>
+  <string name="screen_room_details_error_muting">"Isključivanje zvuka u ovoj sobi nije uspjelo, pokušajte ponovno."</string>
+  <string name="screen_room_details_error_unmuting">"Uključivanje zvuka u ovoj sobi nije uspjelo, pokušajte ponovno."</string>
+  <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_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>
+  <string name="screen_room_details_notification_mode_custom">"Prilagođeno"</string>
+  <string name="screen_room_details_notification_mode_default">"Zadano"</string>
+  <string name="screen_room_details_notification_title">"Obavijesti"</string>
+  <string name="screen_room_details_pinned_events_row_title">"Prikvačene poruke"</string>
+  <string name="screen_room_details_profile_row_title">"Profil"</string>
+  <string name="screen_room_details_requests_to_join_title">"Zahtjevi za pridruživanje"</string>
+  <string name="screen_room_details_roles_and_permissions">"Uloge i dopuštenja"</string>
+  <string name="screen_room_details_room_name_label">"Naziv sobe"</string>
+  <string name="screen_room_details_security_and_privacy_title">"Sigurnost i privatnost"</string>
+  <string name="screen_room_details_security_title">"Sigurnost"</string>
+  <string name="screen_room_details_share_room_title">"Podijeli sobu"</string>
+  <string name="screen_room_details_title">"Informacije o sobi"</string>
+  <string name="screen_room_details_topic_title">"Tema"</string>
+  <string name="screen_room_details_updating_room">"Ažuriranje pojedinosti…"</string>
+  <string name="screen_room_member_list_banned_empty">"Nema zabranjenih korisnika."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d zabranjen"</item>
+    <item quantity="few">"%1$d zabranjena"</item>
+    <item quantity="other">"%1$d zabranjenih"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Provjerite pravopis ili pokušajte s novim pretraživanjem"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nema rezultata za “%1$s”"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d osoba"</item>
+    <item quantity="few">"%1$d osobe"</item>
+    <item quantity="other">"%1$d ljudi"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Zabrani korisnika"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Samo ukloni člana"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"Poništi zabranu"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Moći će se ponovno pridružiti ovoj sobi ako budu pozvani."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Poništi zabranu pristupa korisniku"</string>
+  <string name="screen_room_member_list_mode_banned">"Zabranjeni"</string>
+  <string name="screen_room_member_list_mode_members">"Članovi"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozvan"</item>
+    <item quantity="few">"%1$d pozvana"</item>
+    <item quantity="other">"%1$d pozvanih"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Na čekanju"</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">"Vlasnik"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Članovi sobe"</string>
+  <string name="screen_room_member_list_unbanning_user">"Uklanja se zabrana korisniku %1$s"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Dopusti prilagođenu postavku"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Uključivanjem ovoga poništit ćete zadanu postavku"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Obavijesti me u ovom razgovoru za"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Možete to promijeniti u %1$s ."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"globalne postavke"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Zadana postavka"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Ukloni prilagođenu postavku"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Došlo je do pogreške prilikom učitavanja postavki obavijesti."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Vraćanje zadanog načina rada nije uspjelo, pokušajte ponovno."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Postavljanje načina rada nije uspjelo, pokušajte ponovno."</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"Vaš matični poslužitelj ne podržava ovu mogućnost u šifriranim sobama; nećete dobiti obavijest u ovoj sobi."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Sve poruke"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Samo spominjanja i ključne riječi"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"U ovoj sobi obavijesti me za"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Administratori"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Administratori i vlasnici"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Promijeni moju ulogu"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Degradiraj u člana"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Degradiraj u moderatora"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Moderiranje članova"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Poruke i sadržaj"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Moderatori"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Vlasnici"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Dopuštenja"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Poništi dopuštenja"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Nakon što poništite dopuštenja, izgubit ćete trenutačne postavke."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Želite li poništiti dopuštenja?"</string>
+  <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_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.
+Nitko osim članova sobe neće moći čitati poruke. Zbog toga botovi i mostovi možda neće ispravno funkcionirati.
+Ne preporučujemo omogućavanje šifriranja za sobe koje svatko može pronaći i pridružiti im se."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Želite li omogućiti šifriranje?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Nakon što se šifriranje omogući, više se neće moći onemogućiti."</string>
+  <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_anyone_option_title">"Svatko"</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>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Omogući pronalazak ove sobe pretraživanjem %1$s javnog direktorija soba"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Omogući pronalazak pretraživanjem javnog direktorija."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vidljivo u javnom direktoriju"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Svatko (povijest je javna)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Promjene neće utjecati na prethodne poruke, samo na nove. %1$s"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Tko zna čitati povijest"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Samo za članove nakon što su pozvani"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Članovi (cjelokupna povijest)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adrese soba služe za pronalaženje i pristup sobama. Time se također osigurava jednostavno dijeljenje sobe s drugim korisnicima.
+Možete odabrati objavljivanje svoje sobe u javnom direktoriju soba na matičnom poslužitelju."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Objavljivanje sobe"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adrese služe za pronalaženje soba i prostora te pristup njima. Tako ih ujedno možete jednostavno dijeliti s drugima."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Vidljivost"</string>
+  <string name="screen_security_and_privacy_title">"Sigurnost i privatnost"</string>
+</resources>
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 941389ca42..440ae23d09 100644
--- a/features/roomdetails/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
-  <string name="screen_edit_room_address_title">"A szoba címe"</string>
+  <string name="screen_edit_room_address_title">"Cím szerkesztése"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Hiba történt az értesítési beállítás frissítésekor."</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_polls_history_title">"Szavazások"</string>
-  <string name="screen_room_change_permissions_administrators">"Csak adminisztrátorok"</string>
+  <string name="screen_room_change_permissions_administrators">"Adminisztrátor"</string>
   <string name="screen_room_change_permissions_ban_people">"Emberek kitiltása"</string>
   <string name="screen_room_change_permissions_delete_messages">"Üzenetek eltávolítása"</string>
-  <string name="screen_room_change_permissions_everyone">"Mindenki"</string>
-  <string name="screen_room_change_permissions_invite_people">"Személyek meghívása és csatlakozási kérések elfogadása"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Tagok moderálá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_member_moderation">"Tagok kezelése"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Üzenetek és tartalom"</string>
-  <string name="screen_room_change_permissions_moderators">"Adminisztrátorok és moderátorok"</string>
-  <string name="screen_room_change_permissions_remove_people">"Emberek eltávolítása és a csatlakozási kérések elutasítása"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Emberek eltávolítása"</string>
   <string name="screen_room_change_permissions_room_avatar">"Szoba profilképének módosítása"</string>
-  <string name="screen_room_change_permissions_room_details">"Szoba részletei"</string>
+  <string name="screen_room_change_permissions_room_details">"Részletek szerkesztése"</string>
   <string name="screen_room_change_permissions_room_name">"Szoba nevének módosítása"</string>
   <string name="screen_room_change_permissions_room_topic">"Szoba témájának módosítása"</string>
   <string name="screen_room_change_permissions_send_messages">"Üzenetek küldése"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Titkosított"</string>
   <string name="screen_room_details_badge_not_encrypted">"Nem titkosított"</string>
   <string name="screen_room_details_badge_public">"Nyilvános szoba"</string>
-  <string name="screen_room_details_edit_room_title">"Szoba szerkesztése"</string>
+  <string name="screen_room_details_edit_room_title">"Részletek szerkesztése"</string>
   <string name="screen_room_details_edition_error">"Ismeretlen hiba történt, és az információkat nem lehetett megváltoztatni."</string>
   <string name="screen_room_details_edition_error_title">"Nem sikerült frissíteni a szobát"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Az üzeneteket kulcsok védik. Csak Ön és a címzett rendelkezik a feloldásukhoz szükséges egyedi kulcsokkal."</string>
@@ -71,6 +71,8 @@
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Szoba frissítése…"</string>
   <string name="screen_room_member_list_banned_empty">"Ebben a szobában nincsenek kitiltott felhasználók."</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Ellenőrizze a helyesírást, vagy próbáljon meg egy új keresést"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nincs találat a következőre: „%1$s\""</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d személy"</item>
     <item quantity="other">"%1$d személy"</item>
@@ -79,10 +81,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Csak a tag eltávolítása"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Tiltás feloldása"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Ehhez a szobához is csatlakozhat, ha meghívják."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Felhasználó tiltásának feloldása"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Visszaengedés a szobába"</string>
   <string name="screen_room_member_list_mode_banned">"Kitiltva"</string>
   <string name="screen_room_member_list_mode_members">"Tagok"</string>
-  <string name="screen_room_member_list_pending_header_title">"Függőben"</string>
+  <string name="screen_room_member_list_pending_status">"Függőben"</string>
   <string name="screen_room_member_list_role_administrator">"Adminisztrátor"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Tulajdonos"</string>
@@ -118,8 +120,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_security_and_privacy_add_room_address_action">"Szobacím hozzáadása"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Bárki kérheti, hogy csatlakozzon a szobához, de egy adminisztrátornak vagy moderátornak el kell fogadnia a kérést."</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_option_description">"Mindenkinek hozzáférést kell kérnie."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Csatlakozás kérése"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Igen, engedélyezze a titkosítást"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Az engedélyezés után a szoba titkosítása nem tiltható le. Az üzenetek előzményei csak a szobatagok számára láthatók, amikor meghívást kaptak, vagy mióta csatlakoztak a szobához.
@@ -129,16 +131,17 @@ Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket b
   <string name="screen_security_and_privacy_encryption_section_footer">"Engedélyezés után a titkosítás nem tiltható le."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Titkosítás"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Végpontok közötti titkosítás engedélyezése"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Bárki megtalálhatja és csatlakozhat"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Bárki csatlakozhat."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Bárki"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Az emberek csak akkor csatlakozhatnak, ha meghívást kapnak"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Csak meghívással"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Szobahozzáférés"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"A terek jelenleg nem támogatottak"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Csak a meghívott emberek léphetnek be."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Csak meghívásos"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Hozzáférés"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"A tér tagjai"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá váljon a szobakatalógusban."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"A szoba címe"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"A terek jelenleg nem támogatottak"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Cím"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"A szoba megtalálhatóvá tétele a(z) %1$s nyilvános szobakatalógusában való kereséssel."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Lehetővé teszi, hogy a nyilvános szobakatalógusban megtalálható legyen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Látható a nyilvános szobakatalógusban"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Bárki"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Ki olvashatja az előzményeket"</string>
@@ -147,8 +150,6 @@ Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket b
   <string name="screen_security_and_privacy_room_publishing_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
 Kiválaszthatja, hogy szobáját közzéteszi-e a Matrix-kiszolgáló nyilvános szobakatalógusában."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Szoba közzététele"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
-A cím szükséges ahhoz is, hogy a nyilvános szoba láthatóvá váljon a(z) %1$s kiszolgáló nyilvános szobakatalógusában."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Szoba láthatósága"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Láthatóság"</string>
   <string name="screen_security_and_privacy_title">"Biztonság és adatvédelem"</string>
 </resources>
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 c78485bc4d..34703d6c01 100644
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@@ -8,14 +8,12 @@
   <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_delete_messages">"Hilangkan pesan"</string>
-  <string name="screen_room_change_permissions_everyone">"Semua orang"</string>
   <string name="screen_room_change_permissions_invite_people">"Undang orang-orang dan terima permintaan untuk bergabung"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderasi 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>
   <string name="screen_room_change_permissions_remove_people">"Keluarkan orang-orang dan tolak permintaan untuk bergabung"</string>
   <string name="screen_room_change_permissions_room_avatar">"Ubah avatar ruangan"</string>
-  <string name="screen_room_change_permissions_room_details">"Detail ruangan"</string>
+  <string name="screen_room_change_permissions_room_details">"Sunting Ruangan"</string>
   <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>
@@ -72,12 +70,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Hanya keluarkan anggota"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Batalkan pencekalan"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Pengguna dapat bergabung ke ruangan ini lagi jika diundang."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Batalkan pencekalan pengguna"</string>
+  <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>
-  <string name="screen_room_member_list_pending_header_title">"Tertunda"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</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_room_members_header_title">"Anggota ruangan"</string>
   <string name="screen_room_member_list_unbanning_user">"Membatalkan cekalan %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Izinkan pengaturan khusus"</string>
@@ -101,7 +98,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Moderasi anggota"</string>
   <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_permissions_header">"Perizinan"</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>
@@ -124,20 +120,15 @@ Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat dite
   <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_description">"Space saat ini tidak didukung"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Anda memerlukan alamat ruangan agar dapat membuatnya terlihat di direktori ruangan."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Alamat ruangan"</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">"Anda akan memerlukan alamat ruangan untuk membuatnya terlihat dalam direktori."</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_title">"Terlihat di direktori ruangan publik"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa pun"</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 anggota sejak mereka diundang"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Hanya anggota 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 ruangan adalah cara untuk menemukan dan mengakses ruangan. Hal ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain.
-Alamat ini juga diperlukan untuk membuat ruangan terlihat di %1$s direktori ruangan publik."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Keterlihatan ruangan"</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 3fae2bbc04..3d83dba3cb 100644
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Avrai bisogno di un indirizzo della stanza per renderla visibile nell\'elenco."</string>
-  <string name="screen_edit_room_address_title">"Indirizzo della stanza"</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>
   <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_polls_history_title">"Sondaggi"</string>
-  <string name="screen_room_change_permissions_administrators">"Solo amministratori"</string>
+  <string name="screen_room_change_permissions_administrators">"Amministratore"</string>
   <string name="screen_room_change_permissions_ban_people">"Escludi membri"</string>
   <string name="screen_room_change_permissions_delete_messages">"Rimuovi messaggi"</string>
-  <string name="screen_room_change_permissions_everyone">"Tutti"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invita persone e accetta richieste di partecipazione"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderazione dei membri"</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_member_moderation">"Gestisci membri"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Messaggi e contenuti"</string>
-  <string name="screen_room_change_permissions_moderators">"Amministratori e moderatori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Rimuovi le persone e rifiuta le richieste di partecipazione"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderatore"</string>
+  <string name="screen_room_change_permissions_remove_people">"Rimuovi membri"</string>
   <string name="screen_room_change_permissions_room_avatar">"Cambia avatar della stanza"</string>
-  <string name="screen_room_change_permissions_room_details">"Dettagli della stanza"</string>
+  <string name="screen_room_change_permissions_room_details">"Modifica dettagli"</string>
   <string name="screen_room_change_permissions_room_name">"Cambia il nome della stanza"</string>
   <string name="screen_room_change_permissions_room_topic">"Cambiare l\'argomento della stanza"</string>
   <string name="screen_room_change_permissions_send_messages">"Inviare messaggi"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Cifrata"</string>
   <string name="screen_room_details_badge_not_encrypted">"Non cifrata"</string>
   <string name="screen_room_details_badge_public">"Stanza pubblica"</string>
-  <string name="screen_room_details_edit_room_title">"Modifica stanza"</string>
+  <string name="screen_room_details_edit_room_title">"Modifica dettagli"</string>
   <string name="screen_room_details_edition_error">"Si è verificato un errore sconosciuto e non è stato possibile modificare le informazioni."</string>
   <string name="screen_room_details_edition_error_title">"Impossibile aggiornare la stanza"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"I messaggi sono protetti da lucchetti. Solo tu e i destinatari avete le chiavi univoche per sbloccarli."</string>
@@ -50,6 +50,8 @@
   <string name="screen_room_details_error_loading_notification_settings">"Si è verificato un errore durante il caricamento delle impostazioni di notifica."</string>
   <string name="screen_room_details_error_muting">"Impostazione del silenzioso fallita per questa stanza, riprova."</string>
   <string name="screen_room_details_error_unmuting">"Disattivazione del silenzioso di questa stanza fallita, riprova."</string>
+  <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_leave_conversation_title">"Abbandona la conversazione"</string>
   <string name="screen_room_details_leave_room_title">"Esci dalla stanza"</string>
@@ -68,19 +70,29 @@
   <string name="screen_room_details_title">"Informazioni sulla stanza"</string>
   <string name="screen_room_details_topic_title">"Argomento"</string>
   <string name="screen_room_details_updating_room">"Aggiornamento della stanza…"</string>
-  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti esclusi in questa stanza."</string>
+  <string name="screen_room_member_list_banned_empty">"Non ci sono utenti bannati."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Bannato"</item>
+    <item quantity="other">"%1$d Bannati"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Controlla l\'ortografia o prova una nuova ricerca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nessun risultato per “%1$s ”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d persona"</item>
-    <item quantity="other">"%1$d persone"</item>
+    <item quantity="one">"%1$d Persona"</item>
+    <item quantity="other">"%1$d Persone"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Rimuovi ed escludi"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Rimuovi soltanto"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Riammetti"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Potrà entrare nuovamente in questa stanza se invitato."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Riammetti utente"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Riammetti nella stanza"</string>
   <string name="screen_room_member_list_mode_banned">"Esclusi"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"In attesa"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invitato"</item>
+    <item quantity="other">"%1$d Invitati"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"In attesa"</string>
   <string name="screen_room_member_list_role_administrator">"Amministratore"</string>
   <string name="screen_room_member_list_role_moderator">"Moderatore"</string>
   <string name="screen_room_member_list_role_owner">"Proprietario"</string>
@@ -116,8 +128,8 @@
   <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_security_and_privacy_add_room_address_action">"Aggiungi l\'indirizzo della stanza"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque può chiedere di entrare nella stanza, ma un amministratore o un moderatore dovrà accettare la richiesta."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi indirizzo"</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_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.
@@ -127,17 +139,18 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <string name="screen_security_and_privacy_encryption_section_footer">"Una volta attivata, la crittografia non può essere disattivata."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Crittografia"</string>
   <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ò trovare ed entrare"</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_invite_only_option_description">"Le persone possono partecipare solo se invitate"</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 alla stanza"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Gli spazi non sono attualmente supportati"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accesso"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membri dello spazio"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Per rendere visibile la stanza nell\'elenco delle stanze, è necessario l\'indirizzo della stanza."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo della stanza"</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_title">"Visibile nell\'elenco delle stanze pubbliche"</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_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>
@@ -145,7 +158,7 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <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>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedere a queste ultime. Questo assicura anche che tu possa condividere facilmente la tua stanza con altri. L\'indirizzo è anche necessario per rendere la stanza visibile in %1$s nell\'elenco delle stanze pubbliche."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità della stanza"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi sono un modo per trovare e accedere a stanze e spazi. Questo ti consente anche di condividerli facilmente con altri."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità"</string>
   <string name="screen_security_and_privacy_title">"Sicurezza e privacy"</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 481082bf63..d9c56aa89c 100644
--- a/features/roomdetails/impl/src/main/res/values-ka/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
@@ -6,14 +6,12 @@
   <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_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>
@@ -63,12 +61,10 @@
   <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>
-  <string name="screen_room_member_list_pending_header_title">"მომლოდინე"</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>
@@ -92,7 +88,6 @@
   <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_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>
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 fe864a4be6..196656408c 100644
--- a/features/roomdetails/impl/src/main/res/values-ko/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
@@ -8,14 +8,12 @@
   <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_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>
@@ -76,12 +74,11 @@
   <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_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_pending_header_title">"보류 중"</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,7 +105,6 @@
   <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>
@@ -131,21 +127,16 @@
   <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_description">"스페이스는 현재 지원되지 않습니다"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"스페이스 멤버들"</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_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_directory_visibility_section_footer">"%1$s 공개 방 디렉토리에서 이 방을 검색할 수 있도록 허용합니다"</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_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">"방 주소는 방을 찾고 액세스하는 방법입니다. 또한 이 주소를 사용하면 다른 사람들과 방을 쉽게 공유할 수 있습니다.
-%1$s 의 공개 방 디렉토리에서 방을 표시하려면 이 주소도 필요합니다."</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-lt/translations.xml b/features/roomdetails/impl/src/main/res/values-lt/translations.xml
index 1b3b44fdf2..727875d696 100644
--- a/features/roomdetails/impl/src/main/res/values-lt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-lt/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="screen_room_change_permissions_room_details">"Redaguoti kambarį"</string>
   <string name="screen_room_details_add_topic_title">"Pridėti temą"</string>
   <string name="screen_room_details_edit_room_title">"Redaguoti kambarį"</string>
   <string name="screen_room_details_edition_error">"Įvyko nežinoma klaida ir informacijos pakeisti nepavyko."</string>
@@ -19,6 +20,5 @@
     <item quantity="few">"%1$d asmenys"</item>
     <item quantity="other">"%1$d asmenų"</item>
   </plurals>
-  <string name="screen_room_member_list_pending_header_title">"Laukiama"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kambario nariai"</string>
 </resources>
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 16042fdf57..45499ee3c9 100644
--- a/features/roomdetails/impl/src/main/res/values-nb/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Du trenger en adresse til rommet for å gjøre det synlig i katalogen."</string>
-  <string name="screen_edit_room_address_title">"Romadresse"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Du trenger en adresse for å gjøre den synlig i den offentlige katalogen."</string>
+  <string name="screen_edit_room_address_title">"Rediger adresse"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Det oppstod en feil under oppdatering av varslingsinnstillingen."</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_polls_history_title">"Avstemninger"</string>
-  <string name="screen_room_change_permissions_administrators">"Kun for administratorer"</string>
+  <string name="screen_room_change_permissions_administrators">"Admin"</string>
   <string name="screen_room_change_permissions_ban_people">"Forby folk"</string>
   <string name="screen_room_change_permissions_delete_messages">"Fjern meldinger"</string>
-  <string name="screen_room_change_permissions_everyone">"Alle"</string>
-  <string name="screen_room_change_permissions_invite_people">"Inviter folk og godta forespørsler om å bli med"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderering av medlemmer"</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_member_moderation">"Administrer medlemmer"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Meldinger og innhold"</string>
-  <string name="screen_room_change_permissions_moderators">"Administratorer og moderatorer"</string>
-  <string name="screen_room_change_permissions_remove_people">"Fjern folk og avslå forespørsler om å bli med"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Fjern folk"</string>
   <string name="screen_room_change_permissions_room_avatar">"Endre romavatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Romdetaljer"</string>
+  <string name="screen_room_change_permissions_room_details">"Rediger detaljer"</string>
   <string name="screen_room_change_permissions_room_name">"Endre romnavn"</string>
   <string name="screen_room_change_permissions_room_topic">"Endre temaet til rommet"</string>
   <string name="screen_room_change_permissions_send_messages">"Send meldinger"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Kryptert"</string>
   <string name="screen_room_details_badge_not_encrypted">"Ikke kryptert"</string>
   <string name="screen_room_details_badge_public">"Offentlig rom"</string>
-  <string name="screen_room_details_edit_room_title">"Rediger rom"</string>
+  <string name="screen_room_details_edit_room_title">"Rediger detaljer"</string>
   <string name="screen_room_details_edition_error">"Det oppstod en ukjent feil, og informasjonen kunne ikke endres."</string>
   <string name="screen_room_details_edition_error_title">"Kan ikke oppdatere rommet"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Meldingene er krypterte. Det er bare du og mottakerne som har de unike nøklene til å låse dem opp."</string>
@@ -70,7 +70,7 @@
   <string name="screen_room_details_title">"Informasjon om rommet"</string>
   <string name="screen_room_details_topic_title">"Emne"</string>
   <string name="screen_room_details_updating_room">"Oppdaterer rommet …"</string>
-  <string name="screen_room_member_list_banned_empty">"Det er ingen utestengte brukere i dette rommet."</string>
+  <string name="screen_room_member_list_banned_empty">"Det er ingen utestengte brukere."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d person"</item>
     <item quantity="other">"%1$d personer"</item>
@@ -79,11 +79,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Bare fjern medlem"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Opphev utestengelse"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"De vil kunne bli med i dette rommet igjen hvis de blir invitert."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Opphev utestengelse av bruker"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Fjern utestengelsen fra rommet"</string>
   <string name="screen_room_member_list_mode_banned">"Utestengt"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmer"</string>
-  <string name="screen_room_member_list_pending_header_title">"Venter"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrator"</string>
+  <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Eier"</string>
   <string name="screen_room_member_list_room_members_header_title">"Medlemmer av rommet"</string>
@@ -111,15 +110,14 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Meldinger og innhold"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorer"</string>
   <string name="screen_room_roles_and_permissions_owners">"Eiere"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Tillatelser"</string>
   <string name="screen_room_roles_and_permissions_reset">"Tilbakestill tillatelser"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Når du har tilbakestilt tillatelsene, mister du gjeldende innstillinger."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Vil du tilbakestille tillatelsene?"</string>
   <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_security_and_privacy_add_room_address_action">"Legg til romadresse"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle kan be om å bli med i rommet, men en administrator eller moderator må godta forespørselen."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Legg til adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle må be om tilgang."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om å bli med"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktiver kryptering"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når kryptering for et rom er aktivert, kan den ikke deaktiveres. Meldingshistorikken vil bare være synlig for rommedlemmer siden de ble invitert eller siden de ble med i rommet.
@@ -129,26 +127,24 @@ Vi anbefaler ikke å aktivere kryptering for rom som hvem som helst kan finne og
   <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering er aktivert, kan det ikke deaktiveres."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktiver ende-til-ende-kryptering"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan finne og bli med"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan bli med."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Alle"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Folk kan bare bli med hvis de er invitert"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Bare inviterte personer kan bli med."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun for inviterte"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Tilgang til rom"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Områder støttes ikke for øyeblikket"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Tilgang"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer av område"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse til rommet for å gjøre rommet synlig i romkatalogen."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Romadresse"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Områder støttes ikke for øyeblikket"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse for å gjøre den synlig i den offentlige katalogen."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillat at dette rommet blir funnet ved å søke %1$s offentlig romkatalog"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i offentlig romkatalog"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Alle"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i offentlig katalog"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Alle (historikken er offentlig)"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan lese historikk"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Medlemmer bare siden de ble invitert"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden du valgte dette alternativet"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Medlemmer siden de ble invitert"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Medlemmer (full historikk)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Romadresser er måter å finne og få tilgang til rom på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
 Du kan velge å publisere rommet ditt i hjemeserverens offentlige romkatalog."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publisering av rom"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Romadresser er en måte å finne og få tilgang til rommene på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
-Adressen er også nødvendig for å gjøre rommet synlig i den offentlige romkatalogen på %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Romsynlighet"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Synlighet"</string>
   <string name="screen_security_and_privacy_title">"Sikkerhet og personvern"</string>
 </resources>
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 baec0b0bb9..f780437cd5 100644
--- a/features/roomdetails/impl/src/main/res/values-nl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nl/translations.xml
@@ -6,14 +6,12 @@
   <string name="screen_room_change_permissions_administrators">"Alleen beheerders"</string>
   <string name="screen_room_change_permissions_ban_people">"Personen verbannen"</string>
   <string name="screen_room_change_permissions_delete_messages">"Berichten verwijderen"</string>
-  <string name="screen_room_change_permissions_everyone">"Iedereen"</string>
   <string name="screen_room_change_permissions_invite_people">"Nodig personen uit en accepteer verzoeken om deel te nemen"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderatie van leden"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Berichten en inhoud"</string>
   <string name="screen_room_change_permissions_moderators">"Beheerders en moderators"</string>
   <string name="screen_room_change_permissions_remove_people">"Verwijder personen en weiger verzoeken om deel te nemen"</string>
   <string name="screen_room_change_permissions_room_avatar">"Kamerafbeelding wijzigen"</string>
-  <string name="screen_room_change_permissions_room_details">"Kamergegevens"</string>
+  <string name="screen_room_change_permissions_room_details">"Kamer bewerken"</string>
   <string name="screen_room_change_permissions_room_name">"Kamernaam wijzigen"</string>
   <string name="screen_room_change_permissions_room_topic">"Kameronderwerp wijzigen"</string>
   <string name="screen_room_change_permissions_send_messages">"Berichten verzenden"</string>
@@ -68,12 +66,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Alleen lid verwijderen"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Ontbannen"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Ze kunnen opnieuw tot de kamer toetreden als ze worden uitgenodigd."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Ontban gebruiker"</string>
   <string name="screen_room_member_list_mode_banned">"Verbannen"</string>
   <string name="screen_room_member_list_mode_members">"Leden"</string>
-  <string name="screen_room_member_list_pending_header_title">"In behandeling"</string>
-  <string name="screen_room_member_list_role_administrator">"Beheerder"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Alleen beheerders"</string>
+  <string name="screen_room_member_list_role_moderator">"Beheerders en moderators"</string>
   <string name="screen_room_member_list_room_members_header_title">"Kamerleden"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s ontbannen"</string>
   <string name="screen_room_notification_settings_allow_custom">"Aanpassen toestaan"</string>
@@ -97,7 +93,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Moderatie van leden"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Berichten en inhoud"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderators"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Rechten"</string>
   <string name="screen_room_roles_and_permissions_reset">"Rechten opnieuw instellen"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Als je de rechten opnieuw instelt, raak je de huidige instellingen kwijt."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Rechten opnieuw instellen?"</string>
@@ -106,5 +101,4 @@
   <string name="screen_room_roles_and_permissions_title">"Rollen en rechten"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Vraag om toe te treden"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Iedereen"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Iedereen"</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 b9847c6cfd..620bd0d674 100644
--- a/features/roomdetails/impl/src/main/res/values-pl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
@@ -7,15 +7,13 @@
   <string name="screen_polls_history_title">"Ankiety"</string>
   <string name="screen_room_change_permissions_administrators">"Tylko administratorzy"</string>
   <string name="screen_room_change_permissions_ban_people">"Banowanie osób"</string>
-  <string name="screen_room_change_permissions_delete_messages">"Usuwanie wiadomości"</string>
-  <string name="screen_room_change_permissions_everyone">"Wszyscy"</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_member_moderation">"Moderacja członków"</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_room_avatar">"Zmień awatar pokoju"</string>
-  <string name="screen_room_change_permissions_room_details">"Szczegóły pokoju"</string>
+  <string name="screen_room_change_permissions_room_details">"Edytuj pokój"</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>
@@ -50,6 +48,8 @@
   <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>
   <string name="screen_room_details_error_unmuting">"Nie udało się wyłączyć wyciszenia tego pokoju. Spróbuj ponownie."</string>
+  <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_leave_conversation_title">"Opuść rozmowę"</string>
   <string name="screen_room_details_leave_room_title">"Opuść pokój"</string>
@@ -78,12 +78,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Tylko usuń członka"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Odbanuj"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Będą mogli ponownie dołączyć do tego pokoju, jeśli zostaną zaproszeni."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Odbanuj użytkownika"</string>
+  <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_pending_header_title">"Oczekujące"</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_administrator">"Tylko administratorzy"</string>
+  <string name="screen_room_member_list_role_moderator">"Administratorzy i moderatorzy"</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>
@@ -110,7 +109,6 @@
   <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_permissions_header">"Uprawnienia"</string>
   <string name="screen_room_roles_and_permissions_reset">"Resetuj 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>
@@ -133,21 +131,19 @@ Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do
   <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_space_members_option_description">"Przestrzenie nie są obecnie wspierane"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Członkowie przestrzeni"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi, potrzebny jest adres pokoju."</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_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_title">"Widoczny w katalogu pokoi publicznych"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Wszyscy"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokolwiek"</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_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_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
-Dodatkowo adres pokoju jest wymagany, aby pomieszczenie było widoczne w katalogu pokoi publicznych %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pomieszczenia"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pokoju"</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 9df66d9205..0b65ee0f63 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
@@ -1,21 +1,21 @@
 <?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">"Você precisará de um endereço de sala para torná-la visível no diretório."</string>
-  <string name="screen_edit_room_address_title">"Endereço da sala"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Editar endereço"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Ocorreu um erro ao atualizar a configuração de notificação."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Seu servidor-casa não suporta esta opção em salas criptografadas. Você pode não ser notificado em algumas salas."</string>
   <string name="screen_polls_history_title">"Enquetes"</string>
-  <string name="screen_room_change_permissions_administrators">"Somente administradores"</string>
+  <string name="screen_room_change_permissions_administrators">"Administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Banir pessoas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remover mensagens"</string>
-  <string name="screen_room_change_permissions_everyone">"Todos"</string>
-  <string name="screen_room_change_permissions_invite_people">"Convide pessoas e aceite solicitações de entrada"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderação de membros"</string>
+  <string name="screen_room_change_permissions_everyone">"Membro"</string>
+  <string name="screen_room_change_permissions_invite_people">"Convidar pessoas"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gerenciar membros"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensagens e conteúdo"</string>
-  <string name="screen_room_change_permissions_moderators">"Administradores e moderadores"</string>
-  <string name="screen_room_change_permissions_remove_people">"Remover pessoas e recusar solicitações de entrada"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderador"</string>
+  <string name="screen_room_change_permissions_remove_people">"Remover pessoas"</string>
   <string name="screen_room_change_permissions_room_avatar">"Alterar avatar da sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Detalhes da sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar detalhes"</string>
   <string name="screen_room_change_permissions_room_name">"Alterar nome da sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Alterar tópico da sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensagens"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Criptografado"</string>
   <string name="screen_room_details_badge_not_encrypted">"Não criptografado"</string>
   <string name="screen_room_details_badge_public">"Sala pública"</string>
-  <string name="screen_room_details_edit_room_title">"Editar sala"</string>
+  <string name="screen_room_details_edit_room_title">"Editar detalhes"</string>
   <string name="screen_room_details_edition_error">"Ocorreu um erro desconhecido e as informações não puderam ser alteradas."</string>
   <string name="screen_room_details_edition_error_title">"Não foi possível atualizar a sala"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"As mensagens são protegidas com cadeados. Somente você e os destinatários têm as chaves exclusivas para desbloqueá-los."</string>
@@ -50,6 +50,8 @@
   <string name="screen_room_details_error_loading_notification_settings">"Ocorreu um erro ao carregar as configurações de notificação."</string>
   <string name="screen_room_details_error_muting">"Falha ao silenciar esta sala, tente novamente."</string>
   <string name="screen_room_details_error_unmuting">"Falha ao desilenciar esta sala. Tente novamente."</string>
+  <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_leave_conversation_title">"Sair da conversa"</string>
   <string name="screen_room_details_leave_room_title">"Sair da sala"</string>
@@ -68,7 +70,13 @@
   <string name="screen_room_details_title">"Informação da sala"</string>
   <string name="screen_room_details_topic_title">"Tópico"</string>
   <string name="screen_room_details_updating_room">"Atualizando a sala…"</string>
-  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos nesta sala."</string>
+  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d banido"</item>
+    <item quantity="other">"%1$d banidos"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Confira a ortografia ou tente uma nova busca"</string>
+  <string name="screen_room_member_list_empty_search_title">"Nenhum resultado para “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d pessoa"</item>
     <item quantity="other">"%1$d pessoas"</item>
@@ -77,11 +85,15 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Somente remover o membro"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Desbanir"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Esta pessoa poderá entrar nesta sala novamente se for convidada."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Desbanir usuário"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Membros"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrador"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d convidado"</item>
+    <item quantity="other">"%1$d convidados"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pendente"</string>
+  <string name="screen_room_member_list_role_administrator">"Administradores"</string>
   <string name="screen_room_member_list_role_moderator">"Moderador"</string>
   <string name="screen_room_member_list_role_owner">"Proprietário"</string>
   <string name="screen_room_member_list_room_members_header_title">"Membros da sala"</string>
@@ -116,9 +128,11 @@
   <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_security_and_privacy_add_room_address_action">"Adicionar endereço da sala"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador terá que aceitar o pedido."</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>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Qualquer um em %1$s pode entrar, mas todos os outros devem pedir acesso."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar a criptografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a criptografia de uma sala não pode ser desativada. O histórico de mensagens só será visível para os membros da sala desde que foram convidados ou desde que entraram na sala.
 Ninguém além dos membros da sala poderá ler as mensagens. Isso pode impedir que os bots e as pontes funcionem corretamente.
@@ -127,26 +141,29 @@ Não recomendamos que você ative a criptografia para salas que qualquer pessoa
   <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a criptografia não poderá ser desativada."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Criptografia"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar a criptografia de ponta a ponta"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode encontrar e entrar"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode entrar"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"As pessoas só podem participar se forem convidadas"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Somente para convidados"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Escolha os espaços dos quais os membros podem entrar nesta sala sem um convite. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gerenciar espaços"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Apenas pessoas convidadas podem entrar."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privado"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Qualquer um em espaços autorizados podem entrar."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Qualquer um em %1$s pode entrar."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço de sala para torná-la visível no diretório de salas."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Endereço da sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Endereço publicado"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permitir que esta sala seja encontrada pesquisando diretório de salas públicas de %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório de salas públicas"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permite que seja encontrada ao buscar no diretório público."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Somente membros, desde que foram convidados"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Somente para membros após selecionar esta opção"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Membros desde o convite"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Membros (histórico completo)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
 Você pode optar por publicar sua sala no diretório público de salas do seu servidor-casa."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicação da sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
-O endereço também é necessário para que você possa ver a sala no diretório público de salas do %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhá-las facilmente com outras pessoas."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade"</string>
   <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
 </resources>
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 6338f63b0c..b682c0597d 100644
--- a/features/roomdetails/impl/src/main/res/values-pt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
@@ -8,14 +8,12 @@
   <string name="screen_room_change_permissions_administrators">"Apenas administradores"</string>
   <string name="screen_room_change_permissions_ban_people">"Banir pessoas"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remover mensagens"</string>
-  <string name="screen_room_change_permissions_everyone">"Toda a gente"</string>
   <string name="screen_room_change_permissions_invite_people">"Convidar pessoas e aceitar pedidos de entrada"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderação de participantes"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mensagens e conteúdo"</string>
   <string name="screen_room_change_permissions_moderators">"Administradores e moderadores"</string>
   <string name="screen_room_change_permissions_remove_people">"Remover pessoas e rejeitar pedidos de entrada"</string>
   <string name="screen_room_change_permissions_room_avatar">"Alterar o ícone da sala"</string>
-  <string name="screen_room_change_permissions_room_details">"Detalhes da sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Editar sala"</string>
   <string name="screen_room_change_permissions_room_name">"Altera o nome da sala"</string>
   <string name="screen_room_change_permissions_room_topic">"Alterar a descrição da sala"</string>
   <string name="screen_room_change_permissions_send_messages">"Enviar mensagens"</string>
@@ -79,12 +77,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Remover apenas"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Anular banimento"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Poderão juntar-se novamente a esta sala se forem convidados."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Anular banimento do utilizador"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Desbanir da sala"</string>
   <string name="screen_room_member_list_mode_banned">"Banidos"</string>
   <string name="screen_room_member_list_mode_members">"Participantes"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pendente"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrador"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderador"</string>
+  <string name="screen_room_member_list_role_administrator">"Apenas administradores"</string>
+  <string name="screen_room_member_list_role_moderator">"Administradores e moderadores"</string>
   <string name="screen_room_member_list_role_owner">"Dono / Dona"</string>
   <string name="screen_room_member_list_room_members_header_title">"Participantes"</string>
   <string name="screen_room_member_list_unbanning_user">"A anular banimento de %1$s"</string>
@@ -111,7 +108,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mensagens e conteúdo"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderadores"</string>
   <string name="screen_room_roles_and_permissions_owners">"Donos"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Permissões"</string>
   <string name="screen_room_roles_and_permissions_reset">"Repor permissões"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ao repores as permissões, perderás as configurações atuais."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Repor as permissões?"</string>
@@ -134,8 +130,8 @@ Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Só é possível entrar tendo um convite"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Apenas por convite"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Os espaços ainda não estão implementados"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Os espaços ainda não estão implementados"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Endereço da sala"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite que esta sala seja encontrada através do diretório público do %1$s."</string>
@@ -147,8 +143,6 @@ Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
 Podes escolher publicar a sala no diretório público do teu servidor."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicar sala"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
-Além disso, é necessário ter endereço para publicar a sala no diretório público do %1$s."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
   <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
 </resources>
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 7379a45550..854d3643ce 100644
--- a/features/roomdetails/impl/src/main/res/values-ro/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în director."</string>
-  <string name="screen_edit_room_address_title">"Adresa camerei"</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>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Serverul dumneavoastră nu acceptă această opțiune în camerele criptate, este posibil să nu primiți notificări în unele camere."</string>
   <string name="screen_polls_history_title">"Sondaje"</string>
-  <string name="screen_room_change_permissions_administrators">"Doar administratori"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
   <string name="screen_room_change_permissions_ban_people">"Interziceți persoane"</string>
   <string name="screen_room_change_permissions_delete_messages">"Ștergeți mesajele"</string>
-  <string name="screen_room_change_permissions_everyone">"Toți"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invitați persoane și acceptați cereri de alaturare"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderarea membrilor"</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_member_moderation">"Gestionați membrii"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mesaje și conținut"</string>
-  <string name="screen_room_change_permissions_moderators">"Administratori și moderatori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Îndepărtați persoane și refuzați cereri de alăturare"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Îndepărtați persoane"</string>
   <string name="screen_room_change_permissions_room_avatar">"Schimbați avatarul camerei"</string>
-  <string name="screen_room_change_permissions_room_details">"Detaliile camerei"</string>
+  <string name="screen_room_change_permissions_room_details">"Editați detaliile"</string>
   <string name="screen_room_change_permissions_room_name">"Schimbă numele camerei"</string>
   <string name="screen_room_change_permissions_room_topic">"Schimbați subiectul camerei"</string>
   <string name="screen_room_change_permissions_send_messages">"Trimiteți mesaje"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Criptat"</string>
   <string name="screen_room_details_badge_not_encrypted">"Necriptat"</string>
   <string name="screen_room_details_badge_public">"Cameră publică"</string>
-  <string name="screen_room_details_edit_room_title">"Editați camera"</string>
+  <string name="screen_room_details_edit_room_title">"Editați detaliile"</string>
   <string name="screen_room_details_edition_error">"A apărut o eroare la actualizarea detaliilor camerei"</string>
   <string name="screen_room_details_edition_error_title">"Nu s-a putut actualiza camera"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Mesajele sunt securizate cu încuietori. Doar dumneavoastră și destinatarii aveți cheile unice pentru a le debloca."</string>
@@ -70,19 +70,32 @@
   <string name="screen_room_details_title">"Informatii camera"</string>
   <string name="screen_room_details_topic_title">"Subiect"</string>
   <string name="screen_room_details_updating_room">"Se actualizează camera…"</string>
-  <string name="screen_room_member_list_banned_empty">"Nu există utilizatori interziși în această cameră."</string>
+  <string name="screen_room_member_list_banned_empty">"Nu există utilizatori interziși."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Interzis"</item>
+    <item quantity="few">"%1$d Interziși"</item>
+    <item quantity="other">"%1$d Interziși"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Verificați ortografia sau încercați o căutare nouă"</string>
+  <string name="screen_room_member_list_empty_search_title">"Niciun rezultat pentru “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"o persoană"</item>
+    <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_room_member_list_manage_member_remove_confirmation_ban">"Îndepărtați și interziceți membrul"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Doar înlăturare"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Anulare excludere"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Se vor putea alătura din nou acestei săli dacă sunt invitați."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Anulați interzicerea utilizatorului"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Revocati excluderea din camera"</string>
   <string name="screen_room_member_list_mode_banned">"Excluși"</string>
   <string name="screen_room_member_list_mode_members">"Membri"</string>
-  <string name="screen_room_member_list_pending_header_title">"În așteptare"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invitat"</item>
+    <item quantity="few">"%1$d Invitați"</item>
+    <item quantity="other">"%1$d Invitați"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"În așteptare"</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">"Proprietar"</string>
@@ -118,9 +131,11 @@
   <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_security_and_privacy_add_room_address_action">"Adăugați adresa camerei"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Oricine poate cere să se alăture camerei, dar un administrator sau moderator va trebui să accepte cererea."</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">"Cereț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. 
 Nimeni în afară de membrii camerei nu va putea citi messaje. Acest lucru poate împiedica funcționarea corectă a boților și a punților. 
@@ -129,26 +144,29 @@ Nu recomandăm activarea criptării pentru camerele pe care oricine le poate gă
   <string name="screen_security_and_privacy_encryption_section_footer">"Odată activată, criptarea nu poate fi dezactivată."</string>
   <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 poate găsi și alătura camerei"</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_anyone_option_title">"Oricine"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Persoanele se pot alătura numai dacă invitate"</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_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 la cameră"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spațiile nu sunt momentan suportate."</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_address_section_footer">"Veți avea nevoie de o adresă de cameră pentru a o face vizibilă în directorul de camere."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresa camerei"</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"</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_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>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camerele. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dvs. cu alte persoane.
-Adresa este necesară și pentru ca camera să fie vizibilă în directorul public de camere al %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Vizibilitatea camerei"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresele sunt o modalitate de a găsi și accesa camere și spații. Acest lucru asigură, de asemenea, că le puteți partaja cu ușurință cu alții."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Vizibilitate"</string>
   <string name="screen_security_and_privacy_title">"Securitate &amp; confidențialitate"</string>
 </resources>
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 82efd71adf..47de4c388c 100644
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@@ -1,21 +1,21 @@
 <?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_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_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>
@@ -71,6 +71,8 @@
   <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_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="one">"%1$d пользователь"</item>
     <item quantity="few">"%1$d пользователя"</item>
@@ -80,11 +82,11 @@
   <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_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_pending_header_title">"В ожидании"</string>
-  <string name="screen_room_member_list_role_administrator">"Администратор"</string>
+  <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>
@@ -119,8 +121,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_security_and_privacy_add_room_address_action">"Добавить адрес комнаты"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Любой желающий может подать заявку на присоединение к комнате, но администратор или модератор должен будет принять запрос."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес"</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_enable_encryption_alert_confirm_button_title">"Да, включить шифрование"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Шифрование комнаты нельзя будет отключить, история сообщений будет видна только участникам комнаты с момента их приглашения или с момента присоединения к комнате.
@@ -132,15 +134,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_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_description">"Пространства в настоящее время не поддерживаются."</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Участники пространства"</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_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_header">"Кто может читать историю"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Участники только с тех пор, как они были приглашены"</string>
@@ -148,8 +151,6 @@
   <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">"Адреса комнат — это способ найти комнату и получить к ним доступ. Это также гарантирует, что вы сможете легко поделиться своей комнатой с другими.
-Адрес также необходим для отображения комнаты в каталоге %1$s общедоступных комнат."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Видимость комнаты"</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-sk/translations.xml b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
index 530455cbf2..f61e3341bf 100644
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@@ -1,21 +1,21 @@
 <?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">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári."</string>
-  <string name="screen_edit_room_address_title">"Adresa miestnosti"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Budete potrebovať adresu, aby sa zobrazovala vo verejnom adresári."</string>
+  <string name="screen_edit_room_address_title">"Upraviť adresu"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Pri aktualizácii nastavenia oznámenia došlo k chybe."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Váš domovský server nepodporuje túto možnosť v šifrovaných miestnostiach, v niektorých miestnostiach nemusíte dostať upozornenie."</string>
   <string name="screen_polls_history_title">"Ankety"</string>
-  <string name="screen_room_change_permissions_administrators">"Iba správcovia"</string>
+  <string name="screen_room_change_permissions_administrators">"Správca"</string>
   <string name="screen_room_change_permissions_ban_people">"Zakázať ľudí"</string>
   <string name="screen_room_change_permissions_delete_messages">"Odstrániť správy"</string>
-  <string name="screen_room_change_permissions_everyone">"Všetci"</string>
-  <string name="screen_room_change_permissions_invite_people">"Pozvite ľudí a prijmite žiadosti o pripojenie"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Moderovanie členov"</string>
+  <string name="screen_room_change_permissions_everyone">"Člen"</string>
+  <string name="screen_room_change_permissions_invite_people">"Pozvať ľudí"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Spravovať členov"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Správy a obsah"</string>
-  <string name="screen_room_change_permissions_moderators">"Správcovia a moderátori"</string>
-  <string name="screen_room_change_permissions_remove_people">"Odstrániť ľudí a odmietnuť žiadosti o pripojenie"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderátor"</string>
+  <string name="screen_room_change_permissions_remove_people">"Odstrániť ľudí"</string>
   <string name="screen_room_change_permissions_room_avatar">"Zmeniť obrázok miestnosti"</string>
-  <string name="screen_room_change_permissions_room_details">"Podrobnosti o miestnosti"</string>
+  <string name="screen_room_change_permissions_room_details">"Upraviť podrobnosti"</string>
   <string name="screen_room_change_permissions_room_name">"Zmeniť názov miestnosti"</string>
   <string name="screen_room_change_permissions_room_topic">"Zmeniť tému miestnosti"</string>
   <string name="screen_room_change_permissions_send_messages">"Odoslať správy"</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Zašifrované"</string>
   <string name="screen_room_details_badge_not_encrypted">"Nešifrované"</string>
   <string name="screen_room_details_badge_public">"Verejná miestnosť"</string>
-  <string name="screen_room_details_edit_room_title">"Upraviť miestnosť"</string>
+  <string name="screen_room_details_edit_room_title">"Upraviť podrobnosti"</string>
   <string name="screen_room_details_edition_error">"Vyskytla sa neznáma chyba a informácie nebolo možné zmeniť."</string>
   <string name="screen_room_details_edition_error_title">"Nepodarilo sa aktualizovať miestnosť"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Správy sú zabezpečené zámkami. Jedine vy a príjemcovia máte jedinečné kľúče na ich odomknutie."</string>
@@ -50,6 +50,8 @@
   <string name="screen_room_details_error_loading_notification_settings">"Pri načítaní nastavení oznámení došlo k chybe."</string>
   <string name="screen_room_details_error_muting">"Nepodarilo sa stlmiť túto miestnosť, skúste to prosím znova."</string>
   <string name="screen_room_details_error_unmuting">"Nepodarilo sa zrušiť stlmenie tejto miestnosti, skúste to prosím znova."</string>
+  <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_leave_conversation_title">"Opustiť konverzáciu"</string>
   <string name="screen_room_details_leave_room_title">"Opustiť miestnosť"</string>
@@ -68,7 +70,14 @@
   <string name="screen_room_details_title">"Informácie o miestnosti"</string>
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Aktualizácia miestnosti…"</string>
-  <string name="screen_room_member_list_banned_empty">"V tejto miestnosti nie sú žiadni zakázaní používatelia."</string>
+  <string name="screen_room_member_list_banned_empty">"Neexistujú žiadni zablokovaní používatelia."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d zakázaný"</item>
+    <item quantity="few">"%1$d zakázaní"</item>
+    <item quantity="other">"%1$d zakázaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Skontrolujte preklepy alebo skúste nové vyhľadávanie"</string>
+  <string name="screen_room_member_list_empty_search_title">"Žiadne výsledky pre „%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>
@@ -78,11 +87,16 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Iba odstrániť člena"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Zrušiť zákaz"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"V prípade pozvania sa budú môcť znova pripojiť k tejto miestnosti."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Zrušiť zákaz používateľa"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Zrušiť zákaz prístupu do miestnosti"</string>
   <string name="screen_room_member_list_mode_banned">"Zakázaní"</string>
   <string name="screen_room_member_list_mode_members">"Členovia"</string>
-  <string name="screen_room_member_list_pending_header_title">"Čaká sa"</string>
-  <string name="screen_room_member_list_role_administrator">"Administrátor"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d pozvaný"</item>
+    <item quantity="few">"%1$d pozvaní"</item>
+    <item quantity="other">"%1$d pozvaných"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Čaká na schválenie"</string>
+  <string name="screen_room_member_list_role_administrator">"Správca"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_role_owner">"Vlastník"</string>
   <string name="screen_room_member_list_room_members_header_title">"Členovia miestnosti"</string>
@@ -110,15 +124,15 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Správy a obsah"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderátori"</string>
   <string name="screen_room_roles_and_permissions_owners">"Vlastníci"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Oprávnenia"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Povolenia"</string>
   <string name="screen_room_roles_and_permissions_reset">"Obnoviť povolenia"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Po obnovení oprávnení prídete o aktuálne nastavenia."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Obnoviť oprávnenia?"</string>
   <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_security_and_privacy_add_room_address_action">"Pridať adresu miestnosti"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Ktokoľvek môže požiadať o pripojenie do miestnosti, ale správca alebo moderátor bude musieť žiadosť prijať."</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Pridať adresu"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Všetci musia požiadať o prístup."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Požiadať o pripojenie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Áno, povoliť šifrovanie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivácii nie je možné zakázať šifrovanie pre miestnosť. História správ bude viditeľná len pre členov miestnosti, odkedy boli pozvaní alebo keď vstúpili do miestnosti. 
@@ -128,17 +142,22 @@ To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame p
   <string name="screen_security_and_privacy_encryption_section_footer">"Po zapnutí už šifrovanie nie je možné vypnúť."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Šifrovanie"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Povoliť end-to-end šifrovanie"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Ktokoľvek môže nájsť a pripojiť sa"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Pripojiť sa môže ktokoľvek."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Ktokoľvek"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Ľudia sa môžu pripojiť len vtedy, ak sú pozvaní"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vyberte, ktorých členovia priestorov sa môžu pripojiť k tejto miestnosti bez pozvánky.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Spravovať priestory"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Pripojiť sa môžu iba pozvaní ľudia."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Iba na pozvánku"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Prístup do miestnosti"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Priestory momentálne nie sú podporované"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Prístup"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Ktokoľvek v povolených priestoroch sa môže pripojiť."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Ktokoľvek v %1$s sa môže pripojiť."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členovia priestoru"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu miestnosti, aby bola viditeľná v adresári miestností."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adresa miestnosti"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Priestory momentálne nie sú podporované"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu, aby sa zobrazovala vo verejnom adresári."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožniť vyhľadanie tejto miestnosti v adresári verejných miestností %1$s"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditeľné v adresári verejných miestností"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umožniť nájdenie vyhľadávaním vo verejnom adresári."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditeľné vo verejnom adresári"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokoľvek"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kto môže čítať históriu"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Len pre členov, odkedy boli pozvaní"</string>
@@ -146,8 +165,7 @@ To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame p
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. To tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
 Môžete sa rozhodnúť zverejniť svoju miestnosť v adresári verejných miestností vášho domovského servera."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Zverejnenie miestnosti"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. Toto tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
-Adresa je tiež potrebná, aby bola miestnosť viditeľná v adresári verejných miestností %1$s."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditeľnosť miestnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy sú spôsob, ako nájsť a získať prístup do miestností a priestorov. To tiež zabezpečuje, že ich môžete jednoducho zdieľať s ostatnými."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditeľnosť"</string>
   <string name="screen_security_and_privacy_title">"Bezpečnosť a súkromie"</string>
 </resources>
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 1cc11933ab..1cc0d81715 100644
--- a/features/roomdetails/impl/src/main/res/values-sv/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
@@ -8,14 +8,12 @@
   <string name="screen_room_change_permissions_administrators">"Endast administratörer"</string>
   <string name="screen_room_change_permissions_ban_people">"Banna personer"</string>
   <string name="screen_room_change_permissions_delete_messages">"Ta bort meddelanden"</string>
-  <string name="screen_room_change_permissions_everyone">"Alla"</string>
   <string name="screen_room_change_permissions_invite_people">"Bjuda in personer och acceptera förfrågningar om att gå med"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Medlemsmoderering"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Meddelanden och innehåll"</string>
   <string name="screen_room_change_permissions_moderators">"Administratörer och moderatorer"</string>
   <string name="screen_room_change_permissions_remove_people">"Ta bort personer och avslå förfrågningar om att gå med"</string>
   <string name="screen_room_change_permissions_room_avatar">"Byt rumsavatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Rumsdetaljer"</string>
+  <string name="screen_room_change_permissions_room_details">"Redigera rummet"</string>
   <string name="screen_room_change_permissions_room_name">"Byt rumsnamn"</string>
   <string name="screen_room_change_permissions_room_topic">"Byt rumsämne"</string>
   <string name="screen_room_change_permissions_send_messages">"Skicka meddelanden"</string>
@@ -77,12 +75,11 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Ta bara bort medlem"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Avbanna"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Denne kommer kunna gå med i rummet igen om denne bjuds in"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Avbanna användare"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Avbanna från rummet"</string>
   <string name="screen_room_member_list_mode_banned">"Bannade"</string>
   <string name="screen_room_member_list_mode_members">"Medlemmar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Väntar"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Endast administratörer"</string>
+  <string name="screen_room_member_list_role_moderator">"Administratörer och moderatorer"</string>
   <string name="screen_room_member_list_role_owner">"Ägare"</string>
   <string name="screen_room_member_list_room_members_header_title">"Rumsmedlemmar"</string>
   <string name="screen_room_member_list_unbanning_user">"Avbannar %1$s"</string>
@@ -109,7 +106,6 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Meddelanden och innehåll"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorer"</string>
   <string name="screen_room_roles_and_permissions_owners">"Ägare"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Behörigheter"</string>
   <string name="screen_room_roles_and_permissions_reset">"Återställ behörigheter"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"När du har återställt behörigheterna kommer du att förlora de aktuella inställningarna."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Återställ behörigheter?"</string>
@@ -132,21 +128,16 @@ Vi rekommenderar inte att aktivera kryptering för rum som vem som helst kan hit
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Användare kan bara gå med om de är inbjudna"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Endast inbjudan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Tillgång till rum"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Utrymmen stöds för närvarande inte"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Utrymmesmedlemmar"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i rumskatalogen."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Rumsadress"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Utrymmen stöds för närvarande inte"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i katalogen."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillåt att detta rum hittas genom att söka i den offentliga rumskatalogen på %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i katalogen för offentliga rum"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Vem som helst"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Vem kan läsa historik"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Endast medlemmar sedan de bjöds in"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Endast medlemmar sedan det här alternativet har valts"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra.
 Du kan välja att publicera ditt rum i din hemservers offentliga rumskatalog."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Rumspublicering"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra. 
-Adressen krävs också för att göra rummet synligt i%1$s katalog för offentliga rum."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Rumssynlighet"</string>
   <string name="screen_security_and_privacy_title">"Säkerhet och sekretess"</string>
 </resources>
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 92caaaf5eb..01cac3a6cb 100644
--- a/features/roomdetails/impl/src/main/res/values-tr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
@@ -8,14 +8,12 @@
   <string name="screen_room_change_permissions_administrators">"Yalnızca yöneticiler"</string>
   <string name="screen_room_change_permissions_ban_people">"İnsanları yasakla"</string>
   <string name="screen_room_change_permissions_delete_messages">"Mesajları kaldır"</string>
-  <string name="screen_room_change_permissions_everyone">"Herkes"</string>
   <string name="screen_room_change_permissions_invite_people">"Kişileri davet etme ve katılma isteklerini kabul etme"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Üye moderasyonu"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Mesajlar ve içerik"</string>
   <string name="screen_room_change_permissions_moderators">"Yöneticiler ve moderatörler"</string>
   <string name="screen_room_change_permissions_remove_people">"Kişileri kaldırma ve katılma isteklerini reddetme"</string>
   <string name="screen_room_change_permissions_room_avatar">"Oda resmini değiştir"</string>
-  <string name="screen_room_change_permissions_room_details">"Oda bilgileri"</string>
+  <string name="screen_room_change_permissions_room_details">"Odayı Düzenle"</string>
   <string name="screen_room_change_permissions_room_name">"Oda adını değiştir"</string>
   <string name="screen_room_change_permissions_room_topic">"Oda konusunu değiştir"</string>
   <string name="screen_room_change_permissions_send_messages">"Mesaj gönder"</string>
@@ -73,12 +71,10 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Yalnızca üyeyi kaldır"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Yasağı Kaldır"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Davet edildikleri takdirde bu odaya tekrar katılabileceklerdir."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Kullanıcının yasağını kaldır"</string>
   <string name="screen_room_member_list_mode_banned">"Yasaklandı"</string>
   <string name="screen_room_member_list_mode_members">"Üyeler"</string>
-  <string name="screen_room_member_list_pending_header_title">"Beklemede"</string>
-  <string name="screen_room_member_list_role_administrator">"Yönetici"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderatör"</string>
+  <string name="screen_room_member_list_role_administrator">"Yalnızca yöneticiler"</string>
+  <string name="screen_room_member_list_role_moderator">"Yöneticiler ve moderatörler"</string>
   <string name="screen_room_member_list_room_members_header_title">"Oda üyeleri"</string>
   <string name="screen_room_member_list_unbanning_user">"Yasak kaldırılıyor %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Özel ayarlara izin ver"</string>
@@ -102,7 +98,6 @@
   <string name="screen_room_roles_and_permissions_member_moderation">"Üye moderasyonu"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Mesajlar ve içerik"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatörler"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"İzinler"</string>
   <string name="screen_room_roles_and_permissions_reset">"İzinleri sıfırla"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"İzinleri sıfırladığınızda, mevcut ayarları kaybedersiniz."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"İzinleri sıfırla?"</string>
@@ -125,9 +120,9 @@ Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleşt
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"İnsanlar yalnızca davet edildiklerinde katılabilirler"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Yalnızca davet"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Oda Erişimi"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Alanlar şu anda desteklenmiyor"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Alan üyeleri"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Oda dizininde görünür kılmak için bir oda adresine ihtiyacınız olacaktır."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Alanlar şu anda desteklenmiyor"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Dizinde görünür hale getirmek için bir oda adresine ihtiyacınız olacak."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Oda adresi"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu odanın %1$s genel oda dizininde arama yapılarak bulunmasına izin verin"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Genel oda dizininde görünür"</string>
@@ -138,8 +133,6 @@ Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleşt
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yoludur. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
 Odanızı ana sunucunuzun genel oda dizininde yayınlamayı seçebilirsiniz."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Oda yayınlama"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yollarıdır. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
-Adres, odayı %1$s genel oda dizininde görünür kılmak için de gereklidir."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Oda görünürlüğü"</string>
   <string name="screen_security_and_privacy_title">"Güvenlik ve gizlilik"</string>
 </resources>
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 7ef99d8430..fddcca05d0 100644
--- a/features/roomdetails/impl/src/main/res/values-uk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
@@ -8,14 +8,12 @@
   <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_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>
@@ -78,12 +76,11 @@
   <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_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_pending_header_title">"На розгляді"</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>
@@ -110,7 +107,6 @@
   <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>
@@ -133,21 +129,19 @@
   <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_description">"Простори наразі не підтримуються"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Учасники простору"</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_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_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">"Адреси кімнат — це спосіб знайти та отримати доступ до кімнат. Це також гарантує, що ви зможете легко поділитися своєю кімнатою з іншими.
-Адреса також необхідна, щоб зробити кімнату видимою в каталозі загальнодоступних кімнат %1$s."</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 8cd040835f..524afe515d 100644
--- a/features/roomdetails/impl/src/main/res/values-ur/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ur/translations.xml
@@ -6,14 +6,12 @@
   <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_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>
@@ -68,12 +66,10 @@
   <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>
-  <string name="screen_room_member_list_pending_header_title">"زیر التواء"</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>
@@ -97,7 +93,6 @@
   <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_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>
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 e9b50e5400..466bf18b8b 100644
--- a/features/roomdetails/impl/src/main/res/values-uz/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
@@ -1,32 +1,37 @@
 <?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">"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>
   <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_polls_history_title">"Soʻrovnomalar"</string>
   <string name="screen_room_change_permissions_administrators">"Faqat adminlar"</string>
   <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">"Har kim"</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_member_moderation">"Aʻzo moderatsiyasi"</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">"Adminlar va moderatorlar"</string>
   <string name="screen_room_change_permissions_remove_people">"Odamlarni olib tashlash va qoʻshilish soʻrovlarini rad etish"</string>
   <string name="screen_room_change_permissions_room_avatar">"Xona avatarini oʻzgartirish"</string>
-  <string name="screen_room_change_permissions_room_details">"Xona tafsilotlari"</string>
+  <string name="screen_room_change_permissions_room_details">"Tafsilotlarni tahrirlash"</string>
   <string name="screen_room_change_permissions_room_name">"Xona nomini oʻzgartirish"</string>
   <string name="screen_room_change_permissions_room_topic">"Xona mavzusini almashtirish"</string>
   <string name="screen_room_change_permissions_send_messages">"Xabarlar yuborish"</string>
   <string name="screen_room_change_role_administrators_title">"Administratorlarni tahrirlash"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Bu amalni bekor qila olmaysiz. Siz foydalanuvchini o‘zingiz bilan bir xil quvvat darajasiga ega bo‘lishga undayapsiz."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Admin qo‘shilsinmi?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Bu amalni bekor qila olmaysiz. Siz egalikni tanlangan foydalanuvchilarga o‘tkazmoqdasiz. Tark etsangiz, bu doimiy bo‘ladi."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Egalik huquqini o‘tkazasizmi?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Pastga tushirish"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Siz oʻzingizni imtiyozlardan mahrum qilayotganingiz sababli, bu o‘zgarishni bekor qila olmaysiz. Agar xonadagi so‘nggi imtiyozli foydalanuvchi bo‘lsangiz, imtiyozlarni qayta tiklash imkonsiz bo‘ladi."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"O‘z darajangizni pasaytirmoqchimisiz?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Jarayonda)"</string>
   <string name="screen_room_change_role_invited_member_name_android">"(Kutilmoqda)"</string>
   <string name="screen_room_change_role_moderators_admin_section_footer">"Administratorlar avtomatik ravishda moderator imtiyozlariga ega"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Egalar avtomatik ravishda administrator huquqlariga ega."</string>
   <string name="screen_room_change_role_moderators_title">"Moderatorlarni tahrirlash"</string>
+  <string name="screen_room_change_role_owners_title">"Egalarni tanlang"</string>
   <string name="screen_room_change_role_section_administrators">"Adminlar"</string>
   <string name="screen_room_change_role_section_moderators">"Moderatorlar"</string>
   <string name="screen_room_change_role_section_users">"Azolar"</string>
@@ -36,7 +41,7 @@
   <string name="screen_room_details_badge_encrypted">"Shifrlangan"</string>
   <string name="screen_room_details_badge_not_encrypted">"Shifrlanmagan"</string>
   <string name="screen_room_details_badge_public">"Jamoat xonasi"</string>
-  <string name="screen_room_details_edit_room_title">"Xonani tahrirlash"</string>
+  <string name="screen_room_details_edit_room_title">"Tafsilotlarni tahrirlash"</string>
   <string name="screen_room_details_edition_error">"Nomaʼlum xatolik yuz berdi va maʼlumotni oʻzgartirib boʻlmadi."</string>
   <string name="screen_room_details_edition_error_title">"Xonani yangilab bo‘lmadi"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Xabarlar qulflar bilan himoyalangan. Faqat siz va qabul qiluvchilar ularni qulfdan chiqarish uchun noyob kalitlarga ega."</string>
@@ -47,13 +52,16 @@
   <string name="screen_room_details_invite_people_title">"Odamlarni taklif qiling"</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>
   <string name="screen_room_details_notification_mode_custom">"Maxsus"</string>
   <string name="screen_room_details_notification_mode_default">"Standart"</string>
   <string name="screen_room_details_notification_title">"Bildirishnomalar"</string>
   <string name="screen_room_details_pinned_events_row_title">"Qadalgan xabarlar"</string>
   <string name="screen_room_details_profile_row_title">"Profil"</string>
+  <string name="screen_room_details_requests_to_join_title">"Qo‘shilish uchun so‘rovlar"</string>
   <string name="screen_room_details_roles_and_permissions">"Rollar va ruxsatlar"</string>
   <string name="screen_room_details_room_name_label">"Xona nomi"</string>
+  <string name="screen_room_details_security_and_privacy_title">"Xavfsizlik va maxfiylik"</string>
   <string name="screen_room_details_security_title">"Xavfsizlik"</string>
   <string name="screen_room_details_share_room_title">"Xonani baham ko\'ring"</string>
   <string name="screen_room_details_title">"Xona haqida maʼlumot"</string>
@@ -68,12 +76,12 @@
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Faqat aʻzoni olib tashlash"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Taqiqni bekor qilish"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"Foydalanuvchini blokdan chiqarish"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Xonadan taqiqni olib tashlash"</string>
   <string name="screen_room_member_list_mode_banned">"Taqiqlangan"</string>
   <string name="screen_room_member_list_mode_members">"Azolar"</string>
-  <string name="screen_room_member_list_pending_header_title">"Kutilmoqda"</string>
-  <string name="screen_room_member_list_role_administrator">"Admin"</string>
-  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_administrator">"Faqat adminlar"</string>
+  <string name="screen_room_member_list_role_moderator">"Adminlar va moderatorlar"</string>
+  <string name="screen_room_member_list_role_owner">"Egasi"</string>
   <string name="screen_room_member_list_room_members_header_title">"Xona a\'zolari"</string>
   <string name="screen_room_member_list_unbanning_user">"Taqiqni bekor qilish %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Moslashtirilgan sozlamalarga ruxsat bering"</string>
@@ -91,22 +99,45 @@
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Faqat eslatmalar va kalit so\'zlar"</string>
   <string name="screen_room_notification_settings_room_custom_settings_title">"Bu xonada menga xabar bering"</string>
   <string name="screen_room_roles_and_permissions_admins">"Adminlar"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Adminlar va egalari"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"Rolimni o‘zgartirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Aʼzolikka tushirish"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Moderatorga pasaytirish"</string>
   <string name="screen_room_roles_and_permissions_member_moderation">"Aʻzo moderatsiyasi"</string>
   <string name="screen_room_roles_and_permissions_messages_and_content">"Xabarlar va kontent"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorlar"</string>
-  <string name="screen_room_roles_and_permissions_permissions_header">"Ruxsatlar"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Egalari"</string>
   <string name="screen_room_roles_and_permissions_reset">"Ruxsatlarni tiklash"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ruxsatlarni asliga qaytargach, joriy sozlamalarni yoʻqotasiz."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ruxsatlar asliga qaytarilsinmi?"</string>
   <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_security_and_privacy_add_room_address_action">"Xona manzilini kiritish"</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‘shilishni so‘rang"</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.
+Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shifrlashni yoqishni tavsiya etmaymiz."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Shifrlash yoqilsinmi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Yoqilgandan keyin shifrlashni faolsizlantirish imkonsiz."</string>
   <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_history_anyone_option_title">"Har kim"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Xonaning ko‘rinishi"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Odamlar faqat taklif qilingan taqdirdagina qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Faqat taklif qilish"</string>
+  <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_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_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_title">"Umumiy xona ro‘yxatida ko‘rinadi"</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_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>
+  <string name="screen_security_and_privacy_title">"Xavfsizlik va maxfiylik"</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 888701406d..0332c0ffd5 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,21 +1,21 @@
 <?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_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_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_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>
@@ -42,7 +42,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>
@@ -62,7 +62,7 @@
   <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_room_name_label">"聊天室名稱"</string>
   <string name="screen_room_details_security_and_privacy_title">"安全與隱私"</string>
   <string name="screen_room_details_security_title">"安全性"</string>
@@ -70,18 +70,20 @@
   <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>
+  <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>
+    <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_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_pending_header_title">"待定"</string>
+  <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>
@@ -116,9 +118,9 @@
   <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_security_and_privacy_add_room_address_action">"新增聊天室地址"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"任何人都可以要求加入聊天室，但管理員必須接受請求。"</string>
+  <string name="screen_room_roles_and_permissions_title">"角色與權限"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"新增地址"</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_enable_encryption_alert_confirm_button_title">"是的，啟用加密"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"啟用後就無法停用聊天室的加密，只有受邀的聊天室成員或加入聊天室後才能看到訊息歷史紀錄。
@@ -128,17 +130,18 @@
   <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_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</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_description">"目前不支援空間"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"存取權"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</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_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_title">"在公開聊天室目錄中可見"</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_header">"誰可以讀取歷史紀錄"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"僅在成員被邀請後"</string>
@@ -146,8 +149,6 @@
   <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">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
-若要讓聊天室在 %1$s 公開聊天室目錄中可見，地址也是必要的。"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"聊天室能見度"</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 b260163ca3..f925bdca2a 100644
--- a/features/roomdetails/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
@@ -8,14 +8,12 @@
   <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_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>
@@ -70,7 +68,7 @@
   <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="other">"%1$d 人"</item>
   </plurals>
@@ -78,12 +76,11 @@
   <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_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_pending_header_title">"待处理"</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>
@@ -110,7 +107,6 @@
   <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>
@@ -133,9 +129,9 @@
   <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_description">"目前不支持空间"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空间成员"</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_title">"在公共房间目录中可见"</string>
@@ -146,8 +142,6 @@
   <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">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
-在 %1$s 的公共房间目录中显示该房间时也需要地址。"</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 3f4541dacb..cd90edf709 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -1,23 +1,23 @@
 <?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">"You’ll need a room address in order to make it visible in the directory."</string>
-  <string name="screen_edit_room_address_title">"Room address"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_edit_room_address_title">"Edit address"</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_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_polls_history_title">"Polls"</string>
-  <string name="screen_room_change_permissions_administrators">"Admins only"</string>
+  <string name="screen_room_change_permissions_administrators">"Admin"</string>
   <string name="screen_room_change_permissions_ban_people">"Ban people"</string>
   <string name="screen_room_change_permissions_delete_messages">"Remove messages"</string>
-  <string name="screen_room_change_permissions_everyone">"Everyone"</string>
-  <string name="screen_room_change_permissions_invite_people">"Invite people and accept requests to join"</string>
-  <string name="screen_room_change_permissions_member_moderation">"Member moderation"</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_member_moderation">"Manage members"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Messages and content"</string>
-  <string name="screen_room_change_permissions_moderators">"Admins and moderators"</string>
-  <string name="screen_room_change_permissions_remove_people">"Remove people and decline requests to join"</string>
-  <string name="screen_room_change_permissions_room_avatar">"Change room avatar"</string>
-  <string name="screen_room_change_permissions_room_details">"Room details"</string>
-  <string name="screen_room_change_permissions_room_name">"Change room name"</string>
-  <string name="screen_room_change_permissions_room_topic">"Change room topic"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Remove people"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Change avatar"</string>
+  <string name="screen_room_change_permissions_room_details">"Edit details"</string>
+  <string name="screen_room_change_permissions_room_name">"Change name"</string>
+  <string name="screen_room_change_permissions_room_topic">"Change topic"</string>
   <string name="screen_room_change_permissions_send_messages">"Send messages"</string>
   <string name="screen_room_change_role_administrators_title">"Edit Admins"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"You will not be able to undo this action. You are promoting the user to have the same power level as you."</string>
@@ -42,7 +42,7 @@
   <string name="screen_room_details_badge_encrypted">"Encrypted"</string>
   <string name="screen_room_details_badge_not_encrypted">"Not encrypted"</string>
   <string name="screen_room_details_badge_public">"Public room"</string>
-  <string name="screen_room_details_edit_room_title">"Edit Room"</string>
+  <string name="screen_room_details_edit_room_title">"Edit details"</string>
   <string name="screen_room_details_edition_error">"There was an unknown error and the information couldn\'t be changed."</string>
   <string name="screen_room_details_edition_error_title">"Unable to update room"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Messages are secured with locks. Only you and the recipients have the unique keys to unlock them."</string>
@@ -62,27 +62,37 @@
   <string name="screen_room_details_pinned_events_row_title">"Pinned messages"</string>
   <string name="screen_room_details_profile_row_title">"Profile"</string>
   <string name="screen_room_details_requests_to_join_title">"Requests to join"</string>
-  <string name="screen_room_details_roles_and_permissions">"Roles and permissions"</string>
+  <string name="screen_room_details_roles_and_permissions">"Roles &amp; permissions"</string>
   <string name="screen_room_details_room_name_label">"Room name"</string>
   <string name="screen_room_details_security_and_privacy_title">"Security &amp; privacy"</string>
   <string name="screen_room_details_security_title">"Security"</string>
   <string name="screen_room_details_share_room_title">"Share room"</string>
   <string name="screen_room_details_title">"Room info"</string>
   <string name="screen_room_details_topic_title">"Topic"</string>
-  <string name="screen_room_details_updating_room">"Updating room…"</string>
-  <string name="screen_room_member_list_banned_empty">"There are no banned users in this room."</string>
-  <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d person"</item>
-    <item quantity="other">"%1$d people"</item>
+  <string name="screen_room_details_updating_room">"Updating details…"</string>
+  <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Banned"</item>
+    <item quantity="other">"%1$d Banned"</item>
   </plurals>
-  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban from room"</string>
+  <string name="screen_room_member_list_empty_search_subtitle">"Check the spelling or try a new search"</string>
+  <string name="screen_room_member_list_empty_search_title">"No results for “%1$s”"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d Person"</item>
+    <item quantity="other">"%1$d People"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban user"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Unban"</string>
   <string name="screen_room_member_list_manage_member_unban_message">"They will be able to join this room again if invited."</string>
   <string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string>
   <string name="screen_room_member_list_mode_banned">"Banned"</string>
   <string name="screen_room_member_list_mode_members">"Members"</string>
-  <string name="screen_room_member_list_pending_header_title">"Pending"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d Invited"</item>
+    <item quantity="other">"%1$d Invited"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Pending"</string>
   <string name="screen_room_member_list_role_administrator">"Admin"</string>
   <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Owner"</string>
@@ -117,10 +127,12 @@
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Reset permissions?"</string>
   <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 and permissions"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Add room address"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Anyone can ask to join the room but an administrator or moderator will have to accept the request."</string>
+  <string name="screen_room_roles_and_permissions_title">"Roles &amp; permissions"</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>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Ask to join"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Anyone in %1$s can join, but everyone else must request access."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Yes, enable encryption"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Once enabled, encryption for a room cannot be disabled, Message history will only be visible for room members since they were invited or since they joined the room.
 No one besides the room members will be able to read messages. This may prevent bots and bridges to work correctly.
@@ -129,26 +141,31 @@ We do not recommend enabling encryption for rooms that anyone can find and join.
   <string name="screen_security_and_privacy_encryption_section_footer">"Once enabled, encryption cannot be disabled."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Encryption"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Enable end-to-end encryption"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Anyone can find and join"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Anyone can join."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Anyone"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"People can only join if they are invited"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Choose which spaces’ members can join this room without an invitation.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Manage spaces"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Only invited people can join."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Invite only"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Room access"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Access"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Anyone in authorised spaces can join."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Anyone in %1$s can join."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space members"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need a room address in order to make it visible in the room directory."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Room address"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Address"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Allow for this room to be found by searching %1$s public room directory"</string>
-  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible in public room directory"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Anyone"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Allow to be found by searching the public directory."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible in public directory"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Anyone (history is public)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Changes won\'t affect past messages, only new ones. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Who can read history"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Members only since they were invited"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Members only since selecting this option"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Members since invited"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Members (full history)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
 You can choose to publish your room in your homeserver public room directory."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Room publishing"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
-The address is also required to make the room visible in %1$s public room directory."</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Room visibility"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Addresses are a way to find and access rooms and spaces. This also ensures you can easily share them with others."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibility"</string>
   <string name="screen_security_and_privacy_title">"Security &amp; privacy"</string>
 </resources>
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 f2412e616b..5042f942b6 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,26 +10,26 @@ package io.element.android.features.roomdetails.impl
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.api.ElementCallEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
-import io.element.android.features.messages.api.MessagesEntryPoint
-import io.element.android.features.poll.api.history.PollHistoryEntryPoint
-import io.element.android.features.reportroom.api.ReportRoomEntryPoint
+import io.element.android.features.call.test.FakeElementCallEntryPoint
+import io.element.android.features.changeroommemberroles.test.FakeChangeRoomMemberRolesEntryPoint
+import io.element.android.features.changeroommemberroles.test.FakeRolesAndPermissionsEntryPoint
+import io.element.android.features.knockrequests.test.FakeKnockRequestsListEntryPoint
+import io.element.android.features.messages.test.FakeMessagesEntryPoint
+import io.element.android.features.poll.test.history.FakePollHistoryEntryPoint
+import io.element.android.features.reportroom.test.FakeReportRoomEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
-import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
+import io.element.android.features.roomdetailsedit.test.FakeRoomDetailsEditEntryPoint
+import io.element.android.features.securityandprivacy.test.FakeSecurityAndPrivacyEntryPoint
+import io.element.android.features.verifysession.test.FakeOutgoingVerificationEntryPoint
 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.permalink.PermalinkData
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
-import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
-import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
+import io.element.android.libraries.mediaviewer.test.FakeMediaGalleryEntryPoint
+import io.element.android.libraries.mediaviewer.test.FakeMediaViewerEntryPoint
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
@@ -50,62 +51,37 @@ class DefaultRoomDetailsEntryPointTest {
             RoomDetailsFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                pollHistoryEntryPoint = object : PollHistoryEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                elementCallEntryPoint = object : ElementCallEntryPoint {
-                    override fun startCall(callType: CallType) = lambdaError()
-                    override suspend fun handleIncomingCall(
-                        callType: CallType.RoomCall,
-                        eventId: EventId,
-                        senderId: UserId,
-                        roomName: String?,
-                        senderName: String?,
-                        avatarUrl: String?,
-                        timestamp: Long,
-                        expirationTimestamp: Long,
-                        notificationChannelId: String,
-                        textContent: String?
-                    ) = lambdaError()
-                },
+                pollHistoryEntryPoint = FakePollHistoryEntryPoint(),
+                elementCallEntryPoint = FakeElementCallEntryPoint(),
                 room = FakeJoinedRoom(),
                 analyticsService = FakeAnalyticsService(),
-                messagesEntryPoint = object : MessagesEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                knockRequestsListEntryPoint = object : KnockRequestsListEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                mediaViewerEntryPoint = object : MediaViewerEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                mediaGalleryEntryPoint = object : MediaGalleryEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                outgoingVerificationEntryPoint = object : OutgoingVerificationEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                reportRoomEntryPoint = object : ReportRoomEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId) = lambdaError()
-                },
-                changeRoomMemberRolesEntryPoint = object : ChangeRoomMemberRolesEntryPoint {
-                    override fun builder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                messagesEntryPoint = FakeMessagesEntryPoint(),
+                knockRequestsListEntryPoint = FakeKnockRequestsListEntryPoint(),
+                mediaViewerEntryPoint = FakeMediaViewerEntryPoint(),
+                mediaGalleryEntryPoint = FakeMediaGalleryEntryPoint(),
+                outgoingVerificationEntryPoint = FakeOutgoingVerificationEntryPoint(),
+                reportRoomEntryPoint = FakeReportRoomEntryPoint(),
+                changeRoomMemberRolesEntryPoint = FakeChangeRoomMemberRolesEntryPoint(),
+                rolesAndPermissionsEntryPoint = FakeRolesAndPermissionsEntryPoint(),
+                securityAndPrivacyEntryPoint = FakeSecurityAndPrivacyEntryPoint(),
+                roomDetailsEditEntryPoint = FakeRoomDetailsEditEntryPoint(),
             )
         }
         val callback = object : RoomDetailsEntryPoint.Callback {
-            override fun onOpenGlobalNotificationSettings() = lambdaError()
-            override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) = lambdaError()
-            override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
-            override fun onForwardedToSingleRoom(roomId: RoomId) = lambdaError()
+            override fun navigateToGlobalNotificationSettings() = lambdaError()
+            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) = lambdaError()
+            override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
+            override fun startForwardEventFlow(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
         }
         val params = RoomDetailsEntryPoint.Params(
             initialElement = RoomDetailsEntryPoint.InitialTarget.RoomDetails,
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(RoomDetailsFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
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 1de627fd51..2d85744345 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +13,8 @@ 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.RoomMember
-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.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -24,6 +25,7 @@ import io.element.android.libraries.matrix.test.notificationsettings.FakeNotific
 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.powerlevels.FakeRoomPermissions
 import io.element.android.tests.testutils.lambda.lambdaError
 
 fun aRoom(
@@ -34,6 +36,7 @@ fun aRoom(
     topic: String? = A_ROOM_TOPIC,
     avatarUrl: String? = AN_AVATAR_URL,
     canonicalAlias: RoomAlias? = A_ROOM_ALIAS,
+    roomPermissions: RoomPermissions = FakeRoomPermissions(),
     isEncrypted: Boolean = true,
     isPublic: Boolean = true,
     isDirect: Boolean = false,
@@ -41,29 +44,20 @@ fun aRoom(
     activeMemberCount: Long = 1,
     joinedMemberCount: Long = 1,
     invitedMemberCount: Long = 0,
-    canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    canBanResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    canKickResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
     userDisplayNameResult: (UserId) -> Result<String?> = { lambdaError() },
     userAvatarUrlResult: () -> Result<String?> = { lambdaError() },
-    canUserJoinCallResult: (UserId) -> Result<Boolean> = { lambdaError() },
     getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
     userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
     setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
 ) = FakeBaseRoom(
     sessionId = sessionId,
     roomId = roomId,
-    canInviteResult = canInviteResult,
-    canBanResult = canBanResult,
-    canKickResult = canKickResult,
-    canSendStateResult = canSendStateResult,
     userDisplayNameResult = userDisplayNameResult,
     userAvatarUrlResult = userAvatarUrlResult,
-    canUserJoinCallResult = canUserJoinCallResult,
     getUpdatedMemberResult = getUpdatedMemberResult,
     userRoleResult = userRoleResult,
     setIsFavoriteResult = setIsFavoriteResult,
+    roomPermissions = roomPermissions,
     initialRoomInfo = aRoomInfo(
         name = displayName,
         rawName = rawName,
@@ -88,6 +82,7 @@ fun aJoinedRoom(
     topic: String? = A_ROOM_TOPIC,
     avatarUrl: String? = AN_AVATAR_URL,
     canonicalAlias: RoomAlias? = A_ROOM_ALIAS,
+    roomPermissions: RoomPermissions = FakeRoomPermissions(),
     isEncrypted: Boolean = true,
     isPublic: Boolean = true,
     isDirect: Boolean = false,
@@ -96,17 +91,12 @@ fun aJoinedRoom(
     joinedMemberCount: Long = 1,
     invitedMemberCount: Long = 0,
     notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
-    canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    canBanResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    canKickResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
     userDisplayNameResult: (UserId) -> Result<String?> = { lambdaError() },
     userAvatarUrlResult: () -> Result<String?> = { lambdaError() },
     setNameResult: (String) -> Result<Unit> = { lambdaError() },
     setTopicResult: (String) -> Result<Unit> = { lambdaError() },
     updateAvatarResult: (String, ByteArray) -> Result<Unit> = { _, _ -> lambdaError() },
     removeAvatarResult: () -> Result<Unit> = { lambdaError() },
-    canUserJoinCallResult: (UserId) -> Result<Boolean> = { lambdaError() },
     getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
     userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
     kickUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
@@ -131,13 +121,9 @@ fun aJoinedRoom(
     baseRoom = aRoom(
         sessionId = sessionId,
         roomId = roomId,
-        canInviteResult = canInviteResult,
-        canBanResult = canBanResult,
-        canKickResult = canKickResult,
-        canSendStateResult = canSendStateResult,
+        roomPermissions = roomPermissions,
         userDisplayNameResult = userDisplayNameResult,
         userAvatarUrlResult = userAvatarUrlResult,
-        canUserJoinCallResult = canUserJoinCallResult,
         getUpdatedMemberResult = getUpdatedMemberResult,
         userRoleResult = userRoleResult,
         setIsFavoriteResult = setIsFavoriteResult,
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 695168aa16..5b1fd9474f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,6 +30,7 @@ import io.element.android.libraries.matrix.api.room.RoomMembersState
 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.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
@@ -40,6 +42,7 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 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.test.InMemoryAppPreferencesStore
 import io.element.android.services.analytics.api.AnalyticsService
@@ -118,9 +121,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - initial state is created from initial room info`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -147,9 +148,7 @@ class RoomDetailsPresenterTest {
             pinnedEventIds = listOf(AN_EVENT_ID),
         )
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         ).apply {
             givenRoomInfo(roomInfo)
         }
@@ -169,9 +168,7 @@ class RoomDetailsPresenterTest {
     fun `present - initial state with no room name`() = runTest {
         val room = aJoinedRoom(
             displayName = "",
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -187,9 +184,7 @@ class RoomDetailsPresenterTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
             getUpdatedMemberResult = { userId ->
                 when (userId) {
                     A_SESSION_ID -> Result.success(myRoomMember)
@@ -224,9 +219,9 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - initial state when user can invite others to room`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(
+                canInvite = true,
+            ),
         )
         val presenter = createRoomDetailsPresenter(room, dispatchers = testCoroutineDispatchers())
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -242,26 +237,9 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - initial state when user can not invite others to room`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(false) },
-            canKickResult = { Result.success(false) },
-            canBanResult = { Result.success(false) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
-        )
-        val presenter = createRoomDetailsPresenter(room)
-        presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
-            assertThat(awaitItem().canInvite).isFalse()
-
-            cancelAndIgnoreRemainingEvents()
-        }
-    }
-
-    @Test
-    fun `present - initial state when canInvite errors`() = runTest {
-        val room = aJoinedRoom(
-            canInviteResult = { Result.failure(RuntimeException("Whoops")) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(
+                canInvite = false,
+            ),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -274,17 +252,11 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - initial state when user can edit one attribute`() = runTest {
         val room = aJoinedRoom(
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_TOPIC -> Result.success(true)
-                    StateEventType.ROOM_NAME -> Result.success(false)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
-            canBanResult = { Result.success(false) },
-            canKickResult = { Result.success(false) },
-            canInviteResult = { Result.success(false) },
-            canUserJoinCallResult = { Result.success(true) },
+            roomPermissions = roomPermissions(
+                canChangeName = true,
+                canChangeTopic = false,
+                canChangeAvatar = false,
+            ),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -302,18 +274,7 @@ class RoomDetailsPresenterTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
         val room = aJoinedRoom(
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_TOPIC,
-                    StateEventType.ROOM_NAME,
-                    StateEventType.ROOM_AVATAR -> Result.success(true)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
-            canKickResult = { Result.success(false) },
-            canBanResult = { Result.success(false) },
-            canInviteResult = { Result.success(false) },
-            canUserJoinCallResult = { Result.success(true) },
+            roomPermissions = roomPermissions(),
             getUpdatedMemberResult = { userId ->
                 when (userId) {
                     A_SESSION_ID -> Result.success(myRoomMember)
@@ -353,18 +314,9 @@ class RoomDetailsPresenterTest {
         val room = aJoinedRoom(
             isDirect = true,
             topic = null,
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_AVATAR,
-                    StateEventType.ROOM_TOPIC,
-                    StateEventType.ROOM_NAME -> Result.success(true)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
+            roomPermissions = roomPermissions(),
             userDisplayNameResult = { Result.success(A_USER_NAME) },
             userAvatarUrlResult = { Result.success(AN_AVATAR_URL) },
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
             getUpdatedMemberResult = { userId ->
                 when (userId) {
                     A_SESSION_ID -> Result.success(myRoomMember)
@@ -399,24 +351,11 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - initial state when user can edit all attributes`() = runTest {
         val room = aJoinedRoom(
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_TOPIC,
-                    StateEventType.ROOM_NAME,
-                    StateEventType.ROOM_AVATAR -> Result.success(true)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
-            canKickResult = {
-                Result.success(false)
-            },
-            canBanResult = {
-                Result.success(false)
-            },
-            canInviteResult = {
-                Result.success(false)
-            },
-            canUserJoinCallResult = { Result.success(true) },
+            roomPermissions = roomPermissions(
+                canChangeAvatar = true,
+                canChangeName = true,
+                canChangeTopic = true,
+            ),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -432,24 +371,11 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - initial state when user can edit no attributes`() = runTest {
         val room = aJoinedRoom(
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_TOPIC,
-                    StateEventType.ROOM_NAME,
-                    StateEventType.ROOM_AVATAR -> Result.success(false)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
-            canBanResult = {
-                Result.success(false)
-            },
-            canKickResult = {
-                Result.success(false)
-            },
-            canInviteResult = {
-                Result.success(false)
-            },
-            canUserJoinCallResult = { Result.success(true) },
+            roomPermissions = roomPermissions(
+                canChangeAvatar = false,
+                canChangeName = false,
+                canChangeTopic = false,
+            ),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -464,24 +390,9 @@ class RoomDetailsPresenterTest {
     fun `present - topic state is hidden when no topic and user has no permission`() = runTest {
         val room = aJoinedRoom(
             topic = null,
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_AVATAR,
-                    StateEventType.ROOM_NAME -> Result.success(true)
-                    StateEventType.ROOM_TOPIC -> Result.success(false)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
-            canKickResult = {
-                Result.success(false)
-            },
-            canBanResult = {
-                Result.success(false)
-            },
-            canInviteResult = {
-                Result.success(false)
-            },
-            canUserJoinCallResult = { Result.success(true) },
+            roomPermissions = roomPermissions(
+                canChangeTopic = false
+            ),
         )
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -496,24 +407,7 @@ class RoomDetailsPresenterTest {
     fun `present - topic state is 'can add topic' when no topic and user has permission`() = runTest {
         val room = aJoinedRoom(
             topic = null,
-            canSendStateResult = { _, stateEventType ->
-                when (stateEventType) {
-                    StateEventType.ROOM_AVATAR,
-                    StateEventType.ROOM_TOPIC,
-                    StateEventType.ROOM_NAME -> Result.success(true)
-                    else -> Result.failure(RuntimeException("Whelp"))
-                }
-            },
-            canKickResult = {
-                Result.success(false)
-            },
-            canBanResult = {
-                Result.success(false)
-            },
-            canInviteResult = {
-                Result.success(false)
-            },
-            canUserJoinCallResult = { Result.success(true) },
+            roomPermissions = roomPermissions(),
         ).apply {
             givenRoomInfo(aRoomInfo(topic = null))
         }
@@ -533,9 +427,7 @@ class RoomDetailsPresenterTest {
     fun `present - leave room event is passed on to leave room presenter`() = runTest {
         val leaveRoomEventRecorder = EventsRecorder<LeaveRoomEvent>()
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(
             room = room,
@@ -554,9 +446,7 @@ class RoomDetailsPresenterTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val room = aJoinedRoom(
             notificationSettingsService = notificationSettingsService,
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(
             room = room,
@@ -583,9 +473,7 @@ class RoomDetailsPresenterTest {
             FakeNotificationSettingsService(initialRoomMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY)
         val room = aJoinedRoom(
             notificationSettingsService = notificationSettingsService,
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(
             room = room,
@@ -611,9 +499,7 @@ class RoomDetailsPresenterTest {
         )
         val room = aJoinedRoom(
             notificationSettingsService = notificationSettingsService,
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(
             room = room,
@@ -636,9 +522,7 @@ class RoomDetailsPresenterTest {
         val setIsFavoriteResult = lambdaRecorder<Boolean, Result<Unit>> { _ -> Result.success(Unit) }
         val room = aJoinedRoom(
             setIsFavoriteResult = setIsFavoriteResult,
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val analyticsService = FakeAnalyticsService()
         val presenter =
@@ -664,9 +548,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - changes in room info updates the is favorite flag`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val presenter = createRoomDetailsPresenter(room = room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
@@ -685,9 +567,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - show knock requests`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
             joinRule = JoinRule.Knock,
         )
         val featureFlagService = FakeFeatureFlagService(
@@ -711,18 +591,12 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - show security and privacy`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val featureFlagService = FakeFeatureFlagService()
         val presenter = createRoomDetailsPresenter(room = room, featureFlagService = featureFlagService)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
             skipItems(1)
-            with(awaitItem()) {
-                assertThat(canShowSecurityAndPrivacy).isFalse()
-            }
-            featureFlagService.setFeatureEnabled(FeatureFlags.Knock, true)
             with(awaitItem()) {
                 assertThat(canShowSecurityAndPrivacy).isTrue()
             }
@@ -732,9 +606,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - show debug info`() = runTest {
         val room = aJoinedRoom(
-            canInviteResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
-            canSendStateResult = { _, _ -> Result.success(true) },
+            roomPermissions = roomPermissions(),
         )
         val inMemoryAppPreferencesStore = InMemoryAppPreferencesStore(
             isDeveloperModeEnabled = true,
@@ -747,4 +619,41 @@ class RoomDetailsPresenterTest {
             }
         }
     }
+
+    private fun roomPermissions(
+        canInvite: Boolean = true,
+        canKick: Boolean = true,
+        canBan: Boolean = true,
+        canRedactOther: Boolean = true,
+        canRedactOwn: Boolean = true,
+        canChangeRoomAccess: Boolean = true,
+        canChangeHistoryVisibility: Boolean = true,
+        canChangeEncryption: Boolean = true,
+        canChangeRoomVisibility: Boolean = true,
+        canChangeName: Boolean = true,
+        canChangeTopic: Boolean = true,
+        canChangeAvatar: Boolean = true,
+        canChangePowerLevels: Boolean = true,
+    ): RoomPermissions {
+        return FakeRoomPermissions(
+            canInvite = canInvite,
+            canKick = canKick,
+            canBan = canBan,
+            canRedactOther = canRedactOther,
+            canRedactOwn = canRedactOwn,
+            canSendState = { eventType ->
+                when (eventType) {
+                    StateEventType.RoomJoinRules -> canChangeRoomAccess
+                    StateEventType.RoomHistoryVisibility -> canChangeHistoryVisibility
+                    StateEventType.RoomEncryption -> canChangeEncryption
+                    StateEventType.RoomCanonicalAlias -> canChangeRoomVisibility
+                    StateEventType.RoomAvatar -> canChangeAvatar
+                    StateEventType.RoomName -> canChangeName
+                    StateEventType.RoomTopic -> canChangeTopic
+                    StateEventType.RoomPowerLevels -> canChangePowerLevels
+                    else -> lambdaError()
+                }
+            }
+        )
+    }
 }
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 2a3b41b61b..68889c1551 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3861a20422..b31fb32e8b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
index 03555fb967..f1cab1524a 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
@@ -1,42 +1,34 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.members
 
-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.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembershipState
 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
+import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.tests.testutils.WarmUpRule
-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.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.time.withTimeout
-import kotlinx.coroutines.withTimeout
 import org.junit.Rule
 import org.junit.Test
-import kotlin.time.Duration.Companion.seconds
 
 @ExperimentalCoroutinesApi
 class RoomMemberListPresenterTest {
@@ -44,176 +36,131 @@ class RoomMemberListPresenterTest {
     val warmUpRule = WarmUpRule()
 
     @Test
-    fun `member loading is done automatically on start, but is async`() = runTest {
-        val room = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(
-                updateMembersResult = { Result.success(Unit) },
-                canInviteResult = { Result.success(true) }
-            ).apply {
-                // Needed to avoid discarding the loaded members as a partial and invalid result
-                givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
-            }
-        )
-        val presenter = createPresenter(joinedRoom = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+    fun `initial state is loading`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
-            assertThat(initialState.roomMembers.isLoading()).isTrue()
+            assertThat(initialState.filteredRoomMembers.isLoading()).isTrue()
             assertThat(initialState.searchQuery).isEmpty()
-            assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
-            assertThat(initialState.isSearchActive).isFalse()
-            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            // Skip item while the new members state is processed
-            skipItems(1)
-            val loadedMembersState = awaitItem()
-            assertThat(loadedMembersState.roomMembers.isLoading()).isFalse()
-            assertThat(loadedMembersState.roomMembers.dataOrNull()?.invited)
-                .isEqualTo(listOf(RoomMemberWithIdentityState(aVictor(), null), RoomMemberWithIdentityState(aWalter(), null)))
-            assertThat(loadedMembersState.roomMembers.dataOrNull()?.joined).isNotEmpty()
+            assertThat(initialState.selectedSection).isEqualTo(SelectedSection.MEMBERS)
         }
     }
 
     @Test
-    fun `member loading is done automatically when RoomInfo's activeMemberCount changes`() = runTest {
-        val reloadMembersMutex = Mutex()
-        val updateMembersLambda = lambdaRecorder<Unit> {
-            if (reloadMembersMutex.isLocked) {
-                reloadMembersMutex.unlock()
+    fun `hide banned section when there is no banned users`() = runTest {
+        val allRoomMembers = aRoomMemberList()
+        val noBannedMembers = allRoomMembers
+            .filterNot { it.membership == RoomMembershipState.BAN }
+            .toImmutableList()
+        val room = createFakeJoinedRoom()
+            .apply {
+                givenRoomMembersState(RoomMembersState.Ready(allRoomMembers))
             }
-        }
-        val room = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(
-                updateMembersResult = updateMembersLambda,
-                canInviteResult = { Result.success(true) }
-            ).apply {
-                // Needed to avoid discarding the loaded members as a partial and invalid result
-                givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
-            }
-        )
-        val presenter = createPresenter(joinedRoom = room)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
-            val initialState = awaitItem()
-            assertThat(initialState.roomMembers.isLoading()).isTrue()
-            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-            // Skip item while the new members state is processed
-            skipItems(1)
-            val loadedMembersState = awaitItem()
-            assertThat(loadedMembersState.roomMembers.isLoading()).isFalse()
-            assertThat(loadedMembersState.roomMembers.dataOrNull()?.joined).isNotEmpty()
-
-            // Assert no events are emitted only with that change
-            expectNoEvents()
-
-            // This will only progress if the `Room.updateMembers()` function is called, triggered by the RoomInfo change
-            withTimeout(10.seconds) {
-                reloadMembersMutex.withLock {
-                    launch { room.givenRoomInfo(aRoomInfo(activeMembersCount = 0L)) }
-                }
-            }
-
-            // Update the room members state as `Room.updateMembers()` would have done with the actual implementation
-            room.givenRoomMembersState(RoomMembersState.Ready(persistentListOf()))
-            // Wait for another update
-            skipItems(1)
-            // The members should be reloaded now
-            assertThat(awaitItem().roomMembers.dataOrNull()?.joined).isEmpty()
-        }
-    }
-
-    @Test
-    fun `open search`() = runTest {
         val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
+            joinedRoom = room,
+            roomMemberModerationState = aRoomMemberModerationState(canBan = true),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
-            loadedState.eventSink(RoomMemberListEvents.OnSearchActiveChanged(true))
+            assertThat(loadedState.showBannedSection).isTrue()
+            loadedState.eventSink(RoomMemberListEvents.ChangeSelectedSection(SelectedSection.BANNED))
+            val bannedSectionState = awaitItem()
+            assertThat(bannedSectionState.selectedSection).isEqualTo(SelectedSection.BANNED)
+            // Now update the room members to have no banned users
+            room.givenRoomMembersState(RoomMembersState.Ready(noBannedMembers))
             skipItems(1)
-            val searchActiveState = awaitItem()
-            assertThat(searchActiveState.isSearchActive).isTrue()
+            val noBannedMembersState = awaitItem()
+            assertThat(noBannedMembersState.showBannedSection).isFalse()
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.selectedSection).isEqualTo(SelectedSection.MEMBERS)
+        }
+    }
+
+    @Test
+    fun `member loading is done automatically on start, but is async`() = runTest {
+        val room = createFakeJoinedRoom()
+        val presenter = createPresenter(joinedRoom = room)
+        presenter.test {
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.filteredRoomMembers.isLoading()).isTrue()
+            assertThat(initialState.searchQuery).isEmpty()
+            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
+            // Skip items while the new members state is processed
+            skipItems(2)
+            val loadedState = awaitItem()
+            val loadedRoomMembers = loadedState.filteredRoomMembers.dataOrNull()!!
+            assertThat(loadedRoomMembers.joined).isNotEmpty()
+            assertThat(loadedRoomMembers.banned).isNotEmpty()
+            assertThat(loadedRoomMembers.invited).isNotEmpty()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.BANNED)).isFalse()
         }
     }
 
     @Test
     fun `search for something which is not found`() = runTest {
-        val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val room = createFakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
+        }
+        val presenter = createPresenter(joinedRoom = room)
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
-            loadedState.eventSink(RoomMemberListEvents.OnSearchActiveChanged(true))
-            val searchActiveState = awaitItem()
-            searchActiveState.eventSink(RoomMemberListEvents.UpdateSearchQuery("something"))
-            skipItems(1)
+            val loadedRoomMembers = loadedState.filteredRoomMembers.dataOrNull()!!
+            assertThat(loadedRoomMembers.joined).isNotEmpty()
+            assertThat(loadedRoomMembers.banned).isNotEmpty()
+            assertThat(loadedRoomMembers.invited).isNotEmpty()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.BANNED)).isFalse()
+            loadedState.eventSink(RoomMemberListEvents.UpdateSearchQuery("something"))
             val searchQueryUpdatedState = awaitItem()
             assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("something")
             val searchSearchResultDelivered = awaitItem()
-            assertThat(searchSearchResultDelivered.searchResults).isInstanceOf(SearchBarResultState.NoResultsFound::class.java)
+            val emptyRoomMembers = searchSearchResultDelivered.filteredRoomMembers.dataOrNull()!!
+            assertThat(emptyRoomMembers.joined).isEmpty()
+            assertThat(emptyRoomMembers.banned).isEmpty()
+            assertThat(emptyRoomMembers.invited).isEmpty()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.MEMBERS)).isTrue()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.BANNED)).isTrue()
         }
     }
 
     @Test
     fun `search for something which is found`() = runTest {
-        val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val room = createFakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
+        }
+        val presenter = createPresenter(joinedRoom = room)
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
-            loadedState.eventSink(RoomMemberListEvents.OnSearchActiveChanged(true))
-            val searchActiveState = awaitItem()
-            searchActiveState.eventSink(RoomMemberListEvents.UpdateSearchQuery("Alice"))
-            skipItems(1)
+            val loadedRoomMembers = loadedState.filteredRoomMembers.dataOrNull()!!
+            assertThat(loadedRoomMembers.joined).isNotEmpty()
+            assertThat(loadedRoomMembers.banned).isNotEmpty()
+            assertThat(loadedRoomMembers.invited).isNotEmpty()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(loadedRoomMembers.isEmpty(SelectedSection.BANNED)).isFalse()
+            loadedState.eventSink(RoomMemberListEvents.UpdateSearchQuery("alice"))
             val searchQueryUpdatedState = awaitItem()
-            assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("Alice")
+            assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("alice")
             val searchSearchResultDelivered = awaitItem()
-            assertThat(searchSearchResultDelivered.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
-            assertThat((searchSearchResultDelivered.searchResults as SearchBarResultState.Results).results.dataOrNull()!!.joined.first().roomMember.displayName)
-                .isEqualTo("Alice")
+            val emptyRoomMembers = searchSearchResultDelivered.filteredRoomMembers.dataOrNull()!!
+            assertThat(emptyRoomMembers.joined).isNotEmpty()
+            assertThat(emptyRoomMembers.banned).isEmpty()
+            assertThat(emptyRoomMembers.invited).isEmpty()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.MEMBERS)).isFalse()
+            assertThat(emptyRoomMembers.isEmpty(SelectedSection.BANNED)).isTrue()
         }
     }
 
     @Test
     fun `present - asynchronously sets canInvite when user has correct power level`() = runTest {
-        val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canInviteResult = { Result.success(true) },
-                    updateMembersResult = { Result.success(Unit) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter()
+        presenter.test {
             skipItems(1)
             val loadedState = awaitItem()
             assertThat(loadedState.canInvite).isTrue()
@@ -223,89 +170,56 @@ class RoomMemberListPresenterTest {
     @Test
     fun `present - asynchronously sets canInvite when user does not have correct power level`() = runTest {
         val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canInviteResult = { Result.success(false) },
-                    updateMembersResult = { Result.success(Unit) }
-                )
+            joinedRoom = createFakeJoinedRoom(
+                canInvite = false,
             )
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
+        presenter.test {
             val loadedState = awaitItem()
             assertThat(loadedState.canInvite).isFalse()
         }
     }
 
     @Test
-    fun `present - asynchronously sets canInvite when power level check fails`() = runTest {
+    fun `present - RoomMemberSelected will open the moderation options`() = runTest {
         val presenter = createPresenter(
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    canInviteResult = { Result.failure(RuntimeException("Eek")) },
-                    updateMembersResult = { Result.success(Unit) }
-                )
-            )
+            roomMemberModerationState = aRoomMemberModerationState(canBan = true, canKick = true)
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
-            val loadedState = awaitItem()
-            assertThat(loadedState.canInvite).isFalse()
-        }
-    }
-
-    @Test
-    fun `present - RoomMemberSelected will open the moderation options when target user is not banned`() = runTest {
-        val roomMemberModerationPresenter = Presenter {
-            aRoomMemberModerationState(canBan = true, canKick = true)
-        }
-        val presenter = createPresenter(
-            roomMemberModerationPresenter = roomMemberModerationPresenter,
-            joinedRoom = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(
-                    updateMembersResult = { Result.success(Unit) },
-                    canInviteResult = { Result.success(true) }
-                )
-            )
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            skipItems(1)
-            awaitItem().eventSink(RoomMemberListEvents.RoomMemberSelected(aVictor()))
+            awaitItem().eventSink(RoomMemberListEvents.RoomMemberSelected(anInvitedVictor()))
         }
     }
 }
 
-@ExperimentalCoroutinesApi
-private fun TestScope.createDataSource(
-    room: BaseRoom = FakeBaseRoom().apply {
-        givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
-    },
-    coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers()
-) = RoomMemberListDataSource(room, coroutineDispatchers)
+private fun createFakeJoinedRoom(
+    updateMembersResult: () -> Unit = { },
+    canInvite: Boolean = true,
+): FakeJoinedRoom {
+    return FakeJoinedRoom(
+        baseRoom = FakeBaseRoom(
+            updateMembersResult = updateMembersResult,
+            roomPermissions = FakeRoomPermissions(
+                canInvite = canInvite,
+            ),
+        ).apply {
+            // Needed to avoid discarding the loaded members as a partial and invalid result
+            givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
+        }
+    )
+}
 
 @ExperimentalCoroutinesApi
 private fun TestScope.createPresenter(
     coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
-    joinedRoom: JoinedRoom = FakeJoinedRoom(
-        baseRoom = FakeBaseRoom(
-            updateMembersResult = { Result.success(Unit) }
-        )
-    ),
-    roomMemberListDataSource: RoomMemberListDataSource = createDataSource(coroutineDispatchers = coroutineDispatchers),
+    joinedRoom: JoinedRoom = createFakeJoinedRoom(),
     encryptedService: FakeEncryptionService = FakeEncryptionService(),
-    roomMemberModerationPresenter: Presenter<RoomMemberModerationState> = Presenter {
-        aRoomMemberModerationState()
-    },
+    roomMemberModerationState: RoomMemberModerationState = aRoomMemberModerationState(),
 ) = RoomMemberListPresenter(
     room = joinedRoom,
-    roomMemberListDataSource = roomMemberListDataSource,
     coroutineDispatchers = coroutineDispatchers,
-    roomMembersModerationPresenter = roomMemberModerationPresenter,
+    roomMembersModerationPresenter = Presenter {
+        roomMemberModerationState
+    },
     encryptionService = encryptedService,
 )
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt
index 73859b712f..4dbf21c392 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt
index 308ad94379..c14dca9497 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetailsedit/api/build.gradle.kts b/features/roomdetailsedit/api/build.gradle.kts
new file mode 100644
index 0000000000..0afaad72a6
--- /dev/null
+++ b/features/roomdetailsedit/api/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-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")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.roomdetailsedit.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditEntryPoint.kt b/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditEntryPoint.kt
new file mode 100644
index 0000000000..1dad365646
--- /dev/null
+++ b/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditEntryPoint.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.roomdetailsedit.api
+
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
+
+fun interface RoomDetailsEditEntryPoint : SimpleFeatureEntryPoint
diff --git a/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditPermissions.kt b/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditPermissions.kt
new file mode 100644
index 0000000000..8ac2ea5022
--- /dev/null
+++ b/features/roomdetailsedit/api/src/main/kotlin/io/element/android/features/roomdetailsedit/api/RoomDetailsEditPermissions.kt
@@ -0,0 +1,37 @@
+/*
+ * 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.roomdetailsedit.api
+
+import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+
+data class RoomDetailsEditPermissions(
+    val canEditName: Boolean,
+    val canEditTopic: Boolean,
+    val canEditAvatar: Boolean,
+) {
+    val hasAny = canEditName ||
+        canEditTopic ||
+        canEditAvatar
+
+    companion object {
+        val DEFAULT = RoomDetailsEditPermissions(
+            canEditName = false,
+            canEditTopic = false,
+            canEditAvatar = false,
+        )
+    }
+}
+
+fun RoomPermissions.roomDetailsEditPermissions(): RoomDetailsEditPermissions {
+    return RoomDetailsEditPermissions(
+        canEditName = canOwnUserSendState(StateEventType.RoomName),
+        canEditTopic = canOwnUserSendState(StateEventType.RoomTopic),
+        canEditAvatar = canOwnUserSendState(StateEventType.RoomAvatar),
+    )
+}
diff --git a/features/roomdetailsedit/impl/build.gradle.kts b/features/roomdetailsedit/impl/build.gradle.kts
new file mode 100644
index 0000000000..6b1d886abe
--- /dev/null
+++ b/features/roomdetailsedit/impl/build.gradle.kts
@@ -0,0 +1,57 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.roomdetailsedit.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.mediapickers.api)
+    implementation(projects.libraries.mediaupload.api)
+    implementation(projects.libraries.mediaviewer.api)
+    implementation(projects.libraries.featureflag.api)
+    implementation(projects.libraries.permissions.api)
+    implementation(projects.libraries.preferences.api)
+    implementation(projects.services.analytics.api)
+    implementation(projects.libraries.testtags)
+    api(projects.features.roomdetailsedit.api)
+    api(projects.services.apperror.api)
+    implementation(libs.coil.compose)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.mediaupload.test)
+    testImplementation(projects.libraries.mediapickers.test)
+    testImplementation(projects.libraries.mediaviewer.test)
+    testImplementation(projects.libraries.permissions.test)
+    testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.services.analytics.test)
+}
diff --git a/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/DefaultRoomDetailsEditEntryPoint.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/DefaultRoomDetailsEditEntryPoint.kt
new file mode 100644
index 0000000000..d928a0238c
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/DefaultRoomDetailsEditEntryPoint.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.roomdetailsedit.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.roomdetailsedit.api.RoomDetailsEditEntryPoint
+import io.element.android.libraries.architecture.createNode
+
+@ContributesBinding(AppScope::class)
+class DefaultRoomDetailsEditEntryPoint : RoomDetailsEditEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        return parentNode.createNode<RoomDetailsEditNode>(buildContext)
+    }
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditEvents.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditEvent.kt
similarity index 51%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditEvents.kt
rename to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditEvent.kt
index 1becbe9e5c..40f123401c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditEvents.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditEvent.kt
@@ -1,18 +1,20 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 
-sealed interface RoomDetailsEditEvents {
-    data class HandleAvatarAction(val action: AvatarAction) : RoomDetailsEditEvents
-    data class UpdateRoomName(val name: String) : RoomDetailsEditEvents
-    data class UpdateRoomTopic(val topic: String) : RoomDetailsEditEvents
-    data object Save : RoomDetailsEditEvents
-    data object CancelSaveChanges : RoomDetailsEditEvents
+sealed interface RoomDetailsEditEvent {
+    data class HandleAvatarAction(val action: AvatarAction) : RoomDetailsEditEvent
+    data class UpdateRoomName(val name: String) : RoomDetailsEditEvent
+    data class UpdateRoomTopic(val topic: String) : RoomDetailsEditEvent
+    data object OnBackPress : RoomDetailsEditEvent
+    data object Save : RoomDetailsEditEvent
+    data object CloseDialog : RoomDetailsEditEvent
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditNode.kt
similarity index 87%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt
rename to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditNode.kt
index 8143f1848f..541a36c91a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditNode.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -41,8 +42,7 @@ class RoomDetailsEditNode(
         val state = presenter.present()
         RoomDetailsEditView(
             state = state,
-            onBackClick = ::navigateUp,
-            onRoomEditSuccess = ::navigateUp,
+            onDone = ::navigateUp,
             modifier = modifier,
         )
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt
similarity index 78%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
rename to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt
index 2520d0d29c..24f8f49e81 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenter.kt
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
+import android.Manifest
 import android.net.Uri
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -21,6 +23,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.core.net.toUri
 import dev.zacsweers.metro.Inject
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditPermissions
+import io.element.android.features.roomdetailsedit.api.roomDetailsEditPermissions
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
@@ -28,16 +32,12 @@ import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.StateEventType
-import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.ui.media.AvatarAction
-import io.element.android.libraries.matrix.ui.room.avatarUrl
-import io.element.android.libraries.matrix.ui.room.rawName
-import io.element.android.libraries.matrix.ui.room.topic
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -53,29 +53,28 @@ class RoomDetailsEditPresenter(
     permissionsPresenterFactory: PermissionsPresenter.Factory,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
 ) : Presenter<RoomDetailsEditState> {
-    private val cameraPermissionPresenter = permissionsPresenterFactory.create(android.Manifest.permission.CAMERA)
+    private val cameraPermissionPresenter = permissionsPresenterFactory.create(Manifest.permission.CAMERA)
     private var pendingPermissionRequest = false
 
     @Composable
     override fun present(): RoomDetailsEditState {
         val cameraPermissionState = cameraPermissionPresenter.present()
-        val roomSyncUpdateFlow = room.syncUpdateFlow.collectAsState()
-
-        val roomAvatarUri = room.avatarUrl()?.toUri()
-        var roomAvatarUriEdited by rememberSaveable { mutableStateOf<Uri?>(null) }
+        val roomInfo by room.roomInfoFlow.collectAsState()
+        val roomAvatarUri = roomInfo.avatarUrl
+        var roomAvatarUriEdited by rememberSaveable { mutableStateOf<String?>(null) }
         LaunchedEffect(roomAvatarUri) {
             // Every time the roomAvatar change (from sync), we can set the new avatar.
-            temporaryUriDeleter.delete(roomAvatarUriEdited)
+            temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri())
             roomAvatarUriEdited = roomAvatarUri
         }
 
-        val roomRawNameTrimmed = room.rawName().orEmpty().trim()
+        val roomRawNameTrimmed = roomInfo.rawName.orEmpty().trim()
         var roomRawNameEdited by rememberSaveable { mutableStateOf("") }
         LaunchedEffect(roomRawNameTrimmed) {
             // Every time the rawName change (from sync), we can set the new name.
             roomRawNameEdited = roomRawNameTrimmed
         }
-        val roomTopicTrimmed = room.topic().orEmpty().trim()
+        val roomTopicTrimmed = roomInfo.topic.orEmpty().trim()
         var roomTopicEdited by rememberSaveable { mutableStateOf("") }
         LaunchedEffect(roomTopicTrimmed) {
             // Every time the topic change (from sync), we can set the new topic.
@@ -94,29 +93,23 @@ class RoomDetailsEditPresenter(
             }
         }
 
-        var canChangeName by remember { mutableStateOf(false) }
-        var canChangeTopic by remember { mutableStateOf(false) }
-        var canChangeAvatar by remember { mutableStateOf(false) }
-
-        LaunchedEffect(roomSyncUpdateFlow.value) {
-            canChangeName = room.canSendState(StateEventType.ROOM_NAME).getOrElse { false }
-            canChangeTopic = room.canSendState(StateEventType.ROOM_TOPIC).getOrElse { false }
-            canChangeAvatar = room.canSendState(StateEventType.ROOM_AVATAR).getOrElse { false }
+        val permissions by room.permissionsAsState(RoomDetailsEditPermissions.DEFAULT) { perms ->
+            perms.roomDetailsEditPermissions()
         }
 
         val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker(
             onResult = { uri ->
                 if (uri != null) {
-                    temporaryUriDeleter.delete(roomAvatarUriEdited)
-                    roomAvatarUriEdited = uri
+                    temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri())
+                    roomAvatarUriEdited = uri.toString()
                 }
             }
         )
         val galleryImagePicker = mediaPickerProvider.registerGalleryImagePicker(
             onResult = { uri ->
                 if (uri != null) {
-                    temporaryUriDeleter.delete(roomAvatarUriEdited)
-                    roomAvatarUriEdited = uri
+                    temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri())
+                    roomAvatarUriEdited = uri.toString()
                 }
             }
         )
@@ -140,52 +133,59 @@ class RoomDetailsEditPresenter(
 
         val saveAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val localCoroutineScope = rememberCoroutineScope()
-        fun handleEvents(event: RoomDetailsEditEvents) {
+        fun handleEvent(event: RoomDetailsEditEvent) {
             when (event) {
-                is RoomDetailsEditEvents.Save -> localCoroutineScope.saveChanges(
+                is RoomDetailsEditEvent.Save -> localCoroutineScope.saveChanges(
                     currentNameTrimmed = roomRawNameTrimmed,
                     newNameTrimmed = roomRawNameEdited.trim(),
                     currentTopicTrimmed = roomTopicTrimmed,
                     newTopicTrimmed = roomTopicEdited.trim(),
-                    currentAvatar = roomAvatarUri,
-                    newAvatarUri = roomAvatarUriEdited,
+                    currentAvatar = roomAvatarUri?.toUri(),
+                    newAvatarUri = roomAvatarUriEdited?.toUri(),
                     action = saveAction,
                 )
-                is RoomDetailsEditEvents.HandleAvatarAction -> {
+                is RoomDetailsEditEvent.HandleAvatarAction -> {
                     when (event.action) {
                         AvatarAction.ChoosePhoto -> galleryImagePicker.launch()
                         AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
                             cameraPhotoPicker.launch()
                         } else {
                             pendingPermissionRequest = true
-                            cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
+                            cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
                         }
                         AvatarAction.Remove -> {
-                            temporaryUriDeleter.delete(roomAvatarUriEdited)
+                            temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri())
                             roomAvatarUriEdited = null
                         }
                     }
                 }
 
-                is RoomDetailsEditEvents.UpdateRoomName -> roomRawNameEdited = event.name
-                is RoomDetailsEditEvents.UpdateRoomTopic -> roomTopicEdited = event.topic
-                RoomDetailsEditEvents.CancelSaveChanges -> saveAction.value = AsyncAction.Uninitialized
+                is RoomDetailsEditEvent.UpdateRoomName -> roomRawNameEdited = event.name
+                is RoomDetailsEditEvent.UpdateRoomTopic -> roomTopicEdited = event.topic
+                RoomDetailsEditEvent.CloseDialog -> saveAction.value = AsyncAction.Uninitialized
+                RoomDetailsEditEvent.OnBackPress -> if (saveButtonEnabled.not() || saveAction.value == AsyncAction.ConfirmingCancellation) {
+                    // No changes to save or already confirming exit without saving
+                    saveAction.value = AsyncAction.Success(Unit)
+                } else {
+                    saveAction.value = AsyncAction.ConfirmingCancellation
+                }
             }
         }
 
         return RoomDetailsEditState(
             roomId = room.roomId,
             roomRawName = roomRawNameEdited,
-            canChangeName = canChangeName,
+            canChangeName = permissions.canEditName,
             roomTopic = roomTopicEdited,
-            canChangeTopic = canChangeTopic,
+            canChangeTopic = permissions.canEditTopic,
             roomAvatarUrl = roomAvatarUriEdited,
-            canChangeAvatar = canChangeAvatar,
+            canChangeAvatar = permissions.canEditAvatar,
             avatarActions = avatarActions,
             saveButtonEnabled = saveButtonEnabled,
             saveAction = saveAction.value,
             cameraPermissionState = cameraPermissionState,
-            eventSink = ::handleEvents,
+            isSpace = roomInfo.isSpace,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditState.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditState.kt
similarity index 78%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditState.kt
rename to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditState.kt
index f01011376c..35f088275f 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditState.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditState.kt
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
-import android.net.Uri
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.media.AvatarAction
@@ -21,11 +21,12 @@ data class RoomDetailsEditState(
     val canChangeName: Boolean,
     val roomTopic: String,
     val canChangeTopic: Boolean,
-    val roomAvatarUrl: Uri?,
+    val roomAvatarUrl: String?,
     val canChangeAvatar: Boolean,
     val avatarActions: ImmutableList<AvatarAction>,
     val saveButtonEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
     val cameraPermissionState: PermissionsState,
-    val eventSink: (RoomDetailsEditEvents) -> Unit
+    val isSpace: Boolean,
+    val eventSink: (RoomDetailsEditEvent) -> Unit
 )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditStateProvider.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditStateProvider.kt
similarity index 83%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditStateProvider.kt
rename to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditStateProvider.kt
index 7ae59febc0..a6e2e3798b 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditStateProvider.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditStateProvider.kt
@@ -1,15 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
-import android.net.Uri
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import androidx.core.net.toUri
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.media.AvatarAction
@@ -23,11 +22,13 @@ open class RoomDetailsEditStateProvider : PreviewParameterProvider<RoomDetailsEd
             aRoomDetailsEditState(),
             aRoomDetailsEditState(roomTopic = ""),
             aRoomDetailsEditState(roomRawName = ""),
-            aRoomDetailsEditState(roomAvatarUrl = "example://uri".toUri()),
+            aRoomDetailsEditState(roomAvatarUrl = "example://uri"),
+            aRoomDetailsEditState(roomAvatarUrl = "example://uri", isSpace = true, roomTopic = ""),
             aRoomDetailsEditState(canChangeName = true, canChangeTopic = false, canChangeAvatar = true, saveButtonEnabled = false),
             aRoomDetailsEditState(canChangeName = false, canChangeTopic = true, canChangeAvatar = false, saveButtonEnabled = false),
             aRoomDetailsEditState(saveAction = AsyncAction.Loading),
             aRoomDetailsEditState(saveAction = AsyncAction.Failure(RuntimeException("Whelp"))),
+            aRoomDetailsEditState(saveAction = AsyncAction.ConfirmingCancellation),
         )
 }
 
@@ -37,13 +38,14 @@ fun aRoomDetailsEditState(
     canChangeName: Boolean = true,
     roomTopic: String = "a room topic that is quite long so should wrap onto multiple lines",
     canChangeTopic: Boolean = true,
-    roomAvatarUrl: Uri? = null,
+    roomAvatarUrl: String? = null,
     canChangeAvatar: Boolean = true,
     avatarActions: List<AvatarAction> = emptyList(),
     saveButtonEnabled: Boolean = true,
     saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     cameraPermissionState: PermissionsState = aPermissionsState(showDialog = false),
-    eventSink: (RoomDetailsEditEvents) -> Unit = {},
+    isSpace: Boolean = false,
+    eventSink: (RoomDetailsEditEvent) -> Unit = {},
 ) = RoomDetailsEditState(
     roomId = roomId,
     roomRawName = roomRawName,
@@ -56,5 +58,6 @@ fun aRoomDetailsEditState(
     saveButtonEnabled = saveButtonEnabled,
     saveAction = saveAction,
     cameraPermissionState = cameraPermissionState,
+    isSpace = isSpace,
     eventSink = eventSink,
 )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
similarity index 73%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
rename to features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
index 60082b23f1..aedb9bd16b 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
@@ -1,20 +1,21 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 @file:OptIn(ExperimentalMaterial3Api::class)
 
-package io.element.android.features.roomdetails.impl.edit
+package io.element.android.features.roomdetailsedit.impl
 
+import androidx.activity.compose.BackHandler
 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.imePadding
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
@@ -29,12 +30,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 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.components.dialogs.SaveChangesDialog
 import io.element.android.libraries.designsystem.modifiers.clearFocusOnTap
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -50,8 +52,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun RoomDetailsEditView(
     state: RoomDetailsEditState,
-    onBackClick: () -> Unit,
-    onRoomEditSuccess: () -> Unit,
+    onDone: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val focusManager = LocalFocusManager.current
@@ -62,19 +63,28 @@ fun RoomDetailsEditView(
         isAvatarActionsSheetVisible.value = true
     }
 
+    BackHandler {
+        state.eventSink(RoomDetailsEditEvent.OnBackPress)
+    }
     Scaffold(
         modifier = modifier.clearFocusOnTap(focusManager),
         topBar = {
             TopAppBar(
                 titleStr = stringResource(id = R.string.screen_room_details_edit_room_title),
-                navigationIcon = { BackButton(onClick = onBackClick) },
+                navigationIcon = {
+                    BackButton(
+                        onClick = {
+                            state.eventSink(RoomDetailsEditEvent.OnBackPress)
+                        }
+                    )
+                },
                 actions = {
                     TextButton(
                         text = stringResource(CommonStrings.action_save),
                         enabled = state.saveButtonEnabled,
                         onClick = {
                             focusManager.clearFocus()
-                            state.eventSink(RoomDetailsEditEvents.Save)
+                            state.eventSink(RoomDetailsEditEvent.Save)
                         },
                     )
                 }
@@ -85,7 +95,6 @@ fun RoomDetailsEditView(
             modifier = Modifier
                 .padding(padding)
                 .padding(horizontal = 16.dp)
-                .navigationBarsPadding()
                 .imePadding()
                 .verticalScroll(rememberScrollState())
         ) {
@@ -96,44 +105,51 @@ fun RoomDetailsEditView(
                 displayName = state.roomRawName,
                 avatarUrl = state.roomAvatarUrl,
                 avatarSize = AvatarSize.EditRoomDetails,
-                avatarType = AvatarType.Room(),
+                avatarType = if (state.isSpace) {
+                    AvatarType.Space()
+                } else {
+                    AvatarType.Room()
+                },
+                enabled = state.canChangeAvatar,
                 onAvatarClick = ::onAvatarClick,
                 modifier = Modifier.fillMaxWidth(),
             )
-            Spacer(modifier = Modifier.height(60.dp))
+            Spacer(modifier = Modifier.height(32.dp))
 
             TextField(
-                label = stringResource(id = R.string.screen_room_details_room_name_label),
+                label = stringResource(id = CommonStrings.common_name),
                 value = state.roomRawName,
                 placeholder = stringResource(CommonStrings.common_room_name_placeholder),
                 singleLine = true,
                 readOnly = !state.canChangeName,
-                onValueChange = { state.eventSink(RoomDetailsEditEvents.UpdateRoomName(it)) },
+                onValueChange = { state.eventSink(RoomDetailsEditEvent.UpdateRoomName(it)) },
             )
 
-            Spacer(modifier = Modifier.height(28.dp))
+            Spacer(modifier = Modifier.height(32.dp))
 
             TextField(
                 label = stringResource(CommonStrings.common_topic),
                 value = state.roomTopic,
-                placeholder = stringResource(CommonStrings.common_topic_placeholder),
+                placeholder = if (state.isSpace) {
+                    stringResource(CommonStrings.common_space_topic_placeholder)
+                } else {
+                    stringResource(CommonStrings.common_topic_placeholder)
+                },
                 maxLines = 10,
                 readOnly = !state.canChangeTopic,
-                onValueChange = { state.eventSink(RoomDetailsEditEvents.UpdateRoomTopic(it)) },
+                onValueChange = { state.eventSink(RoomDetailsEditEvent.UpdateRoomTopic(it)) },
                 keyboardOptions = KeyboardOptions(
                     capitalization = KeyboardCapitalization.Sentences,
                 ),
             )
         }
     }
-
     AvatarActionBottomSheet(
         actions = state.avatarActions,
         isVisible = isAvatarActionsSheetVisible.value,
         onDismiss = { isAvatarActionsSheetVisible.value = false },
-        onSelectAction = { state.eventSink(RoomDetailsEditEvents.HandleAvatarAction(it)) }
+        onSelectAction = { state.eventSink(RoomDetailsEditEvent.HandleAvatarAction(it)) }
     )
-
     AsyncActionView(
         async = state.saveAction,
         progressDialog = {
@@ -141,9 +157,18 @@ fun RoomDetailsEditView(
                 progressText = stringResource(R.string.screen_room_details_updating_room),
             )
         },
-        onSuccess = { onRoomEditSuccess() },
+        confirmationDialog = {
+            if (state.saveAction == AsyncAction.ConfirmingCancellation) {
+                SaveChangesDialog(
+                    onSaveClick = { state.eventSink(RoomDetailsEditEvent.Save) },
+                    onDiscardClick = { state.eventSink(RoomDetailsEditEvent.OnBackPress) },
+                    onDismiss = { state.eventSink(RoomDetailsEditEvent.CloseDialog) }
+                )
+            }
+        },
+        onSuccess = { onDone() },
         errorMessage = { stringResource(R.string.screen_room_details_edition_error) },
-        onErrorDismiss = { state.eventSink(RoomDetailsEditEvents.CancelSaveChanges) }
+        onErrorDismiss = { state.eventSink(RoomDetailsEditEvent.CloseDialog) }
     )
 
     PermissionsView(
@@ -156,7 +181,6 @@ fun RoomDetailsEditView(
 internal fun RoomDetailsEditViewPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) = ElementPreview {
     RoomDetailsEditView(
         state = state,
-        onBackClick = {},
-        onRoomEditSuccess = {},
+        onDone = {},
     )
 }
diff --git a/features/roomdetailsedit/impl/src/main/res/values-be/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..26537576b4
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-be/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-bg/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..787110dc79
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-bg/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-cs/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..b2ea107300
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-cs/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">"Upravit podrobnosti"</string>
+  <string name="screen_room_details_edition_error">"Došlo k neznámé chybě a informace nebylo možné změnit."</string>
+  <string name="screen_room_details_edition_error_title">"Nelze aktualizovat místnost"</string>
+  <string name="screen_room_details_updating_room">"Aktualizace místnosti…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-cy/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..e13ddf6d91
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-cy/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">"Ystafell Golygu"</string>
+  <string name="screen_room_details_edition_error">"Roedd gwall anhysbys ac nid oedd modd newid y manylion."</string>
+  <string name="screen_room_details_edition_error_title">"Methu diweddaru\'r ystafell"</string>
+  <string name="screen_room_details_updating_room">"Wrthi\'n diweddaru ystafell…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-da/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-da/translations.xml
new file mode 100644
index 0000000000..d751b1da96
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-da/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">"Redigér detaljer"</string>
+  <string name="screen_room_details_edition_error">"Der opstod en ukendt fejl, og oplysningerne kunne ikke ændres."</string>
+  <string name="screen_room_details_edition_error_title">"Rummet kunne ikke opdateres"</string>
+  <string name="screen_room_details_updating_room">"Opdaterer rum…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-de/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..1bc31f9f68
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-de/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">"Chat bearbeiten"</string>
+  <string name="screen_room_details_edition_error">"Es ist ein unbekannter Fehler aufgetreten und die Informationen konnten nicht geändert werden."</string>
+  <string name="screen_room_details_edition_error_title">"Chat kann nicht aktualisiert werden"</string>
+  <string name="screen_room_details_updating_room">"Chat wird aktualisiert…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-el/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..c783ab1d86
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-el/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-es/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-es/translations.xml
new file mode 100644
index 0000000000..45e1d81df9
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-es/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">"Editar sala"</string>
+  <string name="screen_room_details_edition_error">"Se ha producido un error desconocido y no se ha podido cambiar la información."</string>
+  <string name="screen_room_details_edition_error_title">"No se puede actualizar la sala"</string>
+  <string name="screen_room_details_updating_room">"Actualizando la sala…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-et/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..4c158d348a
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-et/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">"Muuda üksikasju"</string>
+  <string name="screen_room_details_edition_error">"Tekkis tundmatu viga ja andmed jäid muutmata."</string>
+  <string name="screen_room_details_edition_error_title">"Jututoa andmete muutmine ei õnnestu"</string>
+  <string name="screen_room_details_updating_room">"Uuendame jututuba…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-eu/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-eu/translations.xml
new file mode 100644
index 0000000000..000b5856bb
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-eu/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">"Editatu gela"</string>
+  <string name="screen_room_details_edition_error">"Errore ezezaguna gertatu da eta ezin izan da informazioa aldatu."</string>
+  <string name="screen_room_details_edition_error_title">"Ezin da gela eguneratu"</string>
+  <string name="screen_room_details_updating_room">"Gela eguneratzen…"</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
new file mode 100644
index 0000000000..bbbd63d171
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-fa/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-fi/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-fi/translations.xml
new file mode 100644
index 0000000000..eabdcf2ab1
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-fi/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">"Muokkaa tietoja"</string>
+  <string name="screen_room_details_edition_error">"Tuntematon virhe tapahtui, eikä tietoja voitu muuttaa."</string>
+  <string name="screen_room_details_edition_error_title">"Huoneen muokkaaminen ei onnistunut"</string>
+  <string name="screen_room_details_updating_room">"Muokataan huonetta…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-fr/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-fr/translations.xml
new file mode 100644
index 0000000000..bd0c4b6f02
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-fr/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">"Modifier les détails"</string>
+  <string name="screen_room_details_edition_error">"Une erreur inconnue s’est produite et les informations n’ont pas pu être modifiées."</string>
+  <string name="screen_room_details_edition_error_title">"Impossible de mettre à jour le salon"</string>
+  <string name="screen_room_details_updating_room">"Mise à jour du salon…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-hr/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..7cd06d6bd8
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-hr/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">"Uredi pojedinosti"</string>
+  <string name="screen_room_details_edition_error">"Došlo je do nepoznate pogreške i podatci se nisu mogli promijeniti."</string>
+  <string name="screen_room_details_edition_error_title">"Nije moguće ažurirati sobu"</string>
+  <string name="screen_room_details_updating_room">"Ažuriranje pojedinosti…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-hu/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-hu/translations.xml
new file mode 100644
index 0000000000..9685a9afbb
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-hu/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">"Részletek szerkesztése"</string>
+  <string name="screen_room_details_edition_error">"Ismeretlen hiba történt, és az információkat nem lehetett megváltoztatni."</string>
+  <string name="screen_room_details_edition_error_title">"Nem sikerült frissíteni a szobát"</string>
+  <string name="screen_room_details_updating_room">"Szoba frissítése…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-in/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-in/translations.xml
new file mode 100644
index 0000000000..14b3d68c74
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-in/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">"Sunting Ruangan"</string>
+  <string name="screen_room_details_edition_error">"Terjadi kesalahan yang tidak diketahui dan informasinya tidak dapat diubah."</string>
+  <string name="screen_room_details_edition_error_title">"Tidak dapat memperbarui ruangan"</string>
+  <string name="screen_room_details_updating_room">"Memperbarui ruangan…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-it/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..7d28c1a3e2
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-it/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">"Modifica dettagli"</string>
+  <string name="screen_room_details_edition_error">"Si è verificato un errore sconosciuto e non è stato possibile modificare le informazioni."</string>
+  <string name="screen_room_details_edition_error_title">"Impossibile aggiornare la stanza"</string>
+  <string name="screen_room_details_updating_room">"Aggiornamento della stanza…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-ka/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ka/translations.xml
new file mode 100644
index 0000000000..53ea28028b
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ka/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-ko/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ko/translations.xml
new file mode 100644
index 0000000000..ae51384737
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ko/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-lt/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-lt/translations.xml
new file mode 100644
index 0000000000..7e28eeb16c
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-lt/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">"Redaguoti kambarį"</string>
+  <string name="screen_room_details_edition_error">"Įvyko nežinoma klaida ir informacijos pakeisti nepavyko."</string>
+  <string name="screen_room_details_edition_error_title">"Nepavyko atnaujinti kambario"</string>
+  <string name="screen_room_details_updating_room">"Atnaujinamas kambarys…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-nb/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-nb/translations.xml
new file mode 100644
index 0000000000..e660c40e7b
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-nb/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">"Rediger detaljer"</string>
+  <string name="screen_room_details_edition_error">"Det oppstod en ukjent feil, og informasjonen kunne ikke endres."</string>
+  <string name="screen_room_details_edition_error_title">"Kan ikke oppdatere rommet"</string>
+  <string name="screen_room_details_updating_room">"Oppdaterer rommet …"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-nl/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-nl/translations.xml
new file mode 100644
index 0000000000..af6fae3a90
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-nl/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">"Kamer bewerken"</string>
+  <string name="screen_room_details_edition_error">"Er is een onbekende fout opgetreden en de informatie kon niet worden gewijzigd."</string>
+  <string name="screen_room_details_edition_error_title">"Kan kamer niet bijwerken"</string>
+  <string name="screen_room_details_updating_room">"Kamer bijwerken…"</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
new file mode 100644
index 0000000000..c676ff46ed
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-pl/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">"Edytuj pokój"</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>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-pt-rBR/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-pt-rBR/translations.xml
new file mode 100644
index 0000000000..e8e5dfc28d
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-pt-rBR/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">"Editar detalhes"</string>
+  <string name="screen_room_details_edition_error">"Ocorreu um erro desconhecido e as informações não puderam ser alteradas."</string>
+  <string name="screen_room_details_edition_error_title">"Não foi possível atualizar a sala"</string>
+  <string name="screen_room_details_updating_room">"Atualizando a sala…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-pt/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-pt/translations.xml
new file mode 100644
index 0000000000..25069318a5
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-pt/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">"Editar sala"</string>
+  <string name="screen_room_details_edition_error">"Ocorreu um erro desconhecido e não foi possível alterar a informação."</string>
+  <string name="screen_room_details_edition_error_title">"Não foi possível atualizar a sala"</string>
+  <string name="screen_room_details_updating_room">"A atualizar sala…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-ro/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ro/translations.xml
new file mode 100644
index 0000000000..401eeee575
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ro/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ți detaliile"</string>
+  <string name="screen_room_details_edition_error">"A apărut o eroare la actualizarea detaliilor camerei"</string>
+  <string name="screen_room_details_edition_error_title">"Nu s-a putut actualiza camera"</string>
+  <string name="screen_room_details_updating_room">"Se actualizează camera…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-ru/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..91ce37e6c0
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ru/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-sk/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..52e484f1a3
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-sk/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">"Upraviť podrobnosti"</string>
+  <string name="screen_room_details_edition_error">"Vyskytla sa neznáma chyba a informácie nebolo možné zmeniť."</string>
+  <string name="screen_room_details_edition_error_title">"Nepodarilo sa aktualizovať miestnosť"</string>
+  <string name="screen_room_details_updating_room">"Aktualizácia miestnosti…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-sv/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-sv/translations.xml
new file mode 100644
index 0000000000..176aed6b00
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-sv/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">"Redigera rummet"</string>
+  <string name="screen_room_details_edition_error">"Ett okänt fel uppstod och informationen kunde inte ändras."</string>
+  <string name="screen_room_details_edition_error_title">"Kunde inte uppdatera rummet"</string>
+  <string name="screen_room_details_updating_room">"Uppdaterar rummet …"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-tr/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-tr/translations.xml
new file mode 100644
index 0000000000..f55c55cfaf
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-tr/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">"Odayı Düzenle"</string>
+  <string name="screen_room_details_edition_error">"Bilinmeyen bir hata oluştu ve bilgiler değiştirilemedi."</string>
+  <string name="screen_room_details_edition_error_title">"Oda güncellenemiyor"</string>
+  <string name="screen_room_details_updating_room">"Oda güncelleniyor…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-uk/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..21a47cbd59
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-uk/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-ur/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ur/translations.xml
new file mode 100644
index 0000000000..e0fd0e01b5
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ur/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-uz/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..cd11813116
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-uz/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">"Tafsilotlarni tahrirlash"</string>
+  <string name="screen_room_details_edition_error">"Nomaʼlum xatolik yuz berdi va maʼlumotni oʻzgartirib boʻlmadi."</string>
+  <string name="screen_room_details_edition_error_title">"Xonani yangilab bo‘lmadi"</string>
+  <string name="screen_room_details_updating_room">"Xona yangilanmoqda…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-zh-rTW/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..44955e96dd
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-zh-rTW/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-zh/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-zh/translations.xml
new file mode 100644
index 0000000000..6b174fcb2c
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-zh/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/localazy.xml b/features/roomdetailsedit/impl/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..c20e6f2b47
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values/localazy.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">"Edit details"</string>
+  <string name="screen_room_details_edition_error">"There was an unknown error and the information couldn\'t be changed."</string>
+  <string name="screen_room_details_edition_error_title">"Unable to update room"</string>
+  <string name="screen_room_details_updating_room">"Updating details…"</string>
+</resources>
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt b/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenterTest.kt
similarity index 67%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt
rename to features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenterTest.kt
index 996cbcfece..656cc92265 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt
+++ b/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditPresenterTest.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
 import android.net.Uri
 import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.roomdetails.impl.aJoinedRoom
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.mimetype.MimeTypes
@@ -19,6 +18,11 @@ import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_RAW_NAME
+import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
+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.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 import io.element.android.libraries.mediapickers.test.FakePickerProvider
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
@@ -31,6 +35,7 @@ import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.fake.FakeTemporaryUriDeleter
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.matching
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
 import io.mockk.every
@@ -66,7 +71,9 @@ class RoomDetailsEditPresenterTest {
         mockkStatic(Uri::class)
 
         every { Uri.parse(AN_AVATAR_URL) } returns roomAvatarUri
+        every { roomAvatarUri.toString() } returns AN_AVATAR_URL
         every { Uri.parse(ANOTHER_AVATAR_URL) } returns anotherAvatarUri
+        every { anotherAvatarUri.toString() } returns ANOTHER_AVATAR_URL
     }
 
     @After
@@ -96,7 +103,6 @@ class RoomDetailsEditPresenterTest {
             avatarUrl = AN_AVATAR_URL,
             displayName = A_ROOM_NAME,
             rawName = A_ROOM_RAW_NAME,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -107,7 +113,7 @@ class RoomDetailsEditPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.roomId).isEqualTo(room.roomId)
             assertThat(initialState.roomRawName).isEqualTo(A_ROOM_RAW_NAME)
-            assertThat(initialState.roomAvatarUrl).isEqualTo(roomAvatarUri)
+            assertThat(initialState.roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
             assertThat(initialState.roomTopic).isEqualTo(room.info().topic.orEmpty())
             assertThat(initialState.avatarActions).containsExactly(
                 AvatarAction.ChoosePhoto,
@@ -122,15 +128,14 @@ class RoomDetailsEditPresenterTest {
     @Test
     fun `present - sets canChangeName if user has permission`() = runTest {
         val room = aJoinedRoom(
-            avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, stateEventType ->
+            canSendState = { stateEventType ->
                 when (stateEventType) {
-                    StateEventType.ROOM_NAME -> Result.success(true)
-                    StateEventType.ROOM_AVATAR -> Result.success(false)
-                    StateEventType.ROOM_TOPIC -> Result.failure(RuntimeException("Oops"))
+                    StateEventType.RoomName -> true
+                    StateEventType.RoomAvatar -> false
+                    StateEventType.RoomTopic -> false
                     else -> lambdaError()
                 }
-            },
+            }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -156,11 +161,11 @@ class RoomDetailsEditPresenterTest {
     fun `present - sets canChangeAvatar if user has permission`() = runTest {
         val room = aJoinedRoom(
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, stateEventType ->
+            canSendState = { stateEventType ->
                 when (stateEventType) {
-                    StateEventType.ROOM_NAME -> Result.success(false)
-                    StateEventType.ROOM_AVATAR -> Result.success(true)
-                    StateEventType.ROOM_TOPIC -> Result.failure(RuntimeException("Oops"))
+                    StateEventType.RoomName -> false
+                    StateEventType.RoomAvatar -> true
+                    StateEventType.RoomTopic -> false
                     else -> lambdaError()
                 }
             }
@@ -188,11 +193,11 @@ class RoomDetailsEditPresenterTest {
     fun `present - sets canChangeTopic if user has permission`() = runTest {
         val room = aJoinedRoom(
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, stateEventType ->
+            canSendState = { stateEventType ->
                 when (stateEventType) {
-                    StateEventType.ROOM_NAME -> Result.success(false)
-                    StateEventType.ROOM_AVATAR -> Result.failure(RuntimeException("Oops"))
-                    StateEventType.ROOM_TOPIC -> Result.success(true)
+                    StateEventType.RoomName -> false
+                    StateEventType.RoomAvatar -> false
+                    StateEventType.RoomTopic -> true
                     else -> lambdaError()
                 }
             }
@@ -222,7 +227,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -233,26 +237,26 @@ class RoomDetailsEditPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.roomTopic).isEqualTo("My topic")
             assertThat(initialState.roomRawName).isEqualTo("Name")
-            assertThat(initialState.roomAvatarUrl).isEqualTo(roomAvatarUri)
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name II"))
+            assertThat(initialState.roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name II"))
             awaitItem().apply {
                 assertThat(roomTopic).isEqualTo("My topic")
                 assertThat(roomRawName).isEqualTo("Name II")
-                assertThat(roomAvatarUrl).isEqualTo(roomAvatarUri)
+                assertThat(roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
             }
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name III"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name III"))
             awaitItem().apply {
                 assertThat(roomTopic).isEqualTo("My topic")
                 assertThat(roomRawName).isEqualTo("Name III")
-                assertThat(roomAvatarUrl).isEqualTo(roomAvatarUri)
+                assertThat(roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
             }
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("Another topic"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("Another topic"))
             awaitItem().apply {
                 assertThat(roomTopic).isEqualTo("Another topic")
                 assertThat(roomRawName).isEqualTo("Name III")
-                assertThat(roomAvatarUrl).isEqualTo(roomAvatarUri)
+                assertThat(roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
             }
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.Remove))
             awaitItem().apply {
                 assertThat(roomTopic).isEqualTo("Another topic")
                 assertThat(roomRawName).isEqualTo("Name III")
@@ -267,7 +271,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         fakePickerProvider.givenResult(anotherAvatarUri)
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
@@ -277,10 +280,10 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            assertThat(initialState.roomAvatarUrl).isEqualTo(roomAvatarUri)
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            assertThat(initialState.roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             awaitItem().apply {
-                assertThat(roomAvatarUrl).isEqualTo(anotherAvatarUri)
+                assertThat(roomAvatarUrl).isEqualTo(anotherAvatarUri.toString())
             }
         }
     }
@@ -291,7 +294,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         fakePickerProvider.givenResult(anotherAvatarUri)
         val fakePermissionsPresenter = FakePermissionsPresenter()
@@ -303,21 +305,21 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            assertThat(initialState.roomAvatarUrl).isEqualTo(roomAvatarUri)
+            assertThat(initialState.roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
             assertThat(initialState.cameraPermissionState.permissionGranted).isFalse()
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.TakePhoto))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.TakePhoto))
             val stateWithAskingPermission = awaitItem()
             assertThat(stateWithAskingPermission.cameraPermissionState.showDialog).isTrue()
             fakePermissionsPresenter.setPermissionGranted()
             val stateWithPermission = awaitItem()
             assertThat(stateWithPermission.cameraPermissionState.permissionGranted).isTrue()
             val stateWithNewAvatar = awaitItem()
-            assertThat(stateWithNewAvatar.roomAvatarUrl).isEqualTo(anotherAvatarUri)
+            assertThat(stateWithNewAvatar.roomAvatarUrl).isEqualTo(anotherAvatarUri.toString())
             // Do it again, no permission is requested
             fakePickerProvider.givenResult(roomAvatarUri)
-            stateWithNewAvatar.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.TakePhoto))
+            stateWithNewAvatar.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.TakePhoto))
             val stateWithNewAvatar2 = awaitItem()
-            assertThat(stateWithNewAvatar2.roomAvatarUrl).isEqualTo(roomAvatarUri)
+            assertThat(stateWithNewAvatar2.roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
             deleteCallback.assertions().isCalledExactly(3).withSequence(
                 listOf(value(null)),
                 listOf(value(roomAvatarUri)),
@@ -332,7 +334,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         fakePickerProvider.givenResult(roomAvatarUri)
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
@@ -344,32 +345,32 @@ class RoomDetailsEditPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.saveButtonEnabled).isFalse()
             // Once a change is made, the save button is enabled
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name II"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name II"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // If it's reverted then the save disables again
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
             // Make a change...
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("Another topic"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("Another topic"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // Revert it...
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("My topic"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("My topic"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
             // Make a change...
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.Remove))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // Revert it...
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
@@ -382,7 +383,6 @@ class RoomDetailsEditPresenterTest {
             topic = null,
             displayName = "fallback",
             avatarUrl = null,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         fakePickerProvider.givenResult(roomAvatarUri)
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
@@ -394,32 +394,32 @@ class RoomDetailsEditPresenterTest {
             val initialState = awaitFirstItem()
             assertThat(initialState.saveButtonEnabled).isFalse()
             // Once a change is made, the save button is enabled
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("Name II"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name II"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // If it's reverted then the save disables again
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("fallback"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("fallback"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
             // Make a change...
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("Another topic"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("Another topic"))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // Revert it...
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic(""))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic(""))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
             // Make a change...
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isTrue()
             }
             // Revert it...
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.Remove))
             awaitItem().apply {
                 assertThat(saveButtonEnabled).isFalse()
             }
@@ -438,7 +438,6 @@ class RoomDetailsEditPresenterTest {
             setNameResult = setNameResult,
             setTopicResult = setTopicResult,
             removeAvatarResult = removeAvatarResult,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -447,10 +446,10 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("New name"))
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("New topic"))
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("New name"))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("New topic"))
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.Remove))
+            initialState.eventSink(RoomDetailsEditEvent.Save)
             skipItems(5)
             setNameResult.assertions().isCalledOnce().with(value("New name"))
             setTopicResult.assertions().isCalledOnce().with(value("New topic"))
@@ -464,7 +463,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -473,9 +471,9 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName("   Name   "))
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("  My topic  "))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("   Name   "))
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("  My topic  "))
+            initialState.eventSink(RoomDetailsEditEvent.Save)
             cancelAndIgnoreRemainingEvents()
         }
     }
@@ -486,7 +484,6 @@ class RoomDetailsEditPresenterTest {
             topic = null,
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -495,8 +492,8 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic(""))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic(""))
+            initialState.eventSink(RoomDetailsEditEvent.Save)
             cancelAndIgnoreRemainingEvents()
             deleteCallback.assertions().isCalledOnce().with(value(null))
         }
@@ -508,7 +505,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -517,8 +513,8 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomName(""))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName(""))
+            initialState.eventSink(RoomDetailsEditEvent.Save)
             cancelAndIgnoreRemainingEvents()
             deleteCallback.assertions().isCalledOnce().with(value(null))
         }
@@ -532,24 +528,30 @@ class RoomDetailsEditPresenterTest {
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
             updateAvatarResult = updateAvatarResult,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
-        givenPickerReturnsFile()
+        val tmpFile = givenPickerReturnsFile()
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
             room = room,
             temporaryUriDeleter = FakeTemporaryUriDeleter(deleteCallback),
         )
-        presenter.test {
-            val initialState = awaitItem()
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
-            skipItems(4)
-            updateAvatarResult.assertions().isCalledOnce().with(value(MimeTypes.Jpeg), value(fakeFileContents))
-            deleteCallback.assertions().isCalledExactly(2).withSequence(
-                listOf(value(null)),
-                listOf(value(roomAvatarUri)),
-            )
+        try {
+            presenter.test {
+                val initialState = awaitItem()
+                initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
+                initialState.eventSink(RoomDetailsEditEvent.Save)
+                skipItems(4)
+                updateAvatarResult.assertions().isCalledOnce().with(
+                    value(MimeTypes.Jpeg),
+                    matching<ByteArray> { it.contentEquals(fakeFileContents) }
+                )
+                deleteCallback.assertions().isCalledExactly(2).withSequence(
+                    listOf(value(null)),
+                    listOf(value(roomAvatarUri)),
+                )
+            }
+        } finally {
+            tmpFile.delete()
         }
     }
 
@@ -559,7 +561,6 @@ class RoomDetailsEditPresenterTest {
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
         fakePickerProvider.givenResult(anotherAvatarUri)
         fakeMediaPreProcessor.givenResult(Result.failure(RuntimeException("Oh no")))
@@ -570,8 +571,8 @@ class RoomDetailsEditPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
+            initialState.eventSink(RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto))
+            initialState.eventSink(RoomDetailsEditEvent.Save)
             skipItems(3)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
         }
@@ -584,9 +585,8 @@ class RoomDetailsEditPresenterTest {
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
             setNameResult = { Result.failure(RuntimeException("!")) },
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
-        saveAndAssertFailure(room, RoomDetailsEditEvents.UpdateRoomName("New name"), deleteCallbackNumberOfInvocation = 1)
+        saveAndAssertFailure(room, RoomDetailsEditEvent.UpdateRoomName("New name"), deleteCallbackNumberOfInvocation = 1)
     }
 
     @Test
@@ -596,9 +596,8 @@ class RoomDetailsEditPresenterTest {
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
             setTopicResult = { Result.failure(RuntimeException("!")) },
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
-        saveAndAssertFailure(room, RoomDetailsEditEvents.UpdateRoomTopic("New topic"), deleteCallbackNumberOfInvocation = 1)
+        saveAndAssertFailure(room, RoomDetailsEditEvent.UpdateRoomTopic("New topic"), deleteCallbackNumberOfInvocation = 1)
     }
 
     @Test
@@ -608,33 +607,59 @@ class RoomDetailsEditPresenterTest {
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
             removeAvatarResult = { Result.failure(RuntimeException("!")) },
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
-        saveAndAssertFailure(room, RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove), deleteCallbackNumberOfInvocation = 2)
+        saveAndAssertFailure(room, RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.Remove), deleteCallbackNumberOfInvocation = 2)
     }
 
     @Test
     fun `present - sets save action to failure if setting avatar fails`() = runTest {
-        givenPickerReturnsFile()
+        val tmpFile = givenPickerReturnsFile()
         val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
             updateAvatarResult = { _, _ -> Result.failure(RuntimeException("!")) },
-            canSendStateResult = { _, _ -> Result.success(true) }
         )
-        saveAndAssertFailure(room, RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto), deleteCallbackNumberOfInvocation = 2)
+        try {
+            saveAndAssertFailure(room, RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto), deleteCallbackNumberOfInvocation = 2)
+        } finally {
+            tmpFile.delete()
+        }
     }
 
     @Test
     fun `present - CancelSaveChanges resets save action state`() = runTest {
-        givenPickerReturnsFile()
+        val tmpFile = givenPickerReturnsFile()
         val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
             setTopicResult = { Result.failure(RuntimeException("!")) },
-            canSendStateResult = { _, _ -> Result.success(true) }
+        )
+        val deleteCallback = lambdaRecorder<Uri?, Unit> {}
+        val presenter = createRoomDetailsEditPresenter(
+            room = room,
+            temporaryUriDeleter = FakeTemporaryUriDeleter(deleteCallback),
+        )
+        try {
+            presenter.test {
+                val initialState = awaitItem()
+                initialState.eventSink(RoomDetailsEditEvent.UpdateRoomTopic("foo"))
+                initialState.eventSink(RoomDetailsEditEvent.Save)
+                skipItems(3)
+                assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
+                initialState.eventSink(RoomDetailsEditEvent.CloseDialog)
+                assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+        } finally {
+            tmpFile.delete()
+        }
+    }
+
+    @Test
+    fun `present - leave without saving - cancel`() = runTest {
+        val room = aJoinedRoom(
+            displayName = "Name",
         )
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
         val presenter = createRoomDetailsEditPresenter(
@@ -642,19 +667,73 @@ class RoomDetailsEditPresenterTest {
             temporaryUriDeleter = FakeTemporaryUriDeleter(deleteCallback),
         )
         presenter.test {
-            val initialState = awaitItem()
-            initialState.eventSink(RoomDetailsEditEvents.UpdateRoomTopic("foo"))
-            initialState.eventSink(RoomDetailsEditEvents.Save)
-            skipItems(3)
-            assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
-            initialState.eventSink(RoomDetailsEditEvents.CancelSaveChanges)
-            assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            val initialState = awaitFirstItem()
+            assertThat(initialState.saveButtonEnabled).isFalse()
+            // Once a change is made, the save button is enabled
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name edited"))
+            awaitItem().apply {
+                assertThat(saveButtonEnabled).isTrue()
+                eventSink(RoomDetailsEditEvent.OnBackPress)
+            }
+            awaitItem().apply {
+                assertThat(saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
+                eventSink(RoomDetailsEditEvent.CloseDialog)
+            }
+            awaitItem().apply {
+                assertThat(saveAction).isEqualTo(AsyncAction.Uninitialized)
+            }
+        }
+    }
+
+    @Test
+    fun `present - leave no changes, no confirmation`() = runTest {
+        val room = aJoinedRoom(
+            displayName = "Name",
+        )
+        val presenter = createRoomDetailsEditPresenter(
+            room = room,
+            temporaryUriDeleter = FakeTemporaryUriDeleter {},
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            assertThat(initialState.saveButtonEnabled).isFalse()
+            initialState.eventSink(RoomDetailsEditEvent.OnBackPress)
+            assertThat(awaitItem().saveAction).isEqualTo(AsyncAction.Success(Unit))
+        }
+    }
+
+    @Test
+    fun `present - leave without saving - confirm`() = runTest {
+        val room = aJoinedRoom(
+            displayName = "Name",
+            canSendState = { _ -> true }
+        )
+        val presenter = createRoomDetailsEditPresenter(
+            room = room,
+            temporaryUriDeleter = FakeTemporaryUriDeleter({}),
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            assertThat(initialState.saveButtonEnabled).isFalse()
+            // Once a change is made, the save button is enabled
+            initialState.eventSink(RoomDetailsEditEvent.UpdateRoomName("Name edited"))
+            awaitItem().apply {
+                assertThat(saveButtonEnabled).isTrue()
+                eventSink(RoomDetailsEditEvent.OnBackPress)
+            }
+            awaitItem().apply {
+                assertThat(saveAction).isEqualTo(AsyncAction.ConfirmingCancellation)
+                eventSink(RoomDetailsEditEvent.OnBackPress)
+            }
+            awaitItem().apply {
+                assertThat(saveAction).isEqualTo(AsyncAction.Success(Unit))
+            }
         }
     }
 
     private suspend fun saveAndAssertFailure(
         room: JoinedRoom,
-        event: RoomDetailsEditEvents,
+        event: RoomDetailsEditEvent,
         deleteCallbackNumberOfInvocation: Int = 2,
     ) {
         val deleteCallback = lambdaRecorder<Uri?, Unit> {}
@@ -665,7 +744,7 @@ class RoomDetailsEditPresenterTest {
         presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink(event)
-            initialState.eventSink(RoomDetailsEditEvents.Save)
+            initialState.eventSink(RoomDetailsEditEvent.Save)
             skipItems(1)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Loading::class.java)
             assertThat(awaitItem().saveAction).isInstanceOf(AsyncAction.Failure::class.java)
@@ -673,20 +752,49 @@ class RoomDetailsEditPresenterTest {
         }
     }
 
-    private fun givenPickerReturnsFile() {
-        mockkStatic(File::readBytes)
-        val processedFile: File = mockk {
-            every { readBytes() } returns fakeFileContents
-        }
+    private fun givenPickerReturnsFile(): File {
+        val tmpFile = File.createTempFile("test", "jpg")
+        tmpFile.writeBytes(fakeFileContents)
         fakePickerProvider.givenResult(anotherAvatarUri)
         fakeMediaPreProcessor.givenResult(
             Result.success(
                 MediaUploadInfo.AnyFile(
-                    file = processedFile,
+                    file = tmpFile,
                     fileInfo = mockk(),
                 )
             )
         )
+        return tmpFile
+    }
+
+    private fun aJoinedRoom(
+        avatarUrl: String? = AN_AVATAR_URL,
+        displayName: String = A_ROOM_NAME,
+        rawName: String = displayName,
+        topic: String? = A_ROOM_TOPIC,
+        setNameResult: (String) -> Result<Unit> = { Result.success(Unit) },
+        setTopicResult: (String) -> Result<Unit> = { Result.success(Unit) },
+        updateAvatarResult: (String, ByteArray) -> Result<Unit> = { _, _ -> Result.success(Unit) },
+        removeAvatarResult: () -> Result<Unit> = { Result.success(Unit) },
+        canSendState: (StateEventType) -> Boolean = { true },
+    ): JoinedRoom {
+        return FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = FakeRoomPermissions(
+                    canSendState = canSendState,
+                ),
+                initialRoomInfo = aRoomInfo(
+                    name = displayName,
+                    topic = topic,
+                    avatarUrl = avatarUrl,
+                    rawName = rawName
+                )
+            ),
+            setNameResult = setNameResult,
+            setTopicResult = setTopicResult,
+            updateAvatarResult = updateAvatarResult,
+            removeAvatarResult = removeAvatarResult,
+        )
     }
 
     companion object {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditViewTest.kt b/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt
similarity index 75%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditViewTest.kt
rename to features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt
index 2ac3d4397c..71fb143074 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditViewTest.kt
+++ b/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.edit
+package io.element.android.features.roomdetailsedit.impl
 
 import androidx.activity.ComponentActivity
 import androidx.annotation.StringRes
@@ -38,36 +38,60 @@ class RoomDetailsEditViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
-    fun `clicking on back invoke back callback`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>(expectEvents = false)
-        ensureCalledOnce { callback ->
-            rule.setRoomDetailsEditView(
-                aRoomDetailsEditState(
-                    eventSink = eventsRecorder
-                ),
-                onBackClick = callback,
-            )
-            rule.pressBack()
-        }
+    fun `clicking on back emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
+        rule.setRoomDetailsEditView(
+            aRoomDetailsEditState(
+                eventSink = eventsRecorder
+            ),
+        )
+        rule.pressBack()
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.OnBackPress)
+    }
+
+    @Test
+    fun `clicking on discard when confirming exit emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
+        rule.setRoomDetailsEditView(
+            aRoomDetailsEditState(
+                saveAction = AsyncAction.ConfirmingCancellation,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_discard)
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.OnBackPress)
+    }
+
+    @Test
+    fun `clicking on save when confirming exit emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
+        rule.setRoomDetailsEditView(
+            aRoomDetailsEditState(
+                saveAction = AsyncAction.ConfirmingCancellation,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.Save)
     }
 
     @Test
     fun `when edition is successful, the expected callback is invoked`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
             rule.setRoomDetailsEditView(
                 aRoomDetailsEditState(
                     eventSink = eventsRecorder,
                     saveAction = AsyncAction.Success(Unit)
                 ),
-                onRoomEdited = callback,
+                onDone = callback,
             )
         }
     }
 
     @Test
     fun `when name is changed, the expected Event is emitted`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>()
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -75,12 +99,12 @@ class RoomDetailsEditViewTest {
             ),
         )
         rule.onNodeWithText("Marketing").performTextInput("A")
-        eventsRecorder.assertSingle(RoomDetailsEditEvents.UpdateRoomName("AMarketing"))
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.UpdateRoomName("AMarketing"))
     }
 
     @Test
     fun `when user cannot change name, nothing happen`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -93,7 +117,7 @@ class RoomDetailsEditViewTest {
 
     @Test
     fun `when topic is changed, the expected Event is emitted`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>()
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -101,12 +125,12 @@ class RoomDetailsEditViewTest {
             ),
         )
         rule.onNodeWithText("My Topic").performTextInput("A")
-        eventsRecorder.assertSingle(RoomDetailsEditEvents.UpdateRoomTopic("AMy Topic"))
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.UpdateRoomTopic("AMy Topic"))
     }
 
     @Test
     fun `when user cannot change topic, nothing happen`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -122,7 +146,7 @@ class RoomDetailsEditViewTest {
     fun `when avatar is changed with action to take photo, the expected Event is emitted`() {
         testAvatarChange(
             stringActionRes = CommonStrings.action_take_photo,
-            expectedEvent = RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.TakePhoto),
+            expectedEvent = RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.TakePhoto),
         )
     }
 
@@ -131,7 +155,7 @@ class RoomDetailsEditViewTest {
     fun `when avatar is changed with action to choose photo, the expected Event is emitted`() {
         testAvatarChange(
             stringActionRes = CommonStrings.action_choose_photo,
-            expectedEvent = RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.ChoosePhoto),
+            expectedEvent = RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.ChoosePhoto),
         )
     }
 
@@ -140,15 +164,15 @@ class RoomDetailsEditViewTest {
     fun `when avatar is changed with action to remove photo, the expected Event is emitted`() {
         testAvatarChange(
             stringActionRes = CommonStrings.action_remove,
-            expectedEvent = RoomDetailsEditEvents.HandleAvatarAction(AvatarAction.Remove),
+            expectedEvent = RoomDetailsEditEvent.HandleAvatarAction(AvatarAction.Remove),
         )
     }
 
     private fun testAvatarChange(
         @StringRes stringActionRes: Int,
-        expectedEvent: RoomDetailsEditEvents.HandleAvatarAction,
+        expectedEvent: RoomDetailsEditEvent.HandleAvatarAction,
     ) {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>()
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -163,7 +187,7 @@ class RoomDetailsEditViewTest {
 
     @Test
     fun `when user cannot change avatar, nothing happen`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -176,7 +200,7 @@ class RoomDetailsEditViewTest {
 
     @Test
     fun `when save is clicked, the expected Event is emitted`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>()
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -184,12 +208,12 @@ class RoomDetailsEditViewTest {
             ),
         )
         rule.clickOn(CommonStrings.action_save)
-        eventsRecorder.assertSingle(RoomDetailsEditEvents.Save)
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.Save)
     }
 
     @Test
     fun `when save is clicked, but nothing need to be saved, nothing happens`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -201,7 +225,7 @@ class RoomDetailsEditViewTest {
 
     @Test
     fun `when error is shown, closing the dialog emit the expected Event`() {
-        val eventsRecorder = EventsRecorder<RoomDetailsEditEvents>()
+        val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
         rule.setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
@@ -209,20 +233,18 @@ class RoomDetailsEditViewTest {
             ),
         )
         rule.clickOn(CommonStrings.action_ok)
-        eventsRecorder.assertSingle(RoomDetailsEditEvents.CancelSaveChanges)
+        eventsRecorder.assertSingle(RoomDetailsEditEvent.CloseDialog)
     }
 }
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDetailsEditView(
     state: RoomDetailsEditState,
-    onBackClick: () -> Unit = EnsureNeverCalled(),
-    onRoomEdited: () -> Unit = EnsureNeverCalled(),
+    onDone: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         RoomDetailsEditView(
             state = state,
-            onBackClick = onBackClick,
-            onRoomEditSuccess = onRoomEdited,
+            onDone = onDone,
         )
     }
 }
diff --git a/features/roomdetailsedit/test/build.gradle.kts b/features/roomdetailsedit/test/build.gradle.kts
new file mode 100644
index 0000000000..ff9110eb49
--- /dev/null
+++ b/features/roomdetailsedit/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.roomdetetailsedit.test"
+}
+
+dependencies {
+    implementation(projects.features.roomdetailsedit.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/roomdetailsedit/test/src/main/kotlin/io/element/android/features/roomdetailsedit/test/FakeRoomDetailsEditEntryPoint.kt b/features/roomdetailsedit/test/src/main/kotlin/io/element/android/features/roomdetailsedit/test/FakeRoomDetailsEditEntryPoint.kt
new file mode 100644
index 0000000000..df890ab2c6
--- /dev/null
+++ b/features/roomdetailsedit/test/src/main/kotlin/io/element/android/features/roomdetailsedit/test/FakeRoomDetailsEditEntryPoint.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.roomdetailsedit.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeRoomDetailsEditEntryPoint : RoomDetailsEditEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        lambdaError()
+    }
+}
diff --git a/features/roomdirectory/api/build.gradle.kts b/features/roomdirectory/api/build.gradle.kts
index ee27b5b21a..0f1be0e235 100644
--- a/features/roomdirectory/api/build.gradle.kts
+++ b/features/roomdirectory/api/build.gradle.kts
@@ -1,12 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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")
     id("kotlin-parcelize")
 }
 
diff --git a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
index 7d479cbad9..86767fde27 100644
--- a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
+++ b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.roomdirectory.api
 
 import android.os.Parcelable
-import androidx.compose.runtime.Immutable
 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.RoomAlias
@@ -17,7 +17,6 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@Immutable
 data class RoomDescription(
     val roomId: RoomId,
     val name: String?,
diff --git a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt
index 892719554b..db57b2e61d 100644
--- a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt
+++ b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,14 +14,13 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface RoomDirectoryEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onResultClick(roomDescription: RoomDescription)
+        fun navigateToRoom(roomDescription: RoomDescription)
     }
 }
diff --git a/features/roomdirectory/impl/build.gradle.kts b/features/roomdirectory/impl/build.gradle.kts
index ec858ced09..1c63872fc8 100644
--- a/features/roomdirectory/impl/build.gradle.kts
+++ b/features/roomdirectory/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt
index 135b2d5aea..f12c31cdd2 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,29 +10,19 @@ package io.element.android.features.roomdirectory.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.features.roomdirectory.impl.root.RoomDirectoryNode
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRoomDirectoryEntryPoint : RoomDirectoryEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomDirectoryEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : RoomDirectoryEntryPoint.NodeBuilder {
-            override fun callback(callback: RoomDirectoryEntryPoint.Callback): RoomDirectoryEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<RoomDirectoryNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: RoomDirectoryEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<RoomDirectoryNode>(buildContext, listOf(callback))
     }
 }
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt
index 9c0672b54b..20e866f2bf 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt
index 03d2be6e35..0e0ef509dc 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -27,18 +27,14 @@ class RoomDirectoryNode(
     @Assisted plugins: List<Plugin>,
     private val presenter: RoomDirectoryPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private fun onResultClick(roomDescription: RoomDescription) {
-        plugins<RoomDirectoryEntryPoint.Callback>().forEach {
-            it.onResultClick(roomDescription)
-        }
-    }
+    private val callback: RoomDirectoryEntryPoint.Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         RoomDirectoryView(
             state = state,
-            onResultClick = ::onResultClick,
+            onResultClick = callback::navigateToRoom,
             onBackClick = ::navigateUp,
             modifier = modifier
         )
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt
index 4696dd4263..98338440a1 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -62,7 +63,7 @@ class RoomDirectoryPresenter(
                 loadingMore = false
             }
         }
-        fun handleEvents(event: RoomDirectoryEvents) {
+        fun handleEvent(event: RoomDirectoryEvents) {
             when (event) {
                 RoomDirectoryEvents.LoadMore -> {
                     loadingMore = true
@@ -77,7 +78,7 @@ class RoomDirectoryPresenter(
             query = searchQuery.orEmpty(),
             roomDescriptions = listState.items,
             displayLoadMoreIndicator = listState.hasMoreToLoad,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt
index f28a8b8a49..a3647381dc 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt
index 6a5ba74eba..4ee90fdf16 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8b2944f745..f2e4ae44fa 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDescription.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDescription.kt
index fba94c49f7..e6027c5ac9 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDescription.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDescription.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDirectoryListState.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDirectoryListState.kt
index 4f92f09400..cd31d0f458 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDirectoryListState.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDirectoryListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdirectory/impl/src/main/res/values-hr/translations.xml b/features/roomdirectory/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..2057f54c18
--- /dev/null
+++ b/features/roomdirectory/impl/src/main/res/values-hr/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">"Učitavanje nije uspjelo"</string>
+  <string name="screen_room_directory_search_title">"Direktorij soba"</string>
+</resources>
diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPointTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPointTest.kt
index d544f55000..2108c9aff9 100644
--- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPointTest.kt
+++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -35,11 +36,13 @@ class DefaultRoomDirectoryEntryPointTest {
             )
         }
         val callback = object : RoomDirectoryEntryPoint.Callback {
-            override fun onResultClick(roomDescription: RoomDescription) = lambdaError()
+            override fun navigateToRoom(roomDescription: RoomDescription) = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(RoomDirectoryNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
index 4af983b307..6295e4beb6 100644
--- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
+++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,14 +43,14 @@ class RoomDirectoryPresenterTest {
 
     @Test
     fun `present - room directory list emits empty state`() = runTest {
-        val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.State>(replay = 1)
+        val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.SearchResult>(replay = 1)
         val roomDirectoryList = FakeRoomDirectoryList(directoryListStateFlow)
         val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList }
         val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService)
         presenter.test {
             skipItems(1)
             directoryListStateFlow.emit(
-                RoomDirectoryList.State(false, emptyList())
+                RoomDirectoryList.SearchResult(false, emptyList())
             )
             awaitItem().also { state ->
                 assertThat(state.displayEmptyState).isTrue()
@@ -60,14 +61,14 @@ class RoomDirectoryPresenterTest {
 
     @Test
     fun `present - room directory list emits non-empty state`() = runTest {
-        val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.State>(replay = 1)
+        val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.SearchResult>(replay = 1)
         val roomDirectoryList = FakeRoomDirectoryList(directoryListStateFlow)
         val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList }
         val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService)
         presenter.test {
             skipItems(1)
             directoryListStateFlow.emit(
-                RoomDirectoryList.State(
+                RoomDirectoryList.SearchResult(
                     hasMoreToLoad = true,
                     items = listOf(aRoomDescription())
                 )
@@ -105,9 +106,7 @@ class RoomDirectoryPresenterTest {
 
     @Test
     fun `present - emit load more event`() = runTest {
-        val loadMoreLambda = lambdaRecorder { ->
-            Result.success(Unit)
-        }
+        val loadMoreLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
         val roomDirectoryList = FakeRoomDirectoryList(loadMoreLambda = loadMoreLambda)
         val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList }
         val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService)
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 ff09212010..a50ad6a22c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roommembermoderation/api/build.gradle.kts b/features/roommembermoderation/api/build.gradle.kts
index aeea031757..e168d2c8bf 100644
--- a/features/roommembermoderation/api/build.gradle.kts
+++ b/features/roommembermoderation/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationEvents.kt b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationEvents.kt
index da25ca41eb..2238ff41df 100644
--- a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationEvents.kt
+++ b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationPermissions.kt b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationPermissions.kt
new file mode 100644
index 0000000000..87414b836e
--- /dev/null
+++ b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationPermissions.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.roommembermoderation.api
+
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+
+data class RoomMemberModerationPermissions(
+    val canKick: Boolean,
+    val canBan: Boolean,
+) {
+    // Unban requires both kick and ban permission instead of a dedicated unban permission
+    val canUnban = canBan && canKick
+
+    companion object {
+        val DEFAULT = RoomMemberModerationPermissions(
+            canKick = false,
+            canBan = false,
+        )
+    }
+}
+
+fun RoomPermissions.roomMemberModerationPermissions(): RoomMemberModerationPermissions {
+    return RoomMemberModerationPermissions(
+        canKick = canOwnUserKick(),
+        canBan = canOwnUserBan(),
+    )
+}
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 afe8ab0f8b..8fb1ae0c03 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationState.kt b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationState.kt
index 368aa283ad..c9ee958f6f 100644
--- a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationState.kt
+++ b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationState.kt
@@ -1,15 +1,18 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.roommembermoderation.api
 
+import androidx.compose.runtime.Immutable
+
+@Immutable
 interface RoomMemberModerationState {
-    val canKick: Boolean
-    val canBan: Boolean
+    val permissions: RoomMemberModerationPermissions
     val eventSink: (RoomMemberModerationEvents) -> Unit
 }
 
diff --git a/features/roommembermoderation/impl/build.gradle.kts b/features/roommembermoderation/impl/build.gradle.kts
index a58b0ce02f..3157552bae 100644
--- a/features/roommembermoderation/impl/build.gradle.kts
+++ b/features/roommembermoderation/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 830e3ef984..05bf00c7eb 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.roommembermoderation.api.ModerationAction
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationRenderer
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
@@ -20,7 +20,6 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import timber.log.Timber
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultRoomMemberModerationRenderer : RoomMemberModerationRenderer {
     @Composable
     override fun Render(
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationEvents.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationEvents.kt
index 902c2bd21f..2bc76db761 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationEvents.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,6 @@ import io.element.android.features.roommembermoderation.api.RoomMemberModeration
 sealed interface InternalRoomMemberModerationEvents : RoomMemberModerationEvents {
     data class DoKickUser(val reason: String) : InternalRoomMemberModerationEvents
     data class DoBanUser(val reason: String) : InternalRoomMemberModerationEvents
-    data object DoUnbanUser : InternalRoomMemberModerationEvents
+    data class DoUnbanUser(val reason: String) : InternalRoomMemberModerationEvents
     data object Reset : InternalRoomMemberModerationEvents
 }
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationState.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationState.kt
index 3a650ee59c..f45a277992 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationState.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,14 @@ package io.element.android.features.roommembermoderation.impl
 
 import io.element.android.features.roommembermoderation.api.ModerationActionState
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
+import io.element.android.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
 data class InternalRoomMemberModerationState(
-    override val canKick: Boolean,
-    override val canBan: Boolean,
+    override val permissions: RoomMemberModerationPermissions,
     val selectedUser: MatrixUser?,
     val actions: ImmutableList<ModerationActionState>,
     val kickUserAsyncAction: AsyncAction<Unit>,
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 2d4cc75aa9..120a299a7d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 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.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -64,6 +66,14 @@ class InternalRoomMemberModerationStateProvider : PreviewParameterProvider<Inter
                 selectedUser = anAlice(),
                 banUserAsyncAction = AsyncAction.Loading,
             ),
+            aRoomMembersModerationState(
+                selectedUser = anAlice(),
+                unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
+            ),
+            aRoomMembersModerationState(
+                selectedUser = anAlice(),
+                unbanUserAsyncAction = AsyncAction.Loading,
+            ),
         )
 }
 
@@ -74,8 +84,7 @@ fun anAlice() = MatrixUser(
 )
 
 fun aRoomMembersModerationState(
-    canKick: Boolean = false,
-    canBan: Boolean = false,
+    permissions: RoomMemberModerationPermissions = RoomMemberModerationPermissions.DEFAULT,
     selectedUser: MatrixUser? = null,
     actions: List<ModerationActionState> = emptyList(),
     kickUserAsyncAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
@@ -83,8 +92,7 @@ fun aRoomMembersModerationState(
     unbanUserAsyncAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (RoomMemberModerationEvents) -> Unit = {},
 ) = InternalRoomMemberModerationState(
-    canKick = canKick,
-    canBan = canBan,
+    permissions = permissions,
     selectedUser = selectedUser,
     actions = actions.toImmutableList(),
     kickUserAsyncAction = kickUserAsyncAction,
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenter.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenter.kt
index 2ddb3ad34a..2a876fc484 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenter.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,20 +21,22 @@ import im.vector.app.features.analytics.plan.RoomModeration
 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.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
+import io.element.android.features.roommembermoderation.api.roomMemberModerationPermissions
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.coroutine.mapState
 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.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+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.user.MatrixUser
-import io.element.android.libraries.matrix.ui.room.canBanAsState
-import io.element.android.libraries.matrix.ui.room.canKickAsState
-import io.element.android.libraries.matrix.ui.room.userPowerLevelAsState
+import io.element.android.libraries.matrix.ui.model.powerLevelOf
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -54,10 +57,14 @@ class RoomMemberModerationPresenter(
     @Composable
     override fun present(): RoomMemberModerationState {
         val coroutineScope = rememberCoroutineScope()
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
-        val canBan = room.canBanAsState(syncUpdateFlow.value)
-        val canKick = room.canKickAsState(syncUpdateFlow.value)
-        val currentUserMemberPowerLevel = room.userPowerLevelAsState(syncUpdateFlow.value)
+        val permissions by room.permissionsAsState(RoomMemberModerationPermissions.DEFAULT) { perms ->
+            perms.roomMemberModerationPermissions()
+        }
+        val currentUserPowerLevel by remember {
+            room.roomInfoFlow.mapState { info ->
+                info.powerLevelOf(room.sessionId)
+            }
+        }.collectAsState()
 
         val kickUserAsyncAction =
             remember { mutableStateOf(AsyncAction.Uninitialized as AsyncAction<Unit>) }
@@ -79,9 +86,8 @@ class RoomMemberModerationPresenter(
                     }
                     moderationActions.value = computeModerationActions(
                         member = member,
-                        canKick = canKick.value,
-                        canBan = canBan.value,
-                        currentUserMemberPowerLevel = currentUserMemberPowerLevel.value,
+                        permissions = permissions,
+                        currentUserPowerLevel = currentUserPowerLevel,
                     )
                 }
                 is RoomMemberModerationEvents.ProcessAction -> {
@@ -118,7 +124,7 @@ class RoomMemberModerationPresenter(
                 }
                 is InternalRoomMemberModerationEvents.DoUnbanUser -> {
                     selectedUser?.let {
-                        coroutineScope.unbanUser(it.userId, unbanUserAsyncAction)
+                        coroutineScope.unbanUser(it.userId, event.reason, unbanUserAsyncAction)
                     }
                     selectedUser = null
                 }
@@ -133,39 +139,48 @@ class RoomMemberModerationPresenter(
         }
 
         return InternalRoomMemberModerationState(
-            canKick = canKick.value,
-            canBan = canBan.value,
+            permissions = permissions,
             selectedUser = selectedUser,
             actions = moderationActions.value,
             kickUserAsyncAction = kickUserAsyncAction.value,
             banUserAsyncAction = banUserAsyncAction.value,
             unbanUserAsyncAction = unbanUserAsyncAction.value,
-            eventSink = { handleEvent(it) },
+            eventSink = ::handleEvent,
         )
     }
 
     private fun computeModerationActions(
         member: RoomMember?,
-        canKick: Boolean,
-        canBan: Boolean,
-        currentUserMemberPowerLevel: Long,
+        permissions: RoomMemberModerationPermissions,
+        currentUserPowerLevel: Long,
     ): ImmutableList<ModerationActionState> {
         return buildList {
             add(ModerationActionState(action = ModerationAction.DisplayProfile, isEnabled = true))
             // Assume the member is a regular user when it's unknown
             val targetMemberPowerLevel = member?.powerLevel ?: 0
-            val canModerateThisUser = currentUserMemberPowerLevel > targetMemberPowerLevel
+            val canModerateThisUser = currentUserPowerLevel > targetMemberPowerLevel
             // Assume the member is joined when it's unknown
             val membership = member?.membership ?: RoomMembershipState.JOIN
-            if (canKick) {
-                val isKickEnabled = canModerateThisUser && membership.isActive()
-                add(ModerationActionState(action = ModerationAction.KickUser, isEnabled = isKickEnabled))
-            }
-            if (canBan) {
-                if (membership == RoomMembershipState.BAN) {
-                    add(ModerationActionState(action = ModerationAction.UnbanUser, isEnabled = canModerateThisUser))
-                } else {
-                    add(ModerationActionState(action = ModerationAction.BanUser, isEnabled = canModerateThisUser))
+            when (membership) {
+                RoomMembershipState.BAN -> {
+                    if (permissions.canUnban) {
+                        add(ModerationActionState(action = ModerationAction.UnbanUser, isEnabled = canModerateThisUser))
+                    }
+                }
+                RoomMembershipState.INVITE,
+                RoomMembershipState.JOIN,
+                RoomMembershipState.KNOCK -> {
+                    if (permissions.canKick) {
+                        add(ModerationActionState(action = ModerationAction.KickUser, isEnabled = canModerateThisUser))
+                    }
+                    if (permissions.canBan) {
+                        add(ModerationActionState(action = ModerationAction.BanUser, isEnabled = canModerateThisUser))
+                    }
+                }
+                RoomMembershipState.LEAVE -> {
+                    if (permissions.canBan) {
+                        add(ModerationActionState(action = ModerationAction.BanUser, isEnabled = canModerateThisUser))
+                    }
                 }
             }
         }.toImmutableList()
@@ -197,10 +212,14 @@ class RoomMemberModerationPresenter(
 
     private fun CoroutineScope.unbanUser(
         userId: UserId,
+        reason: String,
         unbanUserAction: MutableState<AsyncAction<Unit>>,
     ) = runActionAndWaitForMembershipChange(unbanUserAction) {
         analyticsService.capture(RoomModeration(RoomModeration.Action.UnbanMember))
-        room.unbanUser(userId = userId)
+        room.unbanUser(
+            userId = userId,
+            reason = reason.takeIf { it.isNotBlank() },
+        )
     }
 
     private fun <T> CoroutineScope.runActionAndWaitForMembershipChange(
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 248b6cd02b..ac6c5bc4cb 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,7 +40,6 @@ import io.element.android.libraries.designsystem.components.async.rememberAsyncI
 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
-import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.dialogs.TextFieldDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -92,12 +92,13 @@ private fun RoomMemberAsyncActions(
                 TextFieldDialog(
                     title = stringResource(R.string.screen_bottom_sheet_manage_room_member_kick_member_confirmation_title),
                     submitText = stringResource(R.string.screen_bottom_sheet_manage_room_member_kick_member_confirmation_action),
+                    destructiveSubmit = true,
+                    minLines = 2,
                     onSubmit = { reason ->
                         state.eventSink(InternalRoomMemberModerationEvents.DoKickUser(reason = reason))
                     },
                     onDismissRequest = { state.eventSink(InternalRoomMemberModerationEvents.Reset) },
                     placeholder = stringResource(id = CommonStrings.common_reason),
-                    label = stringResource(id = CommonStrings.common_reason),
                     content = stringResource(R.string.screen_bottom_sheet_manage_room_member_kick_member_confirmation_description),
                     value = "",
                 )
@@ -131,12 +132,13 @@ private fun RoomMemberAsyncActions(
                 TextFieldDialog(
                     title = stringResource(R.string.screen_bottom_sheet_manage_room_member_ban_member_confirmation_title),
                     submitText = stringResource(R.string.screen_bottom_sheet_manage_room_member_ban_member_confirmation_action),
+                    destructiveSubmit = true,
+                    minLines = 2,
                     onSubmit = { reason ->
                         state.eventSink(InternalRoomMemberModerationEvents.DoBanUser(reason = reason))
                     },
                     onDismissRequest = { state.eventSink(InternalRoomMemberModerationEvents.Reset) },
                     placeholder = stringResource(id = CommonStrings.common_reason),
-                    label = stringResource(id = CommonStrings.common_reason),
                     content = stringResource(R.string.screen_bottom_sheet_manage_room_member_ban_member_confirmation_description),
                     value = "",
                 )
@@ -166,18 +168,22 @@ private fun RoomMemberAsyncActions(
         }
         when (val action = state.unbanUserAsyncAction) {
             is AsyncAction.Confirming -> {
-                ConfirmationDialog(
+                TextFieldDialog(
                     title = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_title),
-                    content = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_description),
                     submitText = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_action),
-                    onSubmitClick = {
+                    destructiveSubmit = true,
+                    minLines = 2,
+                    onSubmit = { reason ->
                         val userDisplayName = selectedUser?.getBestName().orEmpty()
                         asyncIndicatorState.enqueue {
                             AsyncIndicator.Loading(text = stringResource(R.string.screen_bottom_sheet_manage_room_member_unbanning_user, userDisplayName))
                         }
-                        state.eventSink(InternalRoomMemberModerationEvents.DoUnbanUser)
+                        state.eventSink(InternalRoomMemberModerationEvents.DoUnbanUser(reason = reason))
                     },
-                    onDismiss = { state.eventSink(InternalRoomMemberModerationEvents.Reset) },
+                    onDismissRequest = { state.eventSink(InternalRoomMemberModerationEvents.Reset) },
+                    placeholder = stringResource(id = CommonStrings.common_reason),
+                    content = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_description),
+                    value = "",
                 )
             }
             is AsyncAction.Failure -> {
@@ -226,32 +232,34 @@ private fun RoomMemberActionsBottomSheet(
                 avatarData = user.getAvatarData(size = AvatarSize.RoomListManageUser),
                 avatarType = AvatarType.User,
                 modifier = Modifier
-                        .padding(bottom = 28.dp)
-                        .align(Alignment.CenterHorizontally)
+                    .padding(bottom = 24.dp)
+                    .align(Alignment.CenterHorizontally)
             )
-            user.displayName?.let {
-                Text(
-                    text = it,
-                    style = ElementTheme.typography.fontHeadingLgBold,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier
-                            .padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
-                            .fillMaxWidth()
-                )
-            }
+            val bestName = user.getBestName()
             Text(
-                text = user.userId.value,
-                style = ElementTheme.typography.fontBodyLgRegular,
-                color = ElementTheme.colors.textSecondary,
+                text = bestName,
+                style = ElementTheme.typography.fontHeadingLgBold,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
                 textAlign = TextAlign.Center,
                 modifier = Modifier
+                    .padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
+                    .fillMaxWidth()
+            )
+            // Show user ID only if it's different from the display name
+            if (bestName != user.userId.value) {
+                Text(
+                    text = user.userId.value,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier
                         .padding(horizontal = 16.dp)
                         .fillMaxWidth()
-            )
+                )
+            }
             Spacer(modifier = Modifier.height(32.dp))
 
             for (actionState in actions) {
@@ -324,8 +332,8 @@ internal fun RoomMemberModerationViewPreview(@PreviewParameter(InternalRoomMembe
     ElementPreview {
         Box(
             modifier = Modifier
-                    .fillMaxWidth()
-                    .heightIn(min = 64.dp)
+                .fillMaxWidth()
+                .heightIn(min = 64.dp)
         ) {
             RoomMemberModerationView(
                 state = state,
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/di/RoomMemberModerationModule.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/di/RoomMemberModerationModule.kt
index 9e4592d475..ab82f6ced4 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/di/RoomMemberModerationModule.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/di/RoomMemberModerationModule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml b/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml
index 263aa9a2e0..a7d8966384 100644
--- a/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-cs/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Vykázat"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Nebudou se moci znovu připojit k této místnosti, pokud budou pozváni."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Jste si jisti, že chcete vykázat tohoto člena?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Pokud budou pozváni, nebudou moci vstoupit do tohoto prostoru, ale stále si zachovají členství ve všech místnostech nebo podprostorech."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Vykazování %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Odebrat"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Pokud budou pozváni, budou se moci do této místnosti znovu připojit."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Opravdu chcete tohoto člena odebrat?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Pokud budou pozváni, budou moci vstoupit do tohoto prostoru a zachovají si členství ve všech místnostech nebo podprostorech."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Zobrazit profil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Odebrat z místnosti"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Odebrat uživatele"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Odebrat člena a zakázat mu připojení v budoucnu?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Odstraňování %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Zrušit vykázání z místnosti"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-da/translations.xml b/features/roommembermoderation/impl/src/main/res/values-da/translations.xml
index 00defeeec6..392c1e891a 100644
--- a/features/roommembermoderation/impl/src/main/res/values-da/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-da/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Spær"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"De vil ikke være i stand til at deltage i dette rum igen, selv om de inviteres."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Er du stikker på, at du ønsker at spærre dette medlem?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"De vil ikke kunne deltage i gruppen igen, selv hvis de bliver inviteret. Men vil beholde deres medlemskaber i rum og undergrupper."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Spærrer %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Fjern"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"De vil være i stand til at deltage i dette rum igen, hvis de inviteres."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Er du sikker på, at du vil fjerne dette medlem?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"De vil kunne deltage i dette rum igen, hvis de bliver inviteret, og de vil stadig beholde deres medlemskaber af eventuelle rum eller sub-grupper."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Se profil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Fjern fra rummet"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Fjern bruger"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Fjern medlem og udeluk dem fra at deltage i fremtiden?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Fjerner %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Fjern brugerens spærring fra rummet"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-et/translations.xml b/features/roommembermoderation/impl/src/main/res/values-et/translations.xml
index 1a0a3ec431..fd046163b7 100644
--- a/features/roommembermoderation/impl/src/main/res/values-et/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-et/translations.xml
@@ -4,10 +4,12 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Sea suhtluskeeld"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Ta ei saa selle jututoaga liituda isegi kutse olemasolul."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Kas sa oled kindel, et soovid sellele kasutajale seada suhtluskeelu?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Ta ei saa ka kutsumise puhul selle kogukonnaga uuesti liituda, kuid liikmelisus jututubades või alamkogukondades säilib."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Seame kasutajale %1$s suhtluskeelu"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Eemalda"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Kutse olemasolul saab ta nüüd jututoaga uuesti liituda"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Kas sa oled kindel, et soovid selle osaleja eemaldada?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Ta saab kutsumise puhul selle kogukonnaga uuesti liituda ning liikmelisus jututubades või alamkogukondades säilib."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Vaata profiili"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Eemalda kasutaja jututoast"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Kas eemaldama kasutaja ja seame talle tulevikuks suhtluskeelu?"</string>
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 a5b7e75950..f17660f418 100644
--- a/features/roommembermoderation/impl/src/main/res/values-fa/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-fa/translations.xml
@@ -12,6 +12,7 @@
   <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_unbanning_user">"رفع تحریم %1$s"</string>
 </resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml b/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml
index 4c93f73780..1eb78cd2ae 100644
--- a/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-fi/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Anna porttikielto"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"He eivät voi enää liittyä tähän huoneeseen, jos heidät kutsutaan."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Haluatko varmasti antaa tälle jäsenelle porttikiellon?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"He eivät voi liittyä tähän tilaan uudelleen, vaikka heidät kutsuttaisiin, mutta he säilyttävät jäsenyytensä muissa huoneissa tai alitiloissa."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Annetaan porttikieltoa käyttäjälle %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Poista"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"He voivat liittyä tähän huoneeseen uudelleen, jos heidät kutsutaan."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Haluatko varmasti poistaa tämän jäsenen?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"He voivat liittyä tähän tilaan uudelleen, jos heidät kutsutaan, ja he säilyttävät jäsenyytensä kaikissa huoneissa tai alitiloissa."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Näytä profiili"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Poista huoneesta"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Poista käyttäjä"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Poistetaanko jäsen huoneesta ja kielletäänkö heitä liittymästä tulevaisuudessa?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Poistetaan käyttäjää %1$s huoneesta…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Poista porttikielto huoneesta"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-fr/translations.xml b/features/roommembermoderation/impl/src/main/res/values-fr/translations.xml
index fa01ddb49a..427d6e32c7 100644
--- a/features/roommembermoderation/impl/src/main/res/values-fr/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-fr/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Bannir"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Ce compte ne pourra pas rejoindre le salon à nouveau, même si il est invité."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Êtes-vous certain de vouloir bannir ce membre ?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"L’utilisateur ne pourra plus accéder à cet espace même sur invitation, mais il restera membre de tous les salons et sous-espaces dont il est déjà membre."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Bannissement de %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Retirer"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Il pourra rejoindre le salon à nouveau si il est invité."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Voulez-vous vraiment supprimer ce membre ?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"L’utilisateur pourra rejoindre cet espace à nouveau s’il y est invité, et il restera membre de tous les salons et sous-espaces."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Voir le profil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Retirer le membre du salon"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Exclure ce membre"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Retirer le membre et interdire l’adhésion à l’avenir ?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Enlever %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Débannir du salon"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-hr/translations.xml b/features/roommembermoderation/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..48185160db
--- /dev/null
+++ b/features/roommembermoderation/impl/src/main/res/values-hr/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">"Zabrani korisnika"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Zabrani"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Neće se moći ponovno pridružiti ako budu pozvani."</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Jeste li sigurni da želite zabraniti pristup ovom članu?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Neće se moći ponovno pridružiti ovom prostoru ako budu pozvani, ali će i dalje zadržati članstvo u svim sobama ili podprostorima."</string>
+  <string name="screen_bottom_sheet_manage_room_member_banning_user">"Zabranjuje se pristup korisniku %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Ukloni"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Moći će se ponovno pridružiti ovoj sobi ako budu pozvani."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Jeste li sigurni da želite ukloniti ovog člana?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Moći će se ponovno pridružiti ovom prostoru ako budu pozvani, a i dalje će zadržati članstvo u svim sobama ili podprostorima."</string>
+  <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Prikaži profil"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Ukloni korisnika"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Želite li ukloniti člana i zabraniti mu da se ubuduće pridruži?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_removing_user">"Uklanjanje člana %1$s…"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"Poništi zabranu pristupa korisniku"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Poništi zabranu"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"Mogli bi se ponovno pridružiti ako budu pozvani"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Jeste li sigurni da želite poništiti zabranu pristupa ovom članu?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Uklanja se zabrana korisniku %1$s"</string>
+</resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-hu/translations.xml b/features/roommembermoderation/impl/src/main/res/values-hu/translations.xml
index 4c68806e7d..63fc984bcf 100644
--- a/features/roommembermoderation/impl/src/main/res/values-hu/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-hu/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Kitiltás"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Többé nem csatlakozhat ehhez a szobához, akkor sem, ha meghívják."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Biztos, hogy kitiltja ezt a tagot?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Ha meghívják őket akkor sem tudnak újra csatlakozni ehhez a térhez, de továbbra is megtartják tagságukat a szobáikban vagy altereikben."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"%1$s kitiltása"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Eltávolítás"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Ehhez a szobához is csatlakozhat, ha meghívják."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Biztos, hogy eltávolítja ezt a tagot?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Ha meghívják őket újra csatlakozhatnak ehhez a térhez, és továbbra is megtartják a tagságukat a szobáikban vagy altereikben."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Profil megtekintése"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Eltávolítás a szobából"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Felhasználó eltávolítása"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Eltávolítja a tagot, és megtiltja a jövőbeni csatlakozást?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"%1$s eltávolítása…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Visszaengedés a szobába"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-it/translations.xml b/features/roommembermoderation/impl/src/main/res/values-it/translations.xml
index 7791d04546..4e423e2951 100644
--- a/features/roommembermoderation/impl/src/main/res/values-it/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-it/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Escludi"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Non potrà entrare nuovamente in questa stanza se invitato."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Vuoi davvero escludere questo membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Se invitati, non potranno più unirsi a questo spazio, ma manterranno comunque la loro iscrizione a tutte le stanze o sottospazi."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Esclusione di %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Rimuovi"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Potrà entrare nuovamente in questa stanza se invitato."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Sei sicuro di voler rimuovere questo membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Potranno unirsi nuovamente a questo spazio se invitati e manterranno comunque la loro iscrizione a tutte le stanze o sottospazi."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Visualizza profilo"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Rimuovi dalla stanza"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Rimuovi utente"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Rimuovere e vietare l\'accesso in futuro?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Rimozione di %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Riammetti nella stanza"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-nb/translations.xml b/features/roommembermoderation/impl/src/main/res/values-nb/translations.xml
index 4507fce49c..392b271a1a 100644
--- a/features/roommembermoderation/impl/src/main/res/values-nb/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-nb/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"De vil kunne bli med i dette rommet igjen hvis de blir invitert."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Er du sikker på at du vil fjerne dette medlemmet?"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Vis profil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Fjern fra rommet"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Fjern bruker"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Fjerne medlem og utestenge fra å bli med i fremtiden?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Fjerner %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Fjern utestengelsen fra rommet"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml b/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml
index 4cbc0ba081..5a356e18f6 100644
--- a/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-pt-rBR/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Banir"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Essa pessoa não poderá entrar nesta sala novamente se for convidada."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Tem certeza de que quer banir este membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Eles não poderão mais entrar no espaço novamente se forem convidados, mas manterão sua participação em quaisquer salas e sub-espaços."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Banindo %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Remover"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Esta pessoa poderá entrar nesta sala novamente se for convidada."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Tem certeza de que deseja remover este membro?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Eles poderão entrar no espaço novamente se convidados, e manterão sua participação em quaisquer salas e sub-espaços."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Ver perfil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Remover da sala"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Remover usuário"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remover membro e banir de entrar novamente no futuro?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Removendo %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Desbanir da sala"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-pt/translations.xml b/features/roommembermoderation/impl/src/main/res/values-pt/translations.xml
index 3989c4de7b..27113593ed 100644
--- a/features/roommembermoderation/impl/src/main/res/values-pt/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-pt/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Poderão juntar-se novamente a esta sala se forem convidados."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Tens certeza que queres remover este membro?"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Ver perfil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Remover da sala"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Remover utilizador"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remover participante e proibir que entre no futuro?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"A remover %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Desbanir da sala"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-ro/translations.xml b/features/roommembermoderation/impl/src/main/res/values-ro/translations.xml
index 4811b5263f..9f21c8d351 100644
--- a/features/roommembermoderation/impl/src/main/res/values-ro/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-ro/translations.xml
@@ -4,10 +4,12 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Interzicere"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Nu se vor putea alătura din nou acestei camere dacă sunt invitați."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Sunteți sigur că doriți să interziceți acest membru?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Nu vor putea să se alăture din nou acestui spațiu dacă sunt invitați, dar își vor păstra în continuare calitatea de membru al oricăror camere sau subspații."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Se interzice %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Îndepărtați"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Se vor putea alătura din nou acestei săli dacă sunt invitați."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Sunteți sigur că doriți să îndepărtați acest membru?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Vor putea să se alăture din nou acestui spațiu dacă sunt invitați și își vor păstra în continuare calitatea de membru al oricăror camere sau subspații."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Vizualizare profil"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Înlăturați membrul"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Înlăturați membrul și interziceți-i să se alăture în viitor?"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-ru/translations.xml b/features/roommembermoderation/impl/src/main/res/values-ru/translations.xml
index 6d89f42fe1..7e1691a089 100644
--- a/features/roommembermoderation/impl/src/main/res/values-ru/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-ru/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-sk/translations.xml b/features/roommembermoderation/impl/src/main/res/values-sk/translations.xml
index ffdd634b0b..c852e7ab29 100644
--- a/features/roommembermoderation/impl/src/main/res/values-sk/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-sk/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Zakázať"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Nebudú sa môcť pripojiť k tejto miestnosti znova ani ak budú pozvaní."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Ste si istý, že chcete zakázať tohto člena?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Ak dostanú pozvánku, nebudú sa môcť k tomuto priestoru znova pripojiť, ale stále si ponechajú členstvo vo všetkých miestnostiach alebo podpriestoroch."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Zakazuje sa %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Odstrániť"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"V prípade pozvania sa budú môcť znova pripojiť k tejto miestnosti."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Ste si istý, že chcete odstrániť tohto člena?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Ak dostanú pozvánku, budú sa môcť k tomuto priestoru znova pripojiť a stále si ponechajú členstvo vo všetkých miestnostiach alebo podpriestoroch."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Zobraziť profil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Odstrániť z miestnosti"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Odstrániť používateľa"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Odstrániť člena a zakázať vstup v budúcnosti?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Odstraňuje sa %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Zrušiť zákaz prístupu do miestnosti"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml b/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml
index d7b09f0e8d..9b8c57ede3 100644
--- a/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-uz/translations.xml
@@ -5,11 +5,16 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Taklif qilingan taqdirda ham, ular bu xonaga boshqa qo‘shila olmaydilar."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Haqiqatan ham bu aʼzoni taqiqlamoqchimisiz?"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Taqiqlash %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Oʻchirish"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Agar taklif qilinsa, ular bu xonaga qayta qo‘shilishlari mumkin."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Haqiqatan ham bu a’zoni olib tashlaysizmi?"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Profilni koʻrish"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Xonadan olib tashlash"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Foydalanuvchini olib tashlash"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Aʻzo oʻchirilsinmi va kelgusida qoʻshilish taqiqlansinmi?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Oʻchirish %1$s …"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"Xonadan taqiqni olib tashlash"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Taqiqni bekor qilish"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"Agar taklif qilinsa, ular xonaga yana qo‘shilishlari mumkin"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Haqiqatan ham bu a’zoni blokdan chiqarmoqchimisiz?"</string>
   <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Taqiqni bekor qilish %1$s"</string>
 </resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml b/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml
index de8a9712ee..14a044a7dc 100644
--- a/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-zh-rTW/translations.xml
@@ -4,12 +4,14 @@
   <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">"移除使用者"</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-zh/translations.xml b/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
index a27d2ded05..aa8b2e3df8 100644
--- a/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
@@ -4,12 +4,14 @@
   <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">"移除用户"</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/localazy.xml b/features/roommembermoderation/impl/src/main/res/values/localazy.xml
index 16b013d537..3d23c8763a 100644
--- a/features/roommembermoderation/impl/src/main/res/values/localazy.xml
+++ b/features/roommembermoderation/impl/src/main/res/values/localazy.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_bottom_sheet_manage_room_member_ban">"Ban from room"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban">"Ban user"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Ban"</string>
-  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"They won’t be able to join this room again if invited."</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"They won’t be able to join again if invited."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Are you sure you want to ban this member?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"They won’t be able to join this space again if invited, but they’ll still keep their memberships of any rooms or subspaces."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Banning %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Remove"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"They will be able to join this room again if invited."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Are you sure you want to remove this member?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"They will be able to join this space again if invited, and they’ll still keep their memberships of any rooms or subspaces."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"View profile"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Remove from room"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Remove user"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remove member and ban from joining in the future?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Removing %1$s…"</string>
-  <string name="screen_bottom_sheet_manage_room_member_unban">"Unban from room"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"Unban user"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Unban"</string>
-  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"They would be able to join the room again if invited"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"They would be able to join again if invited"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Are you sure you want to unban this member?"</string>
   <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Unbanning %1$s"</string>
 </resources>
diff --git a/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenterTest.kt b/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenterTest.kt
index 40e09b3620..3397f3a40a 100644
--- a/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenterTest.kt
+++ b/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ import com.google.common.truth.Truth.assertThat
 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.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -19,17 +21,22 @@ 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.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.user.MatrixUser
 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.defaultRoomPowerLevelValues
+import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 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.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
@@ -47,8 +54,7 @@ class RoomMemberModerationPresenterTest {
         val room = aJoinedRoom()
         createRoomMemberModerationPresenter(room = room).test {
             val initialState = awaitState()
-            assertThat(initialState.canKick).isFalse()
-            assertThat(initialState.canBan).isFalse()
+            assertThat(initialState.permissions).isEqualTo(RoomMemberModerationPermissions.DEFAULT)
             assertThat(initialState.selectedUser).isNull()
             assertThat(initialState.banUserAsyncAction).isEqualTo(AsyncAction.Uninitialized)
             assertThat(initialState.kickUserAsyncAction).isEqualTo(AsyncAction.Uninitialized)
@@ -159,7 +165,6 @@ class RoomMemberModerationPresenterTest {
             assertThat(updatedState.selectedUser).isEqualTo(targetUser)
             assertThat(updatedState.actions).containsExactly(
                 ModerationActionState(action = ModerationAction.DisplayProfile, isEnabled = true),
-                ModerationActionState(action = ModerationAction.KickUser, isEnabled = false),
                 ModerationActionState(action = ModerationAction.UnbanUser, isEnabled = true),
             )
         }
@@ -221,9 +226,11 @@ class RoomMemberModerationPresenterTest {
         val room = aJoinedRoom()
         room.baseRoom.givenUpdateMembersResult {
             // Simulate the member list being updated
-            room.givenRoomMembersState(RoomMembersState.Ready(
-                persistentListOf(aRoomMember())
-            ))
+            room.givenRoomMembersState(
+                RoomMembersState.Ready(
+                    persistentListOf(aRoomMember())
+                )
+            )
         }
         createRoomMemberModerationPresenter(room = room).test {
             val initialState = awaitState()
@@ -249,9 +256,11 @@ class RoomMemberModerationPresenterTest {
         val room = aJoinedRoom()
         room.baseRoom.givenUpdateMembersResult {
             // Simulate the member list being updated
-            room.givenRoomMembersState(RoomMembersState.Ready(
-                persistentListOf(aRoomMember())
-            ))
+            room.givenRoomMembersState(
+                RoomMembersState.Ready(
+                    persistentListOf(aRoomMember())
+                )
+            )
         }
         createRoomMemberModerationPresenter(room = room).test {
             val initialState = awaitState()
@@ -277,9 +286,11 @@ class RoomMemberModerationPresenterTest {
         val room = aJoinedRoom()
         room.baseRoom.givenUpdateMembersResult {
             // Simulate the member list being updated
-            room.givenRoomMembersState(RoomMembersState.Ready(
-                persistentListOf(aRoomMember())
-            ))
+            room.givenRoomMembersState(
+                RoomMembersState.Ready(
+                    persistentListOf(aRoomMember())
+                )
+            )
         }
         createRoomMemberModerationPresenter(room = room).test {
             val initialState = awaitState()
@@ -290,7 +301,7 @@ class RoomMemberModerationPresenterTest {
                 )
             )
             skipItems(2)
-            initialState.eventSink(InternalRoomMemberModerationEvents.DoUnbanUser)
+            initialState.eventSink(InternalRoomMemberModerationEvents.DoUnbanUser("Reason"))
             skipItems(1)
             val loadingState = awaitState()
             assertThat(loadingState.unbanUserAsyncAction).isInstanceOf(AsyncAction.Loading::class.java)
@@ -354,10 +365,18 @@ class RoomMemberModerationPresenterTest {
             banUserResult = { _, _ -> banUserResult },
             unBanUserResult = { _, _ -> unBanUserResult },
             baseRoom = FakeBaseRoom(
-                canBanResult = { _ -> Result.success(canBan) },
-                canKickResult = { _ -> Result.success(canKick) },
+                roomPermissions = FakeRoomPermissions(
+                    canBan = canBan,
+                    canKick = canKick
+                ),
                 userRoleResult = { Result.success(myUserRole) },
-                updateMembersResult = { Result.success(Unit) }
+                updateMembersResult = { Result.success(Unit) },
+                initialRoomInfo = aRoomInfo(
+                    roomPowerLevels = RoomPowerLevels(
+                        values = defaultRoomPowerLevelValues(),
+                        users = persistentMapOf(A_USER_ID to myUserRole.powerLevel)
+                    )
+                )
             ),
         ).apply {
             val roomMembers = listOfNotNull(targetRoomMember).toImmutableList()
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 fc1b815562..6508b28053 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -181,7 +182,7 @@ class RoomMemberModerationViewTest {
             ),
         )
         rule.pressTag(TestTags.dialogPositive.value)
-        eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.DoUnbanUser)
+        eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.DoUnbanUser(""))
     }
 
     @Test
diff --git a/features/securebackup/api/build.gradle.kts b/features/securebackup/api/build.gradle.kts
index f4bf5bd4b9..2c8fa42d5b 100644
--- a/features/securebackup/api/build.gradle.kts
+++ b/features/securebackup/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt
index 4fb2ab00cc..9c9d612b8f 100644
--- a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt
+++ b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -32,15 +33,14 @@ interface SecureBackupEntryPoint : FeatureEntryPoint {
 
     data class Params(val initialElement: InitialTarget) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone()
     }
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
 }
diff --git a/features/securebackup/impl/build.gradle.kts b/features/securebackup/impl/build.gradle.kts
index 92a6013580..b6117271f7 100644
--- a/features/securebackup/impl/build.gradle.kts
+++ b/features/securebackup/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt
index 6d5358299b..46d93da152 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,22 @@ package io.element.android.features.securebackup.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSecureBackupEntryPoint : SecureBackupEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): SecureBackupEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : SecureBackupEntryPoint.NodeBuilder {
-            override fun params(params: SecureBackupEntryPoint.Params): SecureBackupEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun callback(callback: SecureBackupEntryPoint.Callback): SecureBackupEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<SecureBackupFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: SecureBackupEntryPoint.Params,
+        callback: SecureBackupEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<SecureBackupFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(params, callback)
+        )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/LoggerTag.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/LoggerTag.kt
index b6233044de..fe2460760f 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/LoggerTag.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/LoggerTag.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4d79f8ea1b..d9fd8a1785 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -29,6 +29,7 @@ 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
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import kotlinx.parcelize.Parcelize
@@ -71,25 +72,25 @@ class SecureBackupFlowNode(
         data object ResetIdentity : NavTarget
     }
 
-    private val callbacks = plugins<SecureBackupEntryPoint.Callback>()
+    private val callback: SecureBackupEntryPoint.Callback = callback()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Root -> {
                 val callback = object : SecureBackupRootNode.Callback {
-                    override fun onSetupClick() {
+                    override fun navigateToSetup() {
                         backstack.push(NavTarget.Setup)
                     }
 
-                    override fun onChangeClick() {
+                    override fun navigateToChange() {
                         backstack.push(NavTarget.Change)
                     }
 
-                    override fun onDisableClick() {
+                    override fun navigateToDisable() {
                         backstack.push(NavTarget.Disable)
                     }
 
-                    override fun onConfirmRecoveryKeyClick() {
+                    override fun navigateToEnterRecoveryKey() {
                         backstack.push(NavTarget.EnterRecoveryKey)
                     }
                 }
@@ -116,7 +117,7 @@ class SecureBackupFlowNode(
                         if (backstack.canPop()) {
                             backstack.pop()
                         } else {
-                            callbacks.forEach { it.onDone() }
+                            callback.onDone()
                         }
                     }
                 }
@@ -125,7 +126,7 @@ class SecureBackupFlowNode(
             is NavTarget.ResetIdentity -> {
                 val callback = object : ResetIdentityFlowNode.Callback {
                     override fun onDone() {
-                        callbacks.forEach { it.onDone() }
+                        callback.onDone()
                     }
                 }
                 createNode<ResetIdentityFlowNode>(buildContext, listOf(callback))
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableEvents.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableEvents.kt
index 1e25962a1b..05d05a4840 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableEvents.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt
index 8af4f3e613..6877893e83 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenter.kt
index aa1de8fde9..67b6816097 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenter.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -36,7 +37,7 @@ class SecureBackupDisablePresenter(
         Timber.tag(loggerTagDisable.value).d("backupState: $backupState")
         val disableAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val coroutineScope = rememberCoroutineScope()
-        fun handleEvents(event: SecureBackupDisableEvents) {
+        fun handleEvent(event: SecureBackupDisableEvents) {
             when (event) {
                 is SecureBackupDisableEvents.DisableBackup -> coroutineScope.disableBackup(disableAction)
                 SecureBackupDisableEvents.DismissDialogs -> {
@@ -49,7 +50,7 @@ class SecureBackupDisablePresenter(
             backupState = backupState,
             disableAction = disableAction.value,
             appName = buildMeta.applicationName,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableState.kt
index 7e98265441..a4f6b210ab 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableStateProvider.kt
index 5b0a1bdc2e..6aa10d9a0b 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt
index 3042702d04..24678148b4 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyEvents.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyEvents.kt
index d503690e48..644756b957 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyEvents.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt
index 77d1fe8f32..81b06e1719 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,10 +13,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -29,7 +30,7 @@ class SecureBackupEnterRecoveryKeyNode(
         fun onEnterRecoveryKeySuccess()
     }
 
-    private val callback = plugins<Callback>().first()
+    private val callback: Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt
index b56a4542b0..9a71cf1727 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -44,7 +45,7 @@ class SecureBackupEnterRecoveryKeyPresenter(
             mutableStateOf(AsyncAction.Uninitialized)
         }
 
-        fun handleEvents(event: SecureBackupEnterRecoveryKeyEvents) {
+        fun handleEvent(event: SecureBackupEnterRecoveryKeyEvents) {
             when (event) {
                 SecureBackupEnterRecoveryKeyEvents.ClearDialog -> {
                     submitAction.value = AsyncAction.Uninitialized
@@ -78,7 +79,7 @@ class SecureBackupEnterRecoveryKeyPresenter(
             ),
             isSubmitEnabled = recoveryKey.isNotEmpty() && submitAction.value.isUninitialized(),
             submitAction = submitAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyState.kt
index 60b73b37a3..45a6989c15 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.features.securebackup.impl.enter
 import io.element.android.features.securebackup.impl.setup.views.RecoveryKeyViewState
 import io.element.android.libraries.architecture.AsyncAction
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class SecureBackupEnterRecoveryKeyState(
     val recoveryKeyViewState: RecoveryKeyViewState,
     val isSubmitEnabled: Boolean,
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyStateProvider.kt
index 6296986317..5e95b5713e 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3d4434d3df..8b2bc4dc90 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt
index 4ffaa9c344..dce1a35ac7 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 dfc9425ebe..297fd538d1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,7 +21,6 @@ import androidx.lifecycle.LifecycleOwner
 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.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
 import dev.zacsweers.metro.Assisted
@@ -33,6 +33,7 @@ import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTa
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.di.SessionScope
@@ -63,6 +64,8 @@ class ResetIdentityFlowNode(
         fun onDone()
     }
 
+    private val callback: Callback = callback()
+
     sealed interface NavTarget : Parcelable {
         @Parcelize
         data object Root : NavTarget
@@ -86,7 +89,7 @@ class ResetIdentityFlowNode(
                     cancelResetJob()
 
                     resetIdentityFlowManager.whenResetIsDone {
-                        plugins<Callback>().forEach { it.onDone() }
+                        callback.onDone()
                     }
                 }
             }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt
index e96240deab..8fd008fb04 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt
index 3c22673bff..539b18584c 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt
index 26a6ae1fac..8f99fc205a 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,7 +40,7 @@ class ResetIdentityPasswordPresenter(
 
         return ResetIdentityPasswordState(
             resetAction = resetAction.value,
-            eventSink = ::handleEvent
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt
index 4042dd52ce..87ee5e1674 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt
index 368560174c..fc4ce2430e 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 998b46046c..8d32433ac5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt
index de6cf0cf5f..8da89e588e 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt
index 8267242f97..057360c2b9 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,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.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -27,8 +29,8 @@ class ResetIdentityRootNode(
         fun onContinue()
     }
 
+    private val callback: Callback = callback()
     private val presenter = ResetIdentityRootPresenter()
-    private val callback: Callback = plugins.filterIsInstance<Callback>().first()
 
     @Composable
     override fun View(modifier: Modifier) {
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt
index 909cdc1379..90fe89b952 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,7 +29,7 @@ class ResetIdentityRootPresenter : Presenter<ResetIdentityRootState> {
 
         return ResetIdentityRootState(
             displayConfirmationDialog = displayConfirmDialog,
-            eventSink = ::handleEvent
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt
index 7a502e743d..994f106424 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt
index 3d3e8cab59..697401367f 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9e4a5e1b62..97c82f446d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt
index 512d549933..9d371e3c30 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt
index 6d4db197d3..329a406381 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,11 +15,11 @@ import androidx.compose.ui.platform.UriHandler
 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.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.appconfig.LearnMoreConfig
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -32,27 +33,13 @@ class SecureBackupRootNode(
     plugins = plugins
 ) {
     interface Callback : Plugin {
-        fun onSetupClick()
-        fun onChangeClick()
-        fun onDisableClick()
-        fun onConfirmRecoveryKeyClick()
+        fun navigateToSetup()
+        fun navigateToChange()
+        fun navigateToDisable()
+        fun navigateToEnterRecoveryKey()
     }
 
-    private fun onSetupClick() {
-        plugins<Callback>().forEach { it.onSetupClick() }
-    }
-
-    private fun onChangeClick() {
-        plugins<Callback>().forEach { it.onChangeClick() }
-    }
-
-    private fun onDisableClick() {
-        plugins<Callback>().forEach { it.onDisableClick() }
-    }
-
-    private fun onConfirmRecoveryKeyClick() {
-        plugins<Callback>().forEach { it.onConfirmRecoveryKeyClick() }
-    }
+    private val callback: Callback = callback()
 
     private fun onLearnMoreClick(uriHandler: UriHandler) {
         uriHandler.openUri(LearnMoreConfig.SECURE_BACKUP_URL)
@@ -65,10 +52,10 @@ class SecureBackupRootNode(
         SecureBackupRootView(
             state = state,
             onBackClick = ::navigateUp,
-            onSetupClick = ::onSetupClick,
-            onChangeClick = ::onChangeClick,
-            onDisableClick = ::onDisableClick,
-            onConfirmRecoveryKeyClick = ::onConfirmRecoveryKeyClick,
+            onSetupClick = callback::navigateToSetup,
+            onChangeClick = callback::navigateToChange,
+            onDisableClick = callback::navigateToDisable,
+            onConfirmRecoveryKeyClick = callback::navigateToEnterRecoveryKey,
             onLearnMoreClick = { onLearnMoreClick(uriHandler) },
             modifier = modifier,
         )
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt
index 67ec1c9960..9a97bfac25 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -58,7 +59,7 @@ class SecureBackupRootPresenter(
             }
         }
 
-        fun handleEvents(event: SecureBackupRootEvents) {
+        fun handleEvent(event: SecureBackupRootEvents) {
             when (event) {
                 SecureBackupRootEvents.RetryKeyBackupState -> localCoroutineScope.getKeyBackupStatus(doesBackupExistOnServerAction)
                 SecureBackupRootEvents.EnableKeyStorage -> localCoroutineScope.enableBackup(enableAction)
@@ -78,7 +79,7 @@ class SecureBackupRootPresenter(
             appName = buildMeta.applicationName,
             displayKeyStorageDisabledError = displayKeyStorageDisabledError,
             snackbarMessage = snackbarMessage,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt
index fb9e6422a7..1cbf917ca5 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt
index 3a502cf582..5dc3bea7e8 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 904f326120..0aff81aafa 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupEvents.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupEvents.kt
index ecf0ec3711..f61e65ba61 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupEvents.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
index 6adcb890ae..e0f57cb9f0 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenter.kt
index 58a6c4b43c..9f27bc9566 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenter.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -52,7 +53,7 @@ class SecureBackupSetupPresenter(
         }
         var showSaveConfirmationDialog by remember { mutableStateOf(false) }
 
-        fun handleEvents(event: SecureBackupSetupEvents) {
+        fun handleEvent(event: SecureBackupSetupEvents) {
             when (event) {
                 SecureBackupSetupEvents.CreateRecoveryKey -> {
                     coroutineScope.createOrChangeRecoveryKey(stateAndDispatch)
@@ -81,7 +82,7 @@ class SecureBackupSetupPresenter(
             recoveryKeyViewState = recoveryKeyViewState,
             setupState = setupState,
             showSaveConfirmationDialog = showSaveConfirmationDialog,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupState.kt
index 91f710d07d..752b5e4851 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.securebackup.impl.setup
 
 import io.element.android.features.securebackup.impl.setup.views.RecoveryKeyViewState
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class SecureBackupSetupState(
     val isChangeRecoveryKeyUserStory: Boolean,
     val recoveryKeyViewState: RecoveryKeyViewState,
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateMachine.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateMachine.kt
index 24a8be7f77..150aeeddc7 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateMachine.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateMachine.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateProvider.kt
index f414e6e8e7..a780fa0c36 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
index 188c87e513..497c64f072 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -115,11 +116,12 @@ private fun Content(
 ) {
     val context = LocalContext.current
     val formattedRecoveryKey = state.recoveryKeyViewState.formattedRecoveryKey
+    val toastMessage = stringResource(R.string.screen_recovery_key_copied_to_clipboard)
     val clickLambda = if (formattedRecoveryKey != null) {
         {
             context.copyToClipboard(
-                formattedRecoveryKey,
-                context.getString(R.string.screen_recovery_key_copied_to_clipboard)
+                text = formattedRecoveryKey,
+                toastMessage = toastMessage,
             )
             state.eventSink.invoke(SecureBackupSetupEvents.RecoveryKeyHasBeenSaved)
         }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt
index 39d9646061..39fa7debe9 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c9ef2886bf..198891473c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewState.kt
index 46bb957492..8a8be03b88 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewState.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewStateProvider.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewStateProvider.kt
index e34300a219..c1a841aa7b 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewStateProvider.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyTools.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyTools.kt
index 5805146c71..76afd45af5 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyTools.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyTools.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformation.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformation.kt
index e82d9ead1c..5447b79a43 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformation.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/main/res/values-eo/translations.xml b/features/securebackup/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index 4b8e1833a3..0000000000
--- a/features/securebackup/impl/src/main/res/values-eo/translations.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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">"Delete message backup"</string>
-  <string name="screen_chat_backup_key_backup_description">"Store your account security and messages securely on the server. This will allow you to view your message history on any new devices. %1$s."</string>
-  <string name="screen_chat_backup_key_backup_title">"Message backup"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Turn on message backup to set it up."</string>
-  <string name="screen_chat_backup_key_storage_toggle_description">"Upload messages from this device"</string>
-  <string name="screen_chat_backup_key_storage_toggle_title">"Allow message backup"</string>
-  <string name="screen_chat_backup_recovery_action_change">"Change backup password"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Restore your account security and message history with a backup password if you\'ve lost all your existing devices."</string>
-  <string name="screen_chat_backup_recovery_action_confirm">"Enter backup password"</string>
-  <string name="screen_chat_backup_recovery_action_confirm_description">"Your message backup is currently out of sync."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Set up backup"</string>
-  <string name="screen_create_new_recovery_key_list_item_3">"When asked to confirm your device, select %1$s"</string>
-  <string name="screen_create_new_recovery_key_list_item_4">"Follow the instructions to create a new backup password"</string>
-  <string name="screen_create_new_recovery_key_list_item_5">"Save your new backup password in a password manager or encrypted note"</string>
-  <string name="screen_encryption_reset_bullet_3">"You will need to confirm all your existing devices and verify contacts again"</string>
-  <string name="screen_encryption_reset_footer">"Only start fresh if you don\'t have access to another signed-in device and you\'ve lost your backup password."</string>
-  <string name="screen_encryption_reset_title">"Can\'t confirm? You\'ll need to start fresh."</string>
-  <string name="screen_key_backup_disable_description">"Deleting message backup will remove your account security and messages from the server and turn off the following security features:"</string>
-  <string name="screen_key_backup_disable_title">"Are you sure you want to turn off message backup and delete it?"</string>
-  <string name="screen_recovery_key_change_description">"Get a new backup password if you\'ve lost your existing one. After changing your backup password, your old one will no longer work."</string>
-  <string name="screen_recovery_key_change_generate_key">"Generate a new backup password"</string>
-  <string name="screen_recovery_key_change_success">"Backup password changed"</string>
-  <string name="screen_recovery_key_change_title">"Change backup password?"</string>
-  <string name="screen_recovery_key_confirm_create_new_recovery_key">"Create new backup password"</string>
-  <string name="screen_recovery_key_confirm_error_content">"Please try again to confirm access to your message backup."</string>
-  <string name="screen_recovery_key_confirm_error_title">"Incorrect backup password"</string>
-  <string name="screen_recovery_key_confirm_key_description">"You might have seen the terms \"recovery key\", \"security key\" or \"security phrase\" instead of \"backup password\". Don\'t worry, this is all the same."</string>
-  <string name="screen_recovery_key_confirm_lost_recovery_key">"Lost your backup password?"</string>
-  <string name="screen_recovery_key_confirm_success">"Backup password confirmed"</string>
-  <string name="screen_recovery_key_confirm_title">"Enter your backup password"</string>
-  <string name="screen_recovery_key_copied_to_clipboard">"Copied backup password"</string>
-  <string name="screen_recovery_key_save_action">"Save backup password"</string>
-  <string name="screen_recovery_key_save_description">"Write down this backup password somewhere safe, like a password manager, encrypted note, or a physical safe."</string>
-  <string name="screen_recovery_key_save_key_description">"Tap to copy backup password"</string>
-  <string name="screen_recovery_key_save_title">"Save your backup password somewhere safe"</string>
-  <string name="screen_recovery_key_setup_confirmation_description">"You will not be able to access your new backup password after this step."</string>
-  <string name="screen_recovery_key_setup_confirmation_title">"Have you saved your backup password?"</string>
-  <string name="screen_recovery_key_setup_description">"Your message backup is protected by a backup password. If you need a new backup password after setup, you can recreate it by selecting ‘Change backup password’."</string>
-  <string name="screen_recovery_key_setup_generate_key">"Generate your backup password"</string>
-  <string name="screen_recovery_key_setup_success">"Backup setup successful"</string>
-  <string name="screen_recovery_key_setup_title">"Set up backup"</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Are you sure you want to start fresh?"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Confirm that you want to start fresh."</string>
-</resources>
diff --git a/features/securebackup/impl/src/main/res/values-hr/translations.xml b/features/securebackup/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..dcdfe830a7
--- /dev/null
+++ b/features/securebackup/impl/src/main/res/values-hr/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="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_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_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_description">"Pristupite svojim šifriranim porukama ako se odjavite iz aplikacije s%1$s sa svih uređaja ili ih izgubite."</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>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Poništi sve”"</string>
+  <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_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_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>
+  <string name="screen_key_backup_disable_description_point_2">"Ako se odjavite iz aplikacije %1$s na svim uređajima, izgubit ćete pristup svojim šifriranim porukama."</string>
+  <string name="screen_key_backup_disable_title">"Jeste li sigurni da želite isključiti pohranu ključeva i izbrisati je?"</string>
+  <string name="screen_recovery_key_change_description">"Izradite novi ključ za oporavak ako ste izgubili postojeći. Nakon promjene ključa za oporavak, prijašnji više neće funkcionirati."</string>
+  <string name="screen_recovery_key_change_generate_key">"Generiraj novi ključ za oporavak"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"Ne dijelite ovo ni s kim!"</string>
+  <string name="screen_recovery_key_change_success">"Ključ za oporavak je promijenjen"</string>
+  <string name="screen_recovery_key_change_title">"Želite li promijeniti ključ za oporavak?"</string>
+  <string name="screen_recovery_key_confirm_create_new_recovery_key">"Izradi novi ključ za oporavak"</string>
+  <string name="screen_recovery_key_confirm_description">"Pazite da nitko ne vidi ovaj zaslon!"</string>
+  <string name="screen_recovery_key_confirm_error_content">"Pokušajte ponovno potvrditi pristup pohrani ključeva."</string>
+  <string name="screen_recovery_key_confirm_error_title">"Neispravan ključ za oporavak"</string>
+  <string name="screen_recovery_key_confirm_key_description">"Ako imate sigurnosni ključ ili sigurnosnu frazu, i ovo će funkcionirati."</string>
+  <string name="screen_recovery_key_confirm_key_placeholder">"Unos…"</string>
+  <string name="screen_recovery_key_confirm_lost_recovery_key">"Izgubili ste ključ za oporavak?"</string>
+  <string name="screen_recovery_key_confirm_success">"Ključ za oporavak je potvrđen"</string>
+  <string name="screen_recovery_key_confirm_title">"Unesite svoj ključ za oporavak"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Kopirani ključ za oporavak"</string>
+  <string name="screen_recovery_key_generating_key">"Generiranje…"</string>
+  <string name="screen_recovery_key_save_action">"Spremi ključ za oporavak"</string>
+  <string name="screen_recovery_key_save_description">"Zapišite ovaj ključ za oporavak i čuvajte ga na sigurnom mjestu, poput upravitelja zaporki, šifrirane bilješke ili fizičkog sefa."</string>
+  <string name="screen_recovery_key_save_key_description">"Dodirnite za kopiranje ključa za oporavak"</string>
+  <string name="screen_recovery_key_save_title">"Spremite svoj ključ za oporavak na sigurno mjesto"</string>
+  <string name="screen_recovery_key_setup_confirmation_description">"Nakon ovog koraka nećete moći pristupiti svom novom ključu za oporavak."</string>
+  <string name="screen_recovery_key_setup_confirmation_title">"Jeste li spremili svoj ključ za oporavak?"</string>
+  <string name="screen_recovery_key_setup_description">"Vaša pohrana ključeva zaštićena je ključem za oporavak. Ako vam je nakon postavljanja potreban novi ključ za oporavak, možete ga ponovno izraditi odabirom mogućnosti ‘Promijeni ključ za oporavak’."</string>
+  <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_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_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_title">"Unesite zaporku računa kako biste nastavili"</string>
+</resources>
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 7741b5141a..9e984f1ec0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,10 +38,12 @@ class DefaultSecureBackupEntryPointTest {
             override fun onDone() = lambdaError()
         }
         val params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity)
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(SecureBackupFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenterTest.kt
index 9301dd04e1..899726d806 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenterTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt
index 648f9cf81d..a6ffb57dc4 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8e8bb8ef70..d9324fdb91 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt
index 702b10a1bf..0fbb729534 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManagerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt
index d6892673a1..3c2269e048 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b41a0c7fa5..6cfd061103 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt
index b5d8c89372..9bff023fa6 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3eee154e60..a913a9af27 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt
index cc072c81b2..63adfc789e 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateTest.kt
index 1e4f58a84a..10b7a9daff 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2d9a262c2c..a3cf920d82 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyToolsTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyToolsTest.kt
index be0515de8f..ce66a066e6 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyToolsTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyToolsTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformationTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformationTest.kt
index 9a7210a2f3..98605c03c6 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformationTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformationTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/securityandprivacy/api/build.gradle.kts b/features/securityandprivacy/api/build.gradle.kts
new file mode 100644
index 0000000000..4260bea661
--- /dev/null
+++ b/features/securityandprivacy/api/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.securityandprivacy.api"
+}
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt
new file mode 100644
index 0000000000..be2a4dc9e2
--- /dev/null
+++ b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyEntryPoint.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.securityandprivacy.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import io.element.android.libraries.architecture.FeatureEntryPoint
+
+fun interface SecurityAndPrivacyEntryPoint : FeatureEntryPoint {
+    interface Callback : Plugin {
+        fun onDone()
+    }
+
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
+}
diff --git a/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyPermissions.kt b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyPermissions.kt
new file mode 100644
index 0000000000..f42d792b6f
--- /dev/null
+++ b/features/securityandprivacy/api/src/main/kotlin/io/element/android/features/securityandprivacy/api/SecurityAndPrivacyPermissions.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.features.securityandprivacy.api
+
+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
+
+data class SecurityAndPrivacyPermissions(
+    val canChangeRoomAccess: Boolean,
+    val canChangeHistoryVisibility: Boolean,
+    val canChangeEncryption: Boolean,
+    val canChangeRoomVisibility: Boolean,
+) {
+    fun hasAny(isSpace: Boolean, joinRule: JoinRule?): Boolean {
+        val canChangeRoomVisibility = when (joinRule) {
+            is JoinRule.Public,
+            is JoinRule.Knock,
+            is JoinRule.KnockRestricted -> canChangeRoomVisibility
+            else -> false
+        }
+        return if (isSpace) {
+            canChangeRoomAccess || canChangeRoomVisibility
+        } else {
+            canChangeRoomAccess || canChangeRoomVisibility || canChangeHistoryVisibility || canChangeEncryption
+        }
+    }
+
+    companion object {
+        val DEFAULT = SecurityAndPrivacyPermissions(
+            canChangeRoomAccess = false,
+            canChangeHistoryVisibility = false,
+            canChangeEncryption = false,
+            canChangeRoomVisibility = false,
+        )
+    }
+}
+
+fun RoomPermissions.securityAndPrivacyPermissions(): SecurityAndPrivacyPermissions {
+    return SecurityAndPrivacyPermissions(
+        canChangeRoomAccess = canOwnUserSendState(StateEventType.RoomJoinRules),
+        canChangeHistoryVisibility = canOwnUserSendState(StateEventType.RoomHistoryVisibility),
+        canChangeEncryption = canOwnUserSendState(StateEventType.RoomEncryption),
+        canChangeRoomVisibility = canOwnUserSendState(StateEventType.RoomCanonicalAlias),
+    )
+}
diff --git a/features/securityandprivacy/impl/build.gradle.kts b/features/securityandprivacy/impl/build.gradle.kts
new file mode 100644
index 0000000000..bb9764eb60
--- /dev/null
+++ b/features/securityandprivacy/impl/build.gradle.kts
@@ -0,0 +1,50 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.securityandprivacy.impl"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.features.securityandprivacy.api)
+    implementation(projects.appconfig)
+    implementation(projects.appnav)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
+    // For test fixtures used in previews
+    implementation(projects.libraries.previewutils)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.services.analytics.api)
+    implementation(projects.libraries.featureflag.api)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.services.analytics.test)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.testtags)
+}
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt
new file mode 100644
index 0000000000..d2a40c6836
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/DefaultSecurityAndPrivacyEntryPoint.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.securityandprivacy.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.RoomScope
+
+@ContributesBinding(RoomScope::class)
+class DefaultSecurityAndPrivacyEntryPoint : SecurityAndPrivacyEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: SecurityAndPrivacyEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<SecurityAndPrivacyFlowNode>(buildContext, listOf(callback))
+    }
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyFlowNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt
similarity index 54%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyFlowNode.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt
index a0295dde36..3d62e7b5d7 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyFlowNode.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNode.kt
@@ -1,15 +1,19 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
@@ -17,11 +21,21 @@ import com.bumble.appyx.navmodel.backstack.BackStack
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress.EditRoomAddressNode
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.impl.editroomaddress.EditRoomAddressNode
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.powerlevels.use
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 
 @ContributesNode(RoomScope::class)
@@ -29,6 +43,7 @@ import kotlinx.parcelize.Parcelize
 class SecurityAndPrivacyFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
+    private val room: JoinedRoom,
 ) : BaseFlowNode<SecurityAndPrivacyFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.SecurityAndPrivacy,
@@ -45,7 +60,26 @@ class SecurityAndPrivacyFlowNode(
         data object EditRoomAddress : NavTarget
     }
 
-    private val navigator = BackstackSecurityAndPrivacyNavigator(backstack)
+    private val callback: SecurityAndPrivacyEntryPoint.Callback = callback()
+    private val navigator = BackstackSecurityAndPrivacyNavigator(callback, backstack)
+
+    override fun onBuilt() {
+        super.onBuilt()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                room.roomInfoFlow
+                    .map { roomInfo ->
+                        room.roomPermissions().use(false) { perms ->
+                            perms.securityAndPrivacyPermissions().hasAny(roomInfo.isSpace, roomInfo.joinRule)
+                        }
+                    }
+                    .filter { canEdit -> !canEdit }
+                    .first()
+                // If the user can no longer edit security and privacy, exit the flow
+                callback.onDone()
+            }
+        }
+    }
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNavigator.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt
similarity index 71%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNavigator.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt
index ade6479fd9..092da87943 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyNavigator.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyNavigator.kt
@@ -1,25 +1,33 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 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 io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
 
 interface SecurityAndPrivacyNavigator : Plugin {
+    fun onDone()
     fun openEditRoomAddress()
     fun closeEditRoomAddress()
 }
 
 class BackstackSecurityAndPrivacyNavigator(
+    private val callback: SecurityAndPrivacyEntryPoint.Callback,
     private val backStack: BackStack<SecurityAndPrivacyFlowNode.NavTarget>
 ) : SecurityAndPrivacyNavigator {
+    override fun onDone() {
+        callback.onDone()
+    }
+
     override fun openEditRoomAddress() {
         backStack.push(SecurityAndPrivacyFlowNode.NavTarget.EditRoomAddress)
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressEvents.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressEvents.kt
similarity index 75%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressEvents.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressEvents.kt
index 485a9d2fa0..e42236d31c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressEvents.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressEvents.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 sealed interface EditRoomAddressEvents {
     data object Save : EditRoomAddressEvents
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressNode.kt
similarity index 85%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressNode.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressNode.kt
index 76cb1311fc..ba92cfb6d0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressNode.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressNode.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -16,7 +17,7 @@ import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.di.RoomScope
 
 @ContributesNode(RoomScope::class)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenter.kt
similarity index 95%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenter.kt
index 95aee73c13..8dcea0d880 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenter.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -19,7 +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.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
@@ -62,7 +63,7 @@ class EditRoomAddressPresenter(
             )
         }
 
-        fun handleEvents(event: EditRoomAddressEvents) {
+        fun handleEvent(event: EditRoomAddressEvents) {
             when (event) {
                 EditRoomAddressEvents.Save -> coroutineScope.save(
                     saveAction = saveAction,
@@ -92,7 +93,7 @@ class EditRoomAddressPresenter(
             roomAddressValidity = roomAddressValidity.value,
             roomAddress = newRoomAddress,
             saveAction = saveAction.value,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressState.kt
similarity index 82%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressState.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressState.kt
index 9bc256daba..89315ab8ce 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressState.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressStateProvider.kt
similarity index 91%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressStateProvider.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressStateProvider.kt
index 6ef8658bcd..7b82175bb7 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressStateProvider.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressView.kt
similarity index 95%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressView.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressView.kt
index 93c2523f65..da18b963fa 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressView.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.consumeWindowInsets
@@ -20,7 +21,7 @@ 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.features.roomdetails.impl.R
+import io.element.android.features.securityandprivacy.impl.R
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 import io.element.android.libraries.designsystem.components.button.BackButton
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/RoomAlias.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/RoomAlias.kt
similarity index 80%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/RoomAlias.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/RoomAlias.kt
index 39e955da66..f9ae4bf958 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/RoomAlias.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/RoomAlias.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import io.element.android.libraries.matrix.api.core.RoomAlias
 
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvent.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvent.kt
new file mode 100644
index 0000000000..39abedab8c
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyEvent.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.securityandprivacy.impl.root
+
+sealed interface SecurityAndPrivacyEvent {
+    data object EditRoomAddress : SecurityAndPrivacyEvent
+    data object Save : SecurityAndPrivacyEvent
+    data object Exit : SecurityAndPrivacyEvent
+    data object DismissExitConfirmation : SecurityAndPrivacyEvent
+    data class ChangeRoomAccess(val roomAccess: SecurityAndPrivacyRoomAccess) : SecurityAndPrivacyEvent
+    data object ToggleEncryptionState : SecurityAndPrivacyEvent
+    data object CancelEnableEncryption : SecurityAndPrivacyEvent
+    data object ConfirmEnableEncryption : SecurityAndPrivacyEvent
+    data class ChangeHistoryVisibility(val historyVisibility: SecurityAndPrivacyHistoryVisibility) : SecurityAndPrivacyEvent
+    data object ToggleRoomVisibility : SecurityAndPrivacyEvent
+    data object DismissSaveError : SecurityAndPrivacyEvent
+}
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
new file mode 100644
index 0000000000..d5fb72e72e
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyNode.kt
@@ -0,0 +1,59 @@
+/*
+ * 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.securityandprivacy.impl.root
+
+import android.app.Activity
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+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 com.bumble.appyx.core.plugin.plugins
+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.securityandprivacy.impl.SecurityAndPrivacyNavigator
+import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
+import io.element.android.libraries.architecture.appyx.launchMolecule
+import io.element.android.libraries.di.RoomScope
+
+@ContributesNode(RoomScope::class)
+@AssistedInject
+class SecurityAndPrivacyNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenterFactory: SecurityAndPrivacyPresenter.Factory,
+) : Node(buildContext, plugins = plugins) {
+    private val navigator = plugins<SecurityAndPrivacyNavigator>().first()
+    private val presenter = presenterFactory.create(navigator)
+
+    private val stateFlow = launchMolecule { presenter.present() }
+
+    private fun onOpenExternalUrl(activity: Activity, darkTheme: Boolean, url: String) {
+        activity.openUrlInChromeCustomTab(null, darkTheme, url)
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val activity = requireNotNull(LocalActivity.current)
+        val isDark = ElementTheme.isLightTheme.not()
+        val state by stateFlow.collectAsState()
+        SecurityAndPrivacyView(
+            state = state,
+            onLinkClick = { url ->
+                onOpenExternalUrl(activity, isDark, url)
+            },
+            modifier = modifier
+        )
+    }
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
similarity index 74%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index abc0ff72af..e627fef40c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -20,19 +21,24 @@ 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.roomdetails.impl.securityandprivacy.editroomaddress.matchesServer
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.securityAndPrivacyPermissionsAsState
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.editroomaddress.matchesServer
 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.architecture.runUpdatingState
+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.RoomAlias
 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.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
@@ -45,6 +51,7 @@ class SecurityAndPrivacyPresenter(
     @Assisted private val navigator: SecurityAndPrivacyNavigator,
     private val matrixClient: MatrixClient,
     private val room: JoinedRoom,
+    private val featureFlagService: FeatureFlagService,
 ) : Presenter<SecurityAndPrivacyState> {
     @AssistedFactory
     interface Factory {
@@ -55,9 +62,11 @@ class SecurityAndPrivacyPresenter(
     override fun present(): SecurityAndPrivacyState {
         val coroutineScope = rememberCoroutineScope()
 
+        val isKnockEnabled by remember {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
+        }.collectAsState(false)
         val saveAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
         val homeserverName = remember { matrixClient.userIdServerName() }
-        val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val roomInfo by room.roomInfoFlow.collectAsState()
 
         val savedIsVisibleInRoomDirectory = remember { mutableStateOf<AsyncData<Boolean>>(AsyncData.Uninitialized) }
@@ -67,12 +76,11 @@ class SecurityAndPrivacyPresenter(
 
         val savedSettings by remember {
             derivedStateOf {
-                val historyVisibility = roomInfo.historyVisibility.map()
                 SecurityAndPrivacySettings(
                     roomAccess = roomInfo.joinRule.map(),
                     isEncrypted = roomInfo.isEncrypted == true,
                     isVisibleInRoomDirectory = savedIsVisibleInRoomDirectory.value,
-                    historyVisibility = historyVisibility,
+                    historyVisibility = roomInfo.historyVisibility.map(),
                     address = roomInfo.firstDisplayableAlias(homeserverName)?.value,
                 )
             }
@@ -99,11 +107,13 @@ class SecurityAndPrivacyPresenter(
         )
 
         var showEnableEncryptionConfirmation by remember(savedSettings.isEncrypted) { mutableStateOf(false) }
-        val permissions by room.securityAndPrivacyPermissionsAsState(syncUpdateFlow.value)
+        val permissions by room.permissionsAsState(SecurityAndPrivacyPermissions.DEFAULT) { perms ->
+            perms.securityAndPrivacyPermissions()
+        }
 
-        fun handleEvents(event: SecurityAndPrivacyEvents) {
+        fun handleEvent(event: SecurityAndPrivacyEvent) {
             when (event) {
-                SecurityAndPrivacyEvents.Save -> {
+                SecurityAndPrivacyEvent.Save -> {
                     coroutineScope.save(
                         saveAction = saveAction,
                         isVisibleInRoomDirectory = savedIsVisibleInRoomDirectory,
@@ -111,36 +121,52 @@ class SecurityAndPrivacyPresenter(
                         editedSettings = editedSettings
                     )
                 }
-                is SecurityAndPrivacyEvents.ChangeRoomAccess -> {
+                is SecurityAndPrivacyEvent.ChangeRoomAccess -> {
                     editedRoomAccess = event.roomAccess
                 }
-                is SecurityAndPrivacyEvents.ToggleEncryptionState -> {
+                is SecurityAndPrivacyEvent.ToggleEncryptionState -> {
                     if (editedIsEncrypted) {
                         editedIsEncrypted = false
                     } else {
                         showEnableEncryptionConfirmation = true
                     }
                 }
-                is SecurityAndPrivacyEvents.ChangeHistoryVisibility -> {
+                is SecurityAndPrivacyEvent.ChangeHistoryVisibility -> {
                     editedHistoryVisibility = event.historyVisibility
                 }
-                SecurityAndPrivacyEvents.ToggleRoomVisibility -> {
+                SecurityAndPrivacyEvent.ToggleRoomVisibility -> {
                     editedVisibleInRoomDirectory = when (val edited = editedVisibleInRoomDirectory) {
                         is AsyncData.Success -> AsyncData.Success(!edited.data)
                         else -> edited
                     }
                 }
-                SecurityAndPrivacyEvents.EditRoomAddress -> navigator.openEditRoomAddress()
-                SecurityAndPrivacyEvents.CancelEnableEncryption -> {
+                SecurityAndPrivacyEvent.EditRoomAddress -> navigator.openEditRoomAddress()
+                SecurityAndPrivacyEvent.CancelEnableEncryption -> {
                     showEnableEncryptionConfirmation = false
                 }
-                SecurityAndPrivacyEvents.ConfirmEnableEncryption -> {
+                SecurityAndPrivacyEvent.ConfirmEnableEncryption -> {
                     showEnableEncryptionConfirmation = false
                     editedIsEncrypted = true
                 }
-                SecurityAndPrivacyEvents.DismissSaveError -> {
+                SecurityAndPrivacyEvent.DismissSaveError -> {
                     saveAction.value = AsyncAction.Uninitialized
                 }
+                SecurityAndPrivacyEvent.Exit -> {
+                    saveAction.value = if (savedSettings == editedSettings || saveAction.value == AsyncAction.ConfirmingCancellation) {
+                        AsyncAction.Success(Unit)
+                    } else {
+                        AsyncAction.ConfirmingCancellation
+                    }
+                }
+                SecurityAndPrivacyEvent.DismissExitConfirmation -> {
+                    saveAction.value = AsyncAction.Uninitialized
+                }
+            }
+        }
+
+        LaunchedEffect(saveAction.value.isSuccess()) {
+            if (saveAction.value.isSuccess()) {
+                navigator.onDone()
             }
         }
 
@@ -149,14 +175,27 @@ class SecurityAndPrivacyPresenter(
             editedSettings = editedSettings,
             homeserverName = homeserverName,
             showEnableEncryptionConfirmation = showEnableEncryptionConfirmation,
+            isKnockEnabled = isKnockEnabled,
             saveAction = saveAction.value,
             permissions = permissions,
-            eventSink = ::handleEvents
+            isSpace = roomInfo.isSpace,
+            eventSink = ::handleEvent,
         )
 
-        // If the history visibility is not available for the current access, use the fallback.
-        LaunchedEffect(state.availableHistoryVisibilities) {
-            if (editedSettings.historyVisibility !in state.availableHistoryVisibilities) {
+        // Revert changes that the user is not allowed to make anymore
+        LaunchedEffect(permissions, state.editedSettings.roomAccess) {
+            if (!state.showRoomAccessSection) {
+                editedRoomAccess = savedSettings.roomAccess
+            }
+            if (!state.showEncryptionSection) {
+                editedIsEncrypted = savedSettings.isEncrypted
+            }
+            if (!state.showRoomVisibilitySections) {
+                editedVisibleInRoomDirectory = savedSettings.isVisibleInRoomDirectory
+            }
+            if (!state.showHistoryVisibilitySection) {
+                editedHistoryVisibility = savedSettings.historyVisibility
+            } else if (editedSettings.historyVisibility !in state.availableHistoryVisibilities) {
                 editedHistoryVisibility = editedSettings.historyVisibility.fallback()
             }
         }
@@ -262,21 +301,21 @@ private fun SecurityAndPrivacyRoomAccess.map(): JoinRule? {
 
 private fun RoomHistoryVisibility?.map(): SecurityAndPrivacyHistoryVisibility {
     return when (this) {
-        RoomHistoryVisibility.WorldReadable -> SecurityAndPrivacyHistoryVisibility.Anyone
         RoomHistoryVisibility.Joined,
-        RoomHistoryVisibility.Invited -> SecurityAndPrivacyHistoryVisibility.SinceInvite
-        RoomHistoryVisibility.Shared -> SecurityAndPrivacyHistoryVisibility.SinceSelection
-        // All other cases are not supported so we default to SinceSelection
+        RoomHistoryVisibility.Invited -> SecurityAndPrivacyHistoryVisibility.Invited
+        RoomHistoryVisibility.Shared -> SecurityAndPrivacyHistoryVisibility.Shared
+        RoomHistoryVisibility.WorldReadable -> SecurityAndPrivacyHistoryVisibility.WorldReadable
+        // All other cases are not supported so we default to Shared
         is RoomHistoryVisibility.Custom,
-        null -> SecurityAndPrivacyHistoryVisibility.SinceSelection
+        null -> SecurityAndPrivacyHistoryVisibility.Shared
     }
 }
 
 private fun SecurityAndPrivacyHistoryVisibility.map(): RoomHistoryVisibility {
     return when (this) {
-        SecurityAndPrivacyHistoryVisibility.SinceSelection -> RoomHistoryVisibility.Shared
-        SecurityAndPrivacyHistoryVisibility.SinceInvite -> RoomHistoryVisibility.Invited
-        SecurityAndPrivacyHistoryVisibility.Anyone -> RoomHistoryVisibility.WorldReadable
+        SecurityAndPrivacyHistoryVisibility.Invited -> RoomHistoryVisibility.Invited
+        SecurityAndPrivacyHistoryVisibility.Shared -> RoomHistoryVisibility.Shared
+        SecurityAndPrivacyHistoryVisibility.WorldReadable -> RoomHistoryVisibility.WorldReadable
     }
 }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
similarity index 57%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyState.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
index eb22ec2597..e64cf633a8 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
@@ -1,16 +1,17 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
-import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
-import kotlinx.collections.immutable.toImmutableSet
+import kotlinx.collections.immutable.toImmutableList
 
 data class SecurityAndPrivacyState(
     // the settings that are currently applied on the room.
@@ -19,25 +20,34 @@ data class SecurityAndPrivacyState(
     val editedSettings: SecurityAndPrivacySettings,
     val homeserverName: String,
     val showEnableEncryptionConfirmation: Boolean,
+    val isKnockEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
+    val isSpace: Boolean,
     private val permissions: SecurityAndPrivacyPermissions,
-    val eventSink: (SecurityAndPrivacyEvents) -> Unit
+    val eventSink: (SecurityAndPrivacyEvent) -> Unit
 ) {
     val canBeSaved = savedSettings != editedSettings
 
-    val availableHistoryVisibilities = buildSet {
-        add(SecurityAndPrivacyHistoryVisibility.SinceSelection)
+    // Logic is in https://github.com/element-hq/element-meta/issues/3029
+    val availableHistoryVisibilities = buildList {
+        // Shared is always available
+        add(SecurityAndPrivacyHistoryVisibility.Shared)
         if (editedSettings.roomAccess == SecurityAndPrivacyRoomAccess.Anyone && !editedSettings.isEncrypted) {
-            add(SecurityAndPrivacyHistoryVisibility.Anyone)
+            add(SecurityAndPrivacyHistoryVisibility.WorldReadable)
         } else {
-            add(SecurityAndPrivacyHistoryVisibility.SinceInvite)
+            add(SecurityAndPrivacyHistoryVisibility.Invited)
         }
-    }.toImmutableSet()
+    }
+        .sorted()
+        .toImmutableList()
 
     val showRoomAccessSection = permissions.canChangeRoomAccess
-    val showRoomVisibilitySections = permissions.canChangeRoomVisibility && editedSettings.roomAccess != SecurityAndPrivacyRoomAccess.InviteOnly
-    val showHistoryVisibilitySection = permissions.canChangeHistoryVisibility
-    val showEncryptionSection = permissions.canChangeEncryption
+
+    val showRoomVisibilitySections = permissions.canChangeRoomVisibility &&
+        editedSettings.roomAccess.canConfigureRoomVisibility()
+
+    val showHistoryVisibilitySection = permissions.canChangeHistoryVisibility && !isSpace
+    val showEncryptionSection = permissions.canChangeEncryption && !isSpace
 }
 
 data class SecurityAndPrivacySettings(
@@ -49,18 +59,19 @@ data class SecurityAndPrivacySettings(
 )
 
 enum class SecurityAndPrivacyHistoryVisibility {
-    SinceSelection,
-    SinceInvite,
-    Anyone;
+    // Order matters, and is from the most to the least restrictive
+    Invited,
+    Shared,
+    WorldReadable;
 
     /**
      * Returns the fallback visibility when the current visibility is not available.
      */
     fun fallback(): SecurityAndPrivacyHistoryVisibility {
         return when (this) {
-            SinceSelection,
-            SinceInvite -> SinceSelection
-            Anyone -> SinceInvite
+            Invited,
+            Shared -> Shared
+            WorldReadable -> Invited
         }
     }
 }
@@ -69,7 +80,14 @@ enum class SecurityAndPrivacyRoomAccess {
     InviteOnly,
     AskToJoin,
     Anyone,
-    SpaceMember
+    SpaceMember;
+
+    fun canConfigureRoomVisibility(): Boolean {
+        return when (this) {
+            InviteOnly, SpaceMember -> false
+            AskToJoin, Anyone -> true
+        }
+    }
 }
 
 sealed class SecurityAndPrivacyFailures : Exception() {
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
new file mode 100644
index 0000000000..223d524ca3
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -0,0 +1,131 @@
+/*
+ * 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.securityandprivacy.impl.root
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.AsyncData
+
+open class SecurityAndPrivacyStateProvider : PreviewParameterProvider<SecurityAndPrivacyState> {
+    override val values: Sequence<SecurityAndPrivacyState>
+        get() = commonSecurityAndPrivacyStates(isSpace = false) +
+            commonSecurityAndPrivacyStates(isSpace = true) +
+            sequenceOf(
+                aSecurityAndPrivacyState(
+                    saveAction = AsyncAction.Loading,
+                    isSpace = false,
+                ),
+                aSecurityAndPrivacyState(
+                    saveAction = AsyncAction.Failure(SecurityAndPrivacyFailures.SaveFailed),
+                    isSpace = false,
+                ),
+                aSecurityAndPrivacyState(
+                    saveAction = AsyncAction.ConfirmingCancellation,
+                    isSpace = false,
+                ),
+                aSecurityAndPrivacyState(
+                    showEncryptionConfirmation = true,
+                    isSpace = false,
+                ),
+            )
+}
+
+private fun commonSecurityAndPrivacyStates(isSpace: Boolean): Sequence<SecurityAndPrivacyState> = sequenceOf(
+    aSecurityAndPrivacyState(isSpace = isSpace),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin,
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        savedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.AskToJoin
+        ),
+        isSpace = isSpace,
+        isKnockEnabled = false,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
+            isEncrypted = false,
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        savedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.SpaceMember
+        ),
+        isSpace = isSpace,
+        isKnockEnabled = false,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
+            address = "#therapy:myserver.xyz"
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
+            isVisibleInRoomDirectory = AsyncData.Loading()
+        ),
+        isSpace = isSpace,
+    ),
+    aSecurityAndPrivacyState(
+        editedSettings = aSecurityAndPrivacySettings(
+            roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
+            isVisibleInRoomDirectory = AsyncData.Success(true)
+        ),
+        isSpace = isSpace,
+    ),
+)
+
+fun aSecurityAndPrivacySettings(
+    roomAccess: SecurityAndPrivacyRoomAccess = SecurityAndPrivacyRoomAccess.InviteOnly,
+    isEncrypted: Boolean = true,
+    address: String? = null,
+    historyVisibility: SecurityAndPrivacyHistoryVisibility = SecurityAndPrivacyHistoryVisibility.Shared,
+    isVisibleInRoomDirectory: AsyncData<Boolean> = AsyncData.Uninitialized,
+) = SecurityAndPrivacySettings(
+    roomAccess = roomAccess,
+    isEncrypted = isEncrypted,
+    address = address,
+    historyVisibility = historyVisibility,
+    isVisibleInRoomDirectory = isVisibleInRoomDirectory
+)
+
+fun aSecurityAndPrivacyState(
+    savedSettings: SecurityAndPrivacySettings = aSecurityAndPrivacySettings(),
+    editedSettings: SecurityAndPrivacySettings = savedSettings,
+    homeserverName: String = "myserver.xyz",
+    showEncryptionConfirmation: Boolean = false,
+    saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    permissions: SecurityAndPrivacyPermissions = SecurityAndPrivacyPermissions(
+        canChangeRoomAccess = true,
+        canChangeHistoryVisibility = true,
+        canChangeEncryption = true,
+        canChangeRoomVisibility = true
+    ),
+    isKnockEnabled: Boolean = true,
+    isSpace: Boolean = false,
+    eventSink: (SecurityAndPrivacyEvent) -> Unit = {}
+) = SecurityAndPrivacyState(
+    editedSettings = editedSettings,
+    savedSettings = savedSettings,
+    homeserverName = homeserverName,
+    showEnableEncryptionConfirmation = showEncryptionConfirmation,
+    saveAction = saveAction,
+    isKnockEnabled = isKnockEnabled,
+    permissions = permissions,
+    isSpace = isSpace,
+    eventSink = eventSink,
+)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
similarity index 76%
rename from features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
rename to features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index c46f8a7a6f..bf6a5ffdf2 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -1,12 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl.root
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -25,21 +27,26 @@ import androidx.compose.material3.ListItemDefaults
 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.appconfig.LearnMoreConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.features.securityandprivacy.impl.R
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
 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.SaveChangesDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 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.text.stringWithLink
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ListItem
@@ -48,22 +55,27 @@ 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.ui.strings.CommonStrings
-import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun SecurityAndPrivacyView(
     state: SecurityAndPrivacyState,
-    onBackClick: () -> Unit,
+    onLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    BackHandler {
+        state.eventSink(SecurityAndPrivacyEvent.Exit)
+    }
     Scaffold(
         modifier = modifier,
         topBar = {
             SecurityAndPrivacyToolbar(
                 isSaveActionEnabled = state.canBeSaved,
-                onBackClick = onBackClick,
+                onBackClick = {
+                    state.eventSink(SecurityAndPrivacyEvent.Exit)
+                },
                 onSaveClick = {
-                    state.eventSink(SecurityAndPrivacyEvents.Save)
+                    state.eventSink(SecurityAndPrivacyEvent.Save)
                 },
             )
         }
@@ -81,7 +93,8 @@ fun SecurityAndPrivacyView(
                     modifier = Modifier.padding(top = 24.dp),
                     edited = state.editedSettings.roomAccess,
                     saved = state.savedSettings.roomAccess,
-                    onSelectOption = { state.eventSink(SecurityAndPrivacyEvents.ChangeRoomAccess(it)) },
+                    isKnockEnabled = state.isKnockEnabled,
+                    onSelectOption = { state.eventSink(SecurityAndPrivacyEvent.ChangeRoomAccess(it)) },
                 )
             }
             if (state.showRoomVisibilitySections) {
@@ -89,10 +102,10 @@ fun SecurityAndPrivacyView(
                 RoomAddressSection(
                     roomAddress = state.editedSettings.address,
                     homeserverName = state.homeserverName,
-                    onRoomAddressClick = { state.eventSink(SecurityAndPrivacyEvents.EditRoomAddress) },
+                    onRoomAddressClick = { state.eventSink(SecurityAndPrivacyEvent.EditRoomAddress) },
                     isVisibleInRoomDirectory = state.editedSettings.isVisibleInRoomDirectory,
                     onVisibilityChange = {
-                        state.eventSink(SecurityAndPrivacyEvents.ToggleRoomVisibility)
+                        state.eventSink(SecurityAndPrivacyEvent.ToggleRoomVisibility)
                     },
                 )
             }
@@ -101,10 +114,10 @@ fun SecurityAndPrivacyView(
                     isRoomEncrypted = state.editedSettings.isEncrypted,
                     // encryption can't be disabled once enabled
                     canToggleEncryption = !state.savedSettings.isEncrypted,
-                    onToggleEncryption = { state.eventSink(SecurityAndPrivacyEvents.ToggleEncryptionState) },
+                    onToggleEncryption = { state.eventSink(SecurityAndPrivacyEvent.ToggleEncryptionState) },
                     showConfirmation = state.showEnableEncryptionConfirmation,
-                    onDismissConfirmation = { state.eventSink(SecurityAndPrivacyEvents.CancelEnableEncryption) },
-                    onConfirmEncryption = { state.eventSink(SecurityAndPrivacyEvents.ConfirmEnableEncryption) },
+                    onDismissConfirmation = { state.eventSink(SecurityAndPrivacyEvent.CancelEnableEncryption) },
+                    onConfirmEncryption = { state.eventSink(SecurityAndPrivacyEvent.ConfirmEnableEncryption) },
                 )
             }
             if (state.showHistoryVisibilitySection) {
@@ -112,7 +125,8 @@ fun SecurityAndPrivacyView(
                     editedOption = state.editedSettings.historyVisibility,
                     savedOptions = state.savedSettings.historyVisibility,
                     availableOptions = state.availableHistoryVisibilities,
-                    onSelectOption = { state.eventSink(SecurityAndPrivacyEvents.ChangeHistoryVisibility(it)) },
+                    onSelectOption = { state.eventSink(SecurityAndPrivacyEvent.ChangeHistoryVisibility(it)) },
+                    onLinkClick = onLinkClick,
                 )
             }
         }
@@ -120,14 +134,24 @@ fun SecurityAndPrivacyView(
     AsyncActionView(
         async = state.saveAction,
         onSuccess = { },
-        onErrorDismiss = { state.eventSink(SecurityAndPrivacyEvents.DismissSaveError) },
+        onErrorDismiss = { state.eventSink(SecurityAndPrivacyEvent.DismissSaveError) },
+        confirmationDialog = { confirming ->
+            when (confirming) {
+                is AsyncAction.ConfirmingCancellation ->
+                    SaveChangesDialog(
+                        onSaveClick = { state.eventSink(SecurityAndPrivacyEvent.Save) },
+                        onDiscardClick = { state.eventSink(SecurityAndPrivacyEvent.Exit) },
+                        onDismiss = { state.eventSink(SecurityAndPrivacyEvent.DismissExitConfirmation) }
+                    )
+            }
+        },
         errorMessage = { stringResource(CommonStrings.error_unknown) },
         progressDialog = {
             AsyncActionViewDefaults.ProgressDialog(
                 progressText = stringResource(CommonStrings.common_saving),
             )
         },
-        onRetry = { state.eventSink(SecurityAndPrivacyEvents.Save) },
+        onRetry = { state.eventSink(SecurityAndPrivacyEvent.Save) },
     )
 }
 
@@ -141,7 +165,7 @@ private fun SecurityAndPrivacyToolbar(
 ) {
     TopAppBar(
         modifier = modifier,
-        titleStr = stringResource(R.string.screen_room_details_security_and_privacy_title),
+        titleStr = stringResource(R.string.screen_security_and_privacy_title),
         navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             TextButton(
@@ -157,6 +181,7 @@ private fun SecurityAndPrivacyToolbar(
 private fun SecurityAndPrivacySection(
     title: String,
     modifier: Modifier = Modifier,
+    subtitle: AnnotatedString? = null,
     content: @Composable ColumnScope.() -> Unit,
 ) {
     Column(
@@ -168,6 +193,15 @@ private fun SecurityAndPrivacySection(
             color = ElementTheme.colors.textPrimary,
             modifier = Modifier.padding(horizontal = 16.dp),
         )
+        if (subtitle != null) {
+            Spacer(Modifier.height(8.dp))
+            Text(
+                text = subtitle,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
+                modifier = Modifier.padding(horizontal = 16.dp),
+            )
+        }
         content()
     }
 }
@@ -176,6 +210,7 @@ private fun SecurityAndPrivacySection(
 private fun RoomAccessSection(
     edited: SecurityAndPrivacyRoomAccess,
     saved: SecurityAndPrivacyRoomAccess,
+    isKnockEnabled: Boolean,
     onSelectOption: (SecurityAndPrivacyRoomAccess) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -183,33 +218,45 @@ private fun RoomAccessSection(
         title = stringResource(R.string.screen_security_and_privacy_room_access_section_header),
         modifier = modifier,
     ) {
-        ListItem(
-            headlineContent = { 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),
-            onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.InviteOnly) },
-        )
-        ListItem(
-            headlineContent = { 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) },
-        )
         ListItem(
             headlineContent = { 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())),
             onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.Anyone) },
         )
         // Show space member option, but disabled as we don't support this option for now.
         if (saved == SecurityAndPrivacyRoomAccess.SpaceMember) {
             ListItem(
                 headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
-                supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_description)) },
-                trailingContent = ListItemContent.RadioButton(selected = true, enabled = false),
+                supportingContent = {
+                    Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_unavailable_description))
+                },
+                trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.SpaceMember, enabled = false),
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Space())),
                 enabled = false,
             )
         }
+        // Show Ask to join option in two cases:
+        // - the Knock FF is enabled
+        // - AskToJoin is the current saved value
+        if (saved == SecurityAndPrivacyRoomAccess.AskToJoin || isKnockEnabled) {
+            ListItem(
+                headlineContent = { 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) },
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserAdd())),
+                enabled = isKnockEnabled,
+            )
+        }
+        ListItem(
+            headlineContent = { 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())),
+            onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.InviteOnly) },
+        )
     }
 }
 
@@ -258,7 +305,7 @@ private fun RoomAddressSection(
         ListItem(
             headlineContent = { 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_section_footer, homeserverName))
+                Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_toggle_description, homeserverName))
             },
             onClick = if (isVisibleInRoomDirectory.isSuccess()) onVisibilityChange else null,
             trailingContent = when (isVisibleInRoomDirectory) {
@@ -327,12 +374,18 @@ private fun EncryptionSection(
 private fun HistoryVisibilitySection(
     editedOption: SecurityAndPrivacyHistoryVisibility?,
     savedOptions: SecurityAndPrivacyHistoryVisibility?,
-    availableOptions: ImmutableSet<SecurityAndPrivacyHistoryVisibility>,
+    availableOptions: ImmutableList<SecurityAndPrivacyHistoryVisibility>,
     onSelectOption: (SecurityAndPrivacyHistoryVisibility) -> Unit,
+    onLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     SecurityAndPrivacySection(
         title = stringResource(R.string.screen_security_and_privacy_room_history_section_header),
+        subtitle = stringWithLink(
+            textRes = R.string.screen_security_and_privacy_room_history_section_footer,
+            url = LearnMoreConfig.HISTORY_VISIBLE_URL,
+            onLinkClick = onLinkClick,
+        ),
         modifier = modifier,
     ) {
         for (availableOption in availableOptions) {
@@ -364,9 +417,9 @@ private fun HistoryVisibilityItem(
     isEnabled: Boolean = true,
 ) {
     val headlineText = when (option) {
-        SecurityAndPrivacyHistoryVisibility.SinceSelection -> stringResource(R.string.screen_security_and_privacy_room_history_since_selecting_option_title)
-        SecurityAndPrivacyHistoryVisibility.SinceInvite -> stringResource(R.string.screen_security_and_privacy_room_history_since_invite_option_title)
-        SecurityAndPrivacyHistoryVisibility.Anyone -> stringResource(R.string.screen_security_and_privacy_room_history_anyone_option_title)
+        SecurityAndPrivacyHistoryVisibility.Invited -> stringResource(R.string.screen_security_and_privacy_room_history_since_invite_option_title)
+        SecurityAndPrivacyHistoryVisibility.Shared -> stringResource(R.string.screen_security_and_privacy_room_history_since_selecting_option_title)
+        SecurityAndPrivacyHistoryVisibility.WorldReadable -> stringResource(R.string.screen_security_and_privacy_room_history_anyone_option_title)
     }
     ListItem(
         headlineContent = { Text(text = headlineText) },
@@ -392,6 +445,6 @@ internal fun SecurityAndPrivacyViewDarkPreview(@PreviewParameter(SecurityAndPriv
 private fun ContentToPreview(state: SecurityAndPrivacyState) {
     SecurityAndPrivacyView(
         state = state,
-        onBackClick = {},
+        onLinkClick = {},
     )
 }
diff --git a/features/securityandprivacy/impl/src/main/res/values-be/translations.xml b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..4587ac191c
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-be/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_security_and_privacy_ask_to_join_option_title">"Папрасіце далучыцца"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Хто заўгодна"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml b/features/securityandprivacy/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..348c9d491f
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-bg/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_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>
+  <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_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_title">"Членове на пространството"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Пространствата в момента не се поддържат"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в директорията на обществените стаи"</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_title">"Защита и поверителност"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml b/features/securityandprivacy/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..a70ccdbf72
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-cs/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_edit_room_address_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_edit_room_address_title">"Upravit adresu"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Všichni musí požádat o přístup."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požádat o připojení"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ano, povolit šifrování"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivaci nelze šifrování místnosti deaktivovat. Historie zpráv bude viditelná pouze pro členy místnosti od doby, kdy byli pozváni nebo od té doby, co do místnosti vstoupili.
+Nikdo kromě členů místnosti nebude moci číst zprávy. To může bránit správnému fungování robotů a propojení.
+Nedoporučujeme povolovat šifrování pro místnosti, které může kdokoli najít a vstoupit do nich."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Povolit šifrování?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Jakmile je povoleno, šifrování nelze zakázat."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Šifrování"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Povolit koncové šifrování"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vstoupit může kdokoli."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kdokoliv"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vyberte, kteří členové prostorů se k této místnosti mohou připojit bez pozvánky. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vstoupit mohou pouze pozvaní lidé."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Pouze pro zvané"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Přístup"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Vstoupit může kdokoli z autorizovaných prostorů."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Vstoupit může kdokoli v %1$s."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členové prostoru"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Prostory nejsou aktuálně podporovány"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potřebovat adresu místnosti, aby byla viditelná v adresáři místností."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožněte nalezení této místnosti prohledáním adresáře veřejných místností na %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umožnit nalezení vyhledáváním ve veřejném adresáři."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditelné ve veřejném adresáři"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kdokoliv"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kdo může číst historii"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Pouze členové od té doby, co byli pozváni"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Pouze členové od výběru této možnosti"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy místností představují způsoby, jak najít místnosti a získat k nim přístup. Díky tomu můžete svoji místnost snadno sdílet s ostatními.
+Můžete se rozhodnout publikovat svou místnost ve veřejném adresáři místnosti vašeho domovského serveru."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publikování místnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy slouží k vyhledávání a přístupu do místností a prostorů. Díky tomu je také můžete snadno sdílet s ostatními."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditelnost"</string>
+  <string name="screen_security_and_privacy_title">"Zabezpečení a soukromí"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml b/features/securityandprivacy/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..ce812b0f83
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-cy/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_edit_room_address_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
+  <string name="screen_edit_room_address_title">"Cyfeiriad yr ystafell"</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>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Iawn, galluogi amgryptio"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio ar gyfer ystafell, dim ond ar gyfer aelodau\'r ystafell y bydd hanes neges yn weladwy ers iddyn nhw gael eu gwahodd neu ers iddyn nhw ymuno â\'r ystafell.
+Fydd neb ar wahân i aelodau\'r ystafell yn gallu darllen negeseuon. Gall hyn atal botiau a phontydd i weithio\'n gywir.
+Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un ddod o hyd iddynt ac ymuno â nhw."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Galluogi amgryptio?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Amgryptiad"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Galluogi amgryptio o\'r dechrau i\'r diwedd"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Gall unrhyw un ddod o hyd iddo ac ymuno"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Unrhyw un"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Dim ond os cawn nhw wahoddiad gall pobl ymuno"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gwahoddiad yn unig"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Mynediad ystafell"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Aelodau gofod"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Nid yw gofodau\'n cael eu cefnogi ar hyn o bryd"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Cyfeiriad yr ystafell"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Caniatáu i\'r ystafell hon gael ei chanfod trwy chwilio cyfeiriadur ystafelloedd cyhoeddus %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gweladwy yn y cyfeiriadur ystafelloedd cyhoeddus"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Unrhyw un"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Pwy all ddarllen hanes"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Yn aelodau ond dim ond ers cael eu gwahodd"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Yn aelodau dim ond ers dewis y dewis hwn"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
+Gallwch ddewis cyhoeddi eich ystafell yng ngweinydd cartref eich cyfeiriadur ystafelloedd cyhoeddus."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Cyhoeddi ystafell"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Gwelededd yr ystafell"</string>
+  <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</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
new file mode 100644
index 0000000000..12ab70d44e
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-da/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_edit_room_address_room_address_section_footer">"Du skal bruge en adresse for at gøre det synligt i det offentlige register."</string>
+  <string name="screen_edit_room_address_title">"Redigér adresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Tilføj adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle skal anmode om adgang."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Spørg om at deltage"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivér kryptering"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når det først er aktiveret, kan kryptering for et rum ikke deaktiveres igen. Beskedhistorik vil kun være synlig for rummedlemmer, siden de blev inviteret, eller siden de blev medlem af rummet.
+Ingen udover medlemmer af rummet vil være i stand til at læse beskeder. Dette kan forhindre bots og broer i at fungere korrekt.
+Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage i."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktivér kryptering?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering først er aktiveret, kan den ikke deaktiveres igen."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivér end-to-end-kryptering"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan være med."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Enhver"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Kun inviterede personer kan deltage i dette rum."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun inviterede"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Adgang"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af gruppen"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Grupper 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>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillad, at dette rum kan findes ved at søge i %1$s fortegnelse over offentlige rum"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Gør det muligt at blive fundet ved søgninger i det offentlige register."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i det offentlige register"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan læse historikken?"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kun medlemmer, efter de blev inviteret"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kun medlemmer siden valg af denne mulighed"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Rum-adresser er en måde at finde og få adgang til værelser på. Dette sikrer også, at du nemt kan dele dit rum med andre.
+Du kan vælge at offentliggøre dit rum i din hjemmeservers offentlige katalog over rum."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Udgivelse af rum"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Synlighed"</string>
+  <string name="screen_security_and_privacy_title">"Sikkerhed og privatliv"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-de/translations.xml b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..c37481560d
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-de/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_edit_room_address_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im Verzeichnis sichtbar zu machen."</string>
+  <string name="screen_edit_room_address_title">"Chat-Adresse"</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_option_description">"Jeder kann den Beitritt zum Chat anfragen, aber ein Admin oder Moderator müssen die Anfrage akzeptieren."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Beitritt beantragen"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, Verschlüsselung aktivieren"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Einmal angeschaltet kann die Verschlüsselung für einen Chat nicht mehr deaktiviert werden. Der Nachrichtenverlauf ist für Mitglieder nur sichtbar, seit sie eingeladen wurden oder dem Chat beigetreten sind.
+Niemand außer den Chat Mitgliedern kann Nachrichten lesen. Dies kann verhindern, dass Bots und Bridges richtig funktionieren.
+Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden und denen jeder beitreten darf."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Verschlüsselung aktivieren?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Einmal angeschaltet kann die Verschlüsselung nicht mehr deaktiviert werden."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Verschlüsselung"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ende-zu-Ende-Verschlüsselung aktivieren"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Jeder kann diesen Chat finden und ihm beitreten"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Jeder"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Personen können nur beitreten, wenn sie eingeladen werden."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Nur auf Einladung"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Chat Zugang"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Spacemitglieder"</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 Verzeichnis sichtbar zu machen."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Chatroomadresse"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Erlaube das Auffinden dieses Chats durch Suche im öffentlichen Verzeichnis von %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Sichtbar im öffentlichen Verzeichnis"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Jeder"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Wer hat Zugriff auf den Nachrichtenverlauf"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Nur Mitglieder, aber erst seit deren Einladung"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Nur Mitglieder seit Auswahl dieser Option"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Chat-Adressen machen es möglich, Chats zu finden und ihnen beizutreten. Dies erleichtert es, Chats mit anderen zu teilen.
+Auf Wunsch kannst du deinen Chat im öffentlichen Verzeichnis deines Homeservers veröffentlichen."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Veröffentlichung von Chats"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Chatroomsichtbarkeit."</string>
+  <string name="screen_security_and_privacy_title">"Sicherheit &amp; Datenschutz"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-el/translations.xml b/features/securityandprivacy/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..c9a65b058d
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-el/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="screen_edit_room_address_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση αίθουσας για να την κάνετε ορατή στον κατάλογο."</string>
+  <string name="screen_edit_room_address_title">"Διεύθυνση αίθουσας"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Προσθήκη διεύθυνσης αίθουσας"</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_enable_encryption_alert_confirm_button_title">"Ναι, ενεργοποιήστε την κρυπτογράφηση"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Μόλις ενεργοποιηθεί, η κρυπτογράφηση για μια αίθουσα δεν μπορεί να απενεργοποιηθεί, το ιστορικό μηνυμάτων θα είναι ορατό μόνο για τα μέλη της αίθουσας από τότε που προσκλήθηκαν ή από τότε που συμμετείχαν στην αίθουσα.
+Κανείς άλλος εκτός από τα μέλη της αίθουσας δεν θα μπορεί να διαβάσει τα μηνύματα. Αυτό μπορεί να εμποδίσει τη σωστή λειτουργία των bots και των γεφυρών.
+Δεν συνιστούμε την ενεργοποίηση της κρυπτογράφησης για αίθουσες που μπορεί να βρει και να συμμετάσχει ο καθένας."</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_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_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_directory_visibility_section_footer">"Επιστρέψτε την εύρεση αυτής της αίθουσας με αναζήτηση στον κατάλογο %1$s δημοσίων αιθουσών"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Ορατή στον κατάλογο δημόσιων αιθουσών"</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_title">"Ασφάλεια &amp; απόρρητο"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-en-rUS/translations.xml b/features/securityandprivacy/impl/src/main/res/values-en-rUS/translations.xml
new file mode 100644
index 0000000000..9a4b56e287
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-en-rUS/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_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Anyone in authorized spaces can join, but everyone else must request access."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Anyone in authorized spaces can join."</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-es/translations.xml b/features/securityandprivacy/impl/src/main/res/values-es/translations.xml
new file mode 100644
index 0000000000..c63bee50ef
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-es/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="screen_edit_room_address_room_address_section_footer">"Necesitarás una dirección de sala para que sea visible en el directorio."</string>
+  <string name="screen_edit_room_address_title">"Dirección de la sala"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Agregar dirección de sala"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Cualquiera puede solicitar unirse a la sala, pero un administrador o moderador tendrá que aceptar la solicitud."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitud para unirse"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sí, activar cifrado"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una vez activado, el cifrado de una sala no se puede desactivar. El historial de mensajes solo será visible para los miembros de la sala desde que fueron invitados o desde que se unieron a la sala.
+Nadie más que los miembros de la sala podrán leer los mensajes. Esto puede impedir que los bots y los puentes funcionen correctamente.
+No recomendamos habilitar el cifrado para las salas que cualquiera pueda encontrar y unirse."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"¿Activar cifrado?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Una vez activado, el cifrado no se puede desactivar."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Cifrado"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activar el cifrado de extremo a extremo"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Cualquiera puede encontrarla y unirse"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Cualquiera"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Las personas solo pueden unirse si están invitadas"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo por invitación"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acceso a la sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Miembros del espacio"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No se admiten los espacios por el momento."</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Necesitarás una dirección de sala para que sea visible en el directorio."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite encontrar esta sala buscando en el directorio de salas públicas de %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible en el directorio de salas públicas"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Quién puede leer el historial"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo participantes desde que fueron invitados"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo participantes desde que se selecciona esta opción"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Las direcciones de sala son formas de buscar salas y acceder a ellas. Esto también garantiza que puedas compartir fácilmente tu sala con otras personas.
+Puedes optar por publicar tu sala en el directorio de salas públicas de tu servidor base."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicación de la sala"</string>
+  <string name="screen_security_and_privacy_title">"Seguridad y privacidad"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-et/translations.xml b/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..8d74c35733
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-et/translations.xml
@@ -0,0 +1,45 @@
+<?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">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
+  <string name="screen_edit_room_address_title">"Muuda aadressi"</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>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Küsi võimalust liitumiseks"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Liituda saavad kõik „%1$s“ kogukonna liikmed, kuid kõik teised peavad küsima võimalust ligipääsuks."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Jah, lülita krüptimine sisse"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kui jututoa krüptimine on kord sisse lülitatud, siis seda välja lülitada ei saa. Sõnumite ajalugu on nähtav vaid jututoa liikmetele alates kutse saamise või liitumise hetkest.
+Keegi teine peale jututoa liikmete ei saa sõnumeid lugeda. See võib takistada suhtlusrobotite ja/või võrgusildade toimimist.
+Me ei soovita krüptimise kasutamist selliste avalike jututubade puhul, millega kõik võivad liituda."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Kas võtame krüptimise kasutusele?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Kui krüptimine on kasutusel, siis seda enam väljalülitada ei saa."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Krüptimine"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Võta läbiv krüptimine kasutusele"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kõik võivad jututoaga liituda"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kõik kasutajad"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vali kogukonnad, mille liikmed saavad selle jututoaga liituda ilma kutseta. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Halda kogukondi"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Liituda saab vaid kutse olemasolul"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vaid kutsega"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Ligipääs"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Liituda saavad kõik volitatud kogukondade liikmed."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Liituda võivad kõik „%1$s“ liikmed."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Kogukonna liikmed"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Kogukondade tugi veel puudub"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Selleks, et jututuba oleks nähtav jututubade avalikus kataloogis, vajab ta aadressi."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Aadress"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Võimalda leida seda jututuba avalikust kataloogist otsides „%1$s“"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Luba leitavus avaliku kataloogi otsingust."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Nähtav avalikus kataloogis"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kõik (ajalugu on avalik)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Muudatused ei mõjuta varasemaid sõnumeid, ainult uusi. %1$s"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kes võivad lugeda jututoa ajalugu"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Liikmed peale kutse saamist"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Liikmed (terviklik ajalugu)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Jututoa aadressid annavad võimaluse neid leida ning saada neile ligi. Samuti võimaldab see jututuba teistele huvilistele jagada.
+Lisaks võid sa jututoa avaldada oma koduserveri avalikus jututubade kataloogis."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Jututoa avaldamine"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Aadressid on mugav viis jututubade ja kogukondade leidmiseks ning tagab mugava võimaluse nende jagamiseks."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Nähtavus"</string>
+  <string name="screen_security_and_privacy_title">"Turvalisus ja privaatsus"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml b/features/securityandprivacy/impl/src/main/res/values-eu/translations.xml
new file mode 100644
index 0000000000..7024f1c40b
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-eu/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_edit_room_address_title">"Gelaren helbidea"</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>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Edonork aurkitu eta bat egin dezake"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Edonork"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Gonbidatutako pertsonak bakarrik sartu ahal izango dira"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Gonbidapen bidez"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Gelarako sarbidea"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Guneko kideak"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gaur-gaurkoz ez da guneekin bateragarria"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Gelaren helbidea"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gela publikoen direktorioan ikusgai"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Nork irakur dezake historia"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Kideek bakarrik, gonbidatu zituztenetik"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Kideek bakarrik, aukera hau hautatu zenetik"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Gelaren ikusgarritasuna"</string>
+  <string name="screen_security_and_privacy_title">"Segurtasuna eta pribatutasuna"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..8cfa4147b5
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-fa/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_edit_room_address_title">"نشانی اتاق"</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>
+  <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_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_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_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_header">"نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"هرکسی"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</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-fi/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
new file mode 100644
index 0000000000..0f42d87675
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-fi/translations.xml
@@ -0,0 +1,37 @@
+<?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">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_edit_room_address_title">"Muokkaa osoitetta"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lisää osoite"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Kaikkien on pyydettävä pääsyä."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pyydä liittymistä"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Kyllä, ota salaus käyttöön"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä. Viestihistoria näkyy vain huoneen jäsenille kutsusta tai liittymisestä lähtien.
+Kukaan muu kuin huoneen jäsenet eivät pysty lukemaan viestejä. Tämä voi estää botteja tai siltoja toimimasta oikein.
+Emme suosittele salauksen ottamista käyttöön huoneissa, jotka kuka tahansa voi löytää ja joihin kuka tahansa voi liittyä."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Otetaanko salaus käyttöön?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Kun salaus on kerran otettu käyttöön, sitä ei voi poistaa käytöstä."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Salaus"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ota päästä päähän -salaus käyttöön"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Kuka tahansa voi liittyä."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Kuka tahansa"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Vain kutsutut henkilöt voivat liittyä."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Vain kutsutut"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Pääsy"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Tilan jäsenet"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Tiloja ei tällä hetkellä tueta"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Tarvitset osoitteen, jotta se näkyy julkisessa hakemistossa."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Osoite"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Salli tämän huoneen löytäminen hakemalla %1$s -palvelimen julkisesta huonehakemistosta."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Anna muiden löytää tämä julkisen hakemiston kautta."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Näkyy julkisessa hakemistossa"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Kuka tahansa"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kuka voi lukea viestihistoriaa"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Jäsenet vasta kutsusta lähtien"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Jäsenet tämän vaihtoehdon valinnan jälkeen"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Huoneosoitteet ovat tapoja löytää ja käyttää huoneita. Näin voit myös helposti jakaa huoneesi muiden kanssa.
+Voit halutessasi julkaista huoneesi kotipalvelimesi julkisessa huonehakemistossa."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Huoneen julkaiseminen"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Näkyvyys"</string>
+  <string name="screen_security_and_privacy_title">"Turvallisuus ja yksityisyys"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
new file mode 100644
index 0000000000..5426d71706
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-fr/translations.xml
@@ -0,0 +1,42 @@
+<?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">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
+  <string name="screen_edit_room_address_title">"Modifier l’adresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Ajouter une adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Tout le monde doit demander un accès."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Demander à rejoindre"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Oui, activer le chiffrement"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Une fois activé, le chiffrement d’un salon ne peut pas être désactivé. L’historique des messages ne sera visible que pour les membres depuis qu’ils ont été invités ou depuis qu’ils ont rejoint le salon.
+Personne d’autre que les membres du salon ne pourra lire les messages. Cela peut empêcher les bots et les bridges de fonctionner correctement.
+Nous ne recommandons pas d’activer le chiffrement pour les salons que tout le monde peut trouver et rejoindre."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Activer le chiffrement ?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Une fois activé, le chiffrement ne peut pas être désactivé."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Chiffrement"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activer le chiffrement de bout en bout"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tout le monde peut rejoindre."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tout le monde"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Choisissez les espaces dont les membres peuvent rejoindre ce salon sans invitation. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gérer les espaces"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Seules les personnes invitées peuvent rejoindre."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Sur invitation uniquement"</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_multiple_parents_description">"Toute personne se trouvant dans un espace autorisé peut joindre le salon."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Toute personne de l’espace %1$s peut joindre le salon."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membres de l’espace"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Les Espaces ne sont pas encore supportés"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Vous aurez besoin d’une adresse pour le rendre visible dans l’annuaire public."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Autoriser le salon à apparaître dans les résultats de recherche dans le répertoire %1$s des salons publics"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permet d’être trouvé en recherchant dans l’annuaire public."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible dans l’annuaire public"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Tout le monde"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Qui peux lire l’historique"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Les membres uniquement depuis qu’ils ont été invités"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Les membres uniquement depuis la sélection de cette option"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adresses de salon sont un moyen de trouver et d’accéder aux salons. Cela vous permet également de partager facilement votre salon avec d’autres personnes.
+Vous pouvez choisir de publier votre salon dans l’annuaire des salons publics de votre serveur d’accueil."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publication du salon"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Les adresses permettent de trouver et d’accéder aux salons et aux espaces. Elles facilitent également leur partage avec d’autres personnes."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilité"</string>
+  <string name="screen_security_and_privacy_title">"Sécurité &amp; confidentialité"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..401fe806f8
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,45 @@
+<?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">"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_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.
+Nitko osim članova sobe neće moći čitati poruke. Zbog toga botovi i mostovi možda neće ispravno funkcionirati.
+Ne preporučujemo omogućavanje šifriranja za sobe koje svatko može pronaći i pridružiti im se."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Želite li omogućiti šifriranje?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Nakon što se šifriranje omogući, više se neće moći onemogućiti."</string>
+  <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_anyone_option_title">"Svatko"</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>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Omogući pronalazak ove sobe pretraživanjem %1$s javnog direktorija soba"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Omogući pronalazak pretraživanjem javnog direktorija."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vidljivo u javnom direktoriju"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Svatko (povijest je javna)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Promjene neće utjecati na prethodne poruke, samo na nove. %1$s"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Tko zna čitati povijest"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Samo za članove nakon što su pozvani"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Članovi (cjelokupna povijest)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adrese soba služe za pronalaženje i pristup sobama. Time se također osigurava jednostavno dijeljenje sobe s drugim korisnicima.
+Možete odabrati objavljivanje svoje sobe u javnom direktoriju soba na matičnom poslužitelju."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Objavljivanje sobe"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adrese služe za pronalaženje soba i prostora te pristup njima. Tako ih ujedno možete jednostavno dijeliti s drugima."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Vidljivost"</string>
+  <string name="screen_security_and_privacy_title">"Sigurnost i privatnost"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml b/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
new file mode 100644
index 0000000000..503fdc8efe
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-hu/translations.xml
@@ -0,0 +1,37 @@
+<?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">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
+  <string name="screen_edit_room_address_title">"Cím szerkesztése"</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_option_description">"Mindenkinek hozzáférést kell kérnie."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Csatlakozás kérése"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Igen, engedélyezze a titkosítást"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Az engedélyezés után a szoba titkosítása nem tiltható le. Az üzenetek előzményei csak a szobatagok számára láthatók, amikor meghívást kaptak, vagy mióta csatlakoztak a szobához.
+A szobatagokon kívül senki sem tudja olvasni az üzeneteket. Ez megakadályozhatja a botok és a hidak megfelelő működését.
+Nem javasoljuk a titkosítás engedélyezését az olyan szobákban, amelyeket bárki megtalálhat és csatlakozhat."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Engedélyezi a titkosítást?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Engedélyezés után a titkosítás nem tiltható le."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Titkosítás"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Végpontok közötti titkosítás engedélyezése"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Bárki csatlakozhat."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Bárki"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Csak a meghívott emberek léphetnek be."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Csak meghívásos"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Hozzáférés"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"A tér tagjai"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"A terek jelenleg nem támogatottak"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Szüksége lesz egy szobacímre, hogy láthatóvá tegye a szobakatalógusban."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Cím"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"A szoba megtalálhatóvá tétele a(z) %1$s nyilvános szobakatalógusában való kereséssel."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Lehetővé teszi, hogy a nyilvános szobakatalógusban megtalálható legyen."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Látható a nyilvános szobakatalógusban"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Bárki"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Ki olvashatja az előzményeket"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Csak a tagok, a meghívásuktól kezdődően"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Csak a tagok, a beállítás választásától kezdődően"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"A szobacímek a szobák megtalálásának és elérésnek módjai. Ez azt is biztosítja, hogy könnyen megoszthatja a szobáját másokkal.
+Kiválaszthatja, hogy szobáját közzéteszi-e a Matrix-kiszolgáló nyilvános szobakatalógusában."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Szoba közzététele"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Láthatóság"</string>
+  <string name="screen_security_and_privacy_title">"Biztonság és adatvédelem"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-in/translations.xml b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
new file mode 100644
index 0000000000..ea7668dac5
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-in/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_edit_room_address_room_address_section_footer">"Anda akan memerlukan alamat ruangan untuk membuatnya terlihat dalam direktori."</string>
+  <string name="screen_edit_room_address_title">"Alamat ruangan"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Tambahkan alamat ruangan"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Siapa pun dapat meminta untuk bergabung dengan ruangan tetapi administrator atau moderator harus menerima permintaan tersebut."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Minta untuk bergabung"</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.
+Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat ditemukan dan diikuti oleh siapa pun."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktifkan enkripsi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Setelah diaktifkan, enkripsi tidak dapat dinonaktifkan."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Enkripsi"</string>
+  <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">"Siapa pun"</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_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">"Anda akan memerlukan alamat ruangan untuk membuatnya terlihat dalam direktori."</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_title">"Terlihat di direktori ruangan publik"</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 anggota sejak mereka diundang"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Hanya anggota 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_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
new file mode 100644
index 0000000000..2854a69ce1
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-it/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_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_security_and_privacy_add_room_address_action">"Aggiungi indirizzo"</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_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.
+Non consigliamo di attivare la crittografia per le stanze che chiunque può trovare e in cui può entrare."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Attivare la crittografia?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Una volta attivata, la crittografia non può essere disattivata."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Crittografia"</string>
+  <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_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_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_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_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>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Gli indirizzi sono un modo per trovare e accedere a stanze e spazi. Questo ti consente anche di condividerli facilmente con altri."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilità"</string>
+  <string name="screen_security_and_privacy_title">"Sicurezza e privacy"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ko/translations.xml
new file mode 100644
index 0000000000..e18ba05140
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ko/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="screen_edit_room_address_room_address_section_footer">"디렉토리에 표시하려면 방 주소가 필요합니다."</string>
+  <string name="screen_edit_room_address_title">"방 주소"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"방 주소 추가"</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_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>
+  <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_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_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_directory_visibility_section_footer">"%1$s 공개 방 디렉토리에서 이 방을 검색할 수 있도록 허용합니다"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"공개 룸 디렉토리에 표시됨"</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_title">"보안 및 개인정보 보호"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml b/features/securityandprivacy/impl/src/main/res/values-nb/translations.xml
new file mode 100644
index 0000000000..3a9d90345d
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-nb/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_edit_room_address_room_address_section_footer">"Du trenger en adresse for å gjøre den synlig i den offentlige katalogen."</string>
+  <string name="screen_edit_room_address_title">"Rediger adresse"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Legg til adresse"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle må be om tilgang."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om å bli med"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktiver kryptering"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Når kryptering for et rom er aktivert, kan den ikke deaktiveres. Meldingshistorikken vil bare være synlig for rommedlemmer siden de ble invitert eller siden de ble med i rommet.
+Ingen andre enn rommedlemmene vil kunne lese meldingene. Dette kan føre til at bots og broer ikke fungerer som de skal.
+Vi anbefaler ikke å aktivere kryptering for rom som hvem som helst kan finne og bli med i."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Vil du aktivere kryptering?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Når kryptering er aktivert, kan det ikke deaktiveres."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktiver ende-til-ende-kryptering"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Alle kan bli med."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Alle"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Bare inviterte personer kan bli med."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Kun for inviterte"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Tilgang"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer av område"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Områder støttes ikke for øyeblikket"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du trenger en adresse for å gjøre den synlig i den offentlige katalogen."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillat at dette rommet blir funnet ved å søke %1$s offentlig romkatalog"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i offentlig katalog"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Alle (historikken er offentlig)"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Hvem kan lese historikk"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Medlemmer siden de ble invitert"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Medlemmer (full historikk)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Romadresser er måter å finne og få tilgang til rom på. Dette sikrer også at du enkelt kan dele rommet ditt med andre.
+Du kan velge å publisere rommet ditt i hjemeserverens offentlige romkatalog."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publisering av rom"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Synlighet"</string>
+  <string name="screen_security_and_privacy_title">"Sikkerhet og personvern"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml b/features/securityandprivacy/impl/src/main/res/values-nl/translations.xml
new file mode 100644
index 0000000000..6925a40289
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-nl/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_security_and_privacy_ask_to_join_option_title">"Vraag om toe te treden"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Iedereen"</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
new file mode 100644
index 0000000000..f49f944872
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-pl/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_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_security_and_privacy_ask_to_join_option_title">"Poproś o dołączenie"</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.
+Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do których każdy może dołączyć."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Włączyć szyfrowanie?"</string>
+  <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_title">"Wszyscy"</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_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_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_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_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_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_title">"Bezpieczeństwo i prywatność"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
new file mode 100644
index 0000000000..658067be2d
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-pt-rBR/translations.xml
@@ -0,0 +1,43 @@
+<?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">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Editar endereço"</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>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Qualquer um em %1$s pode entrar, mas todos os outros devem pedir acesso."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar a criptografia"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a criptografia de uma sala não pode ser desativada. O histórico de mensagens só será visível para os membros da sala desde que foram convidados ou desde que entraram na sala.
+Ninguém além dos membros da sala poderá ler as mensagens. Isso pode impedir que os bots e as pontes funcionem corretamente.
+Não recomendamos que você ative a criptografia para salas que qualquer pessoa possa encontrar e participar."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ativar a criptografia?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a criptografia não poderá ser desativada."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Criptografia"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar a criptografia de ponta a ponta"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer um pode entrar"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Escolha os espaços dos quais os membros podem entrar nesta sala sem um convite. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gerenciar espaços"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Apenas pessoas convidadas podem entrar."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Privado"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Qualquer um em espaços autorizados podem entrar."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Qualquer um em %1$s pode entrar."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"No momento, não há suporte aos espaços"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Você precisará de um endereço para torná-la visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Endereço publicado"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permitir que esta sala seja encontrada pesquisando diretório de salas públicas de %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permite que seja encontrada ao buscar no diretório público."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Membros desde o convite"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Membros (histórico completo)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhar facilmente sua sala com outras pessoas.
+Você pode optar por publicar sua sala no diretório público de salas do seu servidor-casa."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicação da sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Os endereços das salas são formas de encontrar e acessar as salas. Isso também garante que você possa compartilhá-las facilmente com outras pessoas."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade"</string>
+  <string name="screen_security_and_privacy_title">"Segurança e privacidade"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pt/translations.xml
new file mode 100644
index 0000000000..26585dc4f9
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-pt/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_edit_room_address_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
+  <string name="screen_edit_room_address_title">"Endereço da sala"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço de sala"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador tem que aceitar o pedido."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para participar"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sim, ativar cifragem"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Uma vez ativada, a cifragem não pode ser desativada. O histórico de mensagens só será visível a membros a partir do momento em que foram convidados ou que entraram na sala.
+Ninguém além dos membros poderão ler quaisquer mensagens. Isto pode impedir que robôs (\"bots\") e pontes (\"bridges\") funcionem devidamente.
+Não recomendamos ativar a cifragem em salas que qualquer pessoa possa encontrar e entrar."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Ativar cifragem?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Uma vez ativada, a cifragem não pode ser desativada."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Cifragem"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Ativar cifragem ponta-a-ponta"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Qualquer pessoa pode encontrar a sala e entrar"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Só é possível entrar tendo um convite"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Apenas por convite"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Acesso à sala"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membros do espaço"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Os espaços ainda não estão implementados"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"É necessário um endereço para tornar a sala visível no diretório."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Endereço da sala"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permite que esta sala seja encontrada através do diretório público do %1$s."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visível no diretório público de salas"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Qualquer pessoa"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Quem pode ler o histórico de mensagens"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Apenas membros, desde o momento em que forem convidados"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Apenas membros, desde o memento em que esta opção for selecionada"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Estes endereços permitem encontrar e aceder a sala, bem como a sua fácil partilha com outros.
+Podes escolher publicar a sala no diretório público do teu servidor."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Publicar sala"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilidade da sala"</string>
+  <string name="screen_security_and_privacy_title">"Segurança e privacidade"</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
new file mode 100644
index 0000000000..701cb72370
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
@@ -0,0 +1,43 @@
+<?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">"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_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">"Cereț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. 
+Nimeni în afară de membrii camerei nu va putea citi messaje. Acest lucru poate împiedica funcționarea corectă a boților și a punților. 
+Nu recomandăm activarea criptării pentru camerele pe care oricine le poate găsi și la care se poate alătura."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Activați criptarea?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Odată activată, criptarea nu poate fi dezactivată."</string>
+  <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_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 camere 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_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_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>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresele sunt o modalitate de a găsi și accesa camere și spații. Acest lucru asigură, de asemenea, că le puteți partaja cu ușurință cu alții."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Vizibilitate"</string>
+  <string name="screen_security_and_privacy_title">"Securitate &amp; confidențialitate"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..1a138fbb94
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
@@ -0,0 +1,37 @@
+<?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_security_and_privacy_add_room_address_action">"Добавить адрес"</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_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>
+  <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_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_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_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_header">"Видимость"</string>
+  <string name="screen_security_and_privacy_title">"Безопасность и конфиденциальность"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..ee346dd5d0
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-sk/translations.xml
@@ -0,0 +1,42 @@
+<?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">"Budete potrebovať adresu, aby sa zobrazovala vo verejnom adresári."</string>
+  <string name="screen_edit_room_address_title">"Upraviť adresu"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Pridať adresu"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Všetci musia požiadať o prístup."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Požiadať o pripojenie"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Áno, povoliť šifrovanie"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po aktivácii nie je možné zakázať šifrovanie pre miestnosť. História správ bude viditeľná len pre členov miestnosti, odkedy boli pozvaní alebo keď vstúpili do miestnosti. 
+Nikto okrem členov miestnosti nebude môcť čítať správy. 
+To môže brániť správnemu fungovaniu robotov a premostení. Neodporúčame povoliť šifrovanie pre miestnosti, ktoré môže ktokoľvek nájsť a pripojiť sa k nim."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Povoliť šifrovanie?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Po zapnutí už šifrovanie nie je možné vypnúť."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Šifrovanie"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Povoliť end-to-end šifrovanie"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Pripojiť sa môže ktokoľvek."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Ktokoľvek"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Vyberte, ktorých členovia priestorov sa môžu pripojiť k tejto miestnosti bez pozvánky.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Spravovať priestory"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Pripojiť sa môžu iba pozvaní ľudia."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Iba na pozvánku"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Prístup"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Ktokoľvek v povolených priestoroch sa môže pripojiť."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Ktokoľvek v %1$s sa môže pripojiť."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Členovia priestoru"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Priestory momentálne nie sú podporované"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Budete potrebovať adresu, aby sa zobrazovala vo verejnom adresári."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Umožniť vyhľadanie tejto miestnosti v adresári verejných miestností %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umožniť nájdenie vyhľadávaním vo verejnom adresári."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Viditeľné vo verejnom adresári"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokoľvek"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Kto môže čítať históriu"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Len pre členov, odkedy boli pozvaní"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Len členovia od zvolenia tejto možnosti"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy miestností predstavujú spôsoby, ako nájsť a získať prístup k miestnostiam. To tiež zaisťuje, že môžete jednoducho zdieľať svoju miestnosť s ostatnými. 
+Môžete sa rozhodnúť zverejniť svoju miestnosť v adresári verejných miestností vášho domovského servera."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Zverejnenie miestnosti"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy sú spôsob, ako nájsť a získať prístup do miestností a priestorov. To tiež zabezpečuje, že ich môžete jednoducho zdieľať s ostatnými."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Viditeľnosť"</string>
+  <string name="screen_security_and_privacy_title">"Bezpečnosť a súkromie"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml b/features/securityandprivacy/impl/src/main/res/values-sv/translations.xml
new file mode 100644
index 0000000000..c77201aa5b
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-sv/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="screen_edit_room_address_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i katalogen."</string>
+  <string name="screen_edit_room_address_title">"Rumsadress"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Lägg till rumsadress"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Vem som helst kan be om att gå med i rummet men en administratör eller moderator måste acceptera begäran."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om att gå med"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ja, aktivera kryptering"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"När det är aktiverat kan kryptering för ett rum inte inaktiveras, meddelandehistoriken visas bara för rumsmedlemmar sedan de blev inbjudna eller sedan de gick med i rummet.
+Ingen förutom rumsmedlemmarna kommer att kunna läsa meddelanden. Detta kan förhindra att bots och bridges fungerar korrekt.
+Vi rekommenderar inte att aktivera kryptering för rum som vem som helst kan hitta och gå med i."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktivera kryptering?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Efter aktivering kan kryptering inte inaktiveras."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Kryptering"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktivera totalsträckskryptering"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Vem som helst kan hitta och gå med"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Vem som helst"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Användare kan bara gå med om de är inbjudna"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Endast inbjudan"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Tillgång till rum"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Utrymmesmedlemmar"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Utrymmen stöds för närvarande inte"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Du behöver en rumsadress för att göra den synlig i katalogen."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Tillåt att detta rum hittas genom att söka i den offentliga rumskatalogen på %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Synlig i katalogen för offentliga rum"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Vem kan läsa historik"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Endast medlemmar sedan de bjöds in"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Endast medlemmar sedan det här alternativet har valts"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Rumsadresser är sätt att hitta och komma åt rum. Detta säkerställer också att du enkelt kan dela ditt rum med andra.
+Du kan välja att publicera ditt rum i din hemservers offentliga rumskatalog."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Rumspublicering"</string>
+  <string name="screen_security_and_privacy_title">"Säkerhet och sekretess"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-tr/translations.xml
new file mode 100644
index 0000000000..940fdc9a91
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-tr/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_edit_room_address_room_address_section_footer">"Dizinde görünür hale getirmek için bir oda adresine ihtiyacınız olacak."</string>
+  <string name="screen_edit_room_address_title">"Oda adresi"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Oda adresi ekle"</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>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Katılmak için sor"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Evet, şifrelemeyi etkinleştir"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Etkinleştirildikten sonra, bir oda için şifreleme devre dışı bırakılamaz, Mesaj geçmişi yalnızca davet edildiklerinden veya odaya katıldıklarından beri oda üyeleri için görünür olacaktır.
+Oda üyeleri dışında hiç kimse mesajları okuyamayacaktır. Bu, botların ve köprülerin düzgün çalışmasını engelleyebilir.
+Herkesin bulabileceği ve katılabileceği odalar için şifrelemenin etkinleştirilmesini önermiyoruz."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Şifrelemeyi etkinleştir?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Açıldıktan donra şifreleme kapatılamaz."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Şifreleme"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Uçtan uca şifrelemeyi etkinleştir"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Herkes bulabilir ve katılabilir"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Herkes"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"İnsanlar yalnızca davet edildiklerinde katılabilirler"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Yalnızca davet"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Oda Erişimi"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Alan üyeleri"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Alanlar şu anda desteklenmiyor"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Dizinde görünür hale getirmek için bir oda adresine ihtiyacınız olacak."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Oda adresi"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu odanın %1$s genel oda dizininde arama yapılarak bulunmasına izin verin"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Genel oda dizininde görünür"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Herkes"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Geçmişi kimler okuyabilir ?"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Sadece üyeler (davet edildiklerinden beri)"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Bu seçeneği seçtiğinden beri yalnızca üyeler"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Oda adresleri, odaları bulmanın ve odalara erişmenin yoludur. Bu aynı zamanda odanızı başkalarıyla kolayca paylaşabilmenizi sağlar.
+Odanızı ana sunucunuzun genel oda dizininde yayınlamayı seçebilirsiniz."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Oda yayınlama"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Oda görünürlüğü"</string>
+  <string name="screen_security_and_privacy_title">"Güvenlik ve gizlilik"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..511ebbd980
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-uk/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_edit_room_address_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
+  <string name="screen_edit_room_address_title">"Адреса кімнати"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Додати адресу кімнати"</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_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>
+  <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_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_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_title">"Видима в каталозі загальнодоступних кімнат"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Будь-хто"</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_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
new file mode 100644
index 0000000000..671308c8a1
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-uz/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_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_security_and_privacy_add_room_address_action">"Xona manzilini kiritish"</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‘shilishni so‘rang"</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.
+Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shifrlashni yoqishni tavsiya etmaymiz."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Shifrlash yoqilsinmi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Yoqilgandan keyin shifrlashni faolsizlantirish imkonsiz."</string>
+  <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_invite_only_option_description">"Odamlar faqat taklif qilingan taqdirdagina qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Faqat taklif qilish"</string>
+  <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_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_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_title">"Umumiy xona ro‘yxatida ko‘rinadi"</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_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>
+  <string name="screen_security_and_privacy_title">"Xavfsizlik va maxfiylik"</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
new file mode 100644
index 0000000000..93e5880ae1
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
@@ -0,0 +1,37 @@
+<?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_security_and_privacy_add_room_address_action">"新增地址"</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_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>
+  <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_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_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_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_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
new file mode 100644
index 0000000000..ef9051ab97
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-zh/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_edit_room_address_room_address_section_footer">"你需要房间地址才能使其在目录中可见。"</string>
+  <string name="screen_edit_room_address_title">"房间地址"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"添加房间地址"</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_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>
+  <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_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_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_title">"在公共房间目录中可见"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</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_header">"房间可见性"</string>
+  <string name="screen_security_and_privacy_title">"安全与隐私"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values/localazy.xml b/features/securityandprivacy/impl/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..acf4b04e71
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values/localazy.xml
@@ -0,0 +1,45 @@
+<?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">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_edit_room_address_title">"Edit address"</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>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Ask to join"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Anyone in %1$s can join, but everyone else must request access."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Yes, enable encryption"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Once enabled, encryption for a room cannot be disabled, Message history will only be visible for room members since they were invited or since they joined the room.
+No one besides the room members will be able to read messages. This may prevent bots and bridges to work correctly.
+We do not recommend enabling encryption for rooms that anyone can find and join."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Enable encryption?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Once enabled, encryption cannot be disabled."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Encryption"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Enable end-to-end encryption"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Anyone can join."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Anyone"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Choose which spaces’ members can join this room without an invitation.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Manage spaces"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Only invited people can join."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Invite only"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Access"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Anyone in authorised spaces can join."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Anyone in %1$s can join."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space members"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces are not currently supported"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Address"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Allow for this room to be found by searching %1$s public room directory"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Allow to be found by searching the public directory."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible in public directory"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Anyone (history is public)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Changes won\'t affect past messages, only new ones. %1$s"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Who can read history"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Members since invited"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Members (full history)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.
+You can choose to publish your room in your homeserver public room directory."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Room publishing"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Addresses are a way to find and access rooms and spaces. This also ensures you can easily share them with others."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibility"</string>
+  <string name="screen_security_and_privacy_title">"Security &amp; privacy"</string>
+</resources>
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/FakeSecurityAndPrivacyNavigator.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/FakeSecurityAndPrivacyNavigator.kt
similarity index 72%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/FakeSecurityAndPrivacyNavigator.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/FakeSecurityAndPrivacyNavigator.kt
index 0d68afae1c..f90040d3fb 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/FakeSecurityAndPrivacyNavigator.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/FakeSecurityAndPrivacyNavigator.kt
@@ -1,18 +1,24 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeSecurityAndPrivacyNavigator(
+    private val onDoneLambda: () -> Unit = { lambdaError() },
     private val openEditRoomAddressLambda: () -> Unit = { lambdaError() },
     private val closeEditRoomAddressLambda: () -> Unit = { lambdaError() },
 ) : SecurityAndPrivacyNavigator {
+    override fun onDone() {
+        onDoneLambda()
+    }
+
     override fun openEditRoomAddress() {
         openEditRoomAddressLambda()
     }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
similarity index 66%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
index bc2a3f62f7..c035b5510d 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyPresenterTest.kt
@@ -1,24 +1,36 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyEvent
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyHistoryVisibility
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyPresenter
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyRoomAccess
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
+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.StateEventType
 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.powerlevels.RoomPermissions
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 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.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.tests.testutils.lambda.assert
+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.test.runTest
@@ -38,6 +50,7 @@ class SecurityAndPrivacyPresenterTest {
                 assertThat(showRoomVisibilitySections).isFalse()
                 assertThat(showHistoryVisibilitySection).isFalse()
                 assertThat(showEncryptionSection).isFalse()
+                assertThat(isKnockEnabled).isFalse()
             }
             with(awaitItem()) {
                 assertThat(editedSettings).isEqualTo(savedSettings)
@@ -48,6 +61,7 @@ class SecurityAndPrivacyPresenterTest {
                 assertThat(showRoomVisibilitySections).isFalse()
                 assertThat(showHistoryVisibilitySection).isTrue()
                 assertThat(showEncryptionSection).isTrue()
+                assertThat(isKnockEnabled).isFalse()
             }
         }
     }
@@ -56,21 +70,21 @@ class SecurityAndPrivacyPresenterTest {
     fun `present - room info change updates saved and edited settings`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-            canSendStateResult = { _, _ -> Result.success(true) },
-            initialRoomInfo = aRoomInfo(
-                joinRule = JoinRule.Public,
-                historyVisibility = RoomHistoryVisibility.WorldReadable,
-                canonicalAlias = A_ROOM_ALIAS,
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(
+                    joinRule = JoinRule.Public,
+                    historyVisibility = RoomHistoryVisibility.WorldReadable,
+                    canonicalAlias = A_ROOM_ALIAS,
+                )
             )
         )
-        )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
             skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings).isEqualTo(savedSettings)
                 assertThat(editedSettings.roomAccess).isEqualTo(SecurityAndPrivacyRoomAccess.Anyone)
-                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.Anyone)
+                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.WorldReadable)
                 assertThat(editedSettings.address).isEqualTo(A_ROOM_ALIAS.value)
                 assertThat(canBeSaved).isFalse()
             }
@@ -86,13 +100,13 @@ class SecurityAndPrivacyPresenterTest {
             with(awaitItem()) {
                 assertThat(editedSettings.roomAccess).isEqualTo(SecurityAndPrivacyRoomAccess.InviteOnly)
                 assertThat(showRoomVisibilitySections).isFalse()
-                eventSink(SecurityAndPrivacyEvents.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.Anyone))
+                eventSink(SecurityAndPrivacyEvent.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.Anyone))
             }
             with(awaitItem()) {
                 assertThat(editedSettings.roomAccess).isEqualTo(SecurityAndPrivacyRoomAccess.Anyone)
                 assertThat(showRoomVisibilitySections).isTrue()
                 assertThat(canBeSaved).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.InviteOnly))
+                eventSink(SecurityAndPrivacyEvent.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.InviteOnly))
             }
             with(awaitItem()) {
                 assertThat(editedSettings.roomAccess).isEqualTo(SecurityAndPrivacyRoomAccess.InviteOnly)
@@ -108,16 +122,16 @@ class SecurityAndPrivacyPresenterTest {
         presenter.test {
             skipItems(1)
             with(awaitItem()) {
-                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.SinceSelection)
-                eventSink(SecurityAndPrivacyEvents.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.SinceInvite))
+                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.Shared)
+                eventSink(SecurityAndPrivacyEvent.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.Invited))
             }
             with(awaitItem()) {
-                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.SinceInvite)
+                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.Invited)
                 assertThat(canBeSaved).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.SinceSelection))
+                eventSink(SecurityAndPrivacyEvent.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.Shared))
             }
             with(awaitItem()) {
-                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.SinceSelection)
+                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.Shared)
                 assertThat(canBeSaved).isFalse()
             }
         }
@@ -130,26 +144,26 @@ class SecurityAndPrivacyPresenterTest {
             skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings.isEncrypted).isFalse()
-                eventSink(SecurityAndPrivacyEvents.ToggleEncryptionState)
+                eventSink(SecurityAndPrivacyEvent.ToggleEncryptionState)
             }
             with(awaitItem()) {
                 assertThat(showEnableEncryptionConfirmation).isTrue()
-                eventSink(SecurityAndPrivacyEvents.CancelEnableEncryption)
+                eventSink(SecurityAndPrivacyEvent.CancelEnableEncryption)
             }
             with(awaitItem()) {
                 assertThat(showEnableEncryptionConfirmation).isFalse()
-                eventSink(SecurityAndPrivacyEvents.ToggleEncryptionState)
+                eventSink(SecurityAndPrivacyEvent.ToggleEncryptionState)
             }
             with(awaitItem()) {
                 assertThat(showEnableEncryptionConfirmation).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ConfirmEnableEncryption)
+                eventSink(SecurityAndPrivacyEvent.ConfirmEnableEncryption)
             }
             skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings.isEncrypted).isTrue()
                 assertThat(showEnableEncryptionConfirmation).isFalse()
                 assertThat(canBeSaved).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ToggleEncryptionState)
+                eventSink(SecurityAndPrivacyEvent.ToggleEncryptionState)
             }
             skipItems(1)
             with(awaitItem()) {
@@ -163,10 +177,10 @@ class SecurityAndPrivacyPresenterTest {
     fun `present - room visibility loading and change`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-            canSendStateResult = { _, _ -> Result.success(true) },
-            getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
-            initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared)
-        )
+                roomPermissions = roomPermissions(),
+                getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
+                initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared)
+            )
         )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
@@ -176,12 +190,12 @@ class SecurityAndPrivacyPresenterTest {
             }
             with(awaitItem()) {
                 assertThat(editedSettings.isVisibleInRoomDirectory).isEqualTo(AsyncData.Success(false))
-                eventSink(SecurityAndPrivacyEvents.ToggleRoomVisibility)
+                eventSink(SecurityAndPrivacyEvent.ToggleRoomVisibility)
             }
             with(awaitItem()) {
                 assertThat(editedSettings.isVisibleInRoomDirectory).isEqualTo(AsyncData.Success(true))
                 assertThat(canBeSaved).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ToggleRoomVisibility)
+                eventSink(SecurityAndPrivacyEvent.ToggleRoomVisibility)
             }
             with(awaitItem()) {
                 assertThat(editedSettings.isVisibleInRoomDirectory).isEqualTo(AsyncData.Success(false))
@@ -193,12 +207,12 @@ class SecurityAndPrivacyPresenterTest {
     @Test
     fun `present - edit room address`() = runTest {
         val openEditRoomAddressLambda = lambdaRecorder<Unit> { }
-        val navigator = FakeSecurityAndPrivacyNavigator(openEditRoomAddressLambda)
+        val navigator = FakeSecurityAndPrivacyNavigator(openEditRoomAddressLambda = openEditRoomAddressLambda)
         val presenter = createSecurityAndPrivacyPresenter(navigator = navigator)
         presenter.test {
             skipItems(1)
             with(awaitItem()) {
-                eventSink(SecurityAndPrivacyEvents.EditRoomAddress)
+                eventSink(SecurityAndPrivacyEvent.EditRoomAddress)
             }
             assert(openEditRoomAddressLambda).isCalledOnce()
         }
@@ -212,37 +226,44 @@ class SecurityAndPrivacyPresenterTest {
         val updateRoomHistoryVisibilityLambda = lambdaRecorder<RoomHistoryVisibility, Result<Unit>> { Result.success(Unit) }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-            canSendStateResult = { _, _ -> Result.success(true) },
-            getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
-            initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite, historyVisibility = RoomHistoryVisibility.Shared)
-        ),
+                roomPermissions = roomPermissions(),
+                getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
+                initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite, historyVisibility = RoomHistoryVisibility.Shared)
+            ),
             enableEncryptionResult = enableEncryptionLambda,
             updateJoinRuleResult = updateJoinRuleLambda,
             updateRoomVisibilityResult = updateRoomVisibilityLambda,
             updateRoomHistoryVisibilityResult = updateRoomHistoryVisibilityLambda,
         )
-        val presenter = createSecurityAndPrivacyPresenter(room = room)
+        val onDoneLambda = lambdaRecorder<Unit> { }
+        val navigator = FakeSecurityAndPrivacyNavigator(
+            onDoneLambda = onDoneLambda,
+        )
+        val presenter = createSecurityAndPrivacyPresenter(
+            room = room,
+            navigator = navigator,
+        )
         presenter.test {
-            skipItems(2)
+            skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings.roomAccess).isEqualTo(SecurityAndPrivacyRoomAccess.InviteOnly)
-                eventSink(SecurityAndPrivacyEvents.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.Anyone))
+                eventSink(SecurityAndPrivacyEvent.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.Anyone))
             }
             with(awaitItem()) {
-                eventSink(SecurityAndPrivacyEvents.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.Anyone))
+                eventSink(SecurityAndPrivacyEvent.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.WorldReadable))
             }
             with(awaitItem()) {
-                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.Anyone)
-                eventSink(SecurityAndPrivacyEvents.ConfirmEnableEncryption)
+                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.WorldReadable)
+                eventSink(SecurityAndPrivacyEvent.ConfirmEnableEncryption)
             }
             skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings.isEncrypted).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ToggleRoomVisibility)
+                eventSink(SecurityAndPrivacyEvent.ToggleRoomVisibility)
             }
             with(awaitItem()) {
                 assertThat(editedSettings.isVisibleInRoomDirectory).isEqualTo(AsyncData.Success(true))
-                eventSink(SecurityAndPrivacyEvents.Save)
+                eventSink(SecurityAndPrivacyEvent.Save)
             }
             with(awaitItem()) {
                 assertThat(saveAction).isEqualTo(AsyncAction.Loading)
@@ -255,8 +276,8 @@ class SecurityAndPrivacyPresenterTest {
                     isEncrypted = true,
                 )
             )
-            // Saved settings are updated 3 times to match the edited settings
-            skipItems(3)
+            // Saved settings are updated 2 times to match the edited settings
+            skipItems(2)
             with(awaitItem()) {
                 assertThat(saveAction).isEqualTo(AsyncAction.Success(Unit))
                 assertThat(savedSettings).isEqualTo(editedSettings)
@@ -266,6 +287,7 @@ class SecurityAndPrivacyPresenterTest {
             assert(updateJoinRuleLambda).isCalledOnce()
             assert(updateRoomVisibilityLambda).isCalledOnce()
             assert(updateRoomHistoryVisibilityLambda).isCalledOnce()
+            onDoneLambda.assertions().isCalledOnce()
         }
     }
 
@@ -279,10 +301,10 @@ class SecurityAndPrivacyPresenterTest {
         val updateRoomHistoryVisibilityLambda = lambdaRecorder<RoomHistoryVisibility, Result<Unit>> { Result.success(Unit) }
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-            canSendStateResult = { _, _ -> Result.success(true) },
-            getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
-            initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
-        ),
+                roomPermissions = roomPermissions(),
+                getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
+                initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
+            ),
             enableEncryptionResult = enableEncryptionLambda,
             updateJoinRuleResult = updateJoinRuleLambda,
             updateRoomVisibilityResult = updateRoomVisibilityLambda,
@@ -290,26 +312,26 @@ class SecurityAndPrivacyPresenterTest {
         )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
-            skipItems(2)
+            skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings.roomAccess).isEqualTo(SecurityAndPrivacyRoomAccess.InviteOnly)
-                eventSink(SecurityAndPrivacyEvents.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.Anyone))
+                eventSink(SecurityAndPrivacyEvent.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.Anyone))
             }
             with(awaitItem()) {
-                eventSink(SecurityAndPrivacyEvents.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.Anyone))
+                eventSink(SecurityAndPrivacyEvent.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.WorldReadable))
             }
             with(awaitItem()) {
-                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.Anyone)
-                eventSink(SecurityAndPrivacyEvents.ConfirmEnableEncryption)
+                assertThat(editedSettings.historyVisibility).isEqualTo(SecurityAndPrivacyHistoryVisibility.WorldReadable)
+                eventSink(SecurityAndPrivacyEvent.ConfirmEnableEncryption)
             }
             skipItems(1)
             with(awaitItem()) {
                 assertThat(editedSettings.isEncrypted).isTrue()
-                eventSink(SecurityAndPrivacyEvents.ToggleRoomVisibility)
+                eventSink(SecurityAndPrivacyEvent.ToggleRoomVisibility)
             }
             with(awaitItem()) {
                 assertThat(editedSettings.isVisibleInRoomDirectory).isEqualTo(AsyncData.Success(true))
-                eventSink(SecurityAndPrivacyEvents.Save)
+                eventSink(SecurityAndPrivacyEvent.Save)
             }
             with(awaitItem()) {
                 assertThat(saveAction).isEqualTo(AsyncAction.Loading)
@@ -322,8 +344,9 @@ class SecurityAndPrivacyPresenterTest {
                 )
             )
             // Saved settings are updated 2 times to match the edited settings
-            skipItems(3)
-            with(awaitItem()) {
+            skipItems(2)
+            val state = awaitItem()
+            with(state) {
                 assertThat(saveAction).isInstanceOf(AsyncAction.Failure::class.java)
                 assertThat(savedSettings.isVisibleInRoomDirectory).isNotEqualTo(editedSettings.isVisibleInRoomDirectory)
                 assertThat(canBeSaved).isTrue()
@@ -332,26 +355,67 @@ class SecurityAndPrivacyPresenterTest {
             assert(updateJoinRuleLambda).isCalledOnce()
             assert(updateRoomVisibilityLambda).isCalledOnce()
             assert(updateRoomHistoryVisibilityLambda).isCalledOnce()
+            // Clear error
+            state.eventSink(SecurityAndPrivacyEvent.DismissSaveError)
+            with(awaitItem()) {
+                assertThat(saveAction).isEqualTo(AsyncAction.Uninitialized)
+            }
         }
     }
 
+    @Test
+    fun `present - isKnockEnabled is true if the Knock feature flag is enabled`() = runTest {
+        val presenter = createSecurityAndPrivacyPresenter(
+            featureFlagService = FakeFeatureFlagService(
+                initialState = mapOf(
+                    FeatureFlags.Knock.key to true,
+                )
+            )
+        )
+        presenter.test {
+            assertThat(awaitItem().isKnockEnabled).isFalse()
+            assertThat(awaitItem().isKnockEnabled).isTrue()
+        }
+    }
+
+    private fun roomPermissions(
+        canChangeRoomAccess: Boolean = true,
+        canChangeHistoryVisibility: Boolean = true,
+        canChangeEncryption: Boolean = true,
+        canChangeRoomVisibility: Boolean = true,
+    ): RoomPermissions {
+        return FakeRoomPermissions(
+            canSendState = { eventType ->
+                when (eventType) {
+                    StateEventType.RoomJoinRules -> canChangeRoomAccess
+                    StateEventType.RoomHistoryVisibility -> canChangeHistoryVisibility
+                    StateEventType.RoomEncryption -> canChangeEncryption
+                    StateEventType.RoomCanonicalAlias -> canChangeRoomVisibility
+                    else -> lambdaError()
+                }
+            }
+        )
+    }
+
     private fun createSecurityAndPrivacyPresenter(
         serverName: String = "matrix.org",
         room: FakeJoinedRoom = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                canSendStateResult = { _, _ -> Result.success(true) },
+                roomPermissions = roomPermissions(),
                 getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
                 initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
             ),
         ),
         navigator: SecurityAndPrivacyNavigator = FakeSecurityAndPrivacyNavigator(),
+        featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
     ): SecurityAndPrivacyPresenter {
         return SecurityAndPrivacyPresenter(
             room = room,
             matrixClient = FakeMatrixClient(
                 userIdServerNameLambda = { serverName },
             ),
-            navigator = navigator
+            navigator = navigator,
+            featureFlagService = featureFlagService,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
similarity index 56%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyViewTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
index 9bbd770334..b15bc2fe37 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyViewTest.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy
+package io.element.android.features.securityandprivacy.impl
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -13,13 +14,19 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.features.roomdetails.impl.R
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyEvent
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyHistoryVisibility
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyRoomAccess
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyState
+import io.element.android.features.securityandprivacy.impl.root.SecurityAndPrivacyView
+import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacySettings
+import io.element.android.features.securityandprivacy.impl.root.aSecurityAndPrivacyState
+import io.element.android.libraries.architecture.AsyncAction
 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.pressBack
 import org.junit.Rule
 import org.junit.Test
@@ -32,29 +39,54 @@ class SecurityAndPrivacyViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
-    fun `click on back invokes expected callback`() {
-        ensureCalledOnce { callback ->
-            rule.setSecurityAndPrivacyView(
-                onBackClick = callback,
-            )
-            rule.pressBack()
-        }
+    fun `click on back invokes emits the expected event`() {
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
+        val state = aSecurityAndPrivacyState(
+            eventSink = recorder,
+        )
+        rule.setSecurityAndPrivacyView(state)
+        rule.pressBack()
+        recorder.assertSingle(SecurityAndPrivacyEvent.Exit)
+    }
+
+    @Test
+    fun `discard cancellation emits the expected event`() {
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
+        val state = aSecurityAndPrivacyState(
+            saveAction = AsyncAction.ConfirmingCancellation,
+            eventSink = recorder,
+        )
+        rule.setSecurityAndPrivacyView(state)
+        rule.clickOn(CommonStrings.action_discard)
+        recorder.assertSingle(SecurityAndPrivacyEvent.Exit)
+    }
+
+    @Test
+    fun `save cancellation confirmation emits the expected event`() {
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
+        val state = aSecurityAndPrivacyState(
+            saveAction = AsyncAction.ConfirmingCancellation,
+            eventSink = recorder,
+        )
+        rule.setSecurityAndPrivacyView(state)
+        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        recorder.assertSingle(SecurityAndPrivacyEvent.Save)
     }
 
     @Test
     fun `click on room access item emits the expected event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        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)
-        recorder.assertSingle(SecurityAndPrivacyEvents.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.InviteOnly))
+        recorder.assertSingle(SecurityAndPrivacyEvent.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.InviteOnly))
     }
 
     @Test
     fun `click on disabled save doesn't emit event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>(expectEvents = false)
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>(expectEvents = false)
         val state = aSecurityAndPrivacyState(eventSink = recorder)
         rule.setSecurityAndPrivacyView(state)
         rule.clickOn(CommonStrings.action_save)
@@ -63,7 +95,7 @@ class SecurityAndPrivacyViewTest {
 
     @Test
     fun `click on enabled save emits the expected event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             editedSettings = aSecurityAndPrivacySettings(
@@ -72,14 +104,14 @@ class SecurityAndPrivacyViewTest {
         )
         rule.setSecurityAndPrivacyView(state)
         rule.clickOn(CommonStrings.action_save)
-        recorder.assertSingle(SecurityAndPrivacyEvents.Save)
+        recorder.assertSingle(SecurityAndPrivacyEvent.Save)
     }
 
     @Test
     @Config(qualifiers = "h640dp")
     fun `click on room address item emits the expected event`() {
         val address = "@alias:matrix.org"
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             editedSettings = aSecurityAndPrivacySettings(
@@ -89,13 +121,13 @@ class SecurityAndPrivacyViewTest {
         )
         rule.setSecurityAndPrivacyView(state)
         rule.onNodeWithText(address).performClick()
-        recorder.assertSingle(SecurityAndPrivacyEvents.EditRoomAddress)
+        recorder.assertSingle(SecurityAndPrivacyEvent.EditRoomAddress)
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
     fun `click on room visibility item emits the expected event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             editedSettings = aSecurityAndPrivacySettings(
@@ -105,47 +137,47 @@ class SecurityAndPrivacyViewTest {
         )
         rule.setSecurityAndPrivacyView(state)
         rule.clickOn(R.string.screen_security_and_privacy_room_directory_visibility_toggle_title)
-        recorder.assertSingle(SecurityAndPrivacyEvents.ToggleRoomVisibility)
+        recorder.assertSingle(SecurityAndPrivacyEvent.ToggleRoomVisibility)
     }
 
     @Test
-    @Config(qualifiers = "h640dp")
+    @Config(qualifiers = "h1024dp")
     fun `click on history visibility item emits the expected event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             editedSettings = aSecurityAndPrivacySettings(
-                historyVisibility = SecurityAndPrivacyHistoryVisibility.SinceSelection,
+                historyVisibility = SecurityAndPrivacyHistoryVisibility.Invited,
             ),
         )
         rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_room_history_since_selecting_option_title)
-        recorder.assertSingle(SecurityAndPrivacyEvents.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.SinceSelection))
+        rule.clickOn(R.string.screen_security_and_privacy_room_history_since_invite_option_title)
+        recorder.assertSingle(SecurityAndPrivacyEvent.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.Invited))
     }
 
     @Test
-    @Config(qualifiers = "h640dp")
+    @Config(qualifiers = "h1024dp")
     fun `click on encryption item emits the expected event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        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)
-        recorder.assertSingle(SecurityAndPrivacyEvents.ToggleEncryptionState)
+        recorder.assertSingle(SecurityAndPrivacyEvent.ToggleEncryptionState)
     }
 
     @Test
     fun `click on encryption confirm emits the expected event`() {
-        val recorder = EventsRecorder<SecurityAndPrivacyEvents>()
+        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)
-        recorder.assertSingle(SecurityAndPrivacyEvents.ConfirmEnableEncryption)
+        recorder.assertSingle(SecurityAndPrivacyEvent.ConfirmEnableEncryption)
     }
 }
 
@@ -153,12 +185,12 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSecur
     state: SecurityAndPrivacyState = aSecurityAndPrivacyState(
         eventSink = EventsRecorder(expectEvents = false),
     ),
-    onBackClick: () -> Unit = EnsureNeverCalled(),
+    onLinkClick: (String) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setContent {
         SecurityAndPrivacyView(
             state = state,
-            onBackClick = onBackClick,
+            onLinkClick = onLinkClick,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt
similarity index 92%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt
index 9b9cb4120c..aac25ec018 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressPresenterTest.kt
@@ -1,16 +1,16 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.roomdetails.impl.aJoinedRoom
-import io.element.android.features.roomdetails.impl.securityandprivacy.FakeSecurityAndPrivacyNavigator
-import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.FakeSecurityAndPrivacyNavigator
+import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -20,6 +20,7 @@ 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.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.alias.FakeRoomAliasHelper
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
 import io.element.android.tests.testutils.lambda.assert
@@ -30,11 +31,13 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import java.util.Optional
 
-class EditBaseRoomAddressPresenterTest {
+class EditRoomAddressPresenterTest {
     @Test
     fun `present - initial state no address`() = runTest {
         val presenter = createEditRoomAddressPresenter(
-            room = aJoinedRoom(displayName = "")
+            room = FakeJoinedRoom().apply {
+                givenRoomInfo(aRoomInfo(name = ""))
+            }
         )
         presenter.test {
             with(awaitItem()) {
@@ -49,9 +52,9 @@ class EditBaseRoomAddressPresenterTest {
 
     @Test
     fun `present - initial state address matching own homeserver`() = runTest {
-        val room = aJoinedRoom(
-            canonicalAlias = RoomAlias("#canonical:matrix.org"),
-        )
+        val room = FakeJoinedRoom().apply {
+            givenRoomInfo(aRoomInfo(canonicalAlias = RoomAlias("#canonical:matrix.org")))
+        }
         val presenter = createEditRoomAddressPresenter(room = room)
         presenter.test {
             with(awaitItem()) {
@@ -66,10 +69,14 @@ class EditBaseRoomAddressPresenterTest {
 
     @Test
     fun `present - initial state address not matching own homeserver`() = runTest {
-        val room = aJoinedRoom(
-            displayName = "",
-            canonicalAlias = RoomAlias("#canonical:notmatrix.org"),
-        )
+        val room = FakeJoinedRoom().apply {
+            givenRoomInfo(
+                aRoomInfo(
+                    name = "",
+                    canonicalAlias = RoomAlias("#canonical:notmatrix.org")
+                )
+            )
+        }
         val presenter = createEditRoomAddressPresenter(room = room)
         presenter.test {
             with(awaitItem()) {
@@ -195,12 +202,13 @@ class EditBaseRoomAddressPresenterTest {
 
         val navigator = FakeSecurityAndPrivacyNavigator(closeEditRoomAddressLambda = closeEditAddressLambda)
         val canonicalAlias = RoomAlias("#canonical:matrix.org")
-        val room = aJoinedRoom(
-            canonicalAlias = canonicalAlias,
+        val room = FakeJoinedRoom(
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult,
             removeRoomAliasFromRoomDirectoryResult = removeAliasFromRoomDirectoryResult
-        )
+        ).apply {
+            givenRoomInfo(aRoomInfo(canonicalAlias = canonicalAlias))
+        }
         val presenter = createEditRoomAddressPresenter(room = room, navigator = navigator)
         presenter.test {
             with(awaitItem()) {
@@ -245,12 +253,13 @@ class EditBaseRoomAddressPresenterTest {
 
         val navigator = FakeSecurityAndPrivacyNavigator(closeEditRoomAddressLambda = closeEditAddressLambda)
         val canonicalAlias = RoomAlias("#canonical:notmatrix.org")
-        val room = aJoinedRoom(
-            canonicalAlias = canonicalAlias,
+        val room = FakeJoinedRoom(
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult,
             removeRoomAliasFromRoomDirectoryResult = removeAliasFromRoomDirectoryResult
-        )
+        ).apply {
+            givenRoomInfo(aRoomInfo(canonicalAlias = canonicalAlias))
+        }
         val presenter = createEditRoomAddressPresenter(room = room, navigator = navigator)
         presenter.test {
             with(awaitItem()) {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
similarity index 96%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
rename to features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
index 1d2c716710..17d6f3a88d 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
@@ -1,11 +1,12 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.securityandprivacy.editroomaddress
+package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -28,7 +29,7 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class EditBaseRoomAddressViewTest {
+class EditRoomAddressViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
diff --git a/features/securityandprivacy/test/build.gradle.kts b/features/securityandprivacy/test/build.gradle.kts
new file mode 100644
index 0000000000..903ef6d194
--- /dev/null
+++ b/features/securityandprivacy/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.securityandprivacy.test"
+}
+
+dependencies {
+    implementation(projects.features.securityandprivacy.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt b/features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt
new file mode 100644
index 0000000000..a66fe55bff
--- /dev/null
+++ b/features/securityandprivacy/test/src/main/kotlin/io/element/android/features/securityandprivacy/test/FakeSecurityAndPrivacyEntryPoint.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.securityandprivacy.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeSecurityAndPrivacyEntryPoint : SecurityAndPrivacyEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: SecurityAndPrivacyEntryPoint.Callback,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/share/api/build.gradle.kts b/features/share/api/build.gradle.kts
index e315ab4e8a..06e2b9469a 100644
--- a/features/share/api/build.gradle.kts
+++ b/features/share/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareEntryPoint.kt b/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareEntryPoint.kt
index dd2889e10a..4d8eef9116 100644
--- a/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareEntryPoint.kt
+++ b/features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,21 +13,19 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
-import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface ShareEntryPoint : FeatureEntryPoint {
-    data class Params(val intent: Intent) : NodeInputs
+    data class Params(val intent: Intent)
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone(roomIds: List<RoomId>)
     }
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
 }
diff --git a/features/share/impl/build.gradle.kts b/features/share/impl/build.gradle.kts
index 4c62a06352..73748095a9 100644
--- a/features/share/impl/build.gradle.kts
+++ b/features/share/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -46,4 +47,6 @@ dependencies {
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.mediaupload.test)
     testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.roomselect.test)
+    testImplementation(projects.services.appnavstate.impl)
 }
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt
index fe65c60b73..a8ae4d71c6 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,25 @@ package io.element.android.features.share.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.share.api.ShareEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultShareEntryPoint : ShareEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ShareEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : ShareEntryPoint.NodeBuilder {
-            override fun params(params: ShareEntryPoint.Params): ShareEntryPoint.NodeBuilder {
-                plugins += ShareNode.Inputs(intent = params.intent)
-                return this
-            }
-
-            override fun callback(callback: ShareEntryPoint.Callback): ShareEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<ShareNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ShareEntryPoint.Params,
+        callback: ShareEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<ShareNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ShareNode.Inputs(intent = params.intent),
+                callback,
+            )
+        )
     }
 }
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareEvents.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareEvents.kt
index cb43e579c2..d0e246fe44 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareEvents.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
index b3db111820..9342ef60d4 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,6 @@ import android.os.Build
 import androidx.core.content.IntentCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.compat.queryIntentActivitiesCompat
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAny
@@ -49,7 +49,6 @@ interface ShareIntentHandler {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultShareIntentHandler(
     @ApplicationContext private val context: Context,
 ) : ShareIntentHandler {
@@ -59,8 +58,9 @@ class DefaultShareIntentHandler(
         onPlainText: suspend (String) -> Boolean,
     ): Boolean {
         val type = intent.resolveType(context) ?: return false
+        val uris = getIncomingUris(intent, type)
         return when {
-            type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
+            uris.isEmpty() && type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
             type.isMimeTypeImage() ||
                 type.isMimeTypeVideo() ||
                 type.isMimeTypeAudio() ||
@@ -68,7 +68,6 @@ class DefaultShareIntentHandler(
                 type.isMimeTypeFile() ||
                 type.isMimeTypeText() ||
                 type.isMimeTypeAny() -> {
-                val uris = getIncomingUris(intent, type)
                 val result = onUris(uris)
                 revokeUriPermissions(uris.map { it.uri })
                 result
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 e268419920..b91c484ef3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,6 +24,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.share.api.ShareEntryPoint
 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
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -52,7 +54,7 @@ class ShareNode(
 
     private val inputs = inputs<Inputs>()
     private val presenter = presenterFactory.create(inputs.intent)
-    private val callbacks = plugins.filterIsInstance<ShareEntryPoint.Callback>()
+    private val callback: ShareEntryPoint.Callback = callback()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         val callback = object : RoomSelectEntryPoint.Callback {
@@ -61,14 +63,16 @@ class ShareNode(
             }
 
             override fun onCancel() {
-                navigateUp()
+                callback.onDone(emptyList())
             }
         }
 
-        return roomSelectEntryPoint.nodeBuilder(this, buildContext)
-            .callback(callback)
-            .params(RoomSelectEntryPoint.Params(mode = RoomSelectMode.Share))
-            .build()
+        return roomSelectEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Share),
+            callback = callback,
+        )
     }
 
     @Composable
@@ -82,12 +86,8 @@ class ShareNode(
             val state = presenter.present()
             ShareView(
                 state = state,
-                onShareSuccess = ::onShareSuccess,
+                onShareSuccess = callback::onDone,
             )
         }
     }
-
-    private fun onShareSuccess(roomIds: List<RoomId>) {
-        callbacks.forEach { it.onDone(roomIds) }
-    }
 }
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
index d3222edf5e..4a4086ed87 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,10 +23,8 @@ 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.room.JoinedRoom
-import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
-import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.mediaupload.api.MediaSender
+import io.element.android.libraries.mediaupload.api.MediaSenderRoomFactory
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -38,7 +37,7 @@ class SharePresenter(
     private val sessionCoroutineScope: CoroutineScope,
     private val shareIntentHandler: ShareIntentHandler,
     private val matrixClient: MatrixClient,
-    private val mediaPreProcessor: MediaPreProcessor,
+    private val mediaSenderRoomFactory: MediaSenderRoomFactory,
     private val activeRoomsHolder: ActiveRoomsHolder,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
 ) : Presenter<ShareState> {
@@ -55,7 +54,7 @@ class SharePresenter(
 
     @Composable
     override fun present(): ShareState {
-        fun handleEvents(event: ShareEvents) {
+        fun handleEvent(event: ShareEvents) {
             when (event) {
                 ShareEvents.ClearError -> shareActionState.value = AsyncAction.Uninitialized
             }
@@ -63,7 +62,7 @@ class SharePresenter(
 
         return ShareState(
             shareAction = shareActionState.value,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
@@ -87,12 +86,7 @@ class SharePresenter(
                         roomIds
                             .map { roomId ->
                                 val room = getJoinedRoom(roomId) ?: return@map false
-                                val mediaSender = MediaSender(
-                                    preProcessor = mediaPreProcessor,
-                                    room = room,
-                                    timelineMode = Timeline.Mode.Live,
-                                    mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
-                                )
+                                val mediaSender = mediaSenderRoomFactory.create(room = room)
                                 filesToShare
                                     .map { fileToShare ->
                                         val result = mediaSender.sendMedia(
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareState.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareState.kt
index 948801d341..fd98d58ba3 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareState.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareStateProvider.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareStateProvider.kt
index 5afc622fb9..88f9d42f40 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareStateProvider.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareView.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareView.kt
index 936add8041..ec5897bcad 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareView.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/DefaultShareEntryPointTest.kt b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/DefaultShareEntryPointTest.kt
index 66ee853d26..83a32929ff 100644
--- a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/DefaultShareEntryPointTest.kt
+++ b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/DefaultShareEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,12 +11,11 @@ package io.element.android.features.share.impl
 import android.content.Intent
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.share.api.ShareEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
+import io.element.android.libraries.roomselect.test.FakeRoomSelectEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@@ -37,11 +37,7 @@ class DefaultShareEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 presenterFactory = { createSharePresenter() },
-                roomSelectEntryPoint = object : RoomSelectEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomSelectEntryPoint.NodeBuilder {
-                        lambdaError()
-                    }
-                },
+                roomSelectEntryPoint = FakeRoomSelectEntryPoint(),
             )
         }
         val callback = object : ShareEntryPoint.Callback {
@@ -50,10 +46,12 @@ class DefaultShareEntryPointTest {
         val params = ShareEntryPoint.Params(
             intent = Intent(),
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(ShareNode::class.java)
         assertThat(result.plugins).contains(ShareNode.Inputs(params.intent))
         assertThat(result.plugins).contains(callback)
diff --git a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/FakeShareIntentHandler.kt b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/FakeShareIntentHandler.kt
index 138fb57747..dbb9d1c704 100644
--- a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/FakeShareIntentHandler.kt
+++ b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/FakeShareIntentHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b1b39b2e80..0df1ed7bab 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,18 +17,17 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.media.FileInfo
 import io.element.android.libraries.matrix.test.A_MESSAGE
 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.media.FakeMediaUploadHandler
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
-import io.element.android.libraries.mediaupload.api.MediaPreProcessor
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
+import io.element.android.libraries.mediaupload.api.MediaSenderRoomFactory
 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.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 kotlinx.coroutines.test.TestScope
@@ -36,7 +36,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import java.io.File
 
 @RunWith(RobolectricTestRunner::class)
 class SharePresenterTest {
@@ -120,18 +119,16 @@ class SharePresenterTest {
 
     @Test
     fun `present - send media ok`() = runTest {
-        val sendFileResult =
-            lambdaRecorder<File, FileInfo, String?, String?, EventId?, Result<FakeMediaUploadHandler>> { _, _, _, _, _ ->
-            Result.success(FakeMediaUploadHandler())
-        }
+        val sendMediaResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
         val joinedRoom = FakeJoinedRoom(
-            liveTimeline = FakeTimeline().apply {
-                sendFileLambda = sendFileResult
-            },
+            liveTimeline = FakeTimeline(),
         )
         val matrixClient = FakeMatrixClient().apply {
             givenGetRoomResult(A_ROOM_ID, joinedRoom)
         }
+        val mediaSender = FakeMediaSender(
+            sendMediaResult = sendMediaResult,
+        )
         val presenter = createSharePresenter(
             matrixClient = matrixClient,
             shareIntentHandler = FakeShareIntentHandler { _, onFile, _ ->
@@ -143,7 +140,8 @@ class SharePresenterTest {
                         )
                     )
                 )
-            }
+            },
+            mediaSenderRoomFactory = MediaSenderRoomFactory { mediaSender },
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -155,7 +153,7 @@ class SharePresenterTest {
             val success = awaitItem()
             assertThat(success.shareAction.isSuccess()).isTrue()
             assertThat(success.shareAction).isEqualTo(AsyncAction.Success(listOf(A_ROOM_ID)))
-            sendFileResult.assertions().isCalledOnce()
+            sendMediaResult.assertions().isCalledOnce()
         }
     }
 }
@@ -164,17 +162,17 @@ internal fun TestScope.createSharePresenter(
     intent: Intent = Intent(),
     shareIntentHandler: ShareIntentHandler = FakeShareIntentHandler(),
     matrixClient: MatrixClient = FakeMatrixClient(),
-    mediaPreProcessor: MediaPreProcessor = FakeMediaPreProcessor(),
-    activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(),
-    mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+    activeRoomsHolder: ActiveRoomsHolder = DefaultActiveRoomsHolder(),
+    mediaSenderRoomFactory: MediaSenderRoomFactory = MediaSenderRoomFactory { FakeMediaSender() },
+    mediaOptimizationConfigProvider: MediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
 ): SharePresenter {
     return SharePresenter(
         intent = intent,
         sessionCoroutineScope = this,
         shareIntentHandler = shareIntentHandler,
         matrixClient = matrixClient,
-        mediaPreProcessor = mediaPreProcessor,
         activeRoomsHolder = activeRoomsHolder,
+        mediaSenderRoomFactory = mediaSenderRoomFactory,
         mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
     )
 }
diff --git a/features/signedout/api/build.gradle.kts b/features/signedout/api/build.gradle.kts
index 0cc1bcf092..55031045f9 100644
--- a/features/signedout/api/build.gradle.kts
+++ b/features/signedout/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/signedout/api/src/main/kotlin/io/element/android/features/signedout/api/SignedOutEntryPoint.kt b/features/signedout/api/src/main/kotlin/io/element/android/features/signedout/api/SignedOutEntryPoint.kt
index 9651327dc5..b5e490d4ee 100644
--- a/features/signedout/api/src/main/kotlin/io/element/android/features/signedout/api/SignedOutEntryPoint.kt
+++ b/features/signedout/api/src/main/kotlin/io/element/android/features/signedout/api/SignedOutEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,10 +18,9 @@ interface SignedOutEntryPoint : FeatureEntryPoint {
         val sessionId: SessionId,
     )
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+    ): Node
 }
diff --git a/features/signedout/impl/build.gradle.kts b/features/signedout/impl/build.gradle.kts
index f314cb8283..3c8aac5e25 100644
--- a/features/signedout/impl/build.gradle.kts
+++ b/features/signedout/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPoint.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPoint.kt
index 91def6db8d..1a73c066f5 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPoint.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,21 @@ package io.element.android.features.signedout.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.signedout.api.SignedOutEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSignedOutEntryPoint : SignedOutEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): SignedOutEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : SignedOutEntryPoint.NodeBuilder {
-            override fun params(params: SignedOutEntryPoint.Params): SignedOutEntryPoint.NodeBuilder {
-                plugins += SignedOutNode.Inputs(params.sessionId)
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<SignedOutNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: SignedOutEntryPoint.Params,
+    ): Node {
+        return parentNode.createNode<SignedOutNode>(
+            buildContext = buildContext,
+            plugins = listOf(SignedOutNode.Inputs(params.sessionId))
+        )
     }
 }
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutEvents.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutEvents.kt
index c44b8ec36e..3b78af9918 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutEvents.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
index 1bacc78932..deebde305c 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
index 7c9d1e6d83..1aa13d9b8d 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,7 +43,7 @@ class SignedOutPresenter(
         }.collectAsState(initial = null)
         val coroutineScope = rememberCoroutineScope()
 
-        fun handleEvents(event: SignedOutEvents) {
+        fun handleEvent(event: SignedOutEvents) {
             when (event) {
                 SignedOutEvents.SignInAgain -> coroutineScope.launch {
                     sessionStore.removeSession(sessionId.value)
@@ -53,7 +54,7 @@ class SignedOutPresenter(
         return SignedOutState(
             appName = buildMeta.applicationName,
             signedOutSession = signedOutSession,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutState.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutState.kt
index 725654ca57..bc1ee18f5a 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutState.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.signedout.impl
 
 import io.element.android.libraries.sessionstorage.api.SessionData
 
-// Do not use default value, so no member get forgotten in the presenters.
 data class SignedOutState(
     val appName: String,
     val signedOutSession: SessionData?,
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 a7b95a8537..396339adbb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -36,7 +37,6 @@ private fun aSessionData(
         refreshToken = "aRefreshToken",
         homeserverUrl = "aHomeserverUrl",
         oidcData = null,
-        slidingSyncProxy = 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 969da07f40..f89b36e4d4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/signedout/impl/src/main/res/values-hr/translations.xml b/features/signedout/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..17af7626b1
--- /dev/null
+++ b/features/signedout/impl/src/main/res/values-hr/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">"Promijenili ste zaporku u drugoj sesiji"</string>
+  <string name="screen_signed_out_reason_2">"Izbrisali ste sesiju iz druge sesije"</string>
+  <string name="screen_signed_out_reason_3">"Administrator vašeg poslužitelja poništio je vaš pristup"</string>
+  <string name="screen_signed_out_subtitle">"Možda ste odjavljeni iz jednog od razloga navedenih u nastavku. Ponovno se prijavite kako biste nastavili koristiti %s."</string>
+  <string name="screen_signed_out_title">"Odjavljeni ste"</string>
+</resources>
diff --git a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPointTest.kt b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPointTest.kt
index 6366ba5ea1..93925632a3 100644
--- a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPointTest.kt
+++ b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,9 +35,11 @@ class DefaultSignedOutEntryPointTest {
             )
         }
         val params = SignedOutEntryPoint.Params(A_SESSION_ID)
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+        )
         assertThat(result).isInstanceOf(SignedOutNode::class.java)
         assertThat(result.plugins).contains(SignedOutNode.Inputs(params.sessionId))
     }
diff --git a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
index e53c0af112..519016b1e0 100644
--- a/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
+++ b/features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -58,9 +59,11 @@ class SignedOutPresenterTest {
             val initialState = awaitItem()
             assertThat(initialState.signedOutSession).isEqualTo(aSessionData)
             assertThat(sessionStore.getAllSessions()).isNotEmpty()
+            assertThat(sessionStore.numberOfSessions()).isEqualTo(1)
             initialState.eventSink(SignedOutEvents.SignInAgain)
             assertThat(awaitItem().signedOutSession).isNull()
             assertThat(sessionStore.getAllSessions()).isEmpty()
+            assertThat(sessionStore.numberOfSessions()).isEqualTo(0)
         }
     }
 }
diff --git a/features/space/api/build.gradle.kts b/features/space/api/build.gradle.kts
index dd19efefec..e2b7bb9f97 100644
--- a/features/space/api/build.gradle.kts
+++ b/features/space/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
index bdea93f3ef..48a0a55864 100644
--- a/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
+++ b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,22 +16,19 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface SpaceEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(
+    fun createNode(
         parentNode: Node,
         buildContext: BuildContext,
-    ): NodeBuilder
-
-    interface NodeBuilder {
-        fun inputs(inputs: Inputs): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+        inputs: Inputs,
+        callback: Callback
+    ): Node
 
     data class Inputs(
         val roomId: RoomId
     ) : NodeInputs
 
     interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId, viaParameters: List<String>)
+        fun navigateToRoom(roomId: RoomId, viaParameters: List<String>)
+        fun navigateToRoomMemberList()
     }
 }
diff --git a/features/space/impl/build.gradle.kts b/features/space/impl/build.gradle.kts
index b6afbdcb05..03c8cda4ac 100644
--- a/features/space/impl/build.gradle.kts
+++ b/features/space/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,6 +40,9 @@ dependencies {
     implementation(projects.libraries.featureflag.api)
     implementation(projects.features.invite.api)
     implementation(projects.libraries.previewutils)
+    implementation(projects.features.securityandprivacy.api)
+    implementation(projects.features.rolesandpermissions.api)
+    implementation(projects.features.roomdetailsedit.api)
     api(projects.features.space.api)
 
     testCommonDependencies(libs, true)
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt
index 8591978417..2dc32eb9ea 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,32 +10,22 @@ package io.element.android.features.space.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultSpaceEntryPoint : SpaceEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): SpaceEntryPoint.NodeBuilder {
-        val plugins = mutableSetOf<Plugin>()
-        return object : SpaceEntryPoint.NodeBuilder {
-            override fun inputs(inputs: SpaceEntryPoint.Inputs): SpaceEntryPoint.NodeBuilder {
-                plugins.add(inputs)
-                return this
-            }
-
-            override fun callback(callback: SpaceEntryPoint.Callback): SpaceEntryPoint.NodeBuilder {
-                plugins.add(callback)
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<SpaceFlowNode>(buildContext, plugins = plugins.toList())
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: SpaceEntryPoint.Inputs,
+        callback: SpaceEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<SpaceFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(inputs, callback),
+        )
     }
 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
index 78472c7b31..4c91da0301 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,6 +19,7 @@ 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.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
@@ -26,21 +28,24 @@ import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.features.space.impl.di.SpaceFlowGraph
 import io.element.android.features.space.impl.leave.LeaveSpaceNode
 import io.element.android.features.space.impl.root.SpaceNode
+import io.element.android.features.space.impl.settings.SpaceSettingsFlowNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+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.DependencyInjectionGraphOwner
-import io.element.android.libraries.di.SessionScope
+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.matrix.api.spaces.SpaceService
 import kotlinx.parcelize.Parcelize
 
-@ContributesNode(SessionScope::class)
+@ContributesNode(RoomScope::class)
 @AssistedInject
 class SpaceFlowNode(
     @Assisted val buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
+    room: JoinedRoom,
     spaceService: SpaceService,
     graphFactory: SpaceFlowGraph.Factory,
 ) : BaseFlowNode<SpaceFlowNode.NavTarget>(
@@ -51,15 +56,17 @@ class SpaceFlowNode(
     buildContext = buildContext,
     plugins = plugins,
 ), DependencyInjectionGraphOwner {
-    private val inputs: SpaceEntryPoint.Inputs = inputs()
-    private val callback = plugins.filterIsInstance<SpaceEntryPoint.Callback>().single()
-    private val spaceRoomList = spaceService.spaceRoomList(inputs.roomId)
+    private val callback: SpaceEntryPoint.Callback = callback()
+    private val spaceRoomList = spaceService.spaceRoomList(room.roomId)
     override val graph = graphFactory.create(spaceRoomList)
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
         data object Root : NavTarget
 
+        @Parcelize
+        data class Settings(val initialTarget: SpaceSettingsFlowNode.NavTarget = SpaceSettingsFlowNode.NavTarget.Root) : NavTarget
+
         @Parcelize
         data object Leave : NavTarget
     }
@@ -76,19 +83,54 @@ class SpaceFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Leave -> {
-                createNode<LeaveSpaceNode>(buildContext, listOf(inputs))
+                val callback = object : LeaveSpaceNode.Callback {
+                    override fun closeLeaveSpaceFlow() {
+                        backstack.pop()
+                    }
+
+                    override fun navigateToRolesAndPermissions() {
+                        backstack.push(NavTarget.Settings(SpaceSettingsFlowNode.NavTarget.RolesAndPermissions))
+                    }
+                }
+                createNode<LeaveSpaceNode>(buildContext, listOf(callback))
             }
             NavTarget.Root -> {
                 val callback = object : SpaceNode.Callback {
-                    override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
-                        callback.onOpenRoom(roomId, viaParameters)
+                    override fun navigateToRoom(roomId: RoomId, viaParameters: List<String>) {
+                        callback.navigateToRoom(roomId, viaParameters)
                     }
 
-                    override fun onLeaveSpace() {
+                    override fun navigateToSpaceSettings() {
+                        backstack.push(NavTarget.Settings())
+                    }
+
+                    override fun navigateToRoomMemberList() {
+                        callback.navigateToRoomMemberList()
+                    }
+
+                    override fun startLeaveSpaceFlow() {
                         backstack.push(NavTarget.Leave)
                     }
                 }
-                createNode<SpaceNode>(buildContext, listOf(inputs, callback))
+                createNode<SpaceNode>(buildContext, listOf(callback))
+            }
+            is NavTarget.Settings -> {
+                val callback = object : SpaceSettingsFlowNode.Callback {
+                    override fun initialTarget() = navTarget.initialTarget
+
+                    override fun navigateToSpaceMembers() {
+                        callback.navigateToRoomMemberList()
+                    }
+
+                    override fun startLeaveSpaceFlow() {
+                        backstack.push(NavTarget.Leave)
+                    }
+
+                    override fun closeSettings() {
+                        backstack.pop()
+                    }
+                }
+                createNode<SpaceSettingsFlowNode>(buildContext, listOf(callback))
             }
         }
     }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowGraph.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowGraph.kt
index b1dac522b4..449c1eb158 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowGraph.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowGraph.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,12 @@ import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.GraphExtension
 import dev.zacsweers.metro.Provides
 import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomList
 
 @GraphExtension(SpaceFlowScope::class)
 interface SpaceFlowGraph : NodeFactoriesBindings {
-    @ContributesTo(SessionScope::class)
+    @ContributesTo(RoomScope::class)
     @GraphExtension.Factory
     interface Factory {
         fun create(@Provides spaceRoomList: SpaceRoomList): SpaceFlowGraph
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowScope.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowScope.kt
index 77fb07f871..e3dce49c2e 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowScope.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/di/SpaceFlowScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceEvents.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceEvents.kt
index 558ae8454d..8bc96c428c 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceEvents.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceNode.kt
index c60bddea1d..c41acc0c05 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,10 +17,10 @@ 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.space.api.SpaceEntryPoint
 import io.element.android.features.space.impl.di.SpaceFlowScope
-import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @ContributesNode(SpaceFlowScope::class)
 @AssistedInject
@@ -27,12 +28,19 @@ class LeaveSpaceNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     matrixClient: MatrixClient,
+    room: JoinedRoom,
     presenterFactory: LeaveSpacePresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
-    private val inputs: SpaceEntryPoint.Inputs = inputs()
-    private val leaveSpaceHandle = matrixClient.spaceService.getLeaveSpaceHandle(inputs.roomId)
+    interface Callback : Plugin {
+        fun closeLeaveSpaceFlow()
+        fun navigateToRolesAndPermissions()
+    }
+
+    private val leaveSpaceHandle = matrixClient.spaceService.getLeaveSpaceHandle(room.roomId)
     private val presenter: LeaveSpacePresenter = presenterFactory.create(leaveSpaceHandle)
 
+    private val callback: Callback = callback()
+
     override fun onBuilt() {
         super.onBuilt()
         lifecycle.subscribe(
@@ -47,7 +55,8 @@ class LeaveSpaceNode(
         val state = presenter.present()
         LeaveSpaceView(
             state = state,
-            onCancel = ::navigateUp,
+            onCancel = callback::closeLeaveSpaceFlow,
+            onRolesAndPermissionsClick = callback::navigateToRolesAndPermissions,
             modifier = modifier
         )
     }
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 19e593bf7c..a331aefccd 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -87,7 +88,7 @@ class LeaveSpacePresenter(
         }
         LaunchedEffect(selectedRoomIds, leaveSpaceRooms) {
             selectableSpaceRooms = leaveSpaceRooms.map {
-                it?.others.orEmpty().map { room ->
+                it.others.map { room ->
                     SelectableSpaceRoom(
                         spaceRoom = room.spaceRoom,
                         isLastAdmin = room.isLastAdmin,
@@ -97,7 +98,7 @@ class LeaveSpacePresenter(
             }
         }
 
-        fun handleEvents(event: LeaveSpaceEvents) {
+        fun handleEvent(event: LeaveSpaceEvents) {
             when (event) {
                 LeaveSpaceEvents.Retry -> {
                     leaveSpaceRooms = AsyncData.Loading()
@@ -134,7 +135,7 @@ class LeaveSpacePresenter(
             isLastAdmin = leaveSpaceRooms.dataOrNull()?.current?.isLastAdmin == true,
             selectableSpaceRooms = selectableSpaceRooms,
             leaveSpaceAction = leaveSpaceAction.value,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceState.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceState.kt
index 0f2a0f93f6..1e85014c84 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceState.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,7 @@ package io.element.android.features.space.impl.leave
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 data class LeaveSpaceState(
     val spaceName: String?,
@@ -18,10 +20,15 @@ data class LeaveSpaceState(
     val leaveSpaceAction: AsyncAction<Unit>,
     val eventSink: (LeaveSpaceEvents) -> Unit,
 ) {
-    private val rooms = selectableSpaceRooms.dataOrNull().orEmpty()
-    private val partition = rooms.partition { it.isLastAdmin }
-    private val lastAdminRooms = partition.first
-    private val selectableRooms = partition.second
+    private val rooms = selectableSpaceRooms.dataOrNull().orEmpty().toImmutableList()
+    private val lastAdminRooms: ImmutableList<SelectableSpaceRoom>
+    private val selectableRooms: ImmutableList<SelectableSpaceRoom>
+
+    init {
+        val partition = rooms.partition { it.isLastAdmin }
+        lastAdminRooms = partition.first.toImmutableList()
+        selectableRooms = partition.second.toImmutableList()
+    }
 
     /**
      * True if we should show the quick action to select/deselect all rooms.
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 fec625ca13..46d3e53b2b 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
index 7432301f91..d405162b88 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -69,6 +70,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun LeaveSpaceView(
     state: LeaveSpaceState,
     onCancel: () -> Unit,
+    onRolesAndPermissionsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -130,6 +132,8 @@ fun LeaveSpaceView(
                     state.eventSink(LeaveSpaceEvents.LeaveSpace)
                 },
                 onCancel = onCancel,
+                showRolesAndPermissionsButton = state.isLastAdmin,
+                onRolesAndPermissionsClick = onRolesAndPermissionsClick,
             )
         }
     }
@@ -210,6 +214,8 @@ private fun LeaveSpaceButtons(
     showLeaveButton: Boolean,
     selectedRoomsCount: Int,
     onLeaveSpace: () -> Unit,
+    showRolesAndPermissionsButton: Boolean,
+    onRolesAndPermissionsClick: () -> Unit,
     onCancel: () -> Unit,
 ) {
     ButtonColumnMolecule(
@@ -229,8 +235,14 @@ private fun LeaveSpaceButtons(
                 destructive = true,
             )
         }
-        // TODO For least admin space, add a button to open the settings.
-        // See https://www.figma.com/design/kcnHxunG1LDWXsJhaNuiHz/ER-145--Spaces-on-Element-X?node-id=4622-59600
+        if (showRolesAndPermissionsButton) {
+            Button(
+                text = stringResource(CommonStrings.action_go_to_roles_and_permissions),
+                onClick = onRolesAndPermissionsClick,
+                modifier = Modifier.fillMaxWidth(),
+                leadingIcon = IconSource.Vector(CompoundIcons.Settings()),
+            )
+        }
         TextButton(
             modifier = Modifier.fillMaxWidth(),
             text = stringResource(CommonStrings.action_cancel),
@@ -345,5 +357,6 @@ internal fun LeaveSpaceViewPreview(
     LeaveSpaceView(
         state = state,
         onCancel = {},
+        onRolesAndPermissionsClick = {},
     )
 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/SelectableSpaceRoom.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/SelectableSpaceRoom.kt
index 6247a9e48f..d7ed243af6 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/SelectableSpaceRoom.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/SelectableSpaceRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceEvents.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceEvents.kt
index 8c8eb8dbb7..16a6ad1c3f 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceEvents.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt
index 52c3472182..240bc89990 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,6 +23,7 @@ import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteV
 import io.element.android.features.space.impl.di.SpaceFlowScope
 import io.element.android.libraries.androidutils.R
 import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomList
@@ -40,11 +42,13 @@ class SpaceNode(
     private val acceptDeclineInviteView: AcceptDeclineInviteView,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId, viaParameters: List<String>)
-        fun onLeaveSpace()
+        fun navigateToRoom(roomId: RoomId, viaParameters: List<String>)
+        fun navigateToSpaceSettings()
+        fun navigateToRoomMemberList()
+        fun startLeaveSpaceFlow()
     }
 
-    private val callback = plugins.filterIsInstance<Callback>().single()
+    private val callback: Callback = callback()
 
     private fun onShareRoom(context: Context) = lifecycleScope.launch {
         matrixClient.getRoom(spaceRoomList.roomId)?.use { room ->
@@ -71,19 +75,25 @@ class SpaceNode(
             state = state,
             onBackClick = ::navigateUp,
             onLeaveSpaceClick = {
-                callback.onLeaveSpace()
+                callback.startLeaveSpaceFlow()
             },
             onRoomClick = { spaceRoom ->
-                callback.onOpenRoom(spaceRoom.roomId, spaceRoom.via)
+                callback.navigateToRoom(spaceRoom.roomId, spaceRoom.via)
+            },
+            onSettingsClick = {
+                callback.navigateToSpaceSettings()
             },
             onShareSpace = {
                 onShareRoom(context)
             },
+            onViewMembersClick = {
+                callback.navigateToRoomMemberList()
+            },
             acceptDeclineInviteView = {
                 acceptDeclineInviteView.Render(
                     state = state.acceptDeclineInviteState,
                     onAcceptInviteSuccess = { roomId ->
-                        callback.onOpenRoom(roomId, emptyList())
+                        callback.navigateToRoom(roomId, emptyList())
                     },
                     onDeclineInviteSuccess = { roomId ->
                         // No action needed
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 58f5c8f5fb..309747d2c9 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,26 +11,33 @@ package io.element.android.features.space.impl.root
 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.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
-import im.vector.app.features.analytics.plan.JoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom.Trigger
 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
 import io.element.android.features.invite.api.toInviteData
+import io.element.android.features.space.impl.settings.SpaceSettingsPermissions
+import io.element.android.features.space.impl.settings.spaceSettingsPermissions
 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
+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.join.JoinRoom
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomList
 import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar
@@ -47,11 +55,13 @@ import kotlin.jvm.optionals.getOrNull
 @Inject
 class SpacePresenter(
     private val spaceRoomList: SpaceRoomList,
+    private val room: BaseRoom,
     private val client: MatrixClient,
     private val seenInvitesStore: SeenInvitesStore,
     private val joinRoom: JoinRoom,
     private val acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState>,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
+    private val featureFlagService: FeatureFlagService,
 ) : Presenter<SpaceState> {
     private var children by mutableStateOf<ImmutableList<SpaceRoom>>(persistentListOf())
 
@@ -78,6 +88,17 @@ class SpacePresenter(
             }
         }.collectAsState()
 
+        val permissions by room.permissionsAsState(SpaceSettingsPermissions.DEFAULT) { perms ->
+            perms.spaceSettingsPermissions()
+        }
+        val isSpaceSettingsEnabled by remember {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.SpaceSettings)
+        }.collectAsState(false)
+
+        val roomInfo by room.roomInfoFlow.collectAsState()
+        val canAccessSpaceSettings by remember {
+            derivedStateOf { isSpaceSettingsEnabled && permissions.hasAny(roomInfo.joinRule) }
+        }
         val currentSpace by spaceRoomList.currentSpaceFlow.collectAsState()
         val (joinActions, setJoinActions) = remember { mutableStateOf(emptyMap<RoomId, AsyncAction<Unit>>()) }
 
@@ -93,7 +114,7 @@ class SpacePresenter(
 
         val acceptDeclineInviteState = acceptDeclineInvitePresenter.present()
 
-        fun handleEvents(event: SpaceEvents) {
+        fun handleEvent(event: SpaceEvents) {
             when (event) {
                 SpaceEvents.LoadMore -> localCoroutineScope.paginate()
                 is SpaceEvents.Join -> {
@@ -128,7 +149,8 @@ class SpacePresenter(
             joinActions = joinActions.toImmutableMap(),
             acceptDeclineInviteState = acceptDeclineInviteState,
             topicViewerState = topicViewerState,
-            eventSink = ::handleEvents,
+            canAccessSpaceSettings = canAccessSpaceSettings,
+            eventSink = ::handleEvent,
         )
     }
 
@@ -141,7 +163,7 @@ class SpacePresenter(
         joinRoom.invoke(
             roomIdOrAlias = spaceRoom.roomId.toRoomIdOrAlias(),
             serverNames = spaceRoom.via,
-            trigger = JoinedRoom.Trigger.SpaceHierarchy,
+            trigger = Trigger.SpaceHierarchy,
         ).onFailure {
             setJoinActions(joinActions + mapOf(spaceRoom.roomId to AsyncAction.Failure(it)))
         }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt
index 2499e4c046..cceda62806 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,6 +26,7 @@ data class SpaceState(
     val joinActions: ImmutableMap<RoomId, AsyncAction<Unit>>,
     val acceptDeclineInviteState: AcceptDeclineInviteState,
     val topicViewerState: TopicViewerState,
+    val canAccessSpaceSettings: Boolean,
     val eventSink: (SpaceEvents) -> Unit
 ) {
     fun isJoining(spaceId: RoomId): Boolean = joinActions[spaceId] == AsyncAction.Loading
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 98a7363abb..52894ad599 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -52,6 +53,7 @@ fun aSpaceState(
     hasMoreToLoad: Boolean = true,
     acceptDeclineInviteState: AcceptDeclineInviteState = anAcceptDeclineInviteState(),
     topicViewerState: TopicViewerState = TopicViewerState.Hidden,
+    canAccessSpaceSettings: Boolean = true,
     eventSink: (SpaceEvents) -> Unit = { },
 ) = SpaceState(
     currentSpace = parentSpace,
@@ -62,6 +64,7 @@ fun aSpaceState(
     joinActions = joinActions.toImmutableMap(),
     acceptDeclineInviteState = acceptDeclineInviteState,
     topicViewerState = topicViewerState,
+    canAccessSpaceSettings = canAccessSpaceSettings,
     eventSink = eventSink,
 )
 
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 46c6a10e57..769b608e8e 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
@@ -1,12 +1,15 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.space.impl.root
 
+import androidx.annotation.StringRes
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -14,6 +17,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -24,6 +29,8 @@ 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.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
@@ -49,6 +56,7 @@ 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.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.Scaffold
@@ -72,6 +80,8 @@ fun SpaceView(
     onRoomClick: (spaceRoom: SpaceRoom) -> Unit,
     onShareSpace: () -> Unit,
     onLeaveSpaceClick: () -> Unit,
+    onSettingsClick: () -> Unit,
+    onViewMembersClick: () -> Unit,
     modifier: Modifier = Modifier,
     acceptDeclineInviteView: @Composable () -> Unit,
 ) {
@@ -80,9 +90,12 @@ fun SpaceView(
         topBar = {
             SpaceViewTopBar(
                 currentSpace = state.currentSpace,
+                canAccessSpaceSettings = state.canAccessSpaceSettings,
                 onBackClick = onBackClick,
                 onLeaveSpaceClick = onLeaveSpaceClick,
                 onShareSpace = onShareSpace,
+                onSettingsClick = onSettingsClick,
+                onViewMembersClick = onViewMembersClick,
             )
         },
         content = { padding ->
@@ -177,33 +190,40 @@ private fun SpaceViewContent(
                     onTopicClick = onTopicClick
                 )
             }
-        }
-        state.children.forEach { spaceRoom ->
             item {
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
-                SpaceRoomItemView(
-                    spaceRoom = spaceRoom,
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    onClick = {
-                        onRoomClick(spaceRoom)
+                HorizontalDivider()
+            }
+        }
+        itemsIndexed(
+            items = state.children,
+            key = { _, spaceRoom -> spaceRoom.roomId }
+        ) { index, spaceRoom ->
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
+            SpaceRoomItemView(
+                spaceRoom = spaceRoom,
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
+                onClick = {
+                    onRoomClick(spaceRoom)
+                },
+                onLongClick = {
+                    // TODO
+                },
+                trailingAction = spaceRoom.trailingAction(isCurrentlyJoining = isCurrentlyJoining) {
+                    state.eventSink(SpaceEvents.Join(spaceRoom))
+                },
+                bottomAction = spaceRoom.inviteButtons(
+                    onAcceptClick = {
+                        state.eventSink(SpaceEvents.AcceptInvite(spaceRoom))
                     },
-                    onLongClick = {
-                        // TODO
-                    },
-                    trailingAction = spaceRoom.trailingAction(isCurrentlyJoining = isCurrentlyJoining) {
-                        state.eventSink(SpaceEvents.Join(spaceRoom))
-                    },
-                    bottomAction = spaceRoom.inviteButtons(
-                        onAcceptClick = {
-                            state.eventSink(SpaceEvents.AcceptInvite(spaceRoom))
-                        },
-                        onDeclineClick = {
-                            state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
-                        }
-                    )
+                    onDeclineClick = {
+                        state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
+                    }
                 )
+            )
+            if (index != state.children.lastIndex) {
+                HorizontalDivider()
             }
         }
         if (state.hasMoreToLoad) {
@@ -238,9 +258,12 @@ private fun LoadingMoreIndicator(
 @Composable
 private fun SpaceViewTopBar(
     currentSpace: SpaceRoom?,
+    canAccessSpaceSettings: Boolean,
     onBackClick: () -> Unit,
     onLeaveSpaceClick: () -> Unit,
+    onSettingsClick: () -> Unit,
     onShareSpace: () -> Unit,
+    onViewMembersClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     TopAppBar(
@@ -250,9 +273,13 @@ private fun SpaceViewTopBar(
         },
         title = {
             if (currentSpace != null) {
+                val roundedCornerShape = RoundedCornerShape(8.dp)
                 SpaceAvatarAndNameRow(
                     name = currentSpace.displayName,
                     avatarData = currentSpace.getAvatarData(AvatarSize.TimelineRoom),
+                    modifier = Modifier
+                        .clip(roundedCornerShape)
+                        .clickable(enabled = canAccessSpaceSettings, onClick = onSettingsClick)
                 )
             }
         },
@@ -270,37 +297,39 @@ private fun SpaceViewTopBar(
                 expanded = showMenu,
                 onDismissRequest = { showMenu = false }
             ) {
-                DropdownMenuItem(
+                SpaceMenuItem(
+                    titleRes = CommonStrings.screen_space_menu_action_members,
+                    icon = CompoundIcons.User(),
+                    onClick = {
+                        showMenu = false
+                        onViewMembersClick()
+                    }
+                )
+                SpaceMenuItem(
+                    titleRes = CommonStrings.action_share,
+                    icon = CompoundIcons.ShareAndroid(),
                     onClick = {
                         showMenu = false
                         onShareSpace()
-                    },
-                    text = { Text(stringResource(id = CommonStrings.action_share)) },
-                    leadingIcon = {
-                        Icon(
-                            imageVector = CompoundIcons.ShareAndroid(),
-                            tint = ElementTheme.colors.iconSecondary,
-                            contentDescription = null,
-                        )
                     }
                 )
-                DropdownMenuItem(
+                if (canAccessSpaceSettings) {
+                    SpaceMenuItem(
+                        titleRes = CommonStrings.common_settings,
+                        icon = CompoundIcons.Settings(),
+                        onClick = {
+                            showMenu = false
+                            onSettingsClick()
+                        }
+                    )
+                }
+                SpaceMenuItem(
+                    titleRes = CommonStrings.action_leave_space,
+                    icon = CompoundIcons.Leave(),
+                    isCritical = true,
                     onClick = {
                         showMenu = false
                         onLeaveSpaceClick()
-                    },
-                    text = {
-                        Text(
-                            text = stringResource(id = CommonStrings.action_leave),
-                            color = ElementTheme.colors.textCriticalPrimary,
-                        )
-                    },
-                    leadingIcon = {
-                        Icon(
-                            imageVector = CompoundIcons.Leave(),
-                            tint = ElementTheme.colors.iconCriticalPrimary,
-                            contentDescription = null,
-                        )
                     }
                 )
             }
@@ -308,6 +337,31 @@ private fun SpaceViewTopBar(
     )
 }
 
+@Composable
+private fun SpaceMenuItem(
+    @StringRes titleRes: Int,
+    icon: ImageVector,
+    onClick: () -> Unit,
+    isCritical: Boolean = false,
+) {
+    DropdownMenuItem(
+        onClick = onClick,
+        text = {
+            Text(
+                text = stringResource(titleRes),
+                color = if (isCritical) ElementTheme.colors.textCriticalPrimary else ElementTheme.colors.textPrimary,
+            )
+        },
+        leadingIcon = {
+            Icon(
+                imageVector = icon,
+                tint = if (isCritical) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconSecondary,
+                contentDescription = null,
+            )
+        }
+    )
+}
+
 @Composable
 private fun SpaceAvatarAndNameRow(
     name: String?,
@@ -382,6 +436,8 @@ internal fun SpaceViewPreview(
         onShareSpace = {},
         onLeaveSpaceClick = {},
         acceptDeclineInviteView = {},
+        onSettingsClick = {},
+        onViewMembersClick = {},
         onBackClick = {},
     )
 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsEvents.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsEvents.kt
new file mode 100644
index 0000000000..3c2b1e6609
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsEvents.kt
@@ -0,0 +1,11 @@
+/*
+ * 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.space.impl.settings
+
+sealed interface SpaceSettingsEvents
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsFlowNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsFlowNode.kt
new file mode 100644
index 0000000000..8fc7f51aa7
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsFlowNode.kt
@@ -0,0 +1,145 @@
+/*
+ * 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.space.impl.settings
+
+import android.os.Parcelable
+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 com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.pop
+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.rolesandpermissions.api.RolesAndPermissionsEntryPoint
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditEntryPoint
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyEntryPoint
+import io.element.android.features.space.impl.di.SpaceFlowScope
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.createNode
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(SpaceFlowScope::class)
+@AssistedInject
+class SpaceSettingsFlowNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val securityAndPrivacyEntryPoint: SecurityAndPrivacyEntryPoint,
+    private val rolesAndPermissionsEntryPoint: RolesAndPermissionsEntryPoint,
+    private val roomDetailsEditEntryPoint: RoomDetailsEditEntryPoint
+) : BaseFlowNode<SpaceSettingsFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = initialElement(plugins),
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins,
+) {
+    interface Callback : Plugin {
+        fun initialTarget(): NavTarget = NavTarget.Root
+        fun navigateToSpaceMembers()
+        fun startLeaveSpaceFlow()
+        fun closeSettings()
+    }
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data object EditDetails : NavTarget
+
+        @Parcelize
+        data object SecurityAndPrivacy : NavTarget
+
+        @Parcelize
+        data object RolesAndPermissions : NavTarget
+    }
+
+    private val callback: Callback = callback()
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            is NavTarget.Root -> {
+                val callback = object : SpaceSettingsNode.Callback {
+                    override fun closeSettings() {
+                        callback.closeSettings()
+                    }
+
+                    override fun navigateToEditDetails() {
+                        backstack.push(NavTarget.EditDetails)
+                    }
+
+                    override fun navigateToSpaceMembers() {
+                        callback.navigateToSpaceMembers()
+                    }
+
+                    override fun navigateToRolesAndPermissions() {
+                        backstack.push(NavTarget.RolesAndPermissions)
+                    }
+
+                    override fun navigateToSecurityAndPrivacy() {
+                        backstack.push(NavTarget.SecurityAndPrivacy)
+                    }
+
+                    override fun startLeaveSpaceFlow() {
+                        callback.startLeaveSpaceFlow()
+                    }
+                }
+                createNode<SpaceSettingsNode>(
+                    buildContext = buildContext,
+                    plugins = listOf(callback),
+                )
+            }
+            is NavTarget.SecurityAndPrivacy -> {
+                val callback = object : SecurityAndPrivacyEntryPoint.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                securityAndPrivacyEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
+            }
+            is NavTarget.RolesAndPermissions -> {
+                val callback = object : RolesAndPermissionsEntryPoint.Callback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                rolesAndPermissionsEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
+            }
+            NavTarget.EditDetails -> {
+                roomDetailsEditEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                )
+            }
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        BackstackView(modifier)
+    }
+}
+
+fun initialElement(plugins: List<Plugin>): SpaceSettingsFlowNode.NavTarget {
+    return plugins.callback<SpaceSettingsFlowNode.Callback>().initialTarget()
+}
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt
new file mode 100644
index 0000000000..b1e64fbba1
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt
@@ -0,0 +1,59 @@
+/*
+ * 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.space.impl.settings
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+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.space.impl.di.SpaceFlowScope
+import io.element.android.libraries.architecture.appyx.launchMolecule
+import io.element.android.libraries.architecture.callback
+
+@ContributesNode(SpaceFlowScope::class)
+@AssistedInject
+class SpaceSettingsNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: SpaceSettingsPresenter,
+) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun closeSettings()
+
+        fun navigateToEditDetails()
+        fun navigateToSpaceMembers()
+        fun navigateToRolesAndPermissions()
+        fun navigateToSecurityAndPrivacy()
+        fun startLeaveSpaceFlow()
+    }
+
+    private val callback: Callback = callback()
+    private val stateFlow = launchMolecule { presenter.present() }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state by stateFlow.collectAsState()
+        SpaceSettingsView(
+            state = state,
+            modifier = modifier,
+            onSpaceInfoClick = callback::navigateToEditDetails,
+            onBackClick = callback::closeSettings,
+            onMembersClick = callback::navigateToSpaceMembers,
+            onRolesAndPermissionsClick = callback::navigateToRolesAndPermissions,
+            onSecurityAndPrivacyClick = callback::navigateToSecurityAndPrivacy,
+            onLeaveSpaceClick = callback::startLeaveSpaceFlow,
+        )
+    }
+}
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt
new file mode 100644
index 0000000000..e3ec70a51d
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPermissions.kt
@@ -0,0 +1,44 @@
+/*
+ * 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.space.impl.settings
+
+import io.element.android.features.roomdetailsedit.api.RoomDetailsEditPermissions
+import io.element.android.features.roomdetailsedit.api.roomDetailsEditPermissions
+import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
+import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissions
+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.room.powerlevels.canEditRolesAndPermissions
+
+data class SpaceSettingsPermissions(
+    val editDetailsPermissions: RoomDetailsEditPermissions,
+    val canEditRolesAndPermissions: Boolean,
+    val securityAndPrivacyPermissions: SecurityAndPrivacyPermissions,
+) {
+    fun hasAny(joinRule: JoinRule?): Boolean {
+        return editDetailsPermissions.hasAny ||
+            canEditRolesAndPermissions ||
+            securityAndPrivacyPermissions.hasAny(isSpace = true, joinRule = joinRule)
+    }
+
+    companion object {
+        val DEFAULT = SpaceSettingsPermissions(
+            editDetailsPermissions = RoomDetailsEditPermissions.DEFAULT,
+            canEditRolesAndPermissions = false,
+            securityAndPrivacyPermissions = SecurityAndPrivacyPermissions.DEFAULT,
+        )
+    }
+}
+
+fun RoomPermissions.spaceSettingsPermissions(): SpaceSettingsPermissions {
+    return SpaceSettingsPermissions(
+        editDetailsPermissions = roomDetailsEditPermissions(),
+        canEditRolesAndPermissions = canEditRolesAndPermissions(),
+        securityAndPrivacyPermissions = securityAndPrivacyPermissions(),
+    )
+}
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPresenter.kt
new file mode 100644
index 0000000000..565008a778
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsPresenter.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.space.impl.settings
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
+
+@Inject
+class SpaceSettingsPresenter(
+    private val room: JoinedRoom,
+) : Presenter<SpaceSettingsState> {
+    @Composable
+    override fun present(): SpaceSettingsState {
+        val roomInfo by room.roomInfoFlow.collectAsState()
+        val permissions by room.permissionsAsState(SpaceSettingsPermissions.DEFAULT) { perms ->
+            perms.spaceSettingsPermissions()
+        }
+        val showSecurityAndPrivacy by remember {
+            derivedStateOf { permissions.securityAndPrivacyPermissions.hasAny(isSpace = false, joinRule = roomInfo.joinRule) }
+        }
+
+        return SpaceSettingsState(
+            roomId = room.roomId,
+            name = roomInfo.name.orEmpty(),
+            canonicalAlias = roomInfo.canonicalAlias,
+            avatarUrl = roomInfo.avatarUrl,
+            memberCount = roomInfo.activeMembersCount,
+            canEditDetails = permissions.editDetailsPermissions.hasAny,
+            showRolesAndPermissions = permissions.canEditRolesAndPermissions,
+            showSecurityAndPrivacy = showSecurityAndPrivacy,
+            eventSink = {},
+        )
+    }
+}
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsState.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsState.kt
new file mode 100644
index 0000000000..5c7e9b5c6e
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsState.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.space.impl.settings
+
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
+
+data class SpaceSettingsState(
+    val roomId: RoomId,
+    val name: String,
+    val canonicalAlias: RoomAlias?,
+    val avatarUrl: String?,
+    val memberCount: Long,
+    val canEditDetails: Boolean,
+    val showRolesAndPermissions: Boolean,
+    val showSecurityAndPrivacy: Boolean,
+    val eventSink: (SpaceSettingsEvents) -> Unit
+)
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
new file mode 100644
index 0000000000..2030b6885a
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsStateProvider.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.space.impl.settings
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.matrix.api.core.RoomAlias
+import io.element.android.libraries.matrix.api.core.RoomId
+
+open class SpaceSettingsStateProvider : PreviewParameterProvider<SpaceSettingsState> {
+    override val values: Sequence<SpaceSettingsState>
+        get() = sequenceOf(
+            aSpaceSettingsState(),
+            aSpaceSettingsState(alias = null),
+            aSpaceSettingsState(showSecurityAndPrivacy = true),
+            aSpaceSettingsState(showRolesAndPermissions = true),
+        )
+}
+
+fun aSpaceSettingsState(
+    roomId: RoomId = RoomId("!aRoomId:element.io"),
+    name: String = "Space name",
+    alias: RoomAlias? = RoomAlias("#spacename:element.io"),
+    avatarUrl: String? = null,
+    memberCount: Long = 100,
+    showRolesAndPermissions: Boolean = false,
+    showSecurityAndPrivacy: Boolean = false,
+    canEditDetails: Boolean = false,
+    eventSink: (SpaceSettingsEvents) -> Unit = {},
+) = SpaceSettingsState(
+    roomId = roomId,
+    name = name,
+    canonicalAlias = alias,
+    avatarUrl = avatarUrl,
+    memberCount = memberCount,
+    canEditDetails = canEditDetails,
+    showRolesAndPermissions = showRolesAndPermissions,
+    showSecurityAndPrivacy = showSecurityAndPrivacy,
+    eventSink = eventSink,
+)
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
new file mode 100644
index 0000000000..5a8aac4a30
--- /dev/null
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
@@ -0,0 +1,234 @@
+/*
+ * 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.space.impl.settings
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+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.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.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.space.impl.R
+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.components.list.ListItemContent
+import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
+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.Scaffold
+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.RoomId
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun SpaceSettingsView(
+    state: SpaceSettingsState,
+    onBackClick: () -> Unit,
+    onSpaceInfoClick: () -> Unit,
+    onMembersClick: () -> Unit,
+    onRolesAndPermissionsClick: () -> Unit,
+    onSecurityAndPrivacyClick: () -> Unit,
+    onLeaveSpaceClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            SpaceSettingsTopBar(onBackClick = onBackClick)
+        },
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                .padding(padding)
+                .verticalScroll(rememberScrollState())
+        ) {
+            SpaceInfoSection(
+                roomId = state.roomId,
+                name = state.name,
+                avatarUrl = state.avatarUrl,
+                canonicalAlias = state.canonicalAlias?.value,
+                canEditDetails = state.canEditDetails,
+                onSpaceInfoClick = onSpaceInfoClick,
+            )
+            Section(isVisible = state.showSecurityAndPrivacy, content = {
+                SecurityAndPrivacyItem(
+                    onClick = onSecurityAndPrivacyClick
+                )
+            })
+            Section(content = {
+                MembersItem(state.memberCount, onClick = onMembersClick)
+                if (state.showRolesAndPermissions) {
+                    RolesAndPermissionsItem(onClick = onRolesAndPermissionsClick)
+                }
+            })
+            Section(content = {
+                LeaveSpaceItem(
+                    onClick = onLeaveSpaceClick
+                )
+            })
+        }
+    }
+}
+
+@Composable
+private fun SpaceInfoSection(
+    roomId: RoomId,
+    name: String,
+    avatarUrl: String?,
+    canonicalAlias: String?,
+    canEditDetails: Boolean,
+    onSpaceInfoClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(enabled = canEditDetails, onClick = onSpaceInfoClick)
+            .padding(16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Avatar(
+            avatarData = AvatarData(roomId.value, name, avatarUrl, AvatarSize.SpaceListItem),
+            avatarType = AvatarType.Space(),
+            contentDescription = avatarUrl?.let { stringResource(CommonStrings.a11y_avatar) },
+        )
+        Spacer(Modifier.width(16.dp))
+        Column {
+            Text(
+                text = name,
+                style = ElementTheme.typography.fontHeadingMdRegular,
+                color = ElementTheme.colors.textPrimary,
+            )
+            if (canonicalAlias != null) {
+                Text(
+                    text = canonicalAlias,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun Section(
+    modifier: Modifier = Modifier,
+    isVisible: Boolean = true,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    if (isVisible) {
+        PreferenceCategory(content = content, modifier = modifier)
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun SpaceSettingsTopBar(
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    TopAppBar(
+        titleStr = stringResource(CommonStrings.common_settings),
+        navigationIcon = { BackButton(onClick = onBackClick) },
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun SecurityAndPrivacyItem(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = { Text(stringResource(R.string.screen_space_settings_security_and_privacy)) },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
+        onClick = onClick,
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun MembersItem(
+    memberCount: Long,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = { Text(stringResource(CommonStrings.common_people)) },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.User())),
+        trailingContent = ListItemContent.Text(memberCount.toString()),
+        onClick = onClick,
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun RolesAndPermissionsItem(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = { Text(stringResource(R.string.screen_space_settings_roles_and_permissions)) },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
+        onClick = onClick,
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun LeaveSpaceItem(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        headlineContent = {
+            Text(stringResource(CommonStrings.action_leave_space))
+        },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Leave())),
+        style = ListItemStyle.Destructive,
+        onClick = onClick,
+        modifier = modifier,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun SpaceSettingsViewPreview(
+    @PreviewParameter(SpaceSettingsStateProvider::class) state: SpaceSettingsState
+) = ElementPreview {
+    SpaceSettingsView(
+        state = state,
+        onBackClick = {},
+        onSpaceInfoClick = {},
+        onMembersClick = {},
+        onRolesAndPermissionsClick = {},
+        onSecurityAndPrivacyClick = {},
+        onLeaveSpaceClick = {},
+        modifier = Modifier,
+    )
+}
diff --git a/features/space/impl/src/main/res/values-be/translations.xml b/features/space/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..dbd39abf09
--- /dev/null
+++ b/features/space/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_space_settings_roles_and_permissions">"Ролі і дазволы"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-bg/translations.xml b/features/space/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..0759934bbd
--- /dev/null
+++ b/features/space/impl/src/main/res/values-bg/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_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-cs/translations.xml b/features/space/impl/src/main/res/values-cs/translations.xml
index 0c645f0650..d4730fc62d 100644
--- a/features/space/impl/src/main/res/values-cs/translations.xml
+++ b/features/space/impl/src/main/res/values-cs/translations.xml
@@ -7,5 +7,11 @@
     <item quantity="other">"Opustit %1$d místností a prostor"</item>
   </plurals>
   <string name="screen_leave_space_subtitle">"Tím budete také odstraněni ze všech místností v tomto prostoru."</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Než budete moci odejít, musíte pro tento prostor přiřadit jiného správce."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Z následujících místností nebudete odstraněni, protože jste jediným administrátorem:"</string>
   <string name="screen_leave_space_title">"Opustit %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Jste jediným administrátorem pro %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Opustit prostor"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Role a oprávnění"</string>
+  <string name="screen_space_settings_security_and_privacy">"Zabezpečení a soukromí"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-cy/translations.xml b/features/space/impl/src/main/res/values-cy/translations.xml
index d9d6c02ebe..987a41acbb 100644
--- a/features/space/impl/src/main/res/values-cy/translations.xml
+++ b/features/space/impl/src/main/res/values-cy/translations.xml
@@ -11,4 +11,7 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Dewiswch yr ystafelloedd yr hoffech chi eu gadael nad chi yw\'r unig weinyddwr ar eu cyfer:"</string>
   <string name="screen_leave_space_title">"Gadael %1$s ?"</string>
+  <string name="screen_space_settings_leave_space">"Gadael y gofod"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Rolau a chaniatâd"</string>
+  <string name="screen_space_settings_security_and_privacy">"Diogelwch a phreifatrwydd"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-da/translations.xml b/features/space/impl/src/main/res/values-da/translations.xml
index 7953f32e99..6422b9635d 100644
--- a/features/space/impl/src/main/res/values-da/translations.xml
+++ b/features/space/impl/src/main/res/values-da/translations.xml
@@ -2,12 +2,15 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_leave_space_last_admin_info">"%1$s (Admin)"</string>
   <plurals name="screen_leave_space_submit">
-    <item quantity="one">"Forlad %1$d rum og klynge"</item>
-    <item quantity="other">"Forlad %1$d rum og klynger"</item>
+    <item quantity="one">"Forlad %1$d rum og gruppe"</item>
+    <item quantity="other">"Forlad %1$d rum og Grupper"</item>
   </plurals>
   <string name="screen_leave_space_subtitle">"Vælg de rum, du vil forlade, som du ikke er den eneste administrator for:"</string>
-  <string name="screen_leave_space_subtitle_last_admin">"Du skal tildele en anden administrator til denne klynge, før du kan forlade den."</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Du skal tildele en anden administrator til denne gruppe, før du kan forlade den."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Du vil ikke blive fjernet fra følgende rum, fordi du er den eneste administrator:"</string>
   <string name="screen_leave_space_title">"Forlad %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Du er den eneste administrator for %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Forlad gruppe"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Roller og tilladelser"</string>
+  <string name="screen_space_settings_security_and_privacy">"Sikkerhed og privatliv"</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 6fd5d7c76b..a001756c6c 100644
--- a/features/space/impl/src/main/res/values-de/translations.xml
+++ b/features/space/impl/src/main/res/values-de/translations.xml
@@ -10,4 +10,7 @@
   <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_space_settings_leave_space">"Space verlassen"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Rollen und Berechtigungen"</string>
+  <string name="screen_space_settings_security_and_privacy">"Sicherheit &amp; Datenschutz"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-el/translations.xml b/features/space/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..144aae7278
--- /dev/null
+++ b/features/space/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_space_settings_roles_and_permissions">"Ρόλοι και δικαιώματα"</string>
+  <string name="screen_space_settings_security_and_privacy">"Ασφάλεια &amp; απόρρητο"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-es/translations.xml b/features/space/impl/src/main/res/values-es/translations.xml
new file mode 100644
index 0000000000..41887088b6
--- /dev/null
+++ b/features/space/impl/src/main/res/values-es/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">"Roles y permisos"</string>
+  <string name="screen_space_settings_security_and_privacy">"Seguridad y privacidad"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-et/translations.xml b/features/space/impl/src/main/res/values-et/translations.xml
index 3ab5d65284..43eaade351 100644
--- a/features/space/impl/src/main/res/values-et/translations.xml
+++ b/features/space/impl/src/main/res/values-et/translations.xml
@@ -6,6 +6,11 @@
     <item quantity="other">"Lahku %1$d-st jututoast ja kogukonnast"</item>
   </plurals>
   <string name="screen_leave_space_subtitle">"Sellega eemaldad end ka kõikidest antud kogukonna jututubadest."</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Enne lahkumist pead sa selle kogukonna jaoks lisama vähemalt ühe täiendava peakasutaja."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Sind ei saa järgnevatest jututubadest eemaldada, kuna oled seal/neis ainus peakasutaja:"</string>
   <string name="screen_leave_space_title">"Kas lahkud %1$s kogukonnast?"</string>
+  <string name="screen_leave_space_title_last_admin">"Sa oled siin ainus peakasutaja: %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Lahku kogukonnast"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Rollid ja õigused"</string>
+  <string name="screen_space_settings_security_and_privacy">"Turvalisus ja privaatsus"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-eu/translations.xml b/features/space/impl/src/main/res/values-eu/translations.xml
new file mode 100644
index 0000000000..6124d56327
--- /dev/null
+++ b/features/space/impl/src/main/res/values-eu/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">"Rolak eta baimenak"</string>
+  <string name="screen_space_settings_security_and_privacy">"Segurtasuna eta pribatutasuna"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-fa/translations.xml b/features/space/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..bda53d0947
--- /dev/null
+++ b/features/space/impl/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="screen_leave_space_last_admin_info">"‏%1$s (مدیر)"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"پیش از ترک باید مدیری دیگر به این فضا تخصیص دهید."</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_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-fi/translations.xml b/features/space/impl/src/main/res/values-fi/translations.xml
index 501ff2f97d..e43a4ae7f9 100644
--- a/features/space/impl/src/main/res/values-fi/translations.xml
+++ b/features/space/impl/src/main/res/values-fi/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="screen_leave_space_last_admin_info">"%1$s (Ylläpitäjä)"</string>
   <plurals name="screen_leave_space_submit">
     <item quantity="one">"Poistu %1$d huoneesta ja tilasta"</item>
     <item quantity="other">"Poistu %1$d huoneesta ja tilasta"</item>
@@ -9,4 +10,7 @@
   <string name="screen_leave_space_subtitle_only_last_admin">"Sinua ei poisteta seuraavista huoneista, koska olet ainoa ylläpitäjä:"</string>
   <string name="screen_leave_space_title">"Haluatko poistua tilasta %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Olet ainoa ylläpitäjä tilassa %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Poistu tilasta"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Roolit ja oikeudet"</string>
+  <string name="screen_space_settings_security_and_privacy">"Turvallisuus ja yksityisyys"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-fr/translations.xml b/features/space/impl/src/main/res/values-fr/translations.xml
index cf37795848..befd4a7c92 100644
--- a/features/space/impl/src/main/res/values-fr/translations.xml
+++ b/features/space/impl/src/main/res/values-fr/translations.xml
@@ -10,4 +10,7 @@
   <string name="screen_leave_space_subtitle_only_last_admin">"Vous ne quitterez pas le ou les salons suivants car vous y êtes le seul administrateur:"</string>
   <string name="screen_leave_space_title">"Quitter %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Vous êtes le seul administrateur de %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Quitter l’espace"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Rôles &amp; autorisations"</string>
+  <string name="screen_space_settings_security_and_privacy">"Sécurité &amp; confidentialité"</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
new file mode 100644
index 0000000000..9babbb3d69
--- /dev/null
+++ b/features/space/impl/src/main/res/values-hr/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_leave_space_last_admin_info">"%1$s (administrator)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Napusti %1$d sobu i prostor"</item>
+    <item quantity="few">"Napusti %1$d sobe i prostor"</item>
+    <item quantity="other">"Napusti %1$d soba i prostor"</item>
+  </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_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_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>
+</resources>
diff --git a/features/space/impl/src/main/res/values-hu/translations.xml b/features/space/impl/src/main/res/values-hu/translations.xml
index 79a8733df2..3ddbe6c822 100644
--- a/features/space/impl/src/main/res/values-hu/translations.xml
+++ b/features/space/impl/src/main/res/values-hu/translations.xml
@@ -6,5 +6,11 @@
     <item quantity="other">"%1$d szoba és tér elhagyása"</item>
   </plurals>
   <string name="screen_leave_space_subtitle">"Ez a tér összes szobájából is eltávolítja."</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Mielőtt elhagyhatná ezt a teret, ki kell jelölnie egy másik adminisztrátort."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Nem lesz eltávolítva a következő szobá(k)ból, mert ön az egyetlen adminisztrátor:"</string>
   <string name="screen_leave_space_title">"Kilép innen: %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Ön az egyetlen adminisztrátor itt: %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Tér elhagyása"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Szerepkörök és jogosultságok"</string>
+  <string name="screen_space_settings_security_and_privacy">"Biztonság és adatvédelem"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-in/translations.xml b/features/space/impl/src/main/res/values-in/translations.xml
new file mode 100644
index 0000000000..d505c16f38
--- /dev/null
+++ b/features/space/impl/src/main/res/values-in/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">"Peran dan perizinan"</string>
+  <string name="screen_space_settings_security_and_privacy">"Keamanan &amp; privasi"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-it/translations.xml b/features/space/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..e483f98513
--- /dev/null
+++ b/features/space/impl/src/main/res/values-it/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_leave_space_last_admin_info">"%1$s (Amministratore)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Lascia %1$d stanza e spazio"</item>
+    <item quantity="other">"Lascia %1$d stanze e spazi"</item>
+  </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_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_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>
+</resources>
diff --git a/features/space/impl/src/main/res/values-ka/translations.xml b/features/space/impl/src/main/res/values-ka/translations.xml
new file mode 100644
index 0000000000..6674642954
--- /dev/null
+++ b/features/space/impl/src/main/res/values-ka/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_space_settings_roles_and_permissions">"როლები და ნებართვები"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-ko/translations.xml b/features/space/impl/src/main/res/values-ko/translations.xml
new file mode 100644
index 0000000000..7855147bb7
--- /dev/null
+++ b/features/space/impl/src/main/res/values-ko/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">"역할 및 권한"</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 aafe1d756f..0e0709f80e 100644
--- a/features/space/impl/src/main/res/values-nb/translations.xml
+++ b/features/space/impl/src/main/res/values-nb/translations.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_leave_space_last_admin_info">"%1$s (Admin)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Forlat %1$d rom og område"</item>
+    <item quantity="other">"Forlat %1$d rom og område"</item>
+  </plurals>
   <string name="screen_leave_space_subtitle">"Velg rommene du vil forlate, som du ikke er den eneste administratoren for:"</string>
   <string name="screen_leave_space_subtitle_last_admin">"Du må tildele en annen administrator for dette området før du kan forlate det."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Du vil ikke bli fjernet fra følgende rom fordi du er den eneste administratoren:"</string>
   <string name="screen_leave_space_title">"Forlat %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Du er den eneste administratoren for %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Forlat område"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Roller og tillatelser"</string>
+  <string name="screen_space_settings_security_and_privacy">"Sikkerhet og personvern"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-nl/translations.xml b/features/space/impl/src/main/res/values-nl/translations.xml
new file mode 100644
index 0000000000..e5b9cf7cbe
--- /dev/null
+++ b/features/space/impl/src/main/res/values-nl/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_space_settings_roles_and_permissions">"Rollen en rechten"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-pl/translations.xml b/features/space/impl/src/main/res/values-pl/translations.xml
new file mode 100644
index 0000000000..0c34e56377
--- /dev/null
+++ b/features/space/impl/src/main/res/values-pl/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_leave_space_last_admin_info">"%1$s (Administrator)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Opuść %1$d pokój i przestrzeń"</item>
+    <item quantity="few">"Opuść %1$d pokoje i przestrzeń"</item>
+    <item quantity="many">"Opuść %1$d pokojów i przestrzeń"</item>
+  </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_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_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>
+</resources>
diff --git a/features/space/impl/src/main/res/values-pt-rBR/translations.xml b/features/space/impl/src/main/res/values-pt-rBR/translations.xml
new file mode 100644
index 0000000000..3329be1097
--- /dev/null
+++ b/features/space/impl/src/main/res/values-pt-rBR/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_leave_space_last_admin_info">"%1$s (Administrador)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Sair de %1$d sala e espaço"</item>
+    <item quantity="other">"Sair de %1$d salas e do espaço"</item>
+  </plurals>
+  <string name="screen_leave_space_subtitle">"Selecione as salas que gostaria de sair nas quais você não é o único administrador:"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Você precisa atribuir outro administrador para este espaço antes de sair."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Você não será removido das seguintes salas porque você é o único administrador:"</string>
+  <string name="screen_leave_space_title">"Sair de %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Você é o único administrador de %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Sair do espaço"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Cargos e permissões"</string>
+  <string name="screen_space_settings_security_and_privacy">"Segurança e privacidade"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-pt/translations.xml b/features/space/impl/src/main/res/values-pt/translations.xml
index 75e1f5431e..71d4836588 100644
--- a/features/space/impl/src/main/res/values-pt/translations.xml
+++ b/features/space/impl/src/main/res/values-pt/translations.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_leave_space_last_admin_info">"%1$s (admin)"</string>
   <plurals name="screen_leave_space_submit">
     <item quantity="one">"Sair do espaço e de %1$d sala"</item>
     <item quantity="other">"Sair do espaço e de %1$d salas"</item>
   </plurals>
   <string name="screen_leave_space_subtitle">"Também irás sair de todas as salas deste espaço."</string>
   <string name="screen_leave_space_title">"Sair de %1$s?"</string>
+  <string name="screen_space_settings_leave_space">"Sair do espaço"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Cargos e permissões"</string>
+  <string name="screen_space_settings_security_and_privacy">"Segurança e privacidade"</string>
 </resources>
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 6ff2a5dfa8..588518a249 100644
--- a/features/space/impl/src/main/res/values-ro/translations.xml
+++ b/features/space/impl/src/main/res/values-ro/translations.xml
@@ -11,4 +11,7 @@
   <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_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>
 </resources>
diff --git a/features/space/impl/src/main/res/values-ru/translations.xml b/features/space/impl/src/main/res/values-ru/translations.xml
index 0df1b9224a..47cd467725 100644
--- a/features/space/impl/src/main/res/values-ru/translations.xml
+++ b/features/space/impl/src/main/res/values-ru/translations.xml
@@ -11,4 +11,7 @@
   <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_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-sk/translations.xml b/features/space/impl/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..2fd11ba58b
--- /dev/null
+++ b/features/space/impl/src/main/res/values-sk/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_leave_space_last_admin_info">"%1$s (Správca)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Opustiť %1$d miestnosť a priestor"</item>
+    <item quantity="few">"Opustiť %1$d miestnosti a priestory"</item>
+    <item quantity="other">"Opustiť %1$d miestností a priestorov"</item>
+  </plurals>
+  <string name="screen_leave_space_subtitle">"Vyberte miestnosti, ktoré chcete opustiť a pre ktoré nie ste jediným správcom:"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Pred odchodom musíte pre tento priestor určiť iného správcu."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Z nasledujúcich miestností nebudete odstránený/á, pretože ste jediným správcom:"</string>
+  <string name="screen_leave_space_title">"Opustiť %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Ste jediným administrátorom pre %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Opustiť priestor"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Roly a povolenia"</string>
+  <string name="screen_space_settings_security_and_privacy">"Bezpečnosť a súkromie"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-sv/translations.xml b/features/space/impl/src/main/res/values-sv/translations.xml
new file mode 100644
index 0000000000..d2dcf89347
--- /dev/null
+++ b/features/space/impl/src/main/res/values-sv/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">"Roller och behörigheter"</string>
+  <string name="screen_space_settings_security_and_privacy">"Säkerhet och sekretess"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-tr/translations.xml b/features/space/impl/src/main/res/values-tr/translations.xml
new file mode 100644
index 0000000000..99e4a986fa
--- /dev/null
+++ b/features/space/impl/src/main/res/values-tr/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">"Roller ve izinler"</string>
+  <string name="screen_space_settings_security_and_privacy">"Güvenlik ve gizlilik"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-uk/translations.xml b/features/space/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..d7652641bb
--- /dev/null
+++ b/features/space/impl/src/main/res/values-uk/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">"Ролі та дозволи"</string>
+  <string name="screen_space_settings_security_and_privacy">"Безпека й приватність"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-ur/translations.xml b/features/space/impl/src/main/res/values-ur/translations.xml
new file mode 100644
index 0000000000..827417fb44
--- /dev/null
+++ b/features/space/impl/src/main/res/values-ur/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_space_settings_roles_and_permissions">"کردارہا اور اجازتیں"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-uz/translations.xml b/features/space/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..83540091ca
--- /dev/null
+++ b/features/space/impl/src/main/res/values-uz/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">"Rollar va ruxsatlar"</string>
+  <string name="screen_space_settings_security_and_privacy">"Xavfsizlik va maxfiylik"</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 419ea40233..abf495860f 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
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <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_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_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-zh/translations.xml b/features/space/impl/src/main/res/values-zh/translations.xml
index 4e95141bad..f0afff02f4 100644
--- a/features/space/impl/src/main/res/values-zh/translations.xml
+++ b/features/space/impl/src/main/res/values-zh/translations.xml
@@ -9,4 +9,7 @@
   <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_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/localazy.xml b/features/space/impl/src/main/res/values/localazy.xml
index c6ced29d41..a4df5e767d 100644
--- a/features/space/impl/src/main/res/values/localazy.xml
+++ b/features/space/impl/src/main/res/values/localazy.xml
@@ -10,4 +10,7 @@
   <string name="screen_leave_space_subtitle_only_last_admin">"You will not be removed from the following room(s) because you\'re the only administrator:"</string>
   <string name="screen_leave_space_title">"Leave %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"You are the only admin for %1$s"</string>
+  <string name="screen_space_settings_leave_space">"Leave space"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Roles &amp; permissions"</string>
+  <string name="screen_space_settings_security_and_privacy">"Security &amp; privacy"</string>
 </resources>
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
index 17823ba72b..0e2717c055 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,7 @@ import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.features.space.impl.di.FakeSpaceFlowGraph
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceRoomList
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceService
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -40,16 +42,20 @@ class DefaultSpaceEntryPointTest {
                 spaceService = FakeSpaceService(
                     spaceRoomListResult = { _: RoomId -> FakeSpaceRoomList(A_ROOM_ID) }
                 ),
+                room = FakeJoinedRoom(),
                 graphFactory = FakeSpaceFlowGraph.Factory
             )
         }
         val callback = object : SpaceEntryPoint.Callback {
-            override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) = lambdaError()
+            override fun navigateToRoom(roomId: RoomId, viaParameters: List<String>) = lambdaError()
+            override fun navigateToRoomMemberList() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .inputs(nodeInputs)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            inputs = nodeInputs,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(SpaceFlowNode::class.java)
         assertThat(result.plugins).contains(nodeInputs)
         assertThat(result.plugins).contains(callback)
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/di/FakeSpaceFlowGraph.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/di/FakeSpaceFlowGraph.kt
index 09263ff52d..436e9ac3b9 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/di/FakeSpaceFlowGraph.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/di/FakeSpaceFlowGraph.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3d123f3f41..495f0b38bd 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -61,7 +62,7 @@ class LeaveSpacePresenterTest {
             val state = awaitItem()
             assertThat(state.selectableSpaceRooms.isLoading()).isTrue()
             assertThat(state.leaveSpaceAction).isEqualTo(AsyncAction.Uninitialized)
-            skipItems(3)
+            skipItems(2)
             val stateError = awaitItem()
             assertThat(stateError.selectableSpaceRooms.isFailure()).isTrue()
             // Retry
@@ -83,7 +84,7 @@ class LeaveSpacePresenterTest {
         presenter.test {
             val state = awaitItem()
             assertThat(state.spaceName).isNull()
-            skipItems(3)
+            skipItems(2)
             val finalState = awaitItem()
             assertThat(finalState.spaceName).isEqualTo(A_SPACE_NAME)
             assertThat(finalState.isLastAdmin).isTrue()
@@ -119,7 +120,7 @@ class LeaveSpacePresenterTest {
         presenter.test {
             val state = awaitItem()
             assertThat(state.spaceName).isNull()
-            skipItems(3)
+            skipItems(2)
             val finalState = awaitItem()
             // The current state is not in the sub room list
             assertThat(finalState.selectableSpaceRooms.dataOrNull()!!.map { it.spaceRoom.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_3)
@@ -153,7 +154,7 @@ class LeaveSpacePresenterTest {
             )
         )
         presenter.test {
-            skipItems(4)
+            skipItems(3)
             val state = awaitItem()
             assertThat(state.spaceName).isNull()
             assertThat(state.isLastAdmin).isFalse()
@@ -217,7 +218,7 @@ class LeaveSpacePresenterTest {
             )
         )
         presenter.test {
-            skipItems(4)
+            skipItems(3)
             val state = awaitItem()
             state.eventSink(LeaveSpaceEvents.LeaveSpace)
             val stateLeaving = awaitItem()
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateTest.kt
index 998868593f..d3b3f44398 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fbef7bb3a1..917aceb262 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,9 +19,12 @@ 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.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+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.join.JoinRoom
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomList
@@ -28,7 +32,9 @@ 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_ROOM_ID_2
 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.join.FakeJoinRoom
+import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceRoomList
 import io.element.android.libraries.previewutils.room.aSpaceRoom
 import io.element.android.tests.testutils.EventsRecorder
@@ -61,11 +67,39 @@ class SpacePresenterTest {
             assertThat(state.joinActions).isEmpty()
             assertThat(state.acceptDeclineInviteState).isEqualTo(anAcceptDeclineInviteState())
             assertThat(state.topicViewerState).isEqualTo(TopicViewerState.Hidden)
+            assertThat(state.canAccessSpaceSettings).isFalse()
             advanceUntilIdle()
             paginateResult.assertions().isCalledOnce()
         }
     }
 
+    @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 {
+        val room = FakeBaseRoom(
+            roomPermissions = FakeRoomPermissions(
+                canSendState = { true }
+            )
+        )
+        val presenter = createSpacePresenter(
+            room = room,
+            spaceSettingsEnabled = true,
+        )
+        presenter.test {
+            skipItems(1)
+            val state = awaitItem()
+            assertThat(state.canAccessSpaceSettings).isTrue()
+        }
+    }
+
     @Test
     fun `present - load more`() = runTest {
         val paginateResult = lambdaRecorder<Result<Unit>> {
@@ -321,20 +355,30 @@ class SpacePresenterTest {
 
     private fun TestScope.createSpacePresenter(
         client: MatrixClient = FakeMatrixClient(),
-        spaceRoomList: SpaceRoomList = FakeSpaceRoomList(),
+        room: BaseRoom = FakeBaseRoom(),
+        spaceRoomList: SpaceRoomList = FakeSpaceRoomList(
+            paginateResult = { Result.success(Unit) }
+        ),
         seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
         joinRoom: JoinRoom = FakeJoinRoom(
             lambda = { _, _, _ -> Result.success(Unit) },
         ),
         acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState> = Presenter { anAcceptDeclineInviteState() },
+        spaceSettingsEnabled: Boolean = false,
     ): SpacePresenter {
         return SpacePresenter(
             client = client,
+            room = room,
             spaceRoomList = spaceRoomList,
             seenInvitesStore = seenInvitesStore,
             joinRoom = joinRoom,
             acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
             sessionCoroutineScope = backgroundScope,
+            featureFlagService = FakeFeatureFlagService(
+                initialState = mapOf(
+                    FeatureFlags.SpaceSettings.key to spaceSettingsEnabled,
+                )
+            ),
         )
     }
 }
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt
index d036d7023c..440ec1b6a5 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceStateTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2702133780..406b5d17e8 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -139,6 +140,8 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpace
     onRoomClick: (SpaceRoom) -> Unit = EnsureNeverCalledWithParam(),
     onShareSpace: () -> Unit = EnsureNeverCalled(),
     onLeaveSpaceClick: () -> Unit = EnsureNeverCalled(),
+    onSettingsClick: () -> Unit = EnsureNeverCalled(),
+    onViewMembersClick: () -> Unit = EnsureNeverCalled(),
     acceptDeclineInviteView: @Composable () -> Unit = {},
 ) {
     setContent {
@@ -148,6 +151,8 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpace
             onRoomClick = onRoomClick,
             onShareSpace = onShareSpace,
             onLeaveSpaceClick = onLeaveSpaceClick,
+            onSettingsClick = onSettingsClick,
+            onViewMembersClick = onViewMembersClick,
             acceptDeclineInviteView = acceptDeclineInviteView,
         )
     }
diff --git a/features/startchat/api/build.gradle.kts b/features/startchat/api/build.gradle.kts
index 77822f1a15..890ae26e81 100644
--- a/features/startchat/api/build.gradle.kts
+++ b/features/startchat/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 192c32fee7..5bf015c0f0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartChatEntryPoint.kt b/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartChatEntryPoint.kt
index 17b9b902e2..b560cda240 100644
--- a/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartChatEntryPoint.kt
+++ b/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartChatEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,14 +15,14 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 
 interface StartChatEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
-        fun onOpenRoomDirectory()
+        fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
+        fun navigateToRoomDirectory()
     }
 }
diff --git a/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartDMAction.kt b/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartDMAction.kt
index b49a9fbdfd..6aa2ad5d98 100644
--- a/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartDMAction.kt
+++ b/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartDMAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/build.gradle.kts b/features/startchat/impl/build.gradle.kts
index 8ba7593b36..6ab1a361e9 100644
--- a/features/startchat/impl/build.gradle.kts
+++ b/features/startchat/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -51,6 +52,7 @@ dependencies {
     testImplementation(projects.libraries.mediaupload.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.usersearch.test)
+    testImplementation(projects.features.createroom.test)
     testImplementation(projects.features.startchat.test)
     testImplementation(projects.libraries.featureflag.test)
 }
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/StartChatNavigator.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/StartChatNavigator.kt
index a45b4dddab..125dc2c2b3 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/StartChatNavigator.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/StartChatNavigator.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import io.element.android.libraries.architecture.overlay.operation.show
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 
 interface StartChatNavigator : Plugin {
-    fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
+    fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
     fun onCreateNewRoom()
     fun onShowJoinRoomByAddress()
     fun onDismissJoinRoomByAddress()
@@ -30,7 +31,8 @@ class DefaultStartChatNavigator(
     private val openRoom: (RoomIdOrAlias, List<String>) -> Unit,
     private val openRoomDirectory: () -> Unit,
 ) : StartChatNavigator {
-    override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) = openRoom(roomIdOrAlias, serverNames)
+    override fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) =
+        openRoom(roomIdOrAlias, serverNames)
 
     override fun onOpenRoomDirectory() = openRoomDirectory()
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPoint.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPoint.kt
index c33ac4356f..6e70153dc1 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPoint.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.features.startchat.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.startchat.api.StartChatEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultStartChatEntryPoint : StartChatEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): StartChatEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : StartChatEntryPoint.NodeBuilder {
-            override fun callback(callback: StartChatEntryPoint.Callback): StartChatEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<StartChatFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: StartChatEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<StartChatFlowNode>(buildContext, listOf(callback))
     }
 }
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 6847b1859d..a484fe2e72 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.startchat.impl
 
 import androidx.compose.runtime.MutableState
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.CreatedRoom
 import io.element.android.features.startchat.api.ConfirmingStartDmWithMatrixUser
 import io.element.android.features.startchat.api.StartDMAction
@@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultStartDMAction(
     private val matrixClient: MatrixClient,
     private val analyticsService: AnalyticsService,
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/StartChatFlowNode.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/StartChatFlowNode.kt
index 30d1f3a2cf..236d92fd4a 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/StartChatFlowNode.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/StartChatFlowNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,6 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.navigation.transition.JumpToEndTransitionHandler
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
@@ -29,6 +29,7 @@ import io.element.android.features.startchat.impl.root.StartChatNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.OverlayView
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -60,15 +61,12 @@ class StartChatFlowNode(
         data object JoinByAddress : NavTarget
     }
 
+    private val callback: StartChatEntryPoint.Callback = callback()
     private val navigator = DefaultStartChatNavigator(
         backstack = backstack,
         overlay = overlay,
-        openRoom = { roomIdOrAlias, viaServers ->
-            plugins<StartChatEntryPoint.Callback>().forEach { it.onOpenRoom(roomIdOrAlias, viaServers) }
-        },
-        openRoomDirectory = {
-            plugins<StartChatEntryPoint.Callback>().forEach { it.onOpenRoomDirectory() }
-        }
+        openRoom = callback::onRoomCreated,
+        openRoomDirectory = callback::navigateToRoomDirectory,
     )
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@@ -79,12 +77,14 @@ class StartChatFlowNode(
             NavTarget.NewRoom -> {
                 val callback = object : CreateRoomEntryPoint.Callback {
                     override fun onRoomCreated(roomId: RoomId) {
-                        navigator.onOpenRoom(roomId.toRoomIdOrAlias(), emptyList())
+                        navigator.onRoomCreated(roomId.toRoomIdOrAlias(), emptyList())
                     }
                 }
-                createRoomEntryPoint.nodeBuilder(parentNode = this, buildContext = buildContext)
-                    .callback(callback)
-                    .build()
+                createRoomEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
             }
             NavTarget.JoinByAddress -> {
                 createNode<JoinRoomByAddressNode>(buildContext = buildContext, plugins = listOf(navigator))
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchMultipleUsersResultItem.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchMultipleUsersResultItem.kt
index 867ac9d918..622a0ac71f 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchMultipleUsersResultItem.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchMultipleUsersResultItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchSingleUserResultItem.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchSingleUserResultItem.kt
index bd94d136af..448ed86203 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchSingleUserResultItem.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchSingleUserResultItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchUserBar.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchUserBar.kt
index 3d42c40067..a664ad0912 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchUserBar.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/SearchUserBar.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 753bebec83..f35c6282ed 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressEvents.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressEvents.kt
index 648146fbd7..4a5c2de972 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressEvents.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressNode.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressNode.kt
index 101958ddad..c81cb1af66 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressNode.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressPresenter.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressPresenter.kt
index 540c1a4784..bda1e054e4 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressPresenter.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -48,7 +49,7 @@ class JoinRoomByAddressPresenter(
         var internalAddressState by remember { mutableStateOf<RoomAddressState>(RoomAddressState.Unknown) }
         var validateAddress: Boolean by remember { mutableStateOf(false) }
 
-        fun handleEvents(event: JoinRoomByAddressEvents) {
+        fun handleEvent(event: JoinRoomByAddressEvents) {
             when (event) {
                 JoinRoomByAddressEvents.Continue -> {
                     when (val currentState = internalAddressState) {
@@ -88,13 +89,13 @@ class JoinRoomByAddressPresenter(
         return JoinRoomByAddressState(
             address = address,
             addressState = addressState,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
     private fun onRoomFound(state: RoomAddressState.RoomFound) {
         navigator.onDismissJoinRoomByAddress()
-        navigator.onOpenRoom(
+        navigator.onRoomCreated(
             roomIdOrAlias = state.resolved.roomId.toRoomIdOrAlias(),
             serverNames = state.resolved.servers
         )
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressState.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressState.kt
index 84b01ac263..4749b14b22 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressState.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressStateProvider.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressStateProvider.kt
index 847ca78837..eb1305eb80 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressStateProvider.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2d34dcc1cf..0627a78da0 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatEvents.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatEvents.kt
index 6ea72d8b05..66e135b45c 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatEvents.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatNode.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatNode.kt
index 9a9ca85160..60ef9ee00f 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatNode.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -53,7 +54,7 @@ class StartChatNode(
             onCloseClick = this::navigateUp,
             onNewRoomClick = navigator::onCreateNewRoom,
             onOpenDM = {
-                navigator.onOpenRoom(roomIdOrAlias = it.toRoomIdOrAlias(), serverNames = emptyList())
+                navigator.onRoomCreated(roomIdOrAlias = it.toRoomIdOrAlias(), serverNames = emptyList())
             },
             onJoinByAddressClick = navigator::onShowJoinRoomByAddress,
             onInviteFriendsClick = { invitePeople(activity) },
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 10a9745f32..e176f202ad 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -57,7 +58,7 @@ class StartChatPresenter(
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.RoomDirectorySearch)
         }.collectAsState(initial = false)
 
-        fun handleEvents(event: StartChatEvents) {
+        fun handleEvent(event: StartChatEvents) {
             when (event) {
                 is StartChatEvents.StartDM -> localCoroutineScope.launch {
                     startDMAction.execute(
@@ -75,7 +76,7 @@ class StartChatPresenter(
             userListState = userListState,
             startDmAction = startDmActionState.value,
             isRoomDirectorySearchEnabled = isRoomDirectorySearchEnabled,
-            eventSink = ::handleEvents,
+            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 724d6e5e88..65f977d3e3 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6b5113cc94..1c82ae373e 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ebde080f75..ca308e4815 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 38d15f6de3..4e85dd0353 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -75,6 +76,15 @@ class DefaultUserListPresenter(
             }.launchIn(this)
         }
 
+        fun handleEvent(event: UserListEvents) {
+            when (event) {
+                is UserListEvents.OnSearchActiveChanged -> isSearchActive = event.active
+                is UserListEvents.UpdateSearchQuery -> searchQuery = event.query
+                is UserListEvents.AddToSelection -> userListDataStore.selectUser(event.matrixUser)
+                is UserListEvents.RemoveFromSelection -> userListDataStore.removeUserFromSelection(event.matrixUser)
+            }
+        }
+
         return UserListState(
             searchQuery = searchQuery,
             searchResults = searchResults,
@@ -83,14 +93,7 @@ class DefaultUserListPresenter(
             showSearchLoader = showSearchLoader,
             selectionMode = args.selectionMode,
             recentDirectRooms = recentDirectRooms.toImmutableList(),
-            eventSink = { event ->
-                when (event) {
-                    is UserListEvents.OnSearchActiveChanged -> isSearchActive = event.active
-                    is UserListEvents.UpdateSearchQuery -> searchQuery = event.query
-                    is UserListEvents.AddToSelection -> userListDataStore.selectUser(event.matrixUser)
-                    is UserListEvents.RemoveFromSelection -> userListDataStore.removeUserFromSelection(event.matrixUser)
-                }
-            },
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListDataStore.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListDataStore.kt
index 99fc19f6e1..f7ca98a7e6 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListDataStore.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListEvents.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListEvents.kt
index 794b2c18af..99e910b89f 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListEvents.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenter.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenter.kt
index a07b39a1e7..797938b003 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenter.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenterArgs.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenterArgs.kt
index d7e6a727f8..d1dbf8a382 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenterArgs.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListPresenterArgs.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListState.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListState.kt
index 2186bcb57a..33b74d240c 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListState.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 65b4efdadb..cd43f96688 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/main/res/values-hr/translations.xml b/features/startchat/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..8f0407fcde
--- /dev/null
+++ b/features/startchat/impl/src/main/res/values-hr/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">"Nova soba"</string>
+  <string name="screen_room_directory_search_title">"Direktorij soba"</string>
+  <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_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>
+</resources>
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 6d676d3c76..6b148a7a4c 100644
--- a/features/startchat/impl/src/main/res/values-ru/translations.xml
+++ b/features/startchat/impl/src/main/res/values-ru/translations.xml
@@ -2,7 +2,7 @@
 <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_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>
diff --git a/features/startchat/impl/src/main/res/values-uz/translations.xml b/features/startchat/impl/src/main/res/values-uz/translations.xml
index a789abc565..b2523ab7bd 100644
--- a/features/startchat/impl/src/main/res/values-uz/translations.xml
+++ b/features/startchat/impl/src/main/res/values-uz/translations.xml
@@ -3,4 +3,10 @@
   <string name="screen_create_room_action_create_room">"Yangi xona"</string>
   <string name="screen_room_directory_search_title">"Xona katalogi"</string>
   <string name="screen_start_chat_error_starting_chat">"Suhbatni boshlashda xatolik yuz berdi"</string>
+  <string name="screen_start_chat_join_room_by_address_action">"Xonaga manzil orqali kirish"</string>
+  <string name="screen_start_chat_join_room_by_address_invalid_address">"Yaroqli manzil emas"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Kirish…"</string>
+  <string name="screen_start_chat_join_room_by_address_room_found">"Mos xona topildi"</string>
+  <string name="screen_start_chat_join_room_by_address_room_not_found">"Xona topilmadi"</string>
+  <string name="screen_start_chat_join_room_by_address_supporting_text">"masalan #xona-nomi:matrix.org"</string>
 </resources>
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPointTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPointTest.kt
index 8f4a41a3fa..b00a595747 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPointTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartChatEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,10 +10,9 @@ package io.element.android.features.startchat.impl
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.createroom.api.CreateRoomEntryPoint
+import io.element.android.features.createroom.api.FakeCreateRoomEntryPoint
 import io.element.android.features.startchat.api.StartChatEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -34,18 +34,18 @@ class DefaultStartChatEntryPointTest {
             StartChatFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                createRoomEntryPoint = object : CreateRoomEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                createRoomEntryPoint = FakeCreateRoomEntryPoint(),
             )
         }
         val callback = object : StartChatEntryPoint.Callback {
-            override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) = lambdaError()
-            override fun onOpenRoomDirectory() = lambdaError()
+            override fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) = lambdaError()
+            override fun navigateToRoomDirectory() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(StartChatFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
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 fa6e140c3a..122775f2cc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/FakeStartChatNavigator.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/FakeStartChatNavigator.kt
index 9de00e0a4c..ba1b6a4e69 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/FakeStartChatNavigator.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/FakeStartChatNavigator.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ class FakeStartChatNavigator(
     private val dismissJoinRoomByAddressLambda: () -> Unit = {},
     private val openRoomDirectoryLambda: () -> Unit = {},
 ) : StartChatNavigator {
-    override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
+    override fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
         openRoomLambda(roomIdOrAlias, serverNames)
     }
 
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
index bd40b92d57..74c43d683e 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4de9bd1470..eeea85cb63 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7340981053..7b34b8b52b 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 dc213446a0..9237f3433c 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 50bbc425c2..c02b59f77a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenter.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenter.kt
index 84c4fd9d67..960f596b7a 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenter.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenterFactory.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenterFactory.kt
index 8e80626e86..d61ae25a9c 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenterFactory.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/FakeUserListPresenterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/test/build.gradle.kts b/features/startchat/test/build.gradle.kts
index 96b05a80fa..d6d1471832 100644
--- a/features/startchat/test/build.gradle.kts
+++ b/features/startchat/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/startchat/test/src/main/kotlin/io/element/android/features/invitepeople/test/FakeStartDMAction.kt b/features/startchat/test/src/main/kotlin/io/element/android/features/invitepeople/test/FakeStartDMAction.kt
index d7ab63d0e3..c4969df4d9 100644
--- a/features/startchat/test/src/main/kotlin/io/element/android/features/invitepeople/test/FakeStartDMAction.kt
+++ b/features/startchat/test/src/main/kotlin/io/element/android/features/invitepeople/test/FakeStartDMAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/userprofile/api/build.gradle.kts b/features/userprofile/api/build.gradle.kts
index 8bdaa8d77e..45278693f2 100644
--- a/features/userprofile/api/build.gradle.kts
+++ b/features/userprofile/api/build.gradle.kts
@@ -1,12 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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")
     id("kotlin-parcelize")
 }
 
diff --git a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEntryPoint.kt b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEntryPoint.kt
index 70968aad61..6d02280e88 100644
--- a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEntryPoint.kt
+++ b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,14 +20,13 @@ interface UserProfileEntryPoint : FeatureEntryPoint {
     data class Params(val userId: UserId) : NodeInputs
 
     interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId)
+        fun navigateToRoom(roomId: RoomId)
     }
 
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
-
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 }
diff --git a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEvents.kt b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEvents.kt
index 4a5f6bb415..55c9c40f74 100644
--- a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEvents.kt
+++ b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfilePresenterFactory.kt b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfilePresenterFactory.kt
index 593fda92f2..4bf68ae324 100644
--- a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfilePresenterFactory.kt
+++ b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfilePresenterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b9f08a27f3..0e0016ee14 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/userprofile/impl/build.gradle.kts b/features/userprofile/impl/build.gradle.kts
index f0c214c22e..0b65441cc3 100644
--- a/features/userprofile/impl/build.gradle.kts
+++ b/features/userprofile/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -44,6 +45,9 @@ dependencies {
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.mediaviewer.test)
+    testImplementation(projects.features.call.test)
+    testImplementation(projects.features.verifysession.test)
     testImplementation(projects.features.startchat.test)
     testImplementation(projects.features.enterprise.test)
 }
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPoint.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPoint.kt
index bfc8a30df6..e1b15198cf 100644
--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPoint.kt
+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,22 @@ package io.element.android.features.userprofile.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUserProfileEntryPoint : UserProfileEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): UserProfileEntryPoint.NodeBuilder {
-        return object : UserProfileEntryPoint.NodeBuilder {
-            val plugins = ArrayList<Plugin>()
-
-            override fun params(params: UserProfileEntryPoint.Params): UserProfileEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun callback(callback: UserProfileEntryPoint.Callback): UserProfileEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<UserProfileFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: UserProfileEntryPoint.Params,
+        callback: UserProfileEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<UserProfileFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(params, callback),
+        )
     }
 }
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfilePresenterFactory.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfilePresenterFactory.kt
index 775cdf5ff9..03d803fcd2 100644
--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfilePresenterFactory.kt
+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfilePresenterFactory.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.userprofile.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.userprofile.api.UserProfilePresenterFactory
 import io.element.android.features.userprofile.api.UserProfileState
 import io.element.android.features.userprofile.impl.root.UserProfilePresenter
@@ -17,7 +17,6 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.UserId
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultUserProfilePresenterFactory(
     private val factory: UserProfilePresenter.Factory,
 ) : UserProfilePresenterFactory {
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 5828d60c25..f95ccce528 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -28,6 +28,7 @@ import io.element.android.features.userprofile.shared.UserProfileNodeHelper
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+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.SessionScope
@@ -67,25 +68,26 @@ class UserProfileFlowNode(
         data class VerifyUser(val userId: UserId) : NavTarget
     }
 
+    private val callback: UserProfileEntryPoint.Callback = callback()
     private val inputs = inputs<UserProfileEntryPoint.Params>()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Root -> {
                 val callback = object : UserProfileNodeHelper.Callback {
-                    override fun openAvatarPreview(username: String, avatarUrl: String) {
+                    override fun navigateToAvatarPreview(username: String, avatarUrl: String) {
                         backstack.push(NavTarget.AvatarPreview(username, avatarUrl))
                     }
 
-                    override fun onStartDM(roomId: RoomId) {
-                        plugins<UserProfileEntryPoint.Callback>().forEach { it.onOpenRoom(roomId) }
+                    override fun navigateToRoom(roomId: RoomId) {
+                        callback.navigateToRoom(roomId)
                     }
 
-                    override fun onStartCall(dmRoomId: RoomId) {
+                    override fun startCall(dmRoomId: RoomId) {
                         elementCallEntryPoint.startCall(CallType.RoomCall(sessionId = sessionId, roomId = dmRoomId))
                     }
 
-                    override fun onVerifyUser(userId: UserId) {
+                    override fun startVerifyUserFlow(userId: UserId) {
                         backstack.push(NavTarget.VerifyUser(userId))
                     }
                 }
@@ -98,26 +100,48 @@ class UserProfileFlowNode(
                         backstack.pop()
                     }
 
-                    override fun onViewInTimeline(eventId: EventId) {
+                    override fun viewInTimeline(eventId: EventId) {
+                        // Cannot happen
+                    }
+
+                    override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
                         // Cannot happen
                     }
                 }
-                mediaViewerEntryPoint.nodeBuilder(this, buildContext)
-                    .avatar(
-                        filename = navTarget.name,
-                        avatarUrl = navTarget.avatarUrl
-                    )
-                    .callback(callback)
-                    .build()
+                val params = mediaViewerEntryPoint.createParamsForAvatar(
+                    filename = navTarget.name,
+                    avatarUrl = navTarget.avatarUrl,
+                )
+                mediaViewerEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
             }
             is NavTarget.VerifyUser -> {
                 val params = OutgoingVerificationEntryPoint.Params(
                     showDeviceVerifiedScreen = false,
                     verificationRequest = VerificationRequest.Outgoing.User(userId = navTarget.userId)
                 )
-                outgoingVerificationEntryPoint.nodeBuilder(this, buildContext)
-                    .params(params)
-                    .build()
+                outgoingVerificationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = object : OutgoingVerificationEntryPoint.Callback {
+                        override fun navigateToLearnMoreAboutEncryption() {
+                            // No op
+                        }
+
+                        override fun onBack() {
+                            // No op
+                        }
+
+                        override fun onDone() {
+                            // No op
+                        }
+                    }
+                )
             }
         }
     }
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt
index 735957946a..71f95a2e84 100644
--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt
+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -63,7 +64,7 @@ class UserProfileNode(
         }
 
         fun onStartDM(roomId: RoomId) {
-            callback.onStartDM(roomId)
+            callback.navigateToRoom(roomId)
         }
 
         val state = presenter.present()
@@ -74,9 +75,9 @@ class UserProfileNode(
             goBack = this::navigateUp,
             onShareUser = ::onShareUser,
             onOpenDm = ::onStartDM,
-            onStartCall = callback::onStartCall,
-            openAvatarPreview = callback::openAvatarPreview,
-            onVerifyClick = callback::onVerifyUser,
+            onStartCall = callback::startCall,
+            openAvatarPreview = callback::navigateToAvatarPreview,
+            onVerifyClick = callback::startVerifyUserFlow,
         )
     }
 }
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 3f226d0213..7e09a03ec3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,6 +34,8 @@ import io.element.android.libraries.core.bool.orFalse
 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.powerlevels.canCall
+import io.element.android.libraries.matrix.api.room.powerlevels.use
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -55,7 +58,7 @@ class UserProfilePresenter(
 
     @Composable
     private fun getDmRoomId(): State<RoomId?> {
-        return produceState<RoomId?>(initialValue = null) {
+        return produceState(initialValue = null) {
             value = client.findDM(userId).getOrNull()
         }
     }
@@ -65,7 +68,6 @@ class UserProfilePresenter(
         val isElementCallAvailable by produceState(initialValue = false, roomId) {
             value = sessionEnterpriseService.isElementCallAvailable()
         }
-
         return produceState(initialValue = false, isElementCallAvailable, roomId) {
             value = when {
                 isElementCallAvailable.not() -> false
@@ -74,7 +76,7 @@ class UserProfilePresenter(
                     roomId
                         ?.let { client.getRoom(it) }
                         ?.use { room ->
-                            room.canUserJoinCall(client.sessionId).getOrNull()
+                            room.roomPermissions().use(false) { perms -> perms.canCall() }
                         }
                         .orFalse()
             }
@@ -99,7 +101,7 @@ class UserProfilePresenter(
         }
         val userProfile by produceState<MatrixUser?>(null) { value = client.getProfile(userId).getOrNull() }
 
-        fun handleEvents(event: UserProfileEvents) {
+        fun handleEvent(event: UserProfileEvents) {
             when (event) {
                 is UserProfileEvents.BlockUser -> {
                     if (event.needsConfirmation) {
@@ -151,7 +153,7 @@ class UserProfilePresenter(
             dmRoomId = dmRoomId,
             canCall = canCall,
             snackbarMessage = null,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPointTest.kt b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPointTest.kt
index 75bc434048..652bbc6d94 100644
--- a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPointTest.kt
+++ b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/DefaultUserProfileEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,19 +10,15 @@ package io.element.android.features.userprofile.impl
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.api.ElementCallEntryPoint
+import io.element.android.features.call.test.FakeElementCallEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
-import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
-import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.features.verifysession.test.FakeOutgoingVerificationEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
-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.mediaviewer.api.MediaViewerEntryPoint
+import io.element.android.libraries.mediaviewer.test.FakeMediaViewerEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import org.junit.Rule
@@ -43,41 +40,25 @@ class DefaultUserProfileEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 sessionId = A_SESSION_ID,
-                elementCallEntryPoint = object : ElementCallEntryPoint {
-                    override fun startCall(callType: CallType) = lambdaError()
-                    override suspend fun handleIncomingCall(
-                        callType: CallType.RoomCall,
-                        eventId: EventId,
-                        senderId: UserId,
-                        roomName: String?,
-                        senderName: String?,
-                        avatarUrl: String?,
-                        timestamp: Long,
-                        expirationTimestamp: Long,
-                        notificationChannelId: String,
-                        textContent: String?
-                    ) = lambdaError()
-                },
-                mediaViewerEntryPoint = object : MediaViewerEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
-                outgoingVerificationEntryPoint = object : OutgoingVerificationEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                },
+                elementCallEntryPoint = FakeElementCallEntryPoint(),
+                mediaViewerEntryPoint = FakeMediaViewerEntryPoint(),
+                outgoingVerificationEntryPoint = FakeOutgoingVerificationEntryPoint(),
             )
         }
         val callback = object : UserProfileEntryPoint.Callback {
-            override fun onOpenRoom(roomId: RoomId) {
+            override fun navigateToRoom(roomId: RoomId) {
                 lambdaError()
             }
         }
         val params = UserProfileEntryPoint.Params(
             userId = A_USER_ID,
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(UserProfileFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
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 dd937b067a..511effe750 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,6 +28,7 @@ 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.StateEventType
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -35,9 +37,11 @@ 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.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.tests.testutils.WarmUpRule
 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.test
@@ -88,15 +92,7 @@ class UserProfilePresenterTest {
     @Test
     fun `present - canCall is false when canUserJoinCall returns false`() {
         testCanCall(
-            canUserJoinCallResult = Result.success(false),
-            expectedResult = false,
-        )
-    }
-
-    @Test
-    fun `present - canCall is false when canUserJoinCall fails`() {
-        testCanCall(
-            canUserJoinCallResult = Result.failure(AN_EXCEPTION),
+            canUserJoinCall = false,
             expectedResult = false,
         )
     }
@@ -127,7 +123,7 @@ class UserProfilePresenterTest {
 
     private fun testCanCall(
         isElementCallAvailable: Boolean = true,
-        canUserJoinCallResult: Result<Boolean> = Result.success(true),
+        canUserJoinCall: Boolean = true,
         dmRoom: RoomId? = A_ROOM_ID,
         canFindRoom: Boolean = true,
         expectedResult: Boolean,
@@ -135,7 +131,14 @@ class UserProfilePresenterTest {
         checkThatRoomIsDestroyed: Boolean = false,
     ) = runTest {
         val room = FakeBaseRoom(
-            canUserJoinCallResult = { canUserJoinCallResult },
+            roomPermissions = FakeRoomPermissions(
+                canSendState = { type ->
+                    when (type) {
+                        StateEventType.CallMember -> canUserJoinCall
+                        else -> lambdaError()
+                    }
+                }
+            ),
         )
         val client = createFakeMatrixClient().apply {
             if (canFindRoom) {
@@ -385,14 +388,12 @@ class UserProfilePresenterTest {
     }
 
     private fun createFakeMatrixClient(
-        isUserVerified: Boolean = true,
         userIdentityState: IdentityState? = null,
         ignoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
         unIgnoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
         ignoredUsersFlow: StateFlow<ImmutableList<UserId>> = MutableStateFlow(persistentListOf())
     ) = FakeMatrixClient(
         encryptionService = FakeEncryptionService(
-            isUserVerifiedResult = { Result.success(isUserVerified) },
             getUserIdentityResult = { Result.success(userIdentityState) }
         ),
         ignoreUserResult = ignoreUserResult,
diff --git a/features/userprofile/shared/build.gradle.kts b/features/userprofile/shared/build.gradle.kts
index 95f64154cf..7f4d96c883 100644
--- a/features/userprofile/shared/build.gradle.kts
+++ b/features/userprofile/shared/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 415a6e3282..b27d1ad091 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileMainActionsSection.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileMainActionsSection.kt
index a06813cc02..0ed6d14aca 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileMainActionsSection.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileMainActionsSection.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileNodeHelper.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileNodeHelper.kt
index 61f4669769..6f2266eef2 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileNodeHelper.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileNodeHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,10 +22,10 @@ class UserProfileNodeHelper(
     private val userId: UserId,
 ) {
     interface Callback : NodeInputs {
-        fun openAvatarPreview(username: String, avatarUrl: String)
-        fun onStartDM(roomId: RoomId)
-        fun onStartCall(dmRoomId: RoomId)
-        fun onVerifyUser(userId: UserId)
+        fun navigateToAvatarPreview(username: String, avatarUrl: String)
+        fun navigateToRoom(roomId: RoomId)
+        fun startCall(dmRoomId: RoomId)
+        fun startVerifyUserFlow(userId: UserId)
     }
 
     fun onShareUser(
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 25cb8a5df6..49a2fee4b5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f39cbfaf73..48f89390da 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt
index f6984d4858..2ba17b947b 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6446acdb0f..c3caffa7f3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -69,7 +70,7 @@ private fun PreferenceBlockUser(
     isLoading: Boolean,
     eventSink: (UserProfileEvents) -> Unit,
 ) {
-    val loadingCurrentValue = @Composable {
+    val loadingCurrentValue = @Composable { _: Boolean ->
         CircularProgressIndicator(
             modifier = Modifier
                 .progressSemantics()
diff --git a/features/userprofile/shared/src/main/res/values-fa/translations.xml b/features/userprofile/shared/src/main/res/values-fa/translations.xml
index 65664a007a..4eca6a0be9 100644
--- a/features/userprofile/shared/src/main/res/values-fa/translations.xml
+++ b/features/userprofile/shared/src/main/res/values-fa/translations.xml
@@ -13,5 +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_start_chat_error_starting_chat">"هنگام تلاش برای شروع چت خطایی روی داد"</string>
 </resources>
diff --git a/features/userprofile/shared/src/main/res/values-hr/translations.xml b/features/userprofile/shared/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..5bfaf99a61
--- /dev/null
+++ b/features/userprofile/shared/src/main/res/values-hr/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">"Blokiraj"</string>
+  <string name="screen_dm_details_block_alert_description">"Blokirani korisnici neće vam moći slati poruke i sve njihove poruke bit će skrivene. Možete ih odblokirati u bilo kojem trenutku."</string>
+  <string name="screen_dm_details_block_user">"Blokiraj korisnika"</string>
+  <string name="screen_dm_details_unblock_alert_action">"Odblokiraj"</string>
+  <string name="screen_dm_details_unblock_alert_description">"Moći ćete ponovno vidjeti sve njihove poruke."</string>
+  <string name="screen_dm_details_unblock_user">"Odblokiraj korisnika"</string>
+  <string name="screen_room_member_details_block_alert_action">"Blokiraj"</string>
+  <string name="screen_room_member_details_block_alert_description">"Blokirani korisnici neće vam moći slati poruke i sve njihove poruke bit će skrivene. Možete ih odblokirati u bilo kojem trenutku."</string>
+  <string name="screen_room_member_details_block_user">"Blokiraj korisnika"</string>
+  <string name="screen_room_member_details_title">"Profil"</string>
+  <string name="screen_room_member_details_unblock_alert_action">"Odblokiraj"</string>
+  <string name="screen_room_member_details_unblock_alert_description">"Moći ćete ponovno vidjeti sve njihove poruke."</string>
+  <string name="screen_room_member_details_unblock_user">"Odblokiraj korisnika"</string>
+  <string name="screen_room_member_details_verify_button_subtitle">"Pomoću mrežne aplikacije provjerite ovog korisnika."</string>
+  <string name="screen_room_member_details_verify_button_title">"Provjeri korisnika %1$s"</string>
+  <string name="screen_start_chat_error_starting_chat">"Došlo je do pogreške prilikom pokretanja razgovora"</string>
+</resources>
diff --git a/features/userprofile/shared/src/main/res/values-ru/translations.xml b/features/userprofile/shared/src/main/res/values-ru/translations.xml
index 4138f6471b..fde62b2a3f 100644
--- a/features/userprofile/shared/src/main/res/values-ru/translations.xml
+++ b/features/userprofile/shared/src/main/res/values-ru/translations.xml
@@ -15,5 +15,5 @@
   <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_start_chat_error_starting_chat">"Произошла ошибка при запуске чата"</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 0e614e53d7..dc41fb31c8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b7d300a30e..3219658796 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/api/build.gradle.kts b/features/verifysession/api/build.gradle.kts
index 646f817745..0f174f3e6c 100644
--- a/features/verifysession/api/build.gradle.kts
+++ b/features/verifysession/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/IncomingVerificationEntryPoint.kt b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/IncomingVerificationEntryPoint.kt
index 9d90f33e8d..0330bf47fc 100644
--- a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/IncomingVerificationEntryPoint.kt
+++ b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/IncomingVerificationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,13 +20,12 @@ interface IncomingVerificationEntryPoint : FeatureEntryPoint {
         val verificationRequest: VerificationRequest.Incoming,
     ) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone()
diff --git a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/OutgoingVerificationEntryPoint.kt b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/OutgoingVerificationEntryPoint.kt
index 60536504d2..d7608caf98 100644
--- a/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/OutgoingVerificationEntryPoint.kt
+++ b/features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/OutgoingVerificationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,16 +21,15 @@ interface OutgoingVerificationEntryPoint : FeatureEntryPoint {
         val verificationRequest: VerificationRequest.Outgoing,
     ) : NodeInputs
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun params(params: Params): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onLearnMoreAboutEncryption()
+        fun navigateToLearnMoreAboutEncryption()
         fun onBack()
         fun onDone()
     }
diff --git a/features/verifysession/impl/build.gradle.kts b/features/verifysession/impl/build.gradle.kts
index 13e9010e7f..89a87edf19 100644
--- a/features/verifysession/impl/build.gradle.kts
+++ b/features/verifysession/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/EmojiResource.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/EmojiResource.kt
index b562d8dd15..3957107793 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/EmojiResource.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/EmojiResource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.verifysession.impl.emoji
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/SasEmojisPreview.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/SasEmojisPreview.kt
index a5a80fbaa2..9facf31c8d 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/SasEmojisPreview.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/SasEmojisPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt
index c1a6418153..6567594c0f 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,19 @@ package io.element.android.features.verifysession.impl.incoming
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultIncomingVerificationEntryPoint : IncomingVerificationEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): IncomingVerificationEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : IncomingVerificationEntryPoint.NodeBuilder {
-            override fun callback(callback: IncomingVerificationEntryPoint.Callback): IncomingVerificationEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun params(params: IncomingVerificationEntryPoint.Params): IncomingVerificationEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<IncomingVerificationNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: IncomingVerificationEntryPoint.Params,
+        callback: IncomingVerificationEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<IncomingVerificationNode>(buildContext, listOf(params, callback))
     }
 }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNavigator.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNavigator.kt
index 4430c0221f..8572030f97 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNavigator.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNavigator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNode.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNode.kt
index a17054b9e6..3eb8735838 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNode.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 
@@ -28,13 +29,14 @@ class IncomingVerificationNode(
     presenterFactory: IncomingVerificationPresenter.Factory,
 ) : Node(buildContext, plugins = plugins),
     IncomingVerificationNavigator {
+    private val callback: IncomingVerificationEntryPoint.Callback = callback()
     private val presenter = presenterFactory.create(
         verificationRequest = inputs<IncomingVerificationEntryPoint.Params>().verificationRequest,
         navigator = this,
     )
 
     override fun onFinish() {
-        plugins<IncomingVerificationEntryPoint.Callback>().forEach { it.onDone() }
+        callback.onDone()
     }
 
     @Composable
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt
index 176176a895..aa991a54bc 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -107,7 +108,7 @@ class IncomingVerificationPresenter(
             }
         }
 
-        fun handleEvents(event: IncomingVerificationViewEvents) {
+        fun handleEvent(event: IncomingVerificationViewEvents) {
             Timber.d("Verification user action: ${event::class.simpleName}")
             when (event) {
                 IncomingVerificationViewEvents.StartVerification ->
@@ -141,7 +142,7 @@ class IncomingVerificationPresenter(
         return IncomingVerificationState(
             step = step,
             request = verificationRequest,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationState.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationState.kt
index 00bffa4ce3..311fc13e74 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationState.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationState.kt
@@ -1,19 +1,18 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.verifysession.impl.incoming
 
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.verification.SessionVerificationData
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 
-@Immutable
 data class IncomingVerificationState(
     val step: Step,
     val request: VerificationRequest.Incoming,
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateMachine.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateMachine.kt
index 40fbf4379c..babb12f191 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateMachine.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateMachine.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 478e696889..77f5af4a2e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
index 4506dfe0c9..286d826a6a 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewEvents.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewEvents.kt
index 7a75ec0f45..383354860b 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewEvents.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/ui/SessionDetailsView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/ui/SessionDetailsView.kt
index 14cd6733d9..308410f259 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/ui/SessionDetailsView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/ui/SessionDetailsView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt
index 8355e71f75..9667c7781f 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,19 @@ package io.element.android.features.verifysession.impl.outgoing
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOutgoingVerificationEntryPoint : OutgoingVerificationEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): OutgoingVerificationEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : OutgoingVerificationEntryPoint.NodeBuilder {
-            override fun callback(callback: OutgoingVerificationEntryPoint.Callback): OutgoingVerificationEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun params(params: OutgoingVerificationEntryPoint.Params): OutgoingVerificationEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<OutgoingVerificationNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: OutgoingVerificationEntryPoint.Params,
+        callback: OutgoingVerificationEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<OutgoingVerificationNode>(buildContext, listOf(params, callback))
     }
 }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationNode.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationNode.kt
index 9941ce58fe..f6ccf8b9ef 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationNode.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 
@@ -27,8 +28,7 @@ class OutgoingVerificationNode(
     @Assisted plugins: List<Plugin>,
     presenterFactory: OutgoingVerificationPresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
-    private val callback = plugins<OutgoingVerificationEntryPoint.Callback>().first()
-
+    private val callback: OutgoingVerificationEntryPoint.Callback = callback()
     private val inputs = inputs<OutgoingVerificationEntryPoint.Params>()
 
     private val presenter = presenterFactory.create(
@@ -42,7 +42,7 @@ class OutgoingVerificationNode(
         OutgoingVerificationView(
             state = state,
             modifier = modifier,
-            onLearnMoreClick = callback::onLearnMoreAboutEncryption,
+            onLearnMoreClick = callback::navigateToLearnMoreAboutEncryption,
             onFinish = callback::onDone,
             onBack = callback::onBack,
         )
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenter.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenter.kt
index c985c15e36..90e8a3e598 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenter.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -92,7 +93,7 @@ class OutgoingVerificationPresenter(
             observeVerificationService()
         }
 
-        fun handleEvents(event: OutgoingVerificationViewEvents) {
+        fun handleEvent(event: OutgoingVerificationViewEvents) {
             Timber.d("Verification user action: ${event::class.simpleName}")
             when (event) {
                 // Just relay the event to the state machine
@@ -109,7 +110,7 @@ class OutgoingVerificationPresenter(
         return OutgoingVerificationState(
             step = step,
             request = verificationRequest,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationState.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationState.kt
index 9b2d5f2e40..6ba8a03a7f 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationState.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationState.kt
@@ -1,19 +1,18 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.verifysession.impl.outgoing
 
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.verification.SessionVerificationData
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 
-@Immutable
 data class OutgoingVerificationState(
     val step: Step,
     val request: VerificationRequest.Outgoing,
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 b078b6ed99..7932ccc484 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateProvider.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateProvider.kt
index ab7119d213..2da099df9f 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateProvider.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2357b39be7..f2d3ccfee2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewEvents.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewEvents.kt
index 3a59f579c8..9faab7e790 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewEvents.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/Common.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/Common.kt
index 8859a4180b..665a5e49f7 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/Common.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/Common.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationBottomMenu.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationBottomMenu.kt
index 96aef77a37..123a54e2d9 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationBottomMenu.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationBottomMenu.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7a31a26cbb..6fc593ffb2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2e17b736f2..edaadc583d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/util/StateMachineUtil.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/util/StateMachineUtil.kt
index f07cf5ea8f..3739af6959 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/util/StateMachineUtil.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/util/StateMachineUtil.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/main/res/values-bg/translations.xml b/features/verifysession/impl/src/main/res/values-bg/translations.xml
index 1a2e194696..357600cf60 100644
--- a/features/verifysession/impl/src/main/res/values-bg/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-bg/translations.xml
@@ -10,6 +10,9 @@
   <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_device_verified">"Устройството е потвърдено"</string>
   <string name="screen_session_verification_enter_recovery_key">"Въвеждане на ключ за възстановяване"</string>
@@ -20,13 +23,17 @@
   <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_title">"Неуспешно потвърждаване"</string>
+  <string name="screen_session_verification_request_footer">"Продължете само ако вие сте инициирали това потвърждаване."</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_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>
diff --git a/features/verifysession/impl/src/main/res/values-eo/translations.xml b/features/verifysession/impl/src/main/res/values-eo/translations.xml
deleted file mode 100644
index 71beec704e..0000000000
--- a/features/verifysession/impl/src/main/res/values-eo/translations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_identity_confirmation_create_new_recovery_key">"Create a new backup password"</string>
-  <string name="screen_identity_confirmation_subtitle">"Confirm this device to set up secure messaging."</string>
-  <string name="screen_identity_confirmation_title">"Confirm it\'s you"</string>
-  <string name="screen_identity_confirmation_use_recovery_key">"Use backup password"</string>
-  <string name="screen_identity_confirmed_title">"Device confirmed"</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Confirm that the emojis below match those shown on your other session."</string>
-  <string name="screen_session_verification_complete_subtitle">"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Now you can trust this user when sending or receiving messages."</string>
-  <string name="screen_session_verification_device_verified">"Device confirmed"</string>
-  <string name="screen_session_verification_enter_recovery_key">"Enter backup password"</string>
-  <string name="screen_session_verification_request_success_subtitle">"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted."</string>
-  <string name="screen_session_verification_request_success_title">"Device confirmed"</string>
-  <string name="screen_session_verification_use_another_device_title">"Open the app on another confirmed device"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"For extra security, another user wants to verify you. You\'ll be shown a set of emojis to compare."</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 ace791d1b0..ffc03e1f19 100644
--- a/features/verifysession/impl/src/main/res/values-fa/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-fa/translations.xml
@@ -11,10 +11,10 @@
   <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_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>
@@ -24,8 +24,9 @@
   <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_title">"صحت‌سنجی شکست خورد"</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>
diff --git a/features/verifysession/impl/src/main/res/values-hr/translations.xml b/features/verifysession/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..a2ccb7ce0a
--- /dev/null
+++ b/features/verifysession/impl/src/main/res/values-hr/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">"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_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>
+  <string name="screen_identity_confirmed_title">"Uređaj je potvrđen"</string>
+  <string name="screen_identity_use_another_device">"Upotrijebite drugi uređaj"</string>
+  <string name="screen_identity_waiting_on_other_device">"Čekanje na drugi uređaj…"</string>
+  <string name="screen_session_verification_cancelled_subtitle">"Nešto nije u redu. Zahtjev je istekao ili je odbijen."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Potvrdite da se emotikoni u nastavku podudaraju s onima prikazanima na vašem drugom uređaju."</string>
+  <string name="screen_session_verification_compare_emojis_title">"Usporedi emotikone"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Potvrdite da se emotikoni u nastavku podudaraju s onima prikazanima na uređaju drugog korisnika."</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"Potvrdite da se brojevi u nastavku podudaraju s onima prikazanima na vašoj drugoj sesiji."</string>
+  <string name="screen_session_verification_compare_numbers_title">"Usporedi brojeve"</string>
+  <string name="screen_session_verification_complete_subtitle">"Sada možete sigurno čitati ili slati poruke na svom drugom uređaju."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Sada možete biti sigurni u vjerodostojnost identiteta ovog korisnika prilikom slanja ili primanja poruka."</string>
+  <string name="screen_session_verification_device_verified">"Uređaj je potvrđen"</string>
+  <string name="screen_session_verification_enter_recovery_key">"Unesi ključ za oporavak"</string>
+  <string name="screen_session_verification_failed_subtitle">"Zahtjev je istekao, odbijen je ili je došlo do neusklađenosti u provjeri."</string>
+  <string name="screen_session_verification_open_existing_session_subtitle">"Dokažite da ste to vi kako biste mogli pristupiti povijesti svojih šifriranih poruka."</string>
+  <string name="screen_session_verification_open_existing_session_title">"Otvori postojeću sesiju"</string>
+  <string name="screen_session_verification_positive_button_canceled">"Ponovi provjeru"</string>
+  <string name="screen_session_verification_positive_button_initial">"Spreman/na sam."</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"Čekanje podudaranja…"</string>
+  <string name="screen_session_verification_ready_subtitle">"Usporedite jedinstveni skup emotikona."</string>
+  <string name="screen_session_verification_request_accepted_subtitle">"Usporedite jedinstvene emotikone, pazeći pritom da se pojavljuju istim redoslijedom."</string>
+  <string name="screen_session_verification_request_details_timestamp">"Prijavljen/a"</string>
+  <string name="screen_session_verification_request_failure_subtitle">"Zahtjev je istekao, odbijen je ili je došlo do neusklađenosti u provjeri."</string>
+  <string name="screen_session_verification_request_failure_title">"Provjera nije uspjela"</string>
+  <string name="screen_session_verification_request_footer">"Nastavite samo ako ste pokrenuli ovu provjeru."</string>
+  <string name="screen_session_verification_request_subtitle">"Potvrdite drugi uređaj kako biste zaštitili povijest poruka."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Sada možete sigurno čitati ili slati poruke na svom drugom uređaju."</string>
+  <string name="screen_session_verification_request_success_title">"Uređaj je potvrđen"</string>
+  <string name="screen_session_verification_request_title">"Zatražena je provjera"</string>
+  <string name="screen_session_verification_they_dont_match">"Ne podudaraju se"</string>
+  <string name="screen_session_verification_they_match">"Podudaraju se"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"Prije nego što odavde započnete provjeru, provjerite jeste li otvorili aplikaciju na drugom uređaju."</string>
+  <string name="screen_session_verification_use_another_device_title">"Otvorite aplikaciju na drugom potvrđenom uređaju"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Radi dodatne sigurnosti potvrdite ovog korisnika tako da usporedite skup emotikona na svojim uređajima. Učinite to koristeći se pouzdanim načinom komunikacije."</string>
+  <string name="screen_session_verification_user_initiator_title">"Želite li potvrditi ovog korisnika?"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Radi dodatne sigurnosti drugi korisnik želi potvrditi vaš identitet. Bit će vam prikazan skup emotikona za usporedbu."</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"Trebali biste vidjeti skočni prozor na drugom uređaju. Sada započnite provjeru odatle."</string>
+  <string name="screen_session_verification_waiting_another_device_title">"Započni provjeru na drugom uređaju"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Započni provjeru na drugom uređaju"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"Čeka se drugi korisnik"</string>
+  <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>
+</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 3be984865e..5b11c27cbe 100644
--- a/features/verifysession/impl/src/main/res/values-it/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-it/translations.xml
@@ -11,12 +11,12 @@
   <string name="screen_identity_use_another_device">"Usa un altro dispositivo"</string>
   <string name="screen_identity_waiting_on_other_device">"In attesa sull\'altro dispositivo…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"C\'è qualcosa che non va. La richiesta è scaduta o è stata rifiutata."</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Verifica che gli emoji sottostanti corrispondano a quelli mostrati nell\'altra sessione."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Verifica che le emoji sottostanti corrispondano a quelle mostrate sull\'altro dispositivo."</string>
   <string name="screen_session_verification_compare_emojis_title">"Confronta le emoji"</string>
   <string name="screen_session_verification_compare_emojis_user_subtitle">"Conferma che le emoji qui sotto corrispondano a quelle visualizzate sul dispositivo dell\'altro utente."</string>
   <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">"La tua nuova sessione è ora verificata. Ha accesso ai tuoi messaggi crittografati e gli altri utenti la vedranno come attendibile."</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_device_verified">"Dispositivo verificato"</string>
   <string name="screen_session_verification_enter_recovery_key">"Inserisci la chiave di recupero"</string>
@@ -33,7 +33,7 @@
   <string name="screen_session_verification_request_failure_title">"Verifica fallita"</string>
   <string name="screen_session_verification_request_footer">"Continua solo se tu hai avviato questa verifica."</string>
   <string name="screen_session_verification_request_subtitle">"Verifica l\'altro dispositivo per proteggere la cronologia dei messaggi."</string>
-  <string name="screen_session_verification_request_success_subtitle">"La tua nuova sessione è ora verificata. Ha accesso ai tuoi messaggi crittografati e gli altri utenti la vedranno come attendibile."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Ora puoi leggere o inviare messaggi in modo sicuro sul tuo altro dispositivo."</string>
   <string name="screen_session_verification_request_success_title">"Dispositivo verificato"</string>
   <string name="screen_session_verification_request_title">"Richiesta di verifica"</string>
   <string name="screen_session_verification_they_dont_match">"Non corrispondono"</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 f76f2c31fa..92b0572d08 100644
--- a/features/verifysession/impl/src/main/res/values-pl/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pl/translations.xml
@@ -16,7 +16,7 @@
   <string name="screen_session_verification_compare_emojis_user_subtitle">"Upewnij się, że emoji poniżej odpowiadają tym na urządzeniu drugiego użytkownika."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Upewnij się, że liczby poniżej pasują do tych wyświetlanych na innej sesji."</string>
   <string name="screen_session_verification_compare_numbers_title">"Porównaj liczby"</string>
-  <string name="screen_session_verification_complete_subtitle">"Twoja nowa sesja jest teraz zweryfikowana. Ma ona dostęp do Twoich zaszyfrowanych wiadomości, a inni użytkownicy będą widzieć ją jako zaufaną."</string>
+  <string name="screen_session_verification_complete_subtitle">"Teraz możesz bezpiecznie czytać i wysyłać wiadomości na swoim drugim urządzeniu."</string>
   <string name="screen_session_verification_complete_user_subtitle">"Teraz możesz zaufać tożsamości tego użytkownika podczas wysyłania lub odbierania wiadomości."</string>
   <string name="screen_session_verification_device_verified">"Urządzenie zweryfikowane"</string>
   <string name="screen_session_verification_enter_recovery_key">"Wprowadź klucz przywracania"</string>
@@ -33,7 +33,7 @@
   <string name="screen_session_verification_request_failure_title">"Weryfikacja nie powiodła się"</string>
   <string name="screen_session_verification_request_footer">"Kontynuuj tylko, jeśli to Ty zainicjowałeś tę weryfikację."</string>
   <string name="screen_session_verification_request_subtitle">"Zweryfikuj drugie urządzenie, aby zabezpieczyć historię wiadomości."</string>
-  <string name="screen_session_verification_request_success_subtitle">"Twoja nowa sesja jest teraz zweryfikowana. Ma ona dostęp do Twoich zaszyfrowanych wiadomości, a inni użytkownicy będą widzieć ją jako zaufaną."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Teraz możesz bezpiecznie czytać i wysyłać wiadomości na swoim drugim urządzeniu."</string>
   <string name="screen_session_verification_request_success_title">"Urządzenie zweryfikowane"</string>
   <string name="screen_session_verification_request_title">"Zażądano weryfikacji"</string>
   <string name="screen_session_verification_they_dont_match">"Nie pasują do siebie"</string>
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 8dd7c9a2f7..591c482ca6 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
@@ -11,12 +11,12 @@
   <string name="screen_identity_use_another_device">"Usar outro dispositivo"</string>
   <string name="screen_identity_waiting_on_other_device">"Aguardando o outro dispositivo…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"Algo não parece certo. Ou a solicitação atingiu o tempo limite ou a solicitação foi negada."</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Confirme se os emojis abaixo correspondem aos mostrados na sua outra sessão."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Confirme que os emojis abaixo correspondem aos mostrados no seu outro dispositivo."</string>
   <string name="screen_session_verification_compare_emojis_title">"Compare os emojis"</string>
   <string name="screen_session_verification_compare_emojis_user_subtitle">"Confirme se os emojis abaixo correspondem aos exibidos no dispositivo do outro usuário."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Confirme se os números abaixo correspondem aos mostrados na sua outra sessão."</string>
   <string name="screen_session_verification_compare_numbers_title">"Comparar números"</string>
-  <string name="screen_session_verification_complete_subtitle">"Sua nova sessão está verificada agora. Ela tem acesso às suas mensagens criptografadas e outros usuários a verão como confiável."</string>
+  <string name="screen_session_verification_complete_subtitle">"Agora você pode enviar ou receber mensagens com segurança no seu outro dispositivo."</string>
   <string name="screen_session_verification_complete_user_subtitle">"Agora você pode confiar na identidade desse usuário ao enviar ou receber mensagens."</string>
   <string name="screen_session_verification_device_verified">"Dispositivo verificado"</string>
   <string name="screen_session_verification_enter_recovery_key">"Digitar chave de recuperação"</string>
@@ -33,7 +33,7 @@
   <string name="screen_session_verification_request_failure_title">"A verificação falhou"</string>
   <string name="screen_session_verification_request_footer">"Continue somente se você iniciou esta verificação."</string>
   <string name="screen_session_verification_request_subtitle">"Verifique o outro dispositivo para manter seu histórico de mensagens seguro."</string>
-  <string name="screen_session_verification_request_success_subtitle">"Sua nova sessão está verificada agora. Ela tem acesso às suas mensagens criptografadas e outros usuários a verão como confiável."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Agora você pode enviar ou receber mensagens com segurança no seu outro dispositivo."</string>
   <string name="screen_session_verification_request_success_title">"Dispositivo verificado"</string>
   <string name="screen_session_verification_request_title">"Verificação solicitada"</string>
   <string name="screen_session_verification_they_dont_match">"Eles não combinam"</string>
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 7c4781db77..932b8555fc 100644
--- a/features/verifysession/impl/src/main/res/values-sk/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-sk/translations.xml
@@ -11,12 +11,12 @@
   <string name="screen_identity_use_another_device">"Použite iné zariadenie"</string>
   <string name="screen_identity_waiting_on_other_device">"Čaká sa na druhom zariadení…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"Zdá sa, že niečo nie je v poriadku. Časový limit žiadosti vypršal alebo bola žiadosť zamietnutá."</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Skontrolujte, či sa emotikony uvedené nižšie zhodujú s emotikonmi zobrazenými vo vašej druhej relácii."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Potvrďte, že nižšie uvedené emotikony sa zhodujú s emotikonmi zobrazenými na vašom druhom zariadení."</string>
   <string name="screen_session_verification_compare_emojis_title">"Porovnajte emotikony"</string>
   <string name="screen_session_verification_compare_emojis_user_subtitle">"Potvrďte, že emotikony uvedené nižšie zodpovedajú emotikonom zobrazeným na zariadení druhého používateľa."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Skontrolujte, či sa nižšie uvedené čísla zhodujú s číslami zobrazenými na vašej druhej relácii."</string>
   <string name="screen_session_verification_compare_numbers_title">"Porovnať čísla"</string>
-  <string name="screen_session_verification_complete_subtitle">"Vaša nová relácia je teraz overená. Má prístup k vašim zašifrovaným správam a ostatní používatelia ju budú vidieť ako dôveryhodnú."</string>
+  <string name="screen_session_verification_complete_subtitle">"Teraz môžete bezpečne čítať alebo odosielať správy na svojom druhom zariadení."</string>
   <string name="screen_session_verification_complete_user_subtitle">"Teraz môžete dôverovať identite tohto používateľa pri odosielaní alebo prijímaní správ."</string>
   <string name="screen_session_verification_device_verified">"Zariadenie overené"</string>
   <string name="screen_session_verification_enter_recovery_key">"Zadajte kľúč na obnovenie"</string>
@@ -33,7 +33,7 @@
   <string name="screen_session_verification_request_failure_title">"Overenie zlyhalo"</string>
   <string name="screen_session_verification_request_footer">"Pokračujte iba vtedy, ak ste toto overenie začali."</string>
   <string name="screen_session_verification_request_subtitle">"Overte druhé zariadenie, aby bola vaša história správ zabezpečená."</string>
-  <string name="screen_session_verification_request_success_subtitle">"Vaša nová relácia je teraz overená. Má prístup k vašim zašifrovaným správam a ostatní používatelia ju budú vidieť ako dôveryhodnú."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Teraz môžete bezpečne čítať alebo odosielať správy na svojom druhom zariadení."</string>
   <string name="screen_session_verification_request_success_title">"Zariadenie overené"</string>
   <string name="screen_session_verification_request_title">"Vyžadované overenie"</string>
   <string name="screen_session_verification_they_dont_match">"Nezhodujú sa"</string>
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 3e92ab0189..53b26d75de 100644
--- a/features/verifysession/impl/src/main/res/values-sv/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-sv/translations.xml
@@ -11,7 +11,7 @@
   <string name="screen_identity_use_another_device">"Använd en annan enhet"</string>
   <string name="screen_identity_waiting_on_other_device">"Väntar på annan enhet …"</string>
   <string name="screen_session_verification_cancelled_subtitle">"Något verkar inte stämma. Antingen gick tidsgränsen för begäran ut eller så avvisades begäran."</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Bekräfta att emojierna nedan matchar de som visas på din andra session."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Bekräfta att emojierna nedan matchar de som visas på din andra enhet."</string>
   <string name="screen_session_verification_compare_emojis_title">"Jämför emojis"</string>
   <string name="screen_session_verification_compare_emojis_user_subtitle">"Bekräfta att emojierna nedan matchar de som visas på den andra användarens enhet."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Bekräfta att siffrorna nedan matchar de som visas på din andra session."</string>
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 5204e759b3..26ba7393df 100644
--- a/features/verifysession/impl/src/main/res/values-uz/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-uz/translations.xml
@@ -13,9 +13,11 @@
   <string name="screen_session_verification_cancelled_subtitle">"Nimadir noto‘g‘ri ko‘rinadi. Yoki so‘rov muddati tugadi yoki so‘rov rad etildi."</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"Quyidagi kulgichlar boshqa seansda ko‘rsatilganlarga mos kelishini tasdiqlang."</string>
   <string name="screen_session_verification_compare_emojis_title">"Emojilarni solishtiring"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Quyidagi emojilar narigi foydalanuvchining qurilmasida ko‘rsatilgan emojilarga mos kelishini tasdiqlang."</string>
   <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">"Yangi seansingiz tasdiqlandi. U sizning shifrlangan xabarlaringizga kirish huquqiga ega va boshqa foydalanuvchilar uni ishonchli deb bilishadi."</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_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>
@@ -31,11 +33,21 @@
   <string name="screen_session_verification_request_failure_title">"Tasdiqlanmadi"</string>
   <string name="screen_session_verification_request_footer">"Bu tekshiruvni boshlagan bo‘lsangizgina davom eting."</string>
   <string name="screen_session_verification_request_subtitle">"Xabarlaringiz tarixini xavfsiz saqlash uchun narigi qurilmani tasdiqlang."</string>
-  <string name="screen_session_verification_request_success_subtitle">"Yangi seansingiz tasdiqlandi. U sizning shifrlangan xabarlaringizga kirish huquqiga ega va boshqa foydalanuvchilar uni ishonchli deb bilishadi."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Endi xabarlarni boshqa qurilmangizda xavfsiz o‘qish yoki yuborishingiz mumkin."</string>
   <string name="screen_session_verification_request_success_title">"Qurilma tasdiqlandi"</string>
   <string name="screen_session_verification_request_title">"Tasdiqlash talab qilindi"</string>
   <string name="screen_session_verification_they_dont_match">"Ular mos kelmaydi"</string>
   <string name="screen_session_verification_they_match">"Ular mos keladi"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"Bu yerdan tasdiqlashni boshlashdan oldin, boshqa qurilmada ilovaning ochiq ekanligiga ishonch hosil qiling."</string>
+  <string name="screen_session_verification_use_another_device_title">"Ilovani boshqa tasdiqlangan qurilmada oching"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Qo‘shimcha xavfsizlik chorasi sifatida, qurilmalaringizdagi emojilar to‘plamini solishtirish orqali ushbu foydalanuvchini tasdiqlang. Buni ishonchli aloqa usuli yordamida amalga oshiring."</string>
+  <string name="screen_session_verification_user_initiator_title">"Bu foydalanuvchi tasdiqlansinmi?"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Qo‘shimcha xavfsizlik maqsadida, boshqa foydalanuvchi sizning shaxsingizni tasdiqlashni xohlaydi. Taqqoslash uchun sizga bir qator emojilar ko‘rsatiladi."</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"Boshqa qurilmangizda qalqib chiquvchi oyna paydo bo‘lishi kerak. Tekshirish jarayonini o‘sha yerdan boshlang."</string>
+  <string name="screen_session_verification_waiting_another_device_title">"Boshqa qurilmada tekshirishni boshlang"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Boshqa qurilmada tekshirishni boshlang"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"Boshqa foydalanuvchi kutilmoqda"</string>
+  <string name="screen_session_verification_waiting_subtitle">"Qabul qilinganingizdan so‘ng, tasdiqlash jarayonini davom ettirishingiz mumkin bo‘ladi."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Davom etish uchun boshqa seansda tekshirish jarayonini boshlash soʻrovini qabul qiling."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Soʻrovni qabul qilish kutilmoqda"</string>
   <string name="screen_signout_in_progress_dialog_content">"Chiqish…"</string>
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 7bba014ada..658e5242f6 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
@@ -11,12 +11,12 @@
   <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_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_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>
@@ -33,7 +33,7 @@
   <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_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>
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 92641d1773..54b6de5d68 100644
--- a/features/verifysession/impl/src/main/res/values-zh/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh/translations.xml
@@ -11,12 +11,12 @@
   <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_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_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>
@@ -33,7 +33,7 @@
   <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_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>
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPointTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPointTest.kt
index ad586fc7fb..9fc7858349 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPointTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,10 +38,12 @@ class DefaultIncomingVerificationEntryPointTest {
         val params = IncomingVerificationEntryPoint.Params(
             verificationRequest = anIncomingSessionVerificationRequest()
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(IncomingVerificationNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
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 2bf7116990..c9b9e25b74 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6b61e05689..4aa63f3ab8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPointTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPointTest.kt
index 52ff36dbd6..33da9cc991 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPointTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,7 +35,7 @@ class DefaultOutgoingVerificationEntryPointTest {
             )
         }
         val callback = object : OutgoingVerificationEntryPoint.Callback {
-            override fun onLearnMoreAboutEncryption() = lambdaError()
+            override fun navigateToLearnMoreAboutEncryption() = lambdaError()
             override fun onBack() = lambdaError()
             override fun onDone() = lambdaError()
         }
@@ -42,10 +43,12 @@ class DefaultOutgoingVerificationEntryPointTest {
             showDeviceVerifiedScreen = true,
             verificationRequest = anOutgoingSessionVerificationRequest(),
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(OutgoingVerificationNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
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 2eac19d018..f02f24c9ef 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c1897d4c6f..71b55fac10 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/verifysession/test/build.gradle.kts b/features/verifysession/test/build.gradle.kts
new file mode 100644
index 0000000000..01ce23e0cd
--- /dev/null
+++ b/features/verifysession/test/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.verifysession.test"
+}
+
+dependencies {
+    implementation(projects.features.verifysession.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeIncomingVerificationEntryPoint.kt b/features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeIncomingVerificationEntryPoint.kt
new file mode 100644
index 0000000000..0637e13ae8
--- /dev/null
+++ b/features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeIncomingVerificationEntryPoint.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.verifysession.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeIncomingVerificationEntryPoint : IncomingVerificationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: IncomingVerificationEntryPoint.Params,
+        callback: IncomingVerificationEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeOutgoingVerificationEntryPoint.kt b/features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeOutgoingVerificationEntryPoint.kt
new file mode 100644
index 0000000000..c05aa2acd7
--- /dev/null
+++ b/features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeOutgoingVerificationEntryPoint.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.verifysession.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeOutgoingVerificationEntryPoint : OutgoingVerificationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: OutgoingVerificationEntryPoint.Params,
+        callback: OutgoingVerificationEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/features/viewfolder/api/build.gradle.kts b/features/viewfolder/api/build.gradle.kts
index 4df696b2b2..4763c24d79 100644
--- a/features/viewfolder/api/build.gradle.kts
+++ b/features/viewfolder/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/TextFileViewer.kt b/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/TextFileViewer.kt
index fa1d3511e4..29a7c9f9e8 100644
--- a/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/TextFileViewer.kt
+++ b/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/TextFileViewer.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/ViewFolderEntryPoint.kt b/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/ViewFolderEntryPoint.kt
index e7f6f580a7..6f9fc504cb 100644
--- a/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/ViewFolderEntryPoint.kt
+++ b/features/viewfolder/api/src/main/kotlin/io/element/android/features/viewfolder/api/ViewFolderEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,13 +18,12 @@ interface ViewFolderEntryPoint : FeatureEntryPoint {
         val rootPath: String,
     )
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone()
diff --git a/features/viewfolder/impl/build.gradle.kts b/features/viewfolder/impl/build.gradle.kts
index 0c7ef17b22..4d6ad057e2 100644
--- a/features/viewfolder/impl/build.gradle.kts
+++ b/features/viewfolder/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultTextFileViewer.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultTextFileViewer.kt
index 0e1f1e11b9..ae3e6932ac 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultTextFileViewer.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultTextFileViewer.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +12,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.viewfolder.api.TextFileViewer
 import io.element.android.features.viewfolder.impl.file.ColorationMode
 import io.element.android.features.viewfolder.impl.file.FileContent
 import kotlinx.collections.immutable.ImmutableList
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultTextFileViewer : TextFileViewer {
     @Composable
     override fun Render(
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPoint.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPoint.kt
index 330ca68a8c..3ef83176b9 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPoint.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,34 +10,26 @@ package io.element.android.features.viewfolder.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.viewfolder.api.ViewFolderEntryPoint
 import io.element.android.features.viewfolder.impl.root.ViewFolderFlowNode
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultViewFolderEntryPoint : ViewFolderEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ViewFolderEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : ViewFolderEntryPoint.NodeBuilder {
-            override fun params(params: ViewFolderEntryPoint.Params): ViewFolderEntryPoint.NodeBuilder {
-                plugins += ViewFolderFlowNode.Inputs(params.rootPath)
-                return this
-            }
-
-            override fun callback(callback: ViewFolderEntryPoint.Callback): ViewFolderEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<ViewFolderFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ViewFolderEntryPoint.Params,
+        callback: ViewFolderEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<ViewFolderFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ViewFolderFlowNode.Inputs(params.rootPath),
+                callback,
+            ),
+        )
     }
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContent.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContent.kt
index 8a233d4506..c68d630869 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContent.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContent.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -72,13 +73,14 @@ private fun LineRow(
     colorationMode: ColorationMode,
 ) {
     val context = LocalContext.current
+    val toastMessage = stringResource(CommonStrings.common_line_copied_to_clipboard)
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .clickable(onClick = {
                 context.copyToClipboard(
                     text = line,
-                    toastMessage = context.getString(CommonStrings.common_line_copied_to_clipboard),
+                    toastMessage = toastMessage,
                 )
             })
     ) {
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContentReader.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContentReader.kt
index e3635e40f4..08b7b509ab 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContentReader.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileContentReader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.viewfolder.impl.file
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import kotlinx.coroutines.withContext
@@ -20,7 +20,6 @@ interface FileContentReader {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFileContentReader(
     private val dispatchers: CoroutineDispatchers,
 ) : FileContentReader {
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileSave.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileSave.kt
index 9323281471..03f442f36e 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileSave.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileSave.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,6 @@ import android.provider.MediaStore
 import androidx.annotation.RequiresApi
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.system.toast
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -33,7 +33,6 @@ interface FileSave {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFileSave(
     @ApplicationContext private val context: Context,
     private val dispatchers: CoroutineDispatchers,
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileShare.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileShare.kt
index 3c8aae4f39..9a43933c94 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileShare.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/FileShare.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import android.net.Uri
 import androidx.core.content.FileProvider
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.meta.BuildMeta
@@ -30,7 +30,6 @@ interface FileShare {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFileShare(
     @ApplicationContext private val context: Context,
     private val dispatchers: CoroutineDispatchers,
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileEvents.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileEvents.kt
index 5b562795d7..2cc4f3a601 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileEvents.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
index 41369dda07..6c6a024119 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,12 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.callback
 import io.element.android.libraries.architecture.inputs
 
 @ContributesNode(AppScope::class)
@@ -36,6 +37,7 @@ class ViewFileNode(
         fun onBackClick()
     }
 
+    private val callback: Callback = callback()
     private val inputs: Inputs = inputs()
 
     private val presenter = presenterFactory.create(
@@ -43,17 +45,13 @@ class ViewFileNode(
         name = inputs.name,
     )
 
-    private fun onBackClick() {
-        plugins<Callback>().forEach { it.onBackClick() }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         ViewFileView(
             state = state,
             modifier = modifier,
-            onBackClick = ::onBackClick,
+            onBackClick = callback::onBackClick,
         )
     }
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFilePresenter.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFilePresenter.kt
index fb330327f3..615b77e10b 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFilePresenter.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFilePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileState.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileState.kt
index 229b743e2c..979e188b65 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileState.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileStateProvider.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileStateProvider.kt
index 2c0400363b..1b20b5c947 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileStateProvider.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
index 4f3b84734f..23f92fc9ba 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/FolderExplorer.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/FolderExplorer.kt
index dec0541622..c1a2f60729 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/FolderExplorer.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/FolderExplorer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.features.viewfolder.impl.folder
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.viewfolder.impl.model.Item
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -21,7 +21,6 @@ interface FolderExplorer {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFolderExplorer(
     private val fileSizeFormatter: FileSizeFormatter,
     private val dispatchers: CoroutineDispatchers,
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
index 4c57ea4135..4eac71fb4b 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,13 +13,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.viewfolder.impl.model.Item
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 
 @ContributesNode(AppScope::class)
@@ -35,9 +36,10 @@ class ViewFolderNode(
 
     interface Callback : Plugin {
         fun onBackClick()
-        fun onNavigateTo(item: Item)
+        fun navigateToItem(item: Item)
     }
 
+    private val callback: Callback = callback()
     private val inputs: Inputs = inputs()
 
     private val presenter = presenterFactory.create(
@@ -45,22 +47,14 @@ class ViewFolderNode(
         path = inputs.path,
     )
 
-    private fun onBackClick() {
-        plugins<Callback>().forEach { it.onBackClick() }
-    }
-
-    private fun onNavigateTo(item: Item) {
-        plugins<Callback>().forEach { it.onNavigateTo(item) }
-    }
-
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         ViewFolderView(
             state = state,
             modifier = modifier,
-            onNavigateTo = ::onNavigateTo,
-            onBackClick = ::onBackClick,
+            onNavigateTo = callback::navigateToItem,
+            onBackClick = callback::onBackClick,
         )
     }
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderPresenter.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderPresenter.kt
index 0c5ab61705..6c91675860 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderPresenter.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderState.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderState.kt
index 3eb48790a4..f6e62be4bb 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderState.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderStateProvider.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderStateProvider.kt
index cbaac89cc2..2debe4cbf8 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderStateProvider.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bf5360f847..2a6b4031ef 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/model/Item.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/model/Item.kt
index 104d0dc35c..571ac20ade 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/model/Item.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/model/Item.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderFlowNode.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderFlowNode.kt
index d57824f2fd..7418d7899e 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderFlowNode.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderFlowNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@@ -28,6 +28,7 @@ import io.element.android.features.viewfolder.impl.model.Item
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
 import kotlinx.parcelize.Parcelize
@@ -65,6 +66,7 @@ class ViewFolderFlowNode(
         val rootPath: String,
     ) : NodeInputs
 
+    private val callback: ViewFolderEntryPoint.Callback = callback()
     private val inputs: Inputs = inputs()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@@ -108,10 +110,10 @@ class ViewFolderFlowNode(
     ): Node {
         val callback: ViewFolderNode.Callback = object : ViewFolderNode.Callback {
             override fun onBackClick() {
-                onDone()
+                callback.onDone()
             }
 
-            override fun onNavigateTo(item: Item) {
+            override fun navigateToItem(item: Item) {
                 when (item) {
                     Item.Parent -> {
                         // Should not happen when in Root since parent is not accessible from root (canGoUp set to false)
@@ -133,8 +135,4 @@ class ViewFolderFlowNode(
     override fun View(modifier: Modifier) {
         BackstackView()
     }
-
-    private fun onDone() {
-        plugins<ViewFolderEntryPoint.Callback>().forEach { it.onDone() }
-    }
 }
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPointTest.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPointTest.kt
index 47d5992d8c..3ac0a664d9 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPointTest.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/impl/DefaultViewFolderEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -40,10 +41,12 @@ class DefaultViewFolderEntryPointTest {
         val params = ViewFolderEntryPoint.Params(
             rootPath = "path",
         )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(ViewFolderFlowNode::class.java)
         assertThat(result.plugins).contains(ViewFolderFlowNode.Inputs(params.rootPath))
         assertThat(result.plugins).contains(callback)
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileContentReader.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileContentReader.kt
index 9fed22741d..6dd621ac6a 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileContentReader.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileContentReader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileSave.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileSave.kt
index 2bcbc8648a..3649d30759 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileSave.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileSave.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileShare.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileShare.kt
index 0c639e2649..7348e4bed0 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileShare.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/FakeFileShare.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/ViewFilePresenterTest.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/ViewFilePresenterTest.kt
index 117d1707f7..1a031ade28 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/ViewFilePresenterTest.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/file/ViewFilePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/FakeFolderExplorer.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/FakeFolderExplorer.kt
index fb72582de8..7761bfb976 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/FakeFolderExplorer.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/FakeFolderExplorer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/ViewFolderPresenterTest.kt b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/ViewFolderPresenterTest.kt
index 715dfa711f..31fd91eabe 100644
--- a/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/ViewFolderPresenterTest.kt
+++ b/features/viewfolder/impl/src/test/kotlin/io/element/android/features/viewfolder/test/folder/ViewFolderPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/viewfolder/test/build.gradle.kts b/features/viewfolder/test/build.gradle.kts
new file mode 100644
index 0000000000..6fe542013d
--- /dev/null
+++ b/features/viewfolder/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.viewfolder.test"
+}
+
+dependencies {
+    implementation(projects.features.viewfolder.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/viewfolder/test/src/main/kotlin/io/element/android/features/viewfolder/test/FakeViewFolderEntryPoint.kt b/features/viewfolder/test/src/main/kotlin/io/element/android/features/viewfolder/test/FakeViewFolderEntryPoint.kt
new file mode 100644
index 0000000000..11f009f3af
--- /dev/null
+++ b/features/viewfolder/test/src/main/kotlin/io/element/android/features/viewfolder/test/FakeViewFolderEntryPoint.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.viewfolder.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.viewfolder.api.ViewFolderEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeViewFolderEntryPoint : ViewFolderEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ViewFolderEntryPoint.Params,
+        callback: ViewFolderEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/gradle.properties b/gradle.properties
index a2c7228ed2..ce03899940 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,8 @@
 #
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2022 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Project-wide Gradle settings.
@@ -58,3 +59,6 @@ detekt.use.worker.api=true
 # Let test include roborazzi verification
 # https://github.com/takahirom/roborazzi?tab=readme-ov-file#roborazzitest
 roborazzi.test.verify=true
+
+# Needed after enabling proguard on AGP 8.13.1
+android.r8.gradual.support=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0d4cb342dc..ffabfc9446 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,26 +3,26 @@
 
 [versions]
 # Project
-# We cannot use 8.12.+ since it breaks F-Droid build (see https://github.com/element-hq/element-x-android/issues/3420#issuecomment-3199571010)
-android_gradle_plugin = "8.11.1"
+android_gradle_plugin = "8.13.2"
 # When updateing this, please also update the version in the file ./idea/kotlinc.xml
-kotlin = "2.2.20"
+kotlin = "2.3.0"
 kotlinpoet = "2.2.0"
-ksp = "2.2.20-2.0.2"
-firebaseAppDistribution = "5.1.1"
+ksp = "2.3.4"
+firebaseAppDistribution = "5.2.0"
 
 # AndroidX
 core = "1.17.0"
-datastore = "1.1.7"
+datastore = "1.2.0"
 constraintlayout = "2.2.1"
 constraintlayout_compose = "1.1.1"
-lifecycle = "2.9.2"
-activity = "1.11.0"
-media3 = "1.8.0"
-camera = "1.5.0"
+lifecycle = "2.10.0"
+activity = "1.12.2"
+media3 = "1.9.0"
+camera = "1.5.2"
+work = "2.11.0"
 
 # Compose
-compose_bom = "2025.07.00"
+compose_bom = "2025.12.00"
 
 # Coroutines
 coroutines = "1.10.2"
@@ -32,34 +32,37 @@ accompanist = "0.37.3"
 
 # Test
 test_core = "1.7.0"
-roborazzi = "1.50.0"
+roborazzi = "1.52.0"
 
 # Jetbrain
 datetime = "0.7.1"
 serialization_json = "1.9.0"
 
 #other
-detekt = "1.23.8"
 coil = "3.3.0"
+# Rollback to 1.0.4, 1.0.5 has this issue: https://github.com/airbnb/Showkase/issues/420
 showkase = "1.0.5"
 appyx = "1.7.1"
-sqldelight = "2.1.0"
-wysiwyg = "2.39.0"
+sqldelight = "2.2.1"
+wysiwyg = "2.41.0"
 telephoto = "0.18.0"
-haze = "1.6.10"
+haze = "1.7.1"
 
 # Dependency analysis
-dependencyAnalysis = "3.0.4"
+dependencyAnalysis = "3.5.1"
 
 # DI
-metro = "0.6.8"
+metro = "0.9.2"
 
 # Auto service
 autoservice = "1.1.1"
 
 # quality
+detekt = "1.23.8"
+# See https://github.com/pinterest/ktlint/releases/
+ktlint = "1.8.0"
 androidx-test-ext-junit = "1.3.0"
-kover = "0.9.1"
+kover = "0.9.4"
 
 [libraries]
 # Project
@@ -75,11 +78,11 @@ 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.3.0"
+google_firebase_bom = "com.google.firebase:firebase-bom:34.7.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.18.0"
+google_tink = "com.google.crypto.tink:tink-android:1.20.0"
 
 # AndroidX
 androidx_core = { module = "androidx.core:core", version.ref = "core" }
@@ -87,18 +90,20 @@ androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" }
 androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.9.1"
 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.1"
+androidx_exifinterface = "androidx.exifinterface:exifinterface:1.4.2"
 androidx_constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx_constraintlayout_compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayout_compose" }
 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_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_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.0.1"
+androidx_splash = "androidx.core:core-splashscreen:1.2.0"
 androidx_media3_exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
 androidx_media3_ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }
 androidx_media3_transformer = { module = "androidx.media3:media3-transformer", version.ref = "media3" }
@@ -110,7 +115,7 @@ androidx_activity_activity = { module = "androidx.activity:activity", version.re
 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.14.0"
+androidx_webkit = "androidx.webkit:webkit:1.15.0"
 
 androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
 androidx_compose_material3 = { module = "androidx.compose.material3:material3" }
@@ -126,6 +131,7 @@ androidx_compose_material_icons = { module = "androidx.compose.material:material
 
 # Coroutines
 coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines_guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "coroutines" }
 coroutines_test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
 # Accompanist
@@ -135,7 +141,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.1.0"
+network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:5.3.2"
 network_okhttp_logging = { module = "com.squareup.okhttp3:logging-interceptor" }
 network_okhttp_okhttp = { module = "com.squareup.okhttp3:okhttp" }
 network_okhttp = { module = "com.squareup.okhttp3:okhttp" }
@@ -144,20 +150,24 @@ network_retrofit_bom = "com.squareup.retrofit2:retrofit-bom:3.0.0"
 network_retrofit = { module = "com.squareup.retrofit2:retrofit" }
 network_retrofit_converter_serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization" }
 
+# Quality
+# Reference ktlint-cli so that Renovate can check if a new version is available.
+ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
+
 # Test
 test_core = { module = "androidx.test:core", version.ref = "test_core" }
 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.6"
+test_mockk = "io.mockk:mockk:1.14.7"
 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.19"
-test_robolectric = "org.robolectric:robolectric:4.15.1"
+test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.20"
+test_robolectric = "org.robolectric:robolectric:4.16"
 test_appyx_junit = { module = "com.bumble.appyx:testing-junit4", version.ref = "appyx" }
-test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.7.0"
+test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.8.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" }
 
@@ -167,7 +177,7 @@ 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:25.10.7"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.12.19"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
@@ -189,36 +199,39 @@ 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.10.0"
-sqlite = "androidx.sqlite:sqlite-ktx:2.6.1"
-unifiedpush = "org.unifiedpush.android:connector:3.0.10"
+sqlcipher = "net.zetetic:sqlcipher-android:4.12.0"
+sqlite = "androidx.sqlite:sqlite-ktx:2.6.2"
+unifiedpush = "org.unifiedpush.android:connector:3.1.2"
 vanniktech_blurhash = "com.vanniktech:blurhash:0.3.0"
 telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil", 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:12.0.0"
+maplibre = "org.maplibre.gl:android-sdk:12.3.1"
 maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:3.0.2"
 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:2.3.0"
+google_zxing = "com.google.zxing:core:3.5.4"
+
 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.23.0"
-sentry = "io.sentry:sentry-android:8.23.0"
+posthog = "com.posthog:posthog-android:3.28.0"
+sentry = "io.sentry:sentry-android:8.29.0"
 # main branch can be tested replacing the version with main-SNAPSHOT
-matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.28.0"
+matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.29.2"
 
 # Emojibase
-matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.4.3"
+matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.5.0"
 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.16.0"
+element_call_embedded = "io.element.android:element-call-embedded:0.16.3"
 
 # Auto services
 google_autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
@@ -244,16 +257,16 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 # Note: used in DependencyInjectionExtensions.kt
 metro = { id = "dev.zacsweers.metro", version.ref = "metro" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
-ktlint = "org.jlleitschuh.gradle.ktlint:13.1.0"
+ktlint = "org.jlleitschuh.gradle.ktlint:14.0.1"
 dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12"
-dependencycheck = "org.owasp.dependencycheck:12.1.6"
+dependencycheck = "org.owasp.dependencycheck:12.1.9"
 dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
 paparazzi = "app.cash.paparazzi:2.0.0-alpha02"
 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" }
 knit = { id = "org.jetbrains.kotlinx.knit", version = "0.5.0" }
-sonarqube = "org.sonarqube:6.3.1.5724"
-licensee = "app.cash.licensee:1.13.0"
+sonarqube = "org.sonarqube:7.2.2.6593"
+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.3" }
+gms_google_services = { id = "com.google.gms.google-services", version = "4.4.4" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1b33c55baa..f8e1ee3125 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 78cb6e16a4..8a848873f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 23d15a9367..adff685a03 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index 5eed7ee845..e509b2dd8f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/libraries/accountselect/api/build.gradle.kts b/libraries/accountselect/api/build.gradle.kts
index 7e0ce303f9..c7f5a97307 100644
--- a/libraries/accountselect/api/build.gradle.kts
+++ b/libraries/accountselect/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/accountselect/api/src/main/kotlin/io/element/android/libraries/accountselect/api/AccountSelectEntryPoint.kt b/libraries/accountselect/api/src/main/kotlin/io/element/android/libraries/accountselect/api/AccountSelectEntryPoint.kt
index 72da3491de..0af756aab5 100644
--- a/libraries/accountselect/api/src/main/kotlin/io/element/android/libraries/accountselect/api/AccountSelectEntryPoint.kt
+++ b/libraries/accountselect/api/src/main/kotlin/io/element/android/libraries/accountselect/api/AccountSelectEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,15 +15,14 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.SessionId
 
 interface AccountSelectEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
-        fun onSelectAccount(sessionId: SessionId)
+        fun onAccountSelected(sessionId: SessionId)
         fun onCancel()
     }
 }
diff --git a/libraries/accountselect/impl/build.gradle.kts b/libraries/accountselect/impl/build.gradle.kts
index ea1fbd52ad..2497299f5b 100644
--- a/libraries/accountselect/impl/build.gradle.kts
+++ b/libraries/accountselect/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectNode.kt b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectNode.kt
index 5478d9fe43..1f52143e20 100644
--- a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectNode.kt
+++ b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.accountselect.api.AccountSelectEntryPoint
-import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.architecture.callback
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -26,23 +27,15 @@ class AccountSelectNode(
     @Assisted plugins: List<Plugin>,
     private val presenter: AccountSelectPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private val callbacks = plugins.filterIsInstance<AccountSelectEntryPoint.Callback>()
-
-    private fun onDismiss() {
-        callbacks.forEach { it.onCancel() }
-    }
-
-    private fun onSelectAccount(sessionId: SessionId) {
-        callbacks.forEach { it.onSelectAccount(sessionId) }
-    }
+    private val callback: AccountSelectEntryPoint.Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         AccountSelectView(
             state = state,
-            onDismiss = ::onDismiss,
-            onSelectAccount = ::onSelectAccount,
+            onDismiss = callback::onCancel,
+            onSelectAccount = callback::onAccountSelected,
             modifier = modifier,
         )
     }
diff --git a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenter.kt b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenter.kt
index f69708cc9d..be6a8bea6f 100644
--- a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenter.kt
+++ b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectState.kt b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectState.kt
index feaedaf90d..518c49f829 100644
--- a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectState.kt
+++ b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectStateProvider.kt b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectStateProvider.kt
index 5d99bf3b0c..0c12d34352 100644
--- a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectStateProvider.kt
+++ b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectView.kt b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectView.kt
index b589df23f6..bfa1bf45b6 100644
--- a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectView.kt
+++ b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPoint.kt b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPoint.kt
index baf5ecd5b3..6d601f7bf8 100644
--- a/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPoint.kt
+++ b/libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.libraries.accountselect.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.accountselect.api.AccountSelectEntryPoint
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAccountSelectEntryPoint : AccountSelectEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): AccountSelectEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : AccountSelectEntryPoint.NodeBuilder {
-            override fun callback(callback: AccountSelectEntryPoint.Callback): AccountSelectEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<AccountSelectNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: AccountSelectEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<AccountSelectNode>(buildContext, listOf(callback))
     }
 }
diff --git a/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenterTest.kt b/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenterTest.kt
index 27a8d7d9cf..8b0f581f6d 100644
--- a/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenterTest.kt
+++ b/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPointTest.kt b/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPointTest.kt
index d61dcc89ba..870c43ebdd 100644
--- a/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPointTest.kt
+++ b/libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/DefaultAccountSelectEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -32,12 +33,14 @@ class DefaultAccountSelectEntryPointTest {
             )
         }
         val callback = object : AccountSelectEntryPoint.Callback {
-            override fun onSelectAccount(sessionId: SessionId) = lambdaError()
+            override fun onAccountSelected(sessionId: SessionId) = lambdaError()
             override fun onCancel() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(AccountSelectNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts
index ac1e317b48..90aa4bdba3 100644
--- a/libraries/androidutils/build.gradle.kts
+++ b/libraries/androidutils/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -32,6 +33,7 @@ dependencies {
     implementation(libs.androidx.recyclerview)
     implementation(libs.androidx.exifinterface)
     implementation(libs.androidx.datastore.preferences)
+    implementation(libs.serialization.json)
     api(libs.androidx.browser)
 
     testCommonDependencies(libs)
diff --git a/libraries/androidutils/src/main/AndroidManifest.xml b/libraries/androidutils/src/main/AndroidManifest.xml
index 7eb445a672..446c4606d7 100644
--- a/libraries/androidutils/src/main/AndroidManifest.xml
+++ b/libraries/androidutils/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/assets/AssetReader.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/assets/AssetReader.kt
new file mode 100644
index 0000000000..da44ff43c8
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/assets/AssetReader.kt
@@ -0,0 +1,46 @@
+/*
+ * 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.androidutils.assets
+
+import android.content.Context
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.di.annotations.ApplicationContext
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * Read asset files.
+ */
+@Inject
+class AssetReader(
+    @ApplicationContext private val context: Context,
+) {
+    private val cache = ConcurrentHashMap<String, String?>()
+
+    /**
+     * Read an asset from resource and return a String or null in case of error.
+     *
+     * @param assetFilename Asset filename
+     * @return the content of the asset file, or null in case of error
+     */
+    fun readAssetFile(assetFilename: String): String? {
+        return cache.getOrPut(assetFilename, {
+            return try {
+                context.assets.open(assetFilename).use { it.bufferedReader().readText() }
+            } catch (e: Exception) {
+                Timber.e(e, "## readAssetFile() failed")
+                null
+            }
+        })
+    }
+
+    fun clearCache() {
+        cache.clear()
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt
index 42ae1c8ba5..0ef4c94225 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt
index 5617d459f0..6650f70ecb 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ChromeCustomTab.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -59,7 +60,7 @@ fun Activity.openUrlInChromeCustomTab(
                 })
             }
             .launchUrl(this, url.toUri())
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         openUrlInExternalApp(url)
     }
 }
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
new file mode 100644
index 0000000000..d165da8640
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ConsoleMessageLogger.kt
@@ -0,0 +1,60 @@
+/*
+ * 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.androidutils.browser
+
+import android.util.Log
+import android.webkit.ConsoleMessage
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import timber.log.Timber
+
+interface ConsoleMessageLogger {
+    fun log(
+        tag: String,
+        consoleMessage: ConsoleMessage,
+    )
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultConsoleMessageLogger : ConsoleMessageLogger {
+    override fun log(
+        tag: String,
+        consoleMessage: ConsoleMessage,
+    ) {
+        val priority = when (consoleMessage.messageLevel()) {
+            ConsoleMessage.MessageLevel.ERROR -> Log.ERROR
+            ConsoleMessage.MessageLevel.WARNING -> Log.WARN
+            else -> Log.DEBUG
+        }
+
+        val message = buildString {
+            append(consoleMessage.sourceId())
+            append(":")
+            append(consoleMessage.lineNumber())
+            append(" ")
+            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())
+            },
+        )
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt
index 98fa682060..ce6f61f280 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,13 +14,11 @@ import android.content.Context
 import androidx.core.content.getSystemService
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class AndroidClipboardHelper(
     @ApplicationContext private val context: Context,
 ) : ClipboardHelper {
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/ClipboardHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/ClipboardHelper.kt
index c789ee5900..1d0ab8e3c4 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/ClipboardHelper.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/ClipboardHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt
index 1969313033..9f91b3a4ce 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/compat/Compat.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/compat/Compat.kt
index 8021a1b54e..3abb7dc38a 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/compat/Compat.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/compat/Compat.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt
index 190341611d..3940edad46 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt
index e689f6e143..6737a9b879 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt
index 4adcd7ed71..f8d43b7763 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt
index 227e49ab55..fb3c610a01 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,7 @@ class DiffCacheUpdater<ListItem, CachedItem>(
     private val cacheInvalidator: DiffCacheInvalidator<CachedItem> = DefaultDiffCacheInvalidator(),
     private val areItemsTheSame: (oldItem: ListItem?, newItem: ListItem?) -> Boolean,
 ) {
-    private val lock = Object()
+    private val lock = Any()
     private var prevOriginalList: List<ListItem> = emptyList()
 
     private val listUpdateCallback = object : ListUpdateCallback {
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/Context.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/Context.kt
index eaa0b578bc..65e56a3e0f 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/Context.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/Context.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt
index 414b123129..21306ff192 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/File.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/FileCompression.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/FileCompression.kt
index 7c6926e58d..1dbf87a529 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/FileCompression.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/FileCompression.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -38,8 +39,5 @@ fun compressFile(file: File): File? {
     } catch (e: Exception) {
         Timber.e(e, "## compressFile() failed")
         null
-    } catch (oom: OutOfMemoryError) {
-        Timber.e(oom, "## compressFile() failed")
-        null
     }
 }
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/TemporaryUriDeleter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/TemporaryUriDeleter.kt
index e8f7ef7f1d..beef6c0cfb 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/TemporaryUriDeleter.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/TemporaryUriDeleter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import android.content.Context
 import android.net.Uri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import timber.log.Timber
 
@@ -23,7 +23,6 @@ interface TemporaryUriDeleter {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultTemporaryUriDeleter(
     @ApplicationContext private val context: Context,
 ) : TemporaryUriDeleter {
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt
index 9578c96b2c..6854d099fa 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,10 @@ import android.os.Build
 import android.text.format.Formatter
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidFileSizeFormatter(
     @ApplicationContext private val context: Context,
     private val sdkIntProvider: BuildVersionSdkIntProvider,
@@ -25,12 +24,15 @@ class AndroidFileSizeFormatter(
     override fun format(fileSize: Long, useShortFormat: Boolean): String {
         // Since Android O, the system considers that 1kB = 1000 bytes instead of 1024 bytes.
         // We want to avoid that.
+        // Sadly we do not have access to the flags values Formatter.FLAG_IEC_UNITS and Formatter.FLAG_SHORTER
+        // nor the method Formatter.formatFileSize with the flags parameter.
+        // So for Android 0 and more, first convert the fileSize to MB/GB/TB ourselves
         val normalizedSize = if (sdkIntProvider.get() <= Build.VERSION_CODES.N) {
             fileSize
         } else {
             // First convert the size
             when {
-                fileSize < 1024 -> fileSize
+                fileSize <= 1 -> fileSize
                 fileSize < 1024 * 1024 -> fileSize * 1000 / 1024
                 fileSize < 1024 * 1024 * 1024 -> fileSize * 1000 / 1024 * 1000 / 1024
                 else -> fileSize * 1000 / 1024 * 1000 / 1024 * 1000 / 1024
@@ -41,6 +43,6 @@ class AndroidFileSizeFormatter(
             Formatter.formatShortFileSize(context, normalizedSize)
         } else {
             Formatter.formatFileSize(context, normalizedSize)
-        }
+        }.replace("kB", "KB")
     }
 }
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt
index b64bd79233..1a3e540acd 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt
index 3926c29c71..579c34b5ea 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/VibratorTools.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/VibratorTools.kt
index d742d7defb..b6e01aa737 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/VibratorTools.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/VibratorTools.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hash/Hash.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hash/Hash.kt
index 3574c68eb4..b699054ff0 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hash/Hash.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hash/Hash.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,7 +20,7 @@ fun String.hash() = try {
     digest.digest()
         .joinToString("") { String.format(Locale.ROOT, "%02X", it) }
         .lowercase(Locale.ROOT)
-} catch (exc: Exception) {
+} catch (_: Exception) {
     // Should not happen, but just in case
     hashCode().toString()
 }
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
new file mode 100644
index 0000000000..1e25599962
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
@@ -0,0 +1,28 @@
+/*
+ * 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.androidutils.json
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import kotlinx.serialization.json.Json
+
+/**
+ * Provides a Json instance configured to ignore unknown keys.
+ */
+fun interface JsonProvider {
+    operator fun invoke(): Json
+}
+
+@ContributesBinding(AppScope::class)
+@SingleIn(AppScope::class)
+class DefaultJsonProvider : JsonProvider {
+    private val json: Json by lazy { Json { ignoreUnknownKeys = true } }
+    override fun invoke() = json
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/MediaMetaDataRetriever.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/MediaMetaDataRetriever.kt
index 5152fb42ab..1b0f783856 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/MediaMetaDataRetriever.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/MediaMetaDataRetriever.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt
index 3ac32fd3a9..6262d00d62 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/metadata/IsInDebug.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/metadata/IsInDebug.kt
index d82875201a..658a28cdaf 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/metadata/IsInDebug.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/metadata/IsInDebug.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/preferences/DefaultPreferencesCorruptionHandlerFactory.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/preferences/DefaultPreferencesCorruptionHandlerFactory.kt
index e6270f4af3..b78e8eecf2 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/preferences/DefaultPreferencesCorruptionHandlerFactory.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/preferences/DefaultPreferencesCorruptionHandlerFactory.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/Accessibility.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/Accessibility.kt
new file mode 100644
index 0000000000..35ebd89a74
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/Accessibility.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.androidutils.system
+
+import android.content.Context
+import android.provider.Settings
+
+fun Context.getAnimationScale(): Float {
+    return Settings.Global.getFloat(contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f)
+}
+
+fun Context.areAnimationsEnabled(): Boolean {
+    return getAnimationScale() > 0f
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/Brightness.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/Brightness.kt
new file mode 100644
index 0000000000..8cf1cc6827
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/Brightness.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.androidutils.system
+
+import android.app.Activity
+import android.view.WindowManager
+
+/**
+ * Set the screen brightness for the given activity.
+ *
+ * @receiver current Activity.
+ * @param full If true, override brightness to full; otherwise, set to none (default).
+ */
+fun Activity.setFullBrightness(full: Boolean) {
+    window.attributes = window.attributes.apply {
+        screenBrightness = if (full) {
+            WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL
+        } else {
+            WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
+        }
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/CopyToClipboardUseCase.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/CopyToClipboardUseCase.kt
index f67fe85c9f..53a1c33995 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/CopyToClipboardUseCase.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/CopyToClipboardUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DateTimeObserver.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DateTimeObserver.kt
index e3c7973341..3723eac559 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DateTimeObserver.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DateTimeObserver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.androidutils.system.DateTimeObserver.Event
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -32,7 +32,6 @@ interface DateTimeObserver {
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultDateTimeObserver(
     @ApplicationContext context: Context
 ) : DateTimeObserver {
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt
index 49895e47ec..861aca032d 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,7 +32,7 @@ fun Context.getApplicationLabel(packageName: String): String {
     return try {
         val ai = packageManager.getApplicationInfoCompat(packageName, 0)
         packageManager.getApplicationLabel(ai).toString()
-    } catch (e: PackageManager.NameNotFoundException) {
+    } catch (_: PackageManager.NameNotFoundException) {
         packageName
     }
 }
@@ -95,7 +96,7 @@ fun Context.startNotificationSettingsIntent(
         } else {
             startActivity(intent)
         }
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
@@ -111,7 +112,7 @@ fun Context.openAppSettingsPage(
                 data = Uri.fromParts("package", packageName, null)
             }
         )
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
@@ -125,7 +126,7 @@ fun Context.startInstallFromSourceIntent(
         .setData("package:$packageName".toUri())
     try {
         activityResultLauncher.launch(intent)
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
@@ -156,7 +157,7 @@ fun Context.startSharePlainTextIntent(
         } else {
             startActivity(intent)
         }
-    } catch (activityNotFoundException: ActivityNotFoundException) {
+    } catch (_: ActivityNotFoundException) {
         toast(noActivityFoundMessage)
     }
 }
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/LinkifyHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/LinkifyHelper.kt
index c0cb5a766a..b95dacc5a8 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/LinkifyHelper.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/LinkifyHelper.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,6 +30,7 @@ object LinkifyHelper {
         @LinkifyCompat.LinkifyMask linkifyMask: Int = Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES,
     ): CharSequence {
         // Convert the text to a Spannable to be able to add URL spans, return the original text if it's not possible (in tests, i.e.)
+        @Suppress("USELESS_ELVIS")
         val spannable = text.toSpannable() ?: return text
 
         // Get all URL spans, as they will be removed by LinkifyCompat.addLinks
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/TextUtils.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/TextUtils.kt
new file mode 100644
index 0000000000..dde63e79a6
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/text/TextUtils.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.androidutils.text
+
+import java.net.URLDecoder
+import java.net.URLEncoder
+import java.nio.charset.Charset
+
+fun String.urlEncoded(charset: Charset = Charsets.UTF_8): String = URLEncoder.encode(this, charset.name())
+fun String.urlDecoded(charset: Charset = Charsets.UTF_8): String = URLDecoder.decode(this, charset.name())
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt
index 8f6766cdd6..ebd4a5c6bd 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.throttler
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 e2dacf58e7..96a1e5f9aa 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/uri/UriExtensions.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/uri/UriExtensions.kt
index bef2a50183..1c18c22804 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/uri/UriExtensions.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/uri/UriExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/main/res/values-hr/translations.xml b/libraries/androidutils/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..1e19b4cb89
--- /dev/null
+++ b/libraries/androidutils/src/main/res/values-hr/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">"Nije pronađena kompatibilna aplikacija za izvršavanje ove radnje."</string>
+</resources>
diff --git a/libraries/androidutils/src/main/res/values-ldrtl/integers.xml b/libraries/androidutils/src/main/res/values-ldrtl/integers.xml
index 410bf85b80..2f963a6449 100644
--- a/libraries/androidutils/src/main/res/values-ldrtl/integers.xml
+++ b/libraries/androidutils/src/main/res/values-ldrtl/integers.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <resources>
diff --git a/libraries/androidutils/src/main/res/values/integers.xml b/libraries/androidutils/src/main/res/values/integers.xml
index 6df186f3f2..c6598e8381 100644
--- a/libraries/androidutils/src/main/res/values/integers.xml
+++ b/libraries/androidutils/src/main/res/values/integers.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
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 93f778d9fd..a83aa7d69f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,45 +15,59 @@ 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 {
+    @Config(sdk = [Build.VERSION_CODES.N])
     @Test
     fun `test api 24 long format`() {
         val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.N)
-        assertThat(sut.format(1, useShortFormat = false)).isEqualTo("1.00B")
-        assertThat(sut.format(1000, useShortFormat = false)).isEqualTo("0.98KB")
-        assertThat(sut.format(1024, useShortFormat = false)).isEqualTo("1.00KB")
-        assertThat(sut.format(1024 * 1024, useShortFormat = false)).isEqualTo("1.00MB")
-        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = false)).isEqualTo("1.00GB")
+        assertThat(sut.format(1, useShortFormat = false)).isEqualTo("1 B")
+        assertThat(sut.format(1000, useShortFormat = false)).isEqualTo("0.98 KB")
+        assertThat(sut.format(1024, useShortFormat = false)).isEqualTo("1.00 KB")
+        assertThat(sut.format(1024 * 500, useShortFormat = false)).isEqualTo("500 KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = false)).isEqualTo("1.00 MB")
+        assertThat(sut.format(1024 * 1024 * 500, useShortFormat = false)).isEqualTo("500 MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = false)).isEqualTo("1.00 GB")
     }
 
+    @Config(sdk = [Build.VERSION_CODES.O])
     @Test
     fun `test api 26 long format`() {
         val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.O)
-        assertThat(sut.format(1, useShortFormat = false)).isEqualTo("1.00B")
-        assertThat(sut.format(1000, useShortFormat = false)).isEqualTo("0.98KB")
-        assertThat(sut.format(1024 * 1024, useShortFormat = false)).isEqualTo("0.95MB")
-        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = false)).isEqualTo("0.93GB")
+        assertThat(sut.format(1, useShortFormat = false)).isEqualTo("1 B")
+        assertThat(sut.format(1000, useShortFormat = false)).isEqualTo("0.98 KB")
+        assertThat(sut.format(1024, useShortFormat = false)).isEqualTo("1.00 KB")
+        assertThat(sut.format(1024 * 500, useShortFormat = false)).isEqualTo("500 KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = false)).isEqualTo("1.00 MB")
+        assertThat(sut.format(1024 * 1024 * 500, useShortFormat = false)).isEqualTo("500 MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = false)).isEqualTo("1.00 GB")
     }
 
+    @Config(sdk = [Build.VERSION_CODES.N])
     @Test
     fun `test api 24 short format`() {
         val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.N)
-        assertThat(sut.format(1, useShortFormat = true)).isEqualTo("1.0B")
-        assertThat(sut.format(1000, useShortFormat = true)).isEqualTo("0.98KB")
-        assertThat(sut.format(1024, useShortFormat = true)).isEqualTo("1.0KB")
-        assertThat(sut.format(1024 * 1024, useShortFormat = true)).isEqualTo("1.0MB")
-        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = true)).isEqualTo("1.0GB")
+        assertThat(sut.format(1, useShortFormat = true)).isEqualTo("1 B")
+        assertThat(sut.format(1000, useShortFormat = true)).isEqualTo("0.98 KB")
+        assertThat(sut.format(1024, useShortFormat = true)).isEqualTo("1.0 KB")
+        assertThat(sut.format(1024 * 500, useShortFormat = true)).isEqualTo("500 KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = true)).isEqualTo("1.0 MB")
+        assertThat(sut.format(1024 * 1024 * 500, useShortFormat = true)).isEqualTo("500 MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = true)).isEqualTo("1.0 GB")
     }
 
+    @Config(sdk = [Build.VERSION_CODES.O])
     @Test
     fun `test api 26 short format`() {
         val sut = createAndroidFileSizeFormatter(sdkLevel = Build.VERSION_CODES.O)
-        assertThat(sut.format(1, useShortFormat = true)).isEqualTo("1.0B")
-        assertThat(sut.format(1000, useShortFormat = true)).isEqualTo("0.98KB")
-        assertThat(sut.format(1024 * 1024, useShortFormat = true)).isEqualTo("0.95MB")
-        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = true)).isEqualTo("0.93GB")
+        assertThat(sut.format(1, useShortFormat = true)).isEqualTo("1 B")
+        assertThat(sut.format(1000, useShortFormat = true)).isEqualTo("0.98 KB")
+        assertThat(sut.format(1024, useShortFormat = true)).isEqualTo("1.0 KB")
+        assertThat(sut.format(1024 * 500, useShortFormat = true)).isEqualTo("500 KB")
+        assertThat(sut.format(1024 * 1024, useShortFormat = true)).isEqualTo("1.0 MB")
+        assertThat(sut.format(1024 * 1024 * 1024, useShortFormat = true)).isEqualTo("1.0 GB")
     }
 
     private fun createAndroidFileSizeFormatter(sdkLevel: Int) = AndroidFileSizeFormatter(
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 96d15d6bfa..158dd63845 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 69dcaa32d2..4722994cc8 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt
index f33a3f237a..ef5132d047 100644
--- a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/throttler/FirstThrottlerTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/build.gradle.kts b/libraries/architecture/build.gradle.kts
index 55b79abca0..c745bec6d3 100644
--- a/libraries/architecture/build.gradle.kts
+++ b/libraries/architecture/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
index d333eae1cd..5dfda2aa2e 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AssistedNodeFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt
index c02c64135d..bb833162e3 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -32,6 +33,11 @@ sealed interface AsyncAction<out T> {
 
     data object ConfirmingNoParams : Confirming
 
+    /**
+     * User cancels the action, use this object to ask for confirmation.
+     */
+    data object ConfirmingCancellation : Confirming
+
     /**
      * Represents an operation that is currently ongoing.
      */
@@ -149,16 +155,16 @@ inline fun <T> MutableState<AsyncAction<T>>.runUpdatingStateNoSuccess(
  * @param resultBlock a suspending function that returns a [Result].
  * @return the [Result] returned by [resultBlock].
  */
-@OptIn(ExperimentalContracts::class)
 @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
 suspend inline fun <T> runUpdatingState(
     state: MutableState<AsyncAction<T>>,
     errorTransform: (Throwable) -> Throwable = { it },
     resultBlock: suspend () -> Result<T>,
 ): Result<T> {
-    contract {
-        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
-    }
+    // Restore when the issue with contracts and AGP 8.13.x is fixed
+//    contract {
+//        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
+//    }
     state.value = AsyncAction.Loading
     return try {
         resultBlock()
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
index 7085db62f3..734ff16692 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,9 +11,6 @@ package io.element.android.libraries.architecture
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 
 /**
  * Sealed type that allows to model an asynchronous operation.
@@ -133,16 +131,16 @@ suspend inline fun <T> MutableState<AsyncData<T>>.runUpdatingState(
  * @param resultBlock a suspending function that returns a [Result].
  * @return the [Result] returned by [resultBlock].
  */
-@OptIn(ExperimentalContracts::class)
 @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
 suspend inline fun <T> runUpdatingState(
     state: MutableState<AsyncData<T>>,
     errorTransform: (Throwable) -> Throwable = { it },
     resultBlock: suspend () -> Result<T>,
 ): Result<T> {
-    contract {
-        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
-    }
+    // Restore when the issue with contracts and AGP 8.13.x is fixed
+//    contract {
+//        callsInPlace(resultBlock, InvocationKind.EXACTLY_ONCE)
+//    }
     val prevData = state.value.dataOrNull()
     state.value = AsyncData.Loading(prevData = prevData)
     return resultBlock().fold(
@@ -162,14 +160,14 @@ suspend inline fun <T> runUpdatingState(
 }
 
 inline fun <T, R> AsyncData<T>.map(
-    transform: (T?) -> R,
+    transform: (T) -> R,
 ): AsyncData<R> {
     return when (this) {
         is AsyncData.Failure -> AsyncData.Failure(
             error = error,
-            prevData = transform(prevData)
+            prevData = prevData?.let { transform(prevData) }
         )
-        is AsyncData.Loading -> AsyncData.Loading(transform(prevData))
+        is AsyncData.Loading -> AsyncData.Loading(prevData?.let { transform(prevData) })
         is AsyncData.Success -> AsyncData.Success(transform(data))
         AsyncData.Uninitialized -> AsyncData.Uninitialized
     }
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 b8d678e79c..0ec0c1debe 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
index 4188b0a70a..8ff4a3a6b7 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Bindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/FeatureEntryPoint.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/FeatureEntryPoint.kt
index d5a932b705..ad4f2c9109 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/FeatureEntryPoint.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/FeatureEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/LifecycleExt.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/LifecycleExt.kt
index 115a359822..1f948b14e3 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/LifecycleExt.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/LifecycleExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeCallback.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeCallback.kt
new file mode 100644
index 0000000000..e949dcaf63
--- /dev/null
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeCallback.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.architecture
+
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+
+inline fun <reified I : Plugin> Node.callback(): I {
+    return plugins.callback()
+}
+
+inline fun <reified I : Plugin> List<Plugin>.callback(): I {
+    return requireNotNull(filterIsInstance<I>().singleOrNull()) { "Make sure to actually pass a Callback plugin to your node" }
+}
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
index 63cb4c4ed9..5a19118659 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeFactories.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeInputs.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeInputs.kt
index d55d9263fe..fe9a9e1418 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeInputs.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeInputs.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
index b5ba343b4e..636e90e184 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/NodeKey.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/ParentNodeExt.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/ParentNodeExt.kt
index 2d0aaba27b..f79ef028ba 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/ParentNodeExt.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/ParentNodeExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
index 6e94e8132f..8d69214694 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/Presenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt
index 80a8bcbcf3..19c60044af 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/animation/ScreenTransition.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/BackStackExt.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/BackStackExt.kt
index e689f64c19..9fceaa8297 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/BackStackExt.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/BackStackExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/DelegateTransitionHandler.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/DelegateTransitionHandler.kt
index 642ff6fc3a..157e7cc635 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/DelegateTransitionHandler.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/DelegateTransitionHandler.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/NodeExt.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/NodeExt.kt
index 3874ec2080..2763596f0f 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/NodeExt.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/NodeExt.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/coverage/ExcludeFromCoverage.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/coverage/ExcludeFromCoverage.kt
index 9f9a6ea399..7e0e709b81 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/coverage/ExcludeFromCoverage.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/coverage/ExcludeFromCoverage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt
index 74c609a3d9..528e143f4e 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt
index 2f51553bf6..2c6cd2416d 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt
index 886c65d49f..142f965125 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/OverlayOperation.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/OverlayOperation.kt
index 4dcf048715..0659080c57 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/OverlayOperation.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/OverlayOperation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt
index 608c63556f..bece75b13a 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncActionTest.kt b/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncActionTest.kt
index fbf892a13f..9af8af9e85 100644
--- a/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncActionTest.kt
+++ b/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncActionTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt b/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt
index 1551360da2..39969c0c72 100644
--- a/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt
+++ b/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -75,22 +76,21 @@ class AsyncDataKtTest {
 private class TestableMutableState<T>(
     value: T
 ) : MutableState<T> {
-    @Suppress("ktlint:standard:property-naming")
-    private val _deque = ArrayDeque<T>(listOf(value))
+    private val deque = ArrayDeque(listOf(value))
 
     override var value: T
-        get() = _deque.last()
+        get() = deque.last()
         set(value) {
-            _deque.addLast(value)
+            deque.addLast(value)
         }
 
     /**
      * Returns the states that were set in the order they were set.
      */
-    fun popFirst(): T = _deque.removeFirst()
+    fun popFirst(): T = deque.removeFirst()
 
     fun assertNoMoreValues() {
-        assertThat(_deque).isEmpty()
+        assertThat(deque).isEmpty()
     }
 
     override operator fun component1(): T = value
diff --git a/libraries/audio/api/build.gradle.kts b/libraries/audio/api/build.gradle.kts
index 3a82763787..208979ff32 100644
--- a/libraries/audio/api/build.gradle.kts
+++ b/libraries/audio/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/audio/api/src/main/kotlin/io/element/android/libraries/audio/api/AudioFocus.kt b/libraries/audio/api/src/main/kotlin/io/element/android/libraries/audio/api/AudioFocus.kt
index c363114856..9a3c178b9c 100644
--- a/libraries/audio/api/src/main/kotlin/io/element/android/libraries/audio/api/AudioFocus.kt
+++ b/libraries/audio/api/src/main/kotlin/io/element/android/libraries/audio/api/AudioFocus.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/audio/impl/build.gradle.kts b/libraries/audio/impl/build.gradle.kts
index f2d9157f96..419e81962c 100644
--- a/libraries/audio/impl/build.gradle.kts
+++ b/libraries/audio/impl/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.setupDependencyInjection
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 f5edc2aabb..aa945ea507 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,13 +16,11 @@ import android.os.Build
 import androidx.core.content.getSystemService
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.audio.api.AudioFocus
 import io.element.android.libraries.audio.api.AudioFocusRequester
 import io.element.android.libraries.di.annotations.ApplicationContext
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAudioFocus(
     @ApplicationContext private val context: Context,
 ) : AudioFocus {
diff --git a/libraries/audio/test/build.gradle.kts b/libraries/audio/test/build.gradle.kts
index 57ffffbee7..2270881ac6 100644
--- a/libraries/audio/test/build.gradle.kts
+++ b/libraries/audio/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/audio/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeAudioFocus.kt b/libraries/audio/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeAudioFocus.kt
index bb628e4cf9..ecb263dbb3 100644
--- a/libraries/audio/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeAudioFocus.kt
+++ b/libraries/audio/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeAudioFocus.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/build.gradle.kts b/libraries/compound/build.gradle.kts
index cbdb09d451..ce8479c47a 100644
--- a/libraries/compound/build.gradle.kts
+++ b/libraries/compound/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,12 +19,12 @@ android {
     testOptions {
         unitTests.isIncludeAndroidResources = true
     }
-
-    dependencies {
-        implementation(libs.showkase)
-        testCommonDependencies(libs)
-        testImplementation(libs.test.roborazzi)
-        testImplementation(libs.test.roborazzi.compose)
-        testImplementation(libs.test.roborazzi.junit)
-    }
+}
+
+dependencies {
+    implementation(libs.showkase)
+    testCommonDependencies(libs)
+    testImplementation(libs.test.roborazzi)
+    testImplementation(libs.test.roborazzi.compose)
+    testImplementation(libs.test.roborazzi.junit)
 }
diff --git a/libraries/compound/screenshots/Compound Icons - Dark.png b/libraries/compound/screenshots/Compound Icons - Dark.png
index acac494f89..c0d816a6b9 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:6bc48b9f792da838f9fc2c2a630cbbbb906de851a138cc1ac8b7bf67b801ad84
-size 211300
+oid sha256:fa16f659aa3e7d05fa03a51d52faddc0c40c3ab52231687f8c6c8a4ba81ff6f0
+size 219813
diff --git a/libraries/compound/screenshots/Compound Icons - Light.png b/libraries/compound/screenshots/Compound Icons - Light.png
index c6b76c46bb..fd105971e0 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:e85fd2c67ff42829b8580ab5c0c2af1fee40973f5c0b34ef7de00e3663cee8e4
-size 223041
+oid sha256:72fb457dc50bf1a2261502fc1da15c01ab415344e9070354d38dc7b74234d790
+size 232095
diff --git a/libraries/compound/screenshots/Compound Icons - Rtl.png b/libraries/compound/screenshots/Compound Icons - Rtl.png
index ce2ffe2e88..50c98caee5 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:406b62991171a146e891f95bcad0321ebc60cf1fe2cabc9caedbb17fb062af13
-size 224320
+oid sha256:24cfe760717881ee71f36fae1fb201e74b2c32a2f9a5aef71ef21dab69ea5366
+size 233212
diff --git a/libraries/compound/screenshots/Compound Semantic Colors - Dark HC.png b/libraries/compound/screenshots/Compound Semantic Colors - Dark HC.png
index 4890b91886..b66b386ed8 100644
--- a/libraries/compound/screenshots/Compound Semantic Colors - Dark HC.png	
+++ b/libraries/compound/screenshots/Compound Semantic Colors - Dark HC.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:578e9b5a38791e2686a7b9ba5c461eb1d1fb29dfbe950bf46c113ad75ceac175
-size 327758
+oid sha256:c846cd10b83361c368bdbb31ed6220cc22693c3cbf52791fb369841af1e9ea48
+size 327701
diff --git a/libraries/compound/screenshots/Compound Semantic Colors - Dark.png b/libraries/compound/screenshots/Compound Semantic Colors - Dark.png
index 4cc125b4c8..35d684d39b 100644
--- a/libraries/compound/screenshots/Compound Semantic Colors - Dark.png	
+++ b/libraries/compound/screenshots/Compound Semantic Colors - Dark.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cab40fc0506c8f2a2efafb1199e85f1da3ebacb49b176e9105e3f95175f85ee
-size 325565
+oid sha256:05b35fedbd53dec2cc5c4c211a8db1a56055963de69425ddae2cab5aff7e3e75
+size 325750
diff --git a/libraries/compound/screenshots/Compound Semantic Colors - Light HC.png b/libraries/compound/screenshots/Compound Semantic Colors - Light HC.png
index 5a8f5a6b32..9061d2b894 100644
--- a/libraries/compound/screenshots/Compound Semantic Colors - Light HC.png	
+++ b/libraries/compound/screenshots/Compound Semantic Colors - Light HC.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:174f9d4ee70a29c0c8c2a01a15daeb14281530678ff7d7fb19a208bfd789533a
-size 309210
+oid sha256:8d98e64eda5d6333067ccc599e99636f618331397207bb7534595e2756edb75e
+size 309312
diff --git a/libraries/compound/screenshots/Compound Semantic Colors - Light.png b/libraries/compound/screenshots/Compound Semantic Colors - Light.png
index f010626dda..83c00ab51c 100644
--- a/libraries/compound/screenshots/Compound Semantic Colors - Light.png	
+++ b/libraries/compound/screenshots/Compound Semantic Colors - Light.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7598b98462c015f2bf74b3ea3ad95fc0220b2efb9bb81ac56025cf6a158e3f8a
-size 308976
+oid sha256:5ccbf1234065b182939f001eb65eca0a62adae41a2d91ef0307d27b059407178
+size 309084
diff --git a/libraries/compound/screenshots/Compound Typography.png b/libraries/compound/screenshots/Compound Typography.png
index 095ad6c71d..22e2d92ebb 100644
--- a/libraries/compound/screenshots/Compound Typography.png	
+++ b/libraries/compound/screenshots/Compound Typography.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac84a7175c4a4897aa28eddcf722b7997c6576f612eb38fa09ffabcf7be11e00
-size 119496
+oid sha256:32b12d0b26cd016a632a4cb87b71d5efcb2c0d816bf565bc90aee9963ce2d5df
+size 134117
diff --git a/libraries/compound/screenshots/Compound Vector Icons - Dark.png b/libraries/compound/screenshots/Compound Vector Icons - Dark.png
index 2b535c348b..638e4a5cba 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:6ff6dfdfab51332cad3bdfa351a4d0e305de5f899853575a8514858cc871e904
-size 83609
+oid sha256:a699170cabca6fb912d034a588b45961485afe6ef6d2c24f0ab79f10ae00c168
+size 85629
diff --git a/libraries/compound/screenshots/Compound Vector Icons - Light.png b/libraries/compound/screenshots/Compound Vector Icons - Light.png
index bc29dcd24d..d60a3fdadb 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:ca38f5f23c282a6dc4c01a54705f71bf8c927aeac9c1df0a1f3abe50c10b1b85
-size 89336
+oid sha256:dd4b2a40fcf02d6db29cb0bc371d93236b4a0be6d4446bab86358692cddb53f5
+size 91692
diff --git a/libraries/compound/src/main/assets/theme.iife.js b/libraries/compound/src/main/assets/theme.iife.js
new file mode 100644
index 0000000000..71ce6b0013
--- /dev/null
+++ b/libraries/compound/src/main/assets/theme.iife.js
@@ -0,0 +1 @@
+var CompoundTheme=(function(Fe){"use strict";const Xe=(e,t=0,r=1)=>Zt(Jt(t,e),r),Yt=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]=Xe(e[t],0,255)):t===3&&(e[t]=Xe(e[t],0,1));return e},co={};for(let e of["Boolean","Number","String","Function","Array","Date","RegExp","Undefined","Null"])co[`[object ${e}]`]=e.toLowerCase();function P(e){return co[Object.prototype.toString.call(e)]||"object"}const j=(e,t=null)=>e.length>=3?Array.prototype.slice.call(e):P(e[0])=="object"&&t?t.split("").filter(r=>e[0][r]!==void 0).map(r=>e[0][r]):e[0],pt=e=>{if(e.length<2)return null;const t=e.length-1;return P(e[t])=="string"?e[t].toLowerCase():null},{PI:mt,min:Zt,max:Jt}=Math,we=mt*2,Wt=mt/3,Ac=mt/180,Lc=180/mt,L={format:{},autodetect:[]};let $=class{constructor(...t){const r=this;if(P(t[0])==="object"&&t[0].constructor&&t[0].constructor===this.constructor)return t[0];let n=pt(t),o=!1;if(!n){o=!0,L.sorted||(L.autodetect=L.autodetect.sort((a,s)=>s.p-a.p),L.sorted=!0);for(let a of L.autodetect)if(n=a.test(...t),n)break}if(L.format[n]){const a=L.format[n].apply(null,o?t:t.slice(0,-1));r._rgb=Yt(a)}else throw new Error("unknown format: "+t);r._rgb.length===3&&r._rgb.push(1)}toString(){return P(this.hex)=="function"?this.hex():`[${this._rgb.join(",")}]`}};const Ec="2.6.0",O=(...e)=>new O.Color(...e);O.Color=$,O.version=Ec;const Tc=(...e)=>{e=j(e,"cmyk");const[t,r,n,o]=e,a=e.length>4?e[4]:1;return o===1?[0,0,0,a]:[t>=1?0:255*(1-t)*(1-o),r>=1?0:255*(1-r)*(1-o),n>=1?0:255*(1-n)*(1-o),a]},{max:io}=Math,Sc=(...e)=>{let[t,r,n]=j(e,"rgb");t=t/255,r=r/255,n=n/255;const o=1-io(t,io(r,n)),a=o<1?1/(1-o):0,s=(1-t-o)*a,c=(1-r-o)*a,i=(1-n-o)*a;return[s,c,i,o]};$.prototype.cmyk=function(){return Sc(this._rgb)},O.cmyk=(...e)=>new $(...e,"cmyk"),L.format.cmyk=Tc,L.autodetect.push({p:2,test:(...e)=>{if(e=j(e,"cmyk"),P(e)==="array"&&e.length===4)return"cmyk"}});const Ut=e=>Math.round(e*100)/100,Pc=(...e)=>{const t=j(e,"hsla");let r=pt(e)||"lsa";return t[0]=Ut(t[0]||0),t[1]=Ut(t[1]*100)+"%",t[2]=Ut(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}(${t.join(",")})`},uo=(...e)=>{e=j(e,"rgba");let[t,r,n]=e;t/=255,r/=255,n/=255;const o=Zt(t,r,n),a=Jt(t,r,n),s=(a+o)/2;let c,i;return a===o?(c=0,i=Number.NaN):c=s<.5?(a-o)/(a+o):(a-o)/(2-a-o),t==a?i=(r-n)/(a-o):r==a?i=2+(n-t)/(a-o):n==a&&(i=4+(t-r)/(a-o)),i*=60,i<0&&(i+=360),e.length>3&&e[3]!==void 0?[i,c,s,e[3]]:[i,c,s]},{round:Qt}=Math,jc=(...e)=>{const t=j(e,"rgba");let r=pt(e)||"rgb";return r.substr(0,3)=="hsl"?Pc(uo(t),r):(t[0]=Qt(t[0]),t[1]=Qt(t[1]),t[2]=Qt(t[2]),(r==="rgba"||t.length>3&&t[3]<1)&&(t[3]=t.length>3?t[3]:1,r="rgba"),`${r}(${t.slice(0,r==="rgb"?3:4).join(",")})`)},{round:er}=Math,tr=(...e)=>{e=j(e,"hsl");const[t,r,n]=e;let o,a,s;if(r===0)o=a=s=n*255;else{const c=[0,0,0],i=[0,0,0],u=n<.5?n*(1+r):n+r-n*r,l=2*n-u,f=t/360;c[0]=f+1/3,c[1]=f,c[2]=f-1/3;for(let h=0;h<3;h++)c[h]<0&&(c[h]+=1),c[h]>1&&(c[h]-=1),6*c[h]<1?i[h]=l+(u-l)*6*c[h]:2*c[h]<1?i[h]=u:3*c[h]<2?i[h]=l+(u-l)*(2/3-c[h])*6:i[h]=l;[o,a,s]=[er(i[0]*255),er(i[1]*255),er(i[2]*255)]}return e.length>3?[o,a,s,e[3]]:[o,a,s,1]},fo=/^rgb\(\s*(-?\d+),\s*(-?\d+)\s*,\s*(-?\d+)\s*\)$/,lo=/^rgba\(\s*(-?\d+),\s*(-?\d+)\s*,\s*(-?\d+)\s*,\s*([01]|[01]?\.\d+)\)$/,ho=/^rgb\(\s*(-?\d+(?:\.\d+)?)%,\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*\)$/,bo=/^rgba\(\s*(-?\d+(?:\.\d+)?)%,\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*,\s*([01]|[01]?\.\d+)\)$/,po=/^hsl\(\s*(-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*\)$/,mo=/^hsla\(\s*(-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*,\s*([01]|[01]?\.\d+)\)$/,{round:go}=Math,rr=e=>{e=e.toLowerCase().trim();let t;if(L.format.named)try{return L.format.named(e)}catch{}if(t=e.match(fo)){const r=t.slice(1,4);for(let n=0;n<3;n++)r[n]=+r[n];return r[3]=1,r}if(t=e.match(lo)){const r=t.slice(1,5);for(let n=0;n<4;n++)r[n]=+r[n];return r}if(t=e.match(ho)){const r=t.slice(1,4);for(let n=0;n<3;n++)r[n]=go(r[n]*2.55);return r[3]=1,r}if(t=e.match(bo)){const r=t.slice(1,5);for(let n=0;n<3;n++)r[n]=go(r[n]*2.55);return r[3]=+r[3],r}if(t=e.match(po)){const r=t.slice(1,4);r[1]*=.01,r[2]*=.01;const n=tr(r);return n[3]=1,n}if(t=e.match(mo)){const r=t.slice(1,4);r[1]*=.01,r[2]*=.01;const n=tr(r);return n[3]=+t[4],n}};rr.test=e=>fo.test(e)||lo.test(e)||ho.test(e)||bo.test(e)||po.test(e)||mo.test(e),$.prototype.css=function(e){return jc(this._rgb,e)},O.css=(...e)=>new $(...e,"css"),L.format.css=rr,L.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&P(e)==="string"&&rr.test(e))return"css"}}),L.format.gl=(...e)=>{const t=j(e,"rgba");return t[0]*=255,t[1]*=255,t[2]*=255,t},O.gl=(...e)=>new $(...e,"gl"),$.prototype.gl=function(){const e=this._rgb;return[e[0]/255,e[1]/255,e[2]/255,e[3]]};const{floor:Bc}=Math,Gc=(...e)=>{e=j(e,"hcg");let[t,r,n]=e,o,a,s;n=n*255;const c=r*255;if(r===0)o=a=s=n;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;const i=Bc(t),u=t-i,l=n*(1-r),f=l+c*(1-u),h=l+c*u,d=l+c;switch(i){case 0:[o,a,s]=[d,h,l];break;case 1:[o,a,s]=[f,d,l];break;case 2:[o,a,s]=[l,d,h];break;case 3:[o,a,s]=[l,f,d];break;case 4:[o,a,s]=[h,l,d];break;case 5:[o,a,s]=[d,l,f];break}}return[o,a,s,e.length>3?e[3]:1]},Ic=(...e)=>{const[t,r,n]=j(e,"rgb"),o=Zt(t,r,n),a=Jt(t,r,n),s=a-o,c=s*100/255,i=o/(255-s)*100;let u;return s===0?u=Number.NaN:(t===a&&(u=(r-n)/s),r===a&&(u=2+(n-t)/s),n===a&&(u=4+(t-r)/s),u*=60,u<0&&(u+=360)),[u,c,i]};$.prototype.hcg=function(){return Ic(this._rgb)},O.hcg=(...e)=>new $(...e,"hcg"),L.format.hcg=Gc,L.autodetect.push({p:1,test:(...e)=>{if(e=j(e,"hcg"),P(e)==="array"&&e.length===3)return"hcg"}});const zc=/^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,Fc=/^#?([A-Fa-f0-9]{8}|[A-Fa-f0-9]{4})$/,vo=e=>{if(e.match(zc)){(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(Fc)){(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,a=Math.round((t&255)/255*100)/100;return[r,n,o,a]}throw new Error(`unknown hex color: ${e}`)},{round:gt}=Math,_o=(...e)=>{let[t,r,n,o]=j(e,"rgba"),a=pt(e)||"auto";o===void 0&&(o=1),a==="auto"&&(a=o<1?"rgba":"rgb"),t=gt(t),r=gt(r),n=gt(n);let c="000000"+(t<<16|r<<8|n).toString(16);c=c.substr(c.length-6);let i="0"+gt(o*255).toString(16);switch(i=i.substr(i.length-2),a.toLowerCase()){case"rgba":return`#${c}${i}`;case"argb":return`#${i}${c}`;default:return`#${c}`}};$.prototype.hex=function(e){return _o(this._rgb,e)},O.hex=(...e)=>new $(...e,"hex"),L.format.hex=vo,L.autodetect.push({p:4,test:(e,...t)=>{if(!t.length&&P(e)==="string"&&[3,4,5,6,7,8,9].indexOf(e.length)>=0)return"hex"}});const{cos:Ke}=Math,Xc=(...e)=>{e=j(e,"hsi");let[t,r,n]=e,o,a,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*Ke(we*t)/Ke(Wt-we*t))/3,a=1-(s+o)):t<2/3?(t-=1/3,o=(1-r)/3,a=(1+r*Ke(we*t)/Ke(Wt-we*t))/3,s=1-(o+a)):(t-=2/3,a=(1-r)/3,s=(1+r*Ke(we*t)/Ke(Wt-we*t))/3,o=1-(a+s)),o=Xe(n*o*3),a=Xe(n*a*3),s=Xe(n*s*3),[o*255,a*255,s*255,e.length>3?e[3]:1]},{min:Kc,sqrt:Dc,acos:Vc}=Math,Yc=(...e)=>{let[t,r,n]=j(e,"rgb");t/=255,r/=255,n/=255;let o;const a=Kc(t,r,n),s=(t+r+n)/3,c=s>0?1-a/s:0;return c===0?o=NaN:(o=(t-r+(t-n))/2,o/=Dc((t-r)*(t-r)+(t-n)*(r-n)),o=Vc(o),n>r&&(o=we-o),o/=we),[o*360,c,s]};$.prototype.hsi=function(){return Yc(this._rgb)},O.hsi=(...e)=>new $(...e,"hsi"),L.format.hsi=Xc,L.autodetect.push({p:2,test:(...e)=>{if(e=j(e,"hsi"),P(e)==="array"&&e.length===3)return"hsi"}}),$.prototype.hsl=function(){return uo(this._rgb)},O.hsl=(...e)=>new $(...e,"hsl"),L.format.hsl=tr,L.autodetect.push({p:2,test:(...e)=>{if(e=j(e,"hsl"),P(e)==="array"&&e.length===3)return"hsl"}});const{floor:Zc}=Math,Jc=(...e)=>{e=j(e,"hsv");let[t,r,n]=e,o,a,s;if(n*=255,r===0)o=a=s=n;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;const c=Zc(t),i=t-c,u=n*(1-r),l=n*(1-r*i),f=n*(1-r*(1-i));switch(c){case 0:[o,a,s]=[n,f,u];break;case 1:[o,a,s]=[l,n,u];break;case 2:[o,a,s]=[u,n,f];break;case 3:[o,a,s]=[u,l,n];break;case 4:[o,a,s]=[f,u,n];break;case 5:[o,a,s]=[n,u,l];break}}return[o,a,s,e.length>3?e[3]:1]},{min:Wc,max:Uc}=Math,Qc=(...e)=>{e=j(e,"rgb");let[t,r,n]=e;const o=Wc(t,r,n),a=Uc(t,r,n),s=a-o;let c,i,u;return u=a/255,a===0?(c=Number.NaN,i=0):(i=s/a,t===a&&(c=(r-n)/s),r===a&&(c=2+(n-t)/s),n===a&&(c=4+(t-r)/s),c*=60,c<0&&(c+=360)),[c,i,u]};$.prototype.hsv=function(){return Qc(this._rgb)},O.hsv=(...e)=>new $(...e,"hsv"),L.format.hsv=Jc,L.autodetect.push({p:2,test:(...e)=>{if(e=j(e,"hsv"),P(e)==="array"&&e.length===3)return"hsv"}});const se={Kn:18,Xn:.95047,Yn:1,Zn:1.08883,t0:.137931034,t1:.206896552,t2:.12841855,t3:.008856452},{pow:e0}=Math,yo=(...e)=>{e=j(e,"lab");const[t,r,n]=e;let o,a,s,c,i,u;return a=(t+16)/116,o=isNaN(r)?a:a+r/500,s=isNaN(n)?a:a-n/200,a=se.Yn*or(a),o=se.Xn*or(o),s=se.Zn*or(s),c=nr(3.2404542*o-1.5371385*a-.4985314*s),i=nr(-.969266*o+1.8760108*a+.041556*s),u=nr(.0556434*o-.2040259*a+1.0572252*s),[c,i,u,e.length>3?e[3]:1]},nr=e=>255*(e<=.00304?12.92*e:1.055*e0(e,1/2.4)-.055),or=e=>e>se.t1?e*e*e:se.t2*(e-se.t0),{pow:wo}=Math,ko=(...e)=>{const[t,r,n]=j(e,"rgb"),[o,a,s]=t0(t,r,n),c=116*a-16;return[c<0?0:c,500*(o-a),200*(a-s)]},sr=e=>(e/=255)<=.04045?e/12.92:wo((e+.055)/1.055,2.4),ar=e=>e>se.t3?wo(e,1/3):e/se.t2+se.t0,t0=(e,t,r)=>{e=sr(e),t=sr(t),r=sr(r);const n=ar((.4124564*e+.3575761*t+.1804375*r)/se.Xn),o=ar((.2126729*e+.7151522*t+.072175*r)/se.Yn),a=ar((.0193339*e+.119192*t+.9503041*r)/se.Zn);return[n,o,a]};$.prototype.lab=function(){return ko(this._rgb)},O.lab=(...e)=>new $(...e,"lab"),L.format.lab=yo,L.autodetect.push({p:2,test:(...e)=>{if(e=j(e,"lab"),P(e)==="array"&&e.length===3)return"lab"}});const{sin:r0,cos:n0}=Math,$o=(...e)=>{let[t,r,n]=j(e,"lch");return isNaN(n)&&(n=0),n=n*Ac,[t,n0(n)*r,r0(n)*r]},Co=(...e)=>{e=j(e,"lch");const[t,r,n]=e,[o,a,s]=$o(t,r,n),[c,i,u]=yo(o,a,s);return[c,i,u,e.length>3?e[3]:1]},o0=(...e)=>{const t=j(e,"hcl").reverse();return Co(...t)},{sqrt:s0,atan2:a0,round:c0}=Math,xo=(...e)=>{const[t,r,n]=j(e,"lab"),o=s0(r*r+n*n);let a=(a0(n,r)*Lc+360)%360;return c0(o*1e4)===0&&(a=Number.NaN),[t,o,a]},Ro=(...e)=>{const[t,r,n]=j(e,"rgb"),[o,a,s]=ko(t,r,n);return xo(o,a,s)};$.prototype.lch=function(){return Ro(this._rgb)},$.prototype.hcl=function(){return Ro(this._rgb).reverse()},O.lch=(...e)=>new $(...e,"lch"),O.hcl=(...e)=>new $(...e,"hcl"),L.format.lch=Co,L.format.hcl=o0,["lch","hcl"].forEach(e=>L.autodetect.push({p:2,test:(...t)=>{if(t=j(t,e),P(t)==="array"&&t.length===3)return e}}));const De={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"};$.prototype.name=function(){const e=_o(this._rgb,"rgb");for(let t of Object.keys(De))if(De[t]===e)return t.toLowerCase();return e},L.format.named=e=>{if(e=e.toLowerCase(),De[e])return vo(De[e]);throw new Error("unknown color name: "+e)},L.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&P(e)==="string"&&De[e.toLowerCase()])return"named"}});const i0=e=>{if(P(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)},u0=(...e)=>{const[t,r,n]=j(e,"rgb");return(t<<16)+(r<<8)+n};$.prototype.num=function(){return u0(this._rgb)},O.num=(...e)=>new $(...e,"num"),L.format.num=i0,L.autodetect.push({p:5,test:(...e)=>{if(e.length===1&&P(e[0])==="number"&&e[0]>=0&&e[0]<=16777215)return"num"}});const{round:Ho}=Math;$.prototype.rgb=function(e=!0){return e===!1?this._rgb.slice(0,3):this._rgb.slice(0,3).map(Ho)},$.prototype.rgba=function(e=!0){return this._rgb.slice(0,4).map((t,r)=>r<3?e===!1?t:Ho(t):t)},O.rgb=(...e)=>new $(...e,"rgb"),L.format.rgb=(...e)=>{const t=j(e,"rgba");return t[3]===void 0&&(t[3]=1),t},L.autodetect.push({p:3,test:(...e)=>{if(e=j(e,"rgba"),P(e)==="array"&&(e.length===3||e.length===4&&P(e[3])=="number"&&e[3]>=0&&e[3]<=1))return"rgb"}});const{log:vt}=Math,qo=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*vt(n),o=t<20?0:-254.76935184120902+.8274096064007395*(o=t-10)+115.67994401066147*vt(o)):(r=351.97690566805693+.114206453784165*(r=t-55)-40.25366309332127*vt(r),n=325.4494125711974+.07943456536662342*(n=t-50)-28.0852963507957*vt(n),o=255),[r,n,o,1]},{round:f0}=Math,l0=(...e)=>{const t=j(e,"rgb"),r=t[0],n=t[2];let o=1e3,a=4e4;const s=.4;let c;for(;a-o>s;){c=(a+o)*.5;const i=qo(c);i[2]/i[0]>=n/r?a=c:o=c}return f0(c)};$.prototype.temp=$.prototype.kelvin=$.prototype.temperature=function(){return l0(this._rgb)},O.temp=O.kelvin=O.temperature=(...e)=>new $(...e,"temp"),L.format.temp=L.format.kelvin=L.format.temperature=qo;const{pow:_t,sign:h0}=Math,Mo=(...e)=>{e=j(e,"lab");const[t,r,n]=e,o=_t(t+.3963377774*r+.2158037573*n,3),a=_t(t-.1055613458*r-.0638541728*n,3),s=_t(t-.0894841775*r-1.291485548*n,3);return[255*cr(4.0767416621*o-3.3077115913*a+.2309699292*s),255*cr(-1.2684380046*o+2.6097574011*a-.3413193965*s),255*cr(-.0041960863*o-.7034186147*a+1.707614701*s),e.length>3?e[3]:1]};function cr(e){const t=Math.abs(e);return t>.0031308?(h0(e)||1)*(1.055*_t(t,.4166666666666667)-.055):e*12.92}const{cbrt:ir,pow:d0,sign:b0}=Math,Oo=(...e)=>{const[t,r,n]=j(e,"rgb"),[o,a,s]=[ur(t/255),ur(r/255),ur(n/255)],c=ir(.4122214708*o+.5363325363*a+.0514459929*s),i=ir(.2119034982*o+.6806995451*a+.1073969566*s),u=ir(.0883024619*o+.2817188376*a+.6299787005*s);return[.2104542553*c+.793617785*i-.0040720468*u,1.9779984951*c-2.428592205*i+.4505937099*u,.0259040371*c+.7827717662*i-.808675766*u]};function ur(e){const t=Math.abs(e);return t<.04045?e/12.92:(b0(e)||1)*d0((t+.055)/1.055,2.4)}$.prototype.oklab=function(){return Oo(this._rgb)},O.oklab=(...e)=>new $(...e,"oklab"),L.format.oklab=Mo,L.autodetect.push({p:3,test:(...e)=>{if(e=j(e,"oklab"),P(e)==="array"&&e.length===3)return"oklab"}});const p0=(...e)=>{e=j(e,"lch");const[t,r,n]=e,[o,a,s]=$o(t,r,n),[c,i,u]=Mo(o,a,s);return[c,i,u,e.length>3?e[3]:1]},m0=(...e)=>{const[t,r,n]=j(e,"rgb"),[o,a,s]=Oo(t,r,n);return xo(o,a,s)};$.prototype.oklch=function(){return m0(this._rgb)},O.oklch=(...e)=>new $(...e,"oklch"),L.format.oklch=p0,L.autodetect.push({p:3,test:(...e)=>{if(e=j(e,"oklch"),P(e)==="array"&&e.length===3)return"oklch"}}),$.prototype.alpha=function(e,t=!1){return e!==void 0&&P(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},$.prototype.darken=function(e=1){const t=this,r=t.lab();return r[0]-=se.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:g0}=Math,v0=1e-7,_0=20;$.prototype.luminance=function(e,t="rgb"){if(e!==void 0&&P(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=_0;const o=(s,c)=>{const i=s.interpolate(c,.5,t),u=i.luminance();return Math.abs(e-u)<v0||!n--?i:u>e?o(s,i):o(i,c)},a=(r>e?o(new $([0,0,0]),this):o(this,new $([255,255,255]))).rgb();return new $([...a,this._rgb[3]])}return y0(...this._rgb.slice(0,3))};const y0=(e,t,r)=>(e=fr(e),t=fr(t),r=fr(r),.2126*e+.7152*t+.0722*r),fr=e=>(e/=255,e<=.03928?e/12.92:g0((e+.055)/1.055,2.4)),re={},ct=(e,t,r=.5,...n)=>{let o=n[0]||"lrgb";if(!re[o]&&!n.length&&(o=Object.keys(re)[0]),!re[o])throw new Error(`interpolation mode ${o} is not defined`);return P(e)!=="object"&&(e=new $(e)),P(t)!=="object"&&(t=new $(t)),re[o](e,t,r).alpha(e.alpha()+r*(t.alpha()-e.alpha()))};$.prototype.mix=$.prototype.interpolate=function(e,t=.5,...r){return ct(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")},$.prototype.saturate=function(e=1){const t=this,r=t.lch();return r[1]+=se.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("."),a=this[n]();if(o){const s=n.indexOf(o)-(n.substr(0,2)==="ok"?2:0);if(s>-1){if(P(t)=="string")switch(t.charAt(0)){case"+":a[s]+=+t;break;case"-":a[s]+=+t;break;case"*":a[s]*=+t.substr(1);break;case"/":a[s]/=+t.substr(1);break;default:a[s]=+t}else if(P(t)==="number")a[s]=t;else throw new Error("unsupported value for Color.set");const c=new $(a,n);return r?(this._rgb=c._rgb,this):c}throw new Error(`unknown channel ${o} in mode ${n}`)}else return a},$.prototype.tint=function(e=.5,...t){return ct(this,"white",e,...t)},$.prototype.shade=function(e=.5,...t){return ct(this,"black",e,...t)};const w0=(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")};re.rgb=w0;const{sqrt:lr,pow:Ve}=Math,k0=(e,t,r)=>{const[n,o,a]=e._rgb,[s,c,i]=t._rgb;return new $(lr(Ve(n,2)*(1-r)+Ve(s,2)*r),lr(Ve(o,2)*(1-r)+Ve(c,2)*r),lr(Ve(a,2)*(1-r)+Ve(i,2)*r),"rgb")};re.lrgb=k0;const $0=(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")};re.lab=$0;const Ye=(e,t,r,n)=>{let o,a;n==="hsl"?(o=e.hsl(),a=t.hsl()):n==="hsv"?(o=e.hsv(),a=t.hsv()):n==="hcg"?(o=e.hcg(),a=t.hcg()):n==="hsi"?(o=e.hsi(),a=t.hsi()):n==="lch"||n==="hcl"?(n="hcl",o=e.hcl(),a=t.hcl()):n==="oklch"&&(o=e.oklch().reverse(),a=t.oklch().reverse());let s,c,i,u,l,f;(n.substr(0,1)==="h"||n==="oklch")&&([s,i,l]=o,[c,u,f]=a);let h,d,b,_;return!isNaN(s)&&!isNaN(c)?(c>s&&c-s>180?_=c-(s+360):c<s&&s-c>180?_=c+360-s:_=c-s,d=s+r*_):isNaN(s)?isNaN(c)?d=Number.NaN:(d=c,(l==1||l==0)&&n!="hsv"&&(h=u)):(d=s,(f==1||f==0)&&n!="hsv"&&(h=i)),h===void 0&&(h=i+r*(u-i)),b=l+r*(f-l),n==="oklch"?new $([b,h,d],n):new $([d,h,b],n)},No=(e,t,r)=>Ye(e,t,r,"lch");re.lch=No,re.hcl=No;const C0=(e,t,r)=>{const n=e.num(),o=t.num();return new $(n+r*(o-n),"num")};re.num=C0;const x0=(e,t,r)=>Ye(e,t,r,"hcg");re.hcg=x0;const R0=(e,t,r)=>Ye(e,t,r,"hsi");re.hsi=R0;const H0=(e,t,r)=>Ye(e,t,r,"hsl");re.hsl=H0;const q0=(e,t,r)=>Ye(e,t,r,"hsv");re.hsv=q0;const M0=(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")};re.oklab=M0;const O0=(e,t,r)=>Ye(e,t,r,"oklch");re.oklch=O0;const{pow:hr,sqrt:dr,PI:br,cos:Ao,sin:Lo,atan2:N0}=Math,A0=(e,t="lrgb",r=null)=>{const n=e.length;r||(r=Array.from(new Array(n)).map(()=>1));const o=n/r.reduce(function(f,h){return f+h});if(r.forEach((f,h)=>{r[h]*=o}),e=e.map(f=>new $(f)),t==="lrgb")return L0(e,r);const a=e.shift(),s=a.get(t),c=[];let i=0,u=0;for(let f=0;f<s.length;f++)if(s[f]=(s[f]||0)*r[0],c.push(isNaN(s[f])?0:r[0]),t.charAt(f)==="h"&&!isNaN(s[f])){const h=s[f]/180*br;i+=Ao(h)*r[0],u+=Lo(h)*r[0]}let l=a.alpha()*r[0];e.forEach((f,h)=>{const d=f.get(t);l+=f.alpha()*r[h+1];for(let b=0;b<s.length;b++)if(!isNaN(d[b]))if(c[b]+=r[h+1],t.charAt(b)==="h"){const _=d[b]/180*br;i+=Ao(_)*r[h+1],u+=Lo(_)*r[h+1]}else s[b]+=d[b]*r[h+1]});for(let f=0;f<s.length;f++)if(t.charAt(f)==="h"){let h=N0(u/c[f],i/c[f])/br*180;for(;h<0;)h+=360;for(;h>=360;)h-=360;s[f]=h}else s[f]=s[f]/c[f];return l/=n,new $(s,t).alpha(l>.99999?1:l,!0)},L0=(e,t)=>{const r=e.length,n=[0,0,0,0];for(let o=0;o<e.length;o++){const a=e[o],s=t[o]/r,c=a._rgb;n[0]+=hr(c[0],2)*s,n[1]+=hr(c[1],2)*s,n[2]+=hr(c[2],2)*s,n[3]+=c[3]*s}return n[0]=dr(n[0]),n[1]=dr(n[1]),n[2]=dr(n[2]),n[3]>.9999999&&(n[3]=1),new $(Yt(n))},{pow:E0}=Math;function yt(e){let t="rgb",r=O("#ccc"),n=0,o=[0,1],a=[],s=[0,0],c=!1,i=[],u=!1,l=0,f=1,h=!1,d={},b=!0,_=1;const g=function(m){if(m=m||["#fff","#000"],m&&P(m)==="string"&&O.brewer&&O.brewer[m.toLowerCase()]&&(m=O.brewer[m.toLowerCase()]),P(m)==="array"){m.length===1&&(m=[m[0],m[0]]),m=m.slice(0);for(let p=0;p<m.length;p++)m[p]=O(m[p]);a.length=0;for(let p=0;p<m.length;p++)a.push(p/(m.length-1))}return A(),i=m},v=function(m){if(c!=null){const p=c.length-1;let y=0;for(;y<p&&m>=c[y];)y++;return y-1}return 0};let H=m=>m,x=m=>m;const N=function(m,p){let y,w;if(p==null&&(p=!1),isNaN(m)||m===null)return r;p?w=m:c&&c.length>2?w=v(m)/(c.length-2):f!==l?w=(m-l)/(f-l):w=1,w=x(w),p||(w=H(w)),_!==1&&(w=E0(w,_)),w=s[0]+w*(1-s[0]-s[1]),w=Xe(w,0,1);const C=Math.floor(w*1e4);if(b&&d[C])y=d[C];else{if(P(i)==="array")for(let q=0;q<a.length;q++){const M=a[q];if(w<=M){y=i[q];break}if(w>=M&&q===a.length-1){y=i[q];break}if(w>M&&w<a[q+1]){w=(w-M)/(a[q+1]-M),y=O.interpolate(i[q],i[q+1],w,t);break}}else P(i)==="function"&&(y=i(w));b&&(d[C]=y)}return y};var A=()=>d={};g(e);const R=function(m){const p=O(N(m));return u&&p[u]?p[u]():p};return R.classes=function(m){if(m!=null){if(P(m)==="array")c=m,o=[m[0],m[m.length-1]];else{const p=O.analyze(o);m===0?c=[p.min,p.max]:c=O.limits(p,"e",m)}return R}return c},R.domain=function(m){if(!arguments.length)return o;l=m[0],f=m[m.length-1],a=[];const p=i.length;if(m.length===p&&l!==f)for(let y of Array.from(m))a.push((y-l)/(f-l));else{for(let y=0;y<p;y++)a.push(y/(p-1));if(m.length>2){const y=m.map((C,q)=>q/(m.length-1)),w=m.map(C=>(C-l)/(f-l));w.every((C,q)=>y[q]===C)||(x=C=>{if(C<=0||C>=1)return C;let q=0;for(;C>=w[q+1];)q++;const M=(C-w[q])/(w[q+1]-w[q]);return y[q]+M*(y[q+1]-y[q])})}}return o=[l,f],R},R.mode=function(m){return arguments.length?(t=m,A(),R):t},R.range=function(m,p){return g(m),R},R.out=function(m){return u=m,R},R.spread=function(m){return arguments.length?(n=m,R):n},R.correctLightness=function(m){return m==null&&(m=!0),h=m,A(),h?H=function(p){const y=N(0,!0).lab()[0],w=N(1,!0).lab()[0],C=y>w;let q=N(p,!0).lab()[0];const M=y+(w-y)*p;let S=q-M,X=0,D=1,U=20;for(;Math.abs(S)>.01&&U-- >0;)(function(){return C&&(S*=-1),S<0?(X=p,p+=(D-p)*.5):(D=p,p+=(X-p)*.5),q=N(p,!0).lab()[0],S=q-M})();return p}:H=p=>p,R},R.padding=function(m){return m!=null?(P(m)==="number"&&(m=[m,m]),s=m,R):s},R.colors=function(m,p){arguments.length<2&&(p="hex");let y=[];if(arguments.length===0)y=i.slice(0);else if(m===1)y=[R(.5)];else if(m>1){const w=o[0],C=o[1]-w;y=T0(0,m).map(q=>R(w+q/(m-1)*C))}else{e=[];let w=[];if(c&&c.length>2)for(let C=1,q=c.length,M=1<=q;M?C<q:C>q;M?C++:C--)w.push((c[C-1]+c[C])*.5);else w=o;y=w.map(C=>R(C))}return O[p]&&(y=y.map(w=>w[p]())),y},R.cache=function(m){return m!=null?(b=m,R):b},R.gamma=function(m){return m!=null?(_=m,R):_},R.nodata=function(m){return m!=null?(r=O(m),R):r},R}function T0(e,t,r){let n=[],o=e<t,a=t;for(let s=e;o?s<a:s>a;o?s++:s--)n.push(s);return n}const S0=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},P0=function(e){let t,r,n,o;if(e=e.map(a=>new $(a)),e.length===2)[r,n]=e.map(a=>a.lab()),t=function(a){const s=[0,1,2].map(c=>r[c]+a*(n[c]-r[c]));return new $(s,"lab")};else if(e.length===3)[r,n,o]=e.map(a=>a.lab()),t=function(a){const s=[0,1,2].map(c=>(1-a)*(1-a)*r[c]+2*(1-a)*a*n[c]+a*a*o[c]);return new $(s,"lab")};else if(e.length===4){let a;[r,n,o,a]=e.map(s=>s.lab()),t=function(s){const c=[0,1,2].map(i=>(1-s)*(1-s)*(1-s)*r[i]+3*(1-s)*(1-s)*s*n[i]+3*(1-s)*s*s*o[i]+s*s*s*a[i]);return new $(c,"lab")}}else if(e.length>=5){let a,s,c;a=e.map(i=>i.lab()),c=e.length-1,s=S0(c),t=function(i){const u=1-i,l=[0,1,2].map(f=>a.reduce((h,d,b)=>h+s[b]*u**(c-b)*i**b*d[f],0));return new $(l,"lab")}}else throw new RangeError("No point in running bezier with only one color.");return t},j0=e=>{const t=P0(e);return t.scale=()=>yt(t),t},de=(e,t,r)=>{if(!de[r])throw new Error("unknown blend mode "+r);return de[r](e,t)},Ne=e=>(t,r)=>{const n=O(r).rgb(),o=O(t).rgb();return O.rgb(e(n,o))},Ae=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},B0=e=>e,G0=(e,t)=>e*t/255,I0=(e,t)=>e>t?t:e,z0=(e,t)=>e>t?e:t,F0=(e,t)=>255*(1-(1-e/255)*(1-t/255)),X0=(e,t)=>t<128?2*e*t/255:255*(1-2*(1-e/255)*(1-t/255)),K0=(e,t)=>255*(1-(1-t/255)/(e/255)),D0=(e,t)=>e===255?255:(e=255*(t/255)/(1-e/255),e>255?255:e);de.normal=Ne(Ae(B0)),de.multiply=Ne(Ae(G0)),de.screen=Ne(Ae(F0)),de.overlay=Ne(Ae(X0)),de.darken=Ne(Ae(I0)),de.lighten=Ne(Ae(z0)),de.dodge=Ne(Ae(D0)),de.burn=Ne(Ae(K0));const{pow:V0,sin:Y0,cos:Z0}=Math;function J0(e=300,t=-1.5,r=1,n=1,o=[0,1]){let a=0,s;P(o)==="array"?s=o[1]-o[0]:(s=0,o=[o,o]);const c=function(i){const u=we*((e+120)/360+t*i),l=V0(o[0]+s*i,n),h=(a!==0?r[0]+i*a:r)*l*(1-l)/2,d=Z0(u),b=Y0(u),_=l+h*(-.14861*d+1.78277*b),g=l+h*(-.29227*d-.90649*b),v=l+h*(1.97294*d);return O(Yt([_*255,g*255,v*255,1]))};return c.start=function(i){return i==null?e:(e=i,c)},c.rotations=function(i){return i==null?t:(t=i,c)},c.gamma=function(i){return i==null?n:(n=i,c)},c.hue=function(i){return i==null?r:(r=i,P(r)==="array"?(a=r[1]-r[0],a===0&&(r=r[1])):a=0,c)},c.lightness=function(i){return i==null?o:(P(i)==="array"?(o=i,s=i[1]-i[0]):(o=[i,i],s=0),c)},c.scale=()=>O.scale(c),c.hue(r),c}const W0="0123456789abcdef",{floor:U0,random:Q0}=Math,ei=()=>{let e="#";for(let t=0;t<6;t++)e+=W0.charAt(U0(Q0()*16));return new $(e,"hex")},{log:Eo,pow:ti,floor:ri,abs:ni}=Math;function To(e,t=null){const r={min:Number.MAX_VALUE,max:Number.MAX_VALUE*-1,sum:0,values:[],count:0};return P(e)==="object"&&(e=Object.values(e)),e.forEach(n=>{t&&P(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)=>So(r,n,o),r}function So(e,t="equal",r=7){P(e)=="array"&&(e=To(e));const{min:n,max:o}=e,a=e.values.sort((c,i)=>c-i);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 c=1;c<r;c++)s.push(n+c/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 c=Math.LOG10E*Eo(n),i=Math.LOG10E*Eo(o);s.push(n);for(let u=1;u<r;u++)s.push(ti(10,c+u/r*(i-c)));s.push(o)}else if(t.substr(0,1)==="q"){s.push(n);for(let c=1;c<r;c++){const i=(a.length-1)*c/r,u=ri(i);if(u===i)s.push(a[u]);else{const l=i-u;s.push(a[u]*(1-l)+a[u+1]*l)}}s.push(o)}else if(t.substr(0,1)==="k"){let c;const i=a.length,u=new Array(i),l=new Array(r);let f=!0,h=0,d=null;d=[],d.push(n);for(let g=1;g<r;g++)d.push(n+g/r*(o-n));for(d.push(o);f;){for(let v=0;v<r;v++)l[v]=0;for(let v=0;v<i;v++){const H=a[v];let x=Number.MAX_VALUE,N;for(let A=0;A<r;A++){const R=ni(d[A]-H);R<x&&(x=R,N=A),l[N]++,u[v]=N}}const g=new Array(r);for(let v=0;v<r;v++)g[v]=null;for(let v=0;v<i;v++)c=u[v],g[c]===null?g[c]=a[v]:g[c]+=a[v];for(let v=0;v<r;v++)g[v]*=1/l[v];f=!1;for(let v=0;v<r;v++)if(g[v]!==d[v]){f=!0;break}d=g,h++,h>200&&(f=!1)}const b={};for(let g=0;g<r;g++)b[g]=[];for(let g=0;g<i;g++)c=u[g],b[c].push(a[g]);let _=[];for(let g=0;g<r;g++)_.push(b[g][0]),_.push(b[g][b[g].length-1]);_=_.sort((g,v)=>g-v),s.push(_[0]);for(let g=1;g<_.length;g+=2){const v=_[g];!isNaN(v)&&s.indexOf(v)===-1&&s.push(v)}}return s}const oi=(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)},{sqrt:ke,pow:V,min:si,max:ai,atan2:Po,abs:jo,cos:wt,sin:Bo,exp:ci,PI:Go}=Math;function ii(e,t,r=1,n=1,o=1){var a=function(he){return 360*he/(2*Go)},s=function(he){return 2*Go*he/360};e=new $(e),t=new $(t);const[c,i,u]=Array.from(e.lab()),[l,f,h]=Array.from(t.lab()),d=(c+l)/2,b=ke(V(i,2)+V(u,2)),_=ke(V(f,2)+V(h,2)),g=(b+_)/2,v=.5*(1-ke(V(g,7)/(V(g,7)+V(25,7)))),H=i*(1+v),x=f*(1+v),N=ke(V(H,2)+V(u,2)),A=ke(V(x,2)+V(h,2)),R=(N+A)/2,m=a(Po(u,H)),p=a(Po(h,x)),y=m>=0?m:m+360,w=p>=0?p:p+360,C=jo(y-w)>180?(y+w+360)/2:(y+w)/2,q=1-.17*wt(s(C-30))+.24*wt(s(2*C))+.32*wt(s(3*C+6))-.2*wt(s(4*C-63));let M=w-y;M=jo(M)<=180?M:w<=y?M+360:M-360,M=2*ke(N*A)*Bo(s(M)/2);const S=l-c,X=A-N,D=1+.015*V(d-50,2)/ke(20+V(d-50,2)),U=1+.045*R,ce=1+.015*R*q,ye=30*ci(-V((C-275)/25,2)),le=-(2*ke(V(R,7)/(V(R,7)+V(25,7))))*Bo(2*s(ye)),qe=ke(V(S/(r*D),2)+V(X/(n*U),2)+V(M/(o*ce),2)+le*(X/(n*U))*(M/(o*ce)));return ai(0,si(100,qe))}function ui(e,t,r="lab"){e=new $(e),t=new $(t);const n=e.get(r),o=t.get(r);let a=0;for(let s in n){const c=(n[s]||0)-(o[s]||0);a+=c*c}return Math.sqrt(a)}const fi=(...e)=>{try{return new $(...e),!0}catch{return!1}},li={cool(){return yt([O.hsl(180,1,.9),O.hsl(250,.7,.4)])},hot(){return yt(["#000","#f00","#ff0","#fff"]).mode("rgb")}},kt={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"]};for(let e of Object.keys(kt))kt[e.toLowerCase()]=kt[e];Object.assign(O,{average:A0,bezier:j0,blend:de,cubehelix:J0,mix:ct,interpolate:ct,random:ei,scale:yt,analyze:To,contrast:oi,deltaE:ii,distance:ui,limits:So,valid:fi,scales:li,input:L,colors:De,brewer:kt});function pr(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var mr,Io;function hi(){if(Io)return mr;Io=1;var e=e||{};e.Geometry=function(){},e.Geometry.intersectLineLine=function(r,n){var o=(r.intercept-n.intercept)/(n.slope-r.slope),a=r.slope*o+r.intercept;return{x:o,y:a}},e.Geometry.distanceFromOrigin=function(r){return Math.sqrt(Math.pow(r.x,2)+Math.pow(r.y,2))},e.Geometry.distanceLineFromOrigin=function(r){return Math.abs(r.intercept)/Math.sqrt(Math.pow(r.slope,2)+1)},e.Geometry.perpendicularThroughPoint=function(r,n){var o=-1/r.slope,a=n.y-o*n.x;return{slope:o,intercept:a}},e.Geometry.angleFromOrigin=function(r){return Math.atan2(r.y,r.x)},e.Geometry.normalizeAngle=function(r){var n=2*Math.PI;return(r%n+n)%n},e.Geometry.lengthOfRayUntilIntersect=function(r,n){return n.intercept/(Math.sin(r)-n.slope*Math.cos(r))},e.Hsluv=function(){},e.Hsluv.getBounds=function(r){for(var n=[],o=Math.pow(r+16,3)/1560896,a=o>e.Hsluv.epsilon?o:r/e.Hsluv.kappa,s=0;s<3;)for(var c=s++,i=e.Hsluv.m[c][0],u=e.Hsluv.m[c][1],l=e.Hsluv.m[c][2],f=0;f<2;){var h=f++,d=(284517*i-94839*l)*a,b=(838422*l+769860*u+731718*i)*r*a-769860*h*r,_=(632260*l-126452*u)*a+126452*h;n.push({slope:d/_,intercept:b/_})}return n},e.Hsluv.maxSafeChromaForL=function(r){for(var n=e.Hsluv.getBounds(r),o=1/0,a=0;a<n.length;){var s=n[a];++a;var c=e.Geometry.distanceLineFromOrigin(s);o=Math.min(o,c)}return o},e.Hsluv.maxChromaForLH=function(r,n){for(var o=n/360*Math.PI*2,a=e.Hsluv.getBounds(r),s=1/0,c=0;c<a.length;){var i=a[c];++c;var u=e.Geometry.lengthOfRayUntilIntersect(o,i);u>=0&&(s=Math.min(s,u))}return s},e.Hsluv.dotProduct=function(r,n){for(var o=0,a=0,s=r.length;a<s;){var c=a++;o+=r[c]*n[c]}return o},e.Hsluv.fromLinear=function(r){return r<=.0031308?12.92*r:1.055*Math.pow(r,.4166666666666667)-.055},e.Hsluv.toLinear=function(r){return r>.04045?Math.pow((r+.055)/1.055,2.4):r/12.92},e.Hsluv.xyzToRgb=function(r){return[e.Hsluv.fromLinear(e.Hsluv.dotProduct(e.Hsluv.m[0],r)),e.Hsluv.fromLinear(e.Hsluv.dotProduct(e.Hsluv.m[1],r)),e.Hsluv.fromLinear(e.Hsluv.dotProduct(e.Hsluv.m[2],r))]},e.Hsluv.rgbToXyz=function(r){var n=[e.Hsluv.toLinear(r[0]),e.Hsluv.toLinear(r[1]),e.Hsluv.toLinear(r[2])];return[e.Hsluv.dotProduct(e.Hsluv.minv[0],n),e.Hsluv.dotProduct(e.Hsluv.minv[1],n),e.Hsluv.dotProduct(e.Hsluv.minv[2],n)]},e.Hsluv.yToL=function(r){return r<=e.Hsluv.epsilon?r/e.Hsluv.refY*e.Hsluv.kappa:116*Math.pow(r/e.Hsluv.refY,.3333333333333333)-16},e.Hsluv.lToY=function(r){return r<=8?e.Hsluv.refY*r/e.Hsluv.kappa:e.Hsluv.refY*Math.pow((r+16)/116,3)},e.Hsluv.xyzToLuv=function(r){var n=r[0],o=r[1],a=r[2],s=n+15*o+3*a,c=4*n,i=9*o;s!=0?(c/=s,i/=s):(c=NaN,i=NaN);var u=e.Hsluv.yToL(o);if(u==0)return[0,0,0];var l=13*u*(c-e.Hsluv.refU),f=13*u*(i-e.Hsluv.refV);return[u,l,f]},e.Hsluv.luvToXyz=function(r){var n=r[0],o=r[1],a=r[2];if(n==0)return[0,0,0];var s=o/(13*n)+e.Hsluv.refU,c=a/(13*n)+e.Hsluv.refV,i=e.Hsluv.lToY(n),u=0-9*i*s/((s-4)*c-s*c),l=(9*i-15*c*i-c*u)/(3*c);return[u,i,l]},e.Hsluv.luvToLch=function(r){var n=r[0],o=r[1],a=r[2],s=Math.sqrt(o*o+a*a),c;if(s<1e-8)c=0;else{var i=Math.atan2(a,o);c=i*180/Math.PI,c<0&&(c=360+c)}return[n,s,c]},e.Hsluv.lchToLuv=function(r){var n=r[0],o=r[1],a=r[2],s=a/360*2*Math.PI,c=Math.cos(s)*o,i=Math.sin(s)*o;return[n,c,i]},e.Hsluv.hsluvToLch=function(r){var n=r[0],o=r[1],a=r[2];if(a>99.9999999)return[100,0,n];if(a<1e-8)return[0,0,n];var s=e.Hsluv.maxChromaForLH(a,n),c=s/100*o;return[a,c,n]},e.Hsluv.lchToHsluv=function(r){var n=r[0],o=r[1],a=r[2];if(n>99.9999999)return[a,0,100];if(n<1e-8)return[a,0,0];var s=e.Hsluv.maxChromaForLH(n,a),c=o/s*100;return[a,c,n]},e.Hsluv.hpluvToLch=function(r){var n=r[0],o=r[1],a=r[2];if(a>99.9999999)return[100,0,n];if(a<1e-8)return[0,0,n];var s=e.Hsluv.maxSafeChromaForL(a),c=s/100*o;return[a,c,n]},e.Hsluv.lchToHpluv=function(r){var n=r[0],o=r[1],a=r[2];if(n>99.9999999)return[a,0,100];if(n<1e-8)return[a,0,0];var s=e.Hsluv.maxSafeChromaForL(n),c=o/s*100;return[a,c,n]},e.Hsluv.rgbToHex=function(r){for(var n="#",o=0;o<3;){var a=o++,s=r[a],c=Math.round(s*255),i=c%16,u=(c-i)/16|0;n+=e.Hsluv.hexChars.charAt(u)+e.Hsluv.hexChars.charAt(i)}return n},e.Hsluv.hexToRgb=function(r){r=r.toLowerCase();for(var n=[],o=0;o<3;){var a=o++,s=e.Hsluv.hexChars.indexOf(r.charAt(a*2+1)),c=e.Hsluv.hexChars.indexOf(r.charAt(a*2+2)),i=s*16+c;n.push(i/255)}return n},e.Hsluv.lchToRgb=function(r){return e.Hsluv.xyzToRgb(e.Hsluv.luvToXyz(e.Hsluv.lchToLuv(r)))},e.Hsluv.rgbToLch=function(r){return e.Hsluv.luvToLch(e.Hsluv.xyzToLuv(e.Hsluv.rgbToXyz(r)))},e.Hsluv.hsluvToRgb=function(r){return e.Hsluv.lchToRgb(e.Hsluv.hsluvToLch(r))},e.Hsluv.rgbToHsluv=function(r){return e.Hsluv.lchToHsluv(e.Hsluv.rgbToLch(r))},e.Hsluv.hpluvToRgb=function(r){return e.Hsluv.lchToRgb(e.Hsluv.hpluvToLch(r))},e.Hsluv.rgbToHpluv=function(r){return e.Hsluv.lchToHpluv(e.Hsluv.rgbToLch(r))},e.Hsluv.hsluvToHex=function(r){return e.Hsluv.rgbToHex(e.Hsluv.hsluvToRgb(r))},e.Hsluv.hpluvToHex=function(r){return e.Hsluv.rgbToHex(e.Hsluv.hpluvToRgb(r))},e.Hsluv.hexToHsluv=function(r){return e.Hsluv.rgbToHsluv(e.Hsluv.hexToRgb(r))},e.Hsluv.hexToHpluv=function(r){return e.Hsluv.rgbToHpluv(e.Hsluv.hexToRgb(r))},e.Hsluv.m=[[3.240969941904521,-1.537383177570093,-.498610760293],[-.96924363628087,1.87596750150772,.041555057407175],[.055630079696993,-.20397695888897,1.056971514242878]],e.Hsluv.minv=[[.41239079926595,.35758433938387,.18048078840183],[.21263900587151,.71516867876775,.072192315360733],[.019330818715591,.11919477979462,.95053215224966]],e.Hsluv.refY=1,e.Hsluv.refU=.19783000664283,e.Hsluv.refV=.46831999493879,e.Hsluv.kappa=903.2962962,e.Hsluv.epsilon=.0088564516,e.Hsluv.hexChars="0123456789abcdef";var t={hsluvToRgb:e.Hsluv.hsluvToRgb,rgbToHsluv:e.Hsluv.rgbToHsluv,hpluvToRgb:e.Hsluv.hpluvToRgb,rgbToHpluv:e.Hsluv.rgbToHpluv,hsluvToHex:e.Hsluv.hsluvToHex,hexToHsluv:e.Hsluv.hexToHsluv,hpluvToHex:e.Hsluv.hpluvToHex,hexToHpluv:e.Hsluv.hexToHpluv,lchToHpluv:e.Hsluv.lchToHpluv,hpluvToLch:e.Hsluv.hpluvToLch,lchToHsluv:e.Hsluv.lchToHsluv,hsluvToLch:e.Hsluv.hsluvToLch,lchToLuv:e.Hsluv.lchToLuv,luvToLch:e.Hsluv.luvToLch,xyzToLuv:e.Hsluv.xyzToLuv,luvToXyz:e.Hsluv.luvToXyz,xyzToRgb:e.Hsluv.xyzToRgb,rgbToXyz:e.Hsluv.rgbToXyz,lchToRgb:e.Hsluv.lchToRgb,rgbToLch:e.Hsluv.rgbToLch};return mr=t,mr}var di=hi();const gr=pr(di);var $t={exports:{}},vr,zo;function it(){if(zo)return vr;zo=1;function e(t,r){return Object.prototype.hasOwnProperty.call(t,r)}return vr=e,vr}var _r,Fo;function yr(){if(Fo)return _r;Fo=1;var e=it(),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,c,i){var u,l=0;t==null&&n();for(u in s)if(a(c,s,u,i)===!1)break;if(t)for(var f=s.constructor,h=!!f&&s===f.prototype;(u=r[l++])&&!((u!=="constructor"||!h&&e(s,u))&&s[u]!==Object.prototype[u]&&a(c,s,u,i)===!1););}function a(s,c,i,u){return s.call(u,c[i],i,c)}return _r=o,_r}var wr,Xo;function Ko(){if(Xo)return wr;Xo=1;var e=yr();function t(r){var n=[];return e(r,function(o,a){typeof o=="function"&&n.push(a)}),n.sort()}return wr=t,wr}var kr,Do;function ut(){if(Do)return kr;Do=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 a=[];r<n;)a.push(t[r++]);return a}return kr=e,kr}var $r,Vo;function bi(){if(Vo)return $r;Vo=1;var e=ut();function t(r,n,o){var a=e(arguments,2);return function(){return r.apply(n,a.concat(e(arguments)))}}return $r=t,$r}var Cr,Yo;function xr(){if(Yo)return Cr;Yo=1;function e(t,r,n){if(t!=null)for(var o=-1,a=t.length;++o<a&&r.call(n,t[o],o,t)!==!1;);}return Cr=e,Cr}var Rr,Zo;function pi(){if(Zo)return Rr;Zo=1;var e=Ko(),t=bi(),r=xr(),n=ut();function o(a,s){var c=arguments.length>1?n(arguments,1):e(a);r(c,function(i){a[i]=t(a[i],a)})}return Rr=o,Rr}var Hr,Jo;function Q(){if(Jo)return Hr;Jo=1;var e=it(),t=yr();function r(n,o,a){t(n,function(s,c){if(e(n,c))return o.call(a,n[c],c,n)})}return Hr=r,Hr}var qr,Wo;function mi(){if(Wo)return qr;Wo=1;function e(t){return t}return qr=e,qr}var Mr,Uo;function Qo(){if(Uo)return Mr;Uo=1;function e(t){return function(r){return r[t]}}return Mr=e,Mr}var Or,es;function Nr(){if(es)return Or;es=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 Or=n,Or}var Ar,ts;function Lr(){if(ts)return Ar;ts=1;var e=Nr();function t(r,n){return e(r)===n}return Ar=t,Ar}var Er,rs;function gi(){if(rs)return Er;rs=1;var e=Lr(),t=Array.isArray||function(r){return e(r,"Array")};return Er=t,Er}var Tr,ns;function os(){if(ns)return Tr;ns=1;var e=Q(),t=gi();function r(s,c){for(var i=-1,u=s.length;++i<u;)if(a(s[i],c))return!0;return!1}function n(s,c){for(var i=-1,u=c.length;++i<u;)if(!r(s,c[i]))return!1;return!0}function o(s,c){var i=!0;return e(c,function(u,l){if(!a(s[l],u))return i=!1}),i}function a(s,c){return s&&typeof s=="object"?t(s)&&t(c)?n(s,c):o(s,c):s===c}return Tr=a,Tr}var Sr,ss;function Le(){if(ss)return Sr;ss=1;var e=mi(),t=Qo(),r=os();function n(o,a){if(o==null)return e;switch(typeof o){case"function":return typeof a<"u"?function(s,c,i){return o.call(a,s,c,i)}:o;case"object":return function(s){return r(s,o)};case"string":case"number":return t(o)}}return Sr=n,Sr}var Pr,as;function jr(){if(as)return Pr;as=1;var e=Q(),t=Le();function r(n,o,a){o=t(o,a);var s=!1;return e(n,function(c,i){if(o(c,i,n))return s=!0,!1}),s}return Pr=r,Pr}var Br,cs;function vi(){if(cs)return Br;cs=1;var e=jr();function t(r,n){return e(r,function(o){return o===n})}return Br=t,Br}var Gr,is;function ft(){if(is)return Gr;is=1;function e(t){return!!t&&typeof t=="object"&&t.constructor===Object}return Gr=e,Gr}var Ir,us;function _i(){if(us)return Ir;us=1;var e=Q(),t=ft();function r(n,o){for(var a=0,s=arguments.length,c;++a<s;)c=arguments[a],c&&e(c,function(i,u){var l=n[u];l==null?n[u]=i:t(l)&&t(i)&&r(l,i)});return n}return Ir=r,Ir}var zr,fs;function yi(){if(fs)return zr;fs=1;var e=Q(),t=ft();function r(o,a){for(var s=0,c=arguments.length,i;++s<c;)i=arguments[s],i&&e(i,n,o);return o}function n(o,a){var s=this[a];t(o)&&t(s)?r(s,o):this[a]=o}return zr=r,zr}var Fr,ls;function hs(){if(ls)return Fr;ls=1;var e=Q(),t=Le();function r(n,o,a){o=t(o,a);var s=!0;return e(n,function(c,i){if(!o(c,i,n))return s=!1,!1}),s}return Fr=r,Fr}var Xr,ds;function bs(){if(ds)return Xr;ds=1;var e=Lr();function t(r){return e(r,"Object")}return Xr=t,Xr}var Kr,ps;function wi(){if(ps)return Kr;ps=1;function e(t,r){return t===r?t!==0||1/t===1/r:t!==t&&r!==r}return Kr=e,Kr}var Dr,ms;function ki(){if(ms)return Dr;ms=1;var e=it(),t=hs(),r=bs(),n=wi();function o(c){return function(i,u){return e(this,u)&&c(i,this[u])}}function a(c,i){return e(this,i)}function s(c,i,u){return u=u||n,!r(c)||!r(i)?u(c,i):t(c,o(u),i)&&t(i,a,c)}return Dr=s,Dr}var Vr,gs;function $i(){if(gs)return Vr;gs=1;var e=xr(),t=ut(),r=Q();function n(o,a){return e(t(arguments,1),function(s){r(s,function(c,i){o[i]==null&&(o[i]=c)})}),o}return Vr=n,Vr}var Yr,vs;function _s(){if(vs)return Yr;vs=1;var e=Q(),t=Le();function r(n,o,a){o=t(o,a);var s={};return e(n,function(c,i,u){o(c,i,u)&&(s[i]=c)}),s}return Yr=r,Yr}var Zr,ys;function Ci(){if(ys)return Zr;ys=1;var e=jr(),t=Le();function r(n,o,a){o=t(o,a);var s;return e(n,function(c,i,u){if(o(c,i,u))return s=c,!0}),s}return Zr=r,Zr}var Jr,ws;function xi(){if(ws)return Jr;ws=1;var e=Q(),t=ft();function r(o,a,s,c){return e(o,function(i,u){var l=s?s+"."+u:u;c!==0&&t(i)?r(i,a,l,c-1):a[l]=i}),a}function n(o,a){return o==null?{}:(a=a??-1,r(o,{},"",a))}return Jr=n,Jr}var Wr,ks;function $s(){if(ks)return Wr;ks=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 Wr=e,Wr}var Ur,Cs;function xs(){if(Cs)return Ur;Cs=1;var e=$s(),t;function r(n,o){return e(n,o)!==t}return Ur=r,Ur}var Qr,Rs;function Ri(){if(Rs)return Qr;Rs=1;var e=Q(),t=Object.keys||function(r){var n=[];return e(r,function(o,a){n.push(a)}),n};return Qr=t,Qr}var en,Hs;function qs(){if(Hs)return en;Hs=1;var e=Q(),t=Le();function r(n,o,a){o=t(o,a);var s={};return e(n,function(c,i,u){s[i]=o(c,i,u)}),s}return en=r,en}var tn,Ms;function Hi(){if(Ms)return tn;Ms=1;var e=Q();function t(r,n){var o=!0;return e(n,function(a,s){if(r[s]!==a)return o=!1}),o}return tn=t,tn}var rn,Os;function qi(){if(Os)return rn;Os=1;var e=Le();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 a,s=-1/0,c,i,u=-1,l=r.length;++u<l;)c=r[u],i=n(c,u,r),i>s&&(s=i,a=c);return a}return rn=t,rn}var nn,Ns;function on(){if(Ns)return nn;Ns=1;var e=Q();function t(r){var n=[];return e(r,function(o,a){n.push(o)}),n}return nn=t,nn}var sn,As;function Mi(){if(As)return sn;As=1;var e=qi(),t=on();function r(n,o){return e(t(n),o)}return sn=r,sn}var an,Ls;function Es(){if(Ls)return an;Ls=1;var e=Q();function t(n,o){for(var a=0,s=arguments.length,c;++a<s;)c=arguments[a],c!=null&&e(c,r,n);return n}function r(n,o){this[o]=n}return an=t,an}var cn,Ts;function Oi(){if(Ts)return cn;Ts=1;var e=Nr(),t=ft(),r=Es();function n(i){switch(e(i)){case"Object":return o(i);case"Array":return c(i);case"RegExp":return a(i);case"Date":return s(i);default:return i}}function o(i){return t(i)?r({},i):i}function a(i){var u="";return u+=i.multiline?"m":"",u+=i.global?"g":"",u+=i.ignoreCase?"i":"",new RegExp(i.source,u)}function s(i){return new Date(+i)}function c(i){return i.slice()}return cn=n,cn}var un,Ss;function Ni(){if(Ss)return un;Ss=1;var e=Oi(),t=Q(),r=Nr(),n=ft();function o(c,i){switch(r(c)){case"Object":return a(c,i);case"Array":return s(c,i);default:return e(c)}}function a(c,i){if(n(c)){var u={};return t(c,function(l,f){this[f]=o(l,i)},u),u}else return i?i(c):c}function s(c,i){for(var u=[],l=-1,f=c.length;++l<f;)u[l]=o(c[l],i);return u}return un=o,un}var fn,Ps;function Ai(){if(Ps)return fn;Ps=1;var e=it(),t=Ni(),r=bs();function n(){var o=1,a,s,c,i;for(i=t(arguments[0]);c=arguments[o++];)for(a in c)e(c,a)&&(s=c[a],r(s)&&r(i[a])?i[a]=n(i[a],s):i[a]=t(s));return i}return fn=n,fn}var ln,js;function Li(){if(js)return ln;js=1;var e=Le();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 a,s=1/0,c,i,u=-1,l=r.length;++u<l;)c=r[u],i=n(c,u,r),i<s&&(s=i,a=c);return a}return ln=t,ln}var hn,Bs;function Ei(){if(Bs)return hn;Bs=1;var e=Li(),t=on();function r(n,o){return e(t(n),o)}return hn=r,hn}var dn,Gs;function Is(){if(Gs)return dn;Gs=1;var e=xr();function t(r,n){return n&&e(n.split("."),function(o){r[o]||(r[o]={}),r=r[o]}),r}return dn=t,dn}var bn,zs;function Ti(){if(zs)return bn;zs=1;function e(t,r,n){if(n=n||0,t==null)return-1;for(var o=t.length,a=n<0?o+n:n;a<o;){if(t[a]===r)return a;a++}return-1}return bn=e,bn}var pn,Fs;function Si(){if(Fs)return pn;Fs=1;var e=Ti();function t(r,n){return e(r,n)!==-1}return pn=t,pn}var mn,Xs;function Pi(){if(Xs)return mn;Xs=1;var e=ut(),t=Si();function r(n,o){var a=typeof arguments[1]!="string"?arguments[1]:e(arguments,1),s={};for(var c in n)n.hasOwnProperty(c)&&!t(a,c)&&(s[c]=n[c]);return s}return mn=r,mn}var gn,Ks;function ji(){if(Ks)return gn;Ks=1;var e=ut();function t(r,n){for(var o=typeof arguments[1]!="string"?arguments[1]:e(arguments,1),a={},s=0,c;c=o[s++];)a[c]=r[c];return a}return gn=t,gn}var vn,Ds;function Bi(){if(Ds)return vn;Ds=1;var e=qs(),t=Qo();function r(n,o){return e(n,t(o))}return vn=r,vn}var _n,Vs;function Ys(){if(Vs)return _n;Vs=1;var e=Q();function t(r){var n=0;return e(r,function(){n++}),n}return _n=t,_n}var yn,Zs;function Gi(){if(Zs)return yn;Zs=1;var e=Q(),t=Ys();function r(n,o,a,s){var c=arguments.length>2;if(!t(n)&&!c)throw new Error("reduce of empty object with no initial value");return e(n,function(i,u,l){c?a=o.call(s,a,i,u,l):(a=i,c=!0)}),a}return yn=r,yn}var wn,Js;function Ii(){if(Js)return wn;Js=1;var e=_s(),t=Le();function r(n,o,a){return o=t(o,a),e(n,function(s,c,i){return!o(s,c,i)},a)}return wn=r,wn}var kn,Ws;function zi(){if(Ws)return kn;Ws=1;var e=Lr();function t(r){return e(r,"Function")}return kn=t,kn}var $n,Us;function Fi(){if(Us)return $n;Us=1;var e=zi();function t(r,n){var o=r[n];if(o!==void 0)return e(o)?o.call(r):o}return $n=t,$n}var Cn,Qs;function Xi(){if(Qs)return Cn;Qs=1;var e=Is();function t(r,n,o){var a=/^(.+)\.(.+)$/.exec(n);a?e(r,a[1])[a[2]]=o:r[n]=o}return Cn=t,Cn}var xn,ea;function Ki(){if(ea)return xn;ea=1;var e=xs();function t(r,n){if(e(r,n)){for(var o=n.split("."),a=o.pop();n=o.shift();)r=r[n];return delete r[a]}else return!0}return xn=t,xn}var Rn,ta;function Hn(){return ta||(ta=1,Rn={bindAll:pi(),contains:vi(),deepFillIn:_i(),deepMatches:os(),deepMixIn:yi(),equals:ki(),every:hs(),fillIn:$i(),filter:_s(),find:Ci(),flatten:xi(),forIn:yr(),forOwn:Q(),functions:Ko(),get:$s(),has:xs(),hasOwn:it(),keys:Ri(),map:qs(),matches:Hi(),max:Mi(),merge:Ai(),min:Ei(),mixIn:Es(),namespace:Is(),omit:Pi(),pick:ji(),pluck:Bi(),reduce:Gi(),reject:Ii(),result:Fi(),set:Xi(),size:Ys(),some:jr(),unset:Ki(),values:on()}),Rn}var ra;function na(){return ra||(ra=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=Hn(),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(a){var s=100*(a.x/a.y),c=100,i=100*(1-a.x-a.y)/a.y;return[s,c,i]});t.default=o,e.exports=t.default})($t,$t.exports)),$t.exports}var Ct={exports:{}},oa;function sa(){return oa||(oa=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=Math,n=r.pow,o=r.sign,a=r.abs,s={decode:function(f){return f<=.04045?f/12.92:n((f+.055)/1.055,2.4)},encode:function(f){return f<=.0031308?12.92*f:1.055*n(f,1/2.4)-.055}},c={encode:function(f){return f<.001953125?16*f:n(f,1/1.8)},decode:function(f){return f<16*.001953125?f/16:n(f,1.8)}};function i(l){return{decode:function(h){return o(h)*n(a(h),l)},encode:function(h){return o(h)*n(a(h),1/l)}}}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:i(2.2)},"Wide Gamut RGB":{r:{x:.7347,y:.2653},g:{x:.1152,y:.8264},b:{x:.1566,y:.0177},gamma:i(563/256)},"ProPhoto RGB":{r:{x:.7347,y:.2653},g:{x:.1596,y:.8404},b:{x:.0366,y:1e-4},gamma:c}};t.default=u,e.exports=t.default})(Ct,Ct.exports)),Ct.exports}var $e={},aa;function ca(){if(aa)return $e;aa=1,Object.defineProperty($e,"__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 c=1/t(s);return[[(s[2][2]*s[1][1]-s[2][1]*s[1][2])*c,(s[2][1]*s[0][2]-s[2][2]*s[0][1])*c,(s[1][2]*s[0][1]-s[1][1]*s[0][2])*c],[(s[2][0]*s[1][2]-s[2][2]*s[1][0])*c,(s[2][2]*s[0][0]-s[2][0]*s[0][2])*c,(s[1][0]*s[0][2]-s[1][2]*s[0][0])*c],[(s[2][1]*s[1][0]-s[2][0]*s[1][1])*c,(s[2][0]*s[0][1]-s[2][1]*s[0][0])*c,(s[1][1]*s[0][0]-s[1][0]*s[0][1])*c]]}function n(s,c){return[s[0][0]*c[0]+s[0][1]*c[1]+s[0][2]*c[2],s[1][0]*c[0]+s[1][1]*c[1]+s[1][2]*c[2],s[2][0]*c[0]+s[2][1]*c[1]+s[2][2]*c[2]]}function o(s,c){return[[s[0][0]*c[0],s[0][1]*c[1],s[0][2]*c[2]],[s[1][0]*c[0],s[1][1]*c[1],s[1][2]*c[2]],[s[2][0]*c[0],s[2][1]*c[1],s[2][2]*c[2]]]}function a(s,c){return[[s[0][0]*c[0][0]+s[0][1]*c[1][0]+s[0][2]*c[2][0],s[0][0]*c[0][1]+s[0][1]*c[1][1]+s[0][2]*c[2][1],s[0][0]*c[0][2]+s[0][1]*c[1][2]+s[0][2]*c[2][2]],[s[1][0]*c[0][0]+s[1][1]*c[1][0]+s[1][2]*c[2][0],s[1][0]*c[0][1]+s[1][1]*c[1][1]+s[1][2]*c[2][1],s[1][0]*c[0][2]+s[1][1]*c[1][2]+s[1][2]*c[2][2]],[s[2][0]*c[0][0]+s[2][1]*c[1][0]+s[2][2]*c[2][0],s[2][0]*c[0][1]+s[2][1]*c[1][1]+s[2][2]*c[2][1],s[2][0]*c[0][2]+s[2][1]*c[1][2]+s[2][2]*c[2][2]]]}return $e.transpose=e,$e.determinant=t,$e.inverse=r,$e.multiply=n,$e.scalar=o,$e.product=a,$e}var lt={},ia;function Di(){if(ia)return lt;ia=1,Object.defineProperty(lt,"__esModule",{value:!0});var e=Math,t=e.PI;function r(o){for(var a=o*180/t;a<0;)a+=360;for(;a>360;)a-=360;return a}function n(o){for(var a=t*o/180;a<0;)a+=2*t;for(;a>2*t;)a-=2*t;return a}return lt.fromRadian=r,lt.toRadian=n,lt}var ht={},ua;function Vi(){if(ua)return ht;ua=1,Object.defineProperty(ht,"__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(a){return a+a}).join("")),o.match(/../g).map(function(a){return parseInt(a,16)/255})}function n(o){var a=o.map(function(s){return s=t(255*s).toString(16),s.length<2&&(s="0"+s),s}).join("");return"#"+a}return ht.fromHex=r,ht.toHex=n,ht}var xt={exports:{}},fa;function Yi(){return fa||(fa=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=ca(),n=u(r),o=na(),a=i(o),s=sa(),c=i(s);function i(f){return f&&f.__esModule?f:{default:f}}function u(f){if(f&&f.__esModule)return f;var h={};if(f!=null)for(var d in f)Object.prototype.hasOwnProperty.call(f,d)&&(h[d]=f[d]);return h.default=f,h}function l(){var f=arguments.length<=0||arguments[0]===void 0?c.default.sRGB:arguments[0],h=arguments.length<=1||arguments[1]===void 0?a.default.D65:arguments[1],d=[f.r,f.g,f.b],b=n.transpose(d.map(function(x){var N=x.x/x.y,A=1,R=(1-x.x-x.y)/x.y;return[N,A,R]})),_=f.gamma,g=n.multiply(n.inverse(b),h),v=n.scalar(b,g),H=n.inverse(v);return{fromRgb:function(N){return n.multiply(v,N.map(_.decode))},toRgb:function(N){return n.multiply(H,N).map(_.encode)}}}t.default=l,e.exports=t.default})(xt,xt.exports)),xt.exports}var qn,la;function Rt(){if(la)return qn;la=1;var e=na(),t=sa(),r=ca(),n=Di(),o=Vi(),a=Yi();return qn={illuminant:e,workspace:t,matrix:r,degree:n,rgb:o,xyz:a},qn}var Zi=Rt();const Ht=pr(Zi);var be={},ha;function qt(){if(ha)return be;ha=1,Object.defineProperty(be,"__esModule",{value:!0}),be.cfs=be.distance=be.lerp=be.corLerp=void 0;var e=Hn();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,a=n.pow,s=n.sqrt,c={h:360,H:400};function i(h,d,b,_){var g=c[_];if(g){var v=o(h-d);v>g/2&&(h>d?d+=g:h+=g)}return((1-b)*h+b*d)%(g||1/0)}function u(h,d,b){var _={};for(var g in h)_[g]=i(h[g],d[g],b,g);return _}function l(h,d){var b=0;for(var _ in h)b+=a(h[_]-d[_],2);return s(b)}function f(h){return e.merge.apply(void 0,r(h.split("").map(function(d){return t({},d,!0)})))}return be.corLerp=i,be.lerp=u,be.distance=l,be.cfs=f,be}var Mt={exports:{}},da;function Ji(){return da||(da=1,(function(e,t){var r=(function(){function s(c,i){var u=[],l=!0,f=!1,h=void 0;try{for(var d=c[Symbol.iterator](),b;!(l=(b=d.next()).done)&&(u.push(b.value),!(i&&u.length===i));l=!0);}catch(_){f=!0,h=_}finally{try{!l&&d.return&&d.return()}finally{if(f)throw h}}return u}return function(c,i){if(Array.isArray(c))return c;if(Symbol.iterator in Object(c))return s(c,i);throw new TypeError("Invalid attempt to destructure non-iterable instance")}})();Object.defineProperty(t,"__esModule",{value:!0});var n=Rt(),o=qt();function a(s,c){var i=arguments.length<=2||arguments[2]===void 0?1e-6:arguments[2],u=-i,l=1+i,f=Math,h=f.min,d=f.max,b=["000","fff"].map(function(R){return c.fromXyz(s.fromRgb(n.rgb.fromHex(R)))}),_=r(b,2),g=_[0],v=_[1];function H(R){var m=s.toRgb(c.toXyz(R)),p=m.map(function(y){return y>=u&&y<=l}).reduce(function(y,w){return y&&w},!0);return[p,m]}function x(R,m){for(var p=arguments.length<=2||arguments[2]===void 0?.001:arguments[2];(0,o.distance)(R,m)>p;){var y=(0,o.lerp)(R,m,.5),w=H(y),C=r(w,1),q=C[0];q?R=y:m=y}return R}function N(R){return(0,o.lerp)(g,v,R)}function A(R){return R.map(function(m){return d(u,h(l,m))})}return{contains:H,limit:x,spine:N,crop:A}}t.default=a,e.exports=t.default})(Mt,Mt.exports)),Mt.exports}var Ot={exports:{}},pe={},ba;function pa(){if(ba)return pe;ba=1;var e=(function(){function f(h,d){var b=[],_=!0,g=!1,v=void 0;try{for(var H=h[Symbol.iterator](),x;!(_=(x=H.next()).done)&&(b.push(x.value),!(d&&b.length===d));_=!0);}catch(N){g=!0,v=N}finally{try{!_&&H.return&&H.return()}finally{if(g)throw v}}return b}return function(h,d){if(Array.isArray(h))return h;if(Symbol.iterator in Object(h))return f(h,d);throw new TypeError("Invalid attempt to destructure non-iterable instance")}})();Object.defineProperty(pe,"__esModule",{value:!0}),pe.toNotation=pe.fromNotation=pe.toHue=pe.fromHue=void 0;var t=qt(),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}],a=o.map(function(f){return f.s}).slice(0,-1).join("");function s(f){f<o[0].h&&(f+=360);for(var h=0;o[h+1].h<f;)h++;var d=(f-o[h].h)/o[h].e,b=(o[h+1].h-f)/o[h+1].e,_=o[h].H;return _+100*d/(d+b)}function c(f){var h=n(f/100),d=f%100,b=o.slice(h,h+2),_=e(b,2),g=_[0],v=g.e,H=g.h,x=_[1],N=x.e,A=x.h,R=(d*(N*H-v*A)-100*H*N)/(d*(N-v)-100*N);return R}var i={O:"RY",S:"YG",T:"G25B",C:"GB",A:"B25G",V:"B25R",M:"BR",P:"R25B"};function u(f){var h=f.match(/^([a-z])(?:(.+)?([a-z]))?$/i),d=e(h,4),b=d[1],_=d[2],g=d[3];g===void 0&&(g=b),_===void 0&&(_="50");var v=[b,g].map(function(x){x=x.toUpperCase();var N=i[x];return N?u(N):100*a.indexOf(x)}),H=e(v,2);return b=H[0],g=H[1],_=parseFloat(_)/100,(0,t.corLerp)(b,g,_,"H")}function l(f){var h=n(f/100),d=(h+1)%a.length,b=f-h*100;if(b>50){var _=[d,h];h=_[0],d=_[1],b=100-b}return b<1?a[h]:a[h]+b.toFixed()+a[d]}return pe.fromHue=s,pe.toHue=c,pe.fromNotation=u,pe.toNotation=l,pe}var ma;function Wi(){return ma||(ma=1,(function(e,t){var r=(function(){function S(X,D){var U=[],ce=!0,ye=!1,st=void 0;try{for(var le=X[Symbol.iterator](),qe;!(ce=(qe=le.next()).done)&&(U.push(qe.value),!(D&&U.length===D));ce=!0);}catch(he){ye=!0,st=he}finally{try{!ce&&le.return&&le.return()}finally{if(ye)throw st}}return U}return function(X,D){if(Array.isArray(X))return X;if(Symbol.iterator in Object(X))return S(X,D);throw new TypeError("Invalid attempt to destructure non-iterable instance")}})();Object.defineProperty(t,"__esModule",{value:!0});var n=Rt(),o=pa(),a=i(o),s=qt(),c=Hn();function i(S){if(S&&S.__esModule)return S;var X={};if(S!=null)for(var D in S)Object.prototype.hasOwnProperty.call(S,D)&&(X[D]=S[D]);return X.default=S,X}var u=Math,l=u.pow,f=u.sqrt,h=u.exp,d=u.abs,b=u.sign,_=Math,g=_.sin,v=_.cos,H=_.atan2,x={average:{F:1,c:.69,N_c:1},dim:{F:.9,c:.59,N_c:.9},dark:{F:.8,c:.535,N_c:.8}},N=[[.7328,.4296,-.1624],[-.7036,1.6975,.0061],[.003,.0136,.9834]],A=[[.38971,.68898,-.07868],[-.22981,1.1834,.04641],[0,0,1]],R=N,m=n.matrix.inverse(N),p=n.matrix.product(A,n.matrix.inverse(N)),y=n.matrix.product(N,n.matrix.inverse(A)),w={whitePoint:n.illuminant.D65,adaptingLuminance:40,backgroundLuminance:20,surroundType:"average",discounting:!1},C=(0,s.cfs)("QJMCshH"),q=(0,s.cfs)("JCh");function M(){var S=arguments.length<=0||arguments[0]===void 0?{}:arguments[0],X=arguments.length<=1||arguments[1]===void 0?C:arguments[1];S=(0,c.merge)(w,S);var D=S.whitePoint,U=S.adaptingLuminance,ce=S.backgroundLuminance,ye=x[S.surroundType],st=ye.F,le=ye.c,qe=ye.N_c,he=D[1],wc=1/(5*U+1),Ge=.2*l(wc,4)*5*U+.1*l(1-l(wc,4),2)*l(5*U,1/3),Xt=ce/he,no=.725*l(1/Xt,.2),kc=no,$c=1.48+f(Xt),Cc=S.discounting?1:st*(1-1/3.6*h(-(U+42)/92)),$l=n.matrix.multiply(N,D),Cl=$l.map(function(I){return Cc*he/I+1-Cc}),oo=r(Cl,3),xc=oo[0],Rc=oo[1],Hc=oo[2],xl=qc(D),Rl=Mc(xl),Kt=Oc(Rl);function qc(I){var z=n.matrix.multiply(R,I),F=r(z,3),ee=F[0],W=F[1],ie=F[2];return[xc*ee,Rc*W,Hc*ie]}function Hl(I){var z=r(I,3),F=z[0],ee=z[1],W=z[2];return n.matrix.multiply(m,[F/xc,ee/Rc,W/Hc])}function Mc(I){return n.matrix.multiply(p,I).map(function(z){var F=l(Ge*d(z)/100,.42);return b(z)*400*F/(27.13+F)+.1})}function ql(I){return n.matrix.multiply(y,I.map(function(z){var F=z-.1;return b(F)*100/Ge*l(27.13*d(F)/(400-d(F)),2.380952380952381)}))}function Oc(I){var z=r(I,3),F=z[0],ee=z[1],W=z[2];return(F*2+ee+W/20-.305)*no}function so(I){return 4/le*f(I/100)*(Kt+4)*l(Ge,.25)}function Ml(I){return 6.25*l(le*I/((Kt+4)*l(Ge,.25)),2)}function Nc(I){return I*l(Ge,.25)}function Ol(I,z){return l(I/100,2)*z/l(Ge,.25)}function Nl(I){return I/l(Ge,.25)}function Al(I,z){return 100*f(I/z)}function ao(I,z){var F=z.Q,ee=z.J,W=z.M,ie=z.C,ve=z.s,Me=z.h,Oe=z.H,te={};return I.J&&(te.J=isNaN(ee)?Ml(F):ee),I.C&&(isNaN(ie)?isNaN(W)?(F=isNaN(F)?so(ee):F,te.C=Ol(ve,F)):te.C=Nl(W):te.C=z.C),I.h&&(te.h=isNaN(Me)?a.toHue(Oe):Me),I.Q&&(te.Q=isNaN(F)?so(ee):F),I.M&&(te.M=isNaN(W)?Nc(ie):W),I.s&&(isNaN(ve)?(F=isNaN(F)?so(ee):F,W=isNaN(W)?Nc(ie):W,te.s=Al(W,F)):te.s=ve),I.H&&(te.H=isNaN(Oe)?a.fromHue(Me):Oe),te}function Ll(I){var z=qc(I),F=Mc(z),ee=r(F,3),W=ee[0],ie=ee[1],ve=ee[2],Me=W-ie*12/11+ve/11,Oe=(W+ie-2*ve)/9,te=H(Oe,Me),at=n.degree.fromRadian(te),Dt=1/4*(v(te+2)+3.8),Vt=Oc(F),bt=100*l(Vt/Kt,le*$c),Pe=5e4/13*qe*kc*Dt*f(Me*Me+Oe*Oe)/(W+ie+21/20*ve),je=l(Pe,.9)*f(bt/100)*l(1.64-l(.29,Xt),.73);return ao(X,{J:bt,C:je,h:at})}function El(I){var z=ao(q,I),F=z.J,ee=z.C,W=z.h,ie=n.degree.toRadian(W),ve=l(ee/(f(F/100)*l(1.64-l(.29,Xt),.73)),10/9),Me=1/4*(v(ie+2)+3.8),Oe=Kt*l(F/100,1/le/$c),te=5e4/13*qe*kc*Me/ve,at=Oe/no+.305,Dt=at*61/20*460/1403,Vt=61/20*220/1403,bt=21/20*6300/1403-27/1403,Pe=g(ie),je=v(ie),Ie,ze;ve===0||isNaN(ve)?Ie=ze=0:d(Pe)>=d(je)?(ze=Dt/(te/Pe+Vt*je/Pe+bt),Ie=ze*je/Pe):(Ie=Dt/(te/je+Vt+bt*Pe/je),ze=Ie*Pe/je);var Tl=[20/61*at+451/1403*Ie+288/1403*ze,20/61*at-891/1403*Ie-261/1403*ze,20/61*at-220/1403*Ie-6300/1403*ze],Sl=ql(Tl),Pl=Hl(Sl);return Pl}return{fromXyz:Ll,toXyz:El,fillOut:ao}}t.default=M,e.exports=t.default})(Ot,Ot.exports)),Ot.exports}var Nt={exports:{}},ga;function Ui(){return ga||(ga=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=Rt(),n=Math,o=n.sqrt,a=n.pow,s=n.exp,c=n.log,i=n.cos,u=n.sin,l=n.atan2,f={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=f[d],_=b.K_L,g=b.c_1,v=b.c_2;function H(A){var R=A.J,m=A.M,p=A.h,y=r.degree.toRadian(p),w=(1+100*g)*R/(1+g*R),C=1/v*c(1+v*m),q=C*i(y),M=C*u(y);return{J_p:w,a_p:q,b_p:M}}function x(A){var R=A.J_p,m=A.a_p,p=A.b_p,y=-R/(g*R-100*g-1),w=o(a(m,2)+a(p,2)),C=(s(v*w)-1)/v,q=l(p,m),M=r.degree.fromRadian(q);return{J:y,M:C,h:M}}function N(A,R){return o(a((A.J_p-R.J_p)/_,2)+a(A.a_p-R.a_p,2)+a(A.b_p-R.b_p,2))}return{fromCam:H,toCam:x,distance:N}}t.default=h,e.exports=t.default})(Nt,Nt.exports)),Nt.exports}var Mn,va;function Qi(){if(va)return Mn;va=1;var e=qt(),t=Ji(),r=Wi(),n=Ui(),o=pa();return Mn={gamut:t,cfs:e.cfs,lerp:e.lerp,cam:r,ucs:n,hq:o},Mn}var eu=Qi();const _a=pr(eu),ya=_a.cam({whitePoint:Ht.illuminant.D65,adaptingLuminance:40,backgroundLuminance:20,surroundType:"average",discounting:!1},_a.cfs("JCh")),wa=Ht.xyz(Ht.workspace.sRGB,Ht.illuminant.D65),ka=e=>wa.toRgb(ya.toXyz({J:e[0],C:e[1],h:e[2]})),On=e=>{const t=ya.fromXyz(wa.fromRgb(e));return[t.J,t.C,t.h]},[tu,ru]=(()=>{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[a=>{const[s,c,i]=a,u=c*o**.25;let l=(1+100*e.c1)*s/(1+e.c1*s);l/=e.k_l;const f=1/e.c2*Math.log(1+e.c2*u),h=f*Math.cos(i*(t/180)),d=f*Math.sin(i*(t/180));return[l,h,d]},a=>{const[s,c,i]=a,u=Math.sqrt(c*c+i*i),l=(Math.exp(u*e.c2)-1)/e.c2,f=(180/t*Math.atan2(i,c)+360)%360,h=l/o**.25;return[s/(1+e.c1*(100-s)),h,f]}]})(),nu=e=>ka(ru(e)),$a=e=>tu(On(e)),At=console;At.color=(e,t="")=>{const n=O(e).luminance();At.log(`%c${e} ${t}`,`background-color: ${e};padding: 5px; border-radius: 5px; color: ${n>.5?"#000":"#fff"}`)},At.ramp=(e,t=1)=>{At.log("%c ",`font-size: 1px;line-height: 16px;background: ${O.getCSSGradient(e,t)};padding: 0 0 0 200px; border-radius: 2px;`)};const Ca=(e,t,r,n,o,a,s=.1)=>{if(e===r||t===n)return!0;const c=(n-t)/(r-e),i=(a+o/c-t+c*e)/(c+1/c),u=a+o/c-i/c;return(o-i)**2+(a-u)**2<s**2},ou=(e,t,r,n)=>{const o=(t[0]+r[0])/2,a=e(o);return Ca(...t,...r,o,a,n)?null:[o,a]},Nn=(e,t,r,n=.1)=>{const o=(r-t)/10,a=[];for(let s=t;s<r;s+=o)a.push([s,e(s)]);a.push([r,e(r)]);for(let s=0;s<a.length-1;s++){const c=ou(e,a[s],a[s+1],n);c&&(a.splice(s+1,0,c),s--)}for(let s=0;s<a.length-2;s++)Ca(...a[s],...a[s+2],...a[s+1],n)&&(a.splice(s+1,1),s--);return a},Lt=(e,t=4)=>Math.round(e*10**t)/10**t,su=(e,t=1,r=90,n=.005)=>{const o=Nn(i=>e(i).gl()[0],0,t,n),a=Nn(i=>e(i).gl()[1],0,t,n),s=Nn(i=>e(i).gl()[2],0,t,n),c=Array.from(new Set([...o.map(i=>Lt(i[0])),...a.map(i=>Lt(i[0])),...s.map(i=>Lt(i[0]))].sort((i,u)=>i-u)));return`linear-gradient(${r}deg, ${c.map(i=>`${e(i).hex()} ${Lt(i*100)}%`).join()});`},au=e=>{e.Color.prototype.jch=function(){return On(this._rgb.slice(0,3).map(o=>o/255))},e.jch=(...o)=>new e.Color(...ka(o).map(a=>Math.floor(a*255)),"rgb"),e.Color.prototype.jab=function(){return $a(this._rgb.slice(0,3).map(o=>o/255))},e.jab=(...o)=>new e.Color(...nu(o).map(a=>Math.floor(a*255)),"rgb"),e.Color.prototype.hsluv=function(){return gr.rgbToHsluv(this._rgb.slice(0,3).map(o=>o/255))},e.hsluv=(...o)=>new e.Color(...gr.hsluvToRgb(o).map(a=>Math.floor(a*255)),"rgb");const t=e.interpolate,r={jch:On,jab:$a,hsluv:gr.rgbToHsluv},n=(o,a,s)=>(Math.abs(o-a)>360/2&&(o>a?a+=360:o+=360),((1-s)*o+s*a)%360);e.interpolate=(o,a,s=.5,c="lrgb")=>{if(r[c]){typeof o!="object"&&(o=new e.Color(o)),typeof a!="object"&&(a=new e.Color(a));const i=r[c](o.gl()),u=r[c](a.gl()),l=Number.isNaN(o.hsl()[0]),f=Number.isNaN(a.hsl()[0]);let h,d,b;switch(c){case"hsluv":i[1]<1e-10&&(i[0]=u[0]),i[1]===0&&(i[1]=u[1]),u[1]<1e-10&&(u[0]=i[0]),u[1]===0&&(u[1]=i[1]),h=n(i[0],u[0],s),d=i[1]+(u[1]-i[1])*s,b=i[2]+(u[2]-i[2])*s;break;case"jch":l&&(i[2]=u[2]),f&&(u[2]=i[2]),h=i[0]+(u[0]-i[0])*s,d=i[1]+(u[1]-i[1])*s,b=n(i[2],u[2],s);break;default:h=i[0]+(u[0]-i[0])*s,d=i[1]+(u[1]-i[1])*s,b=i[2]+(u[2]-i[2])*s}return e[c](h,d,b).alpha(o.alpha()+s*(a.alpha()-o.alpha()))}return t(o,a,s,c)},e.getCSSGradient=su};const Y={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 xa(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,a=0,s="BoW";return e=e>Y.blkThrs?e:e+Math.pow(Y.blkThrs-e,Y.blkClmp),t=t>Y.blkThrs?t:t+Math.pow(Y.blkThrs-t,Y.blkClmp),Math.abs(t-e)<Y.deltaYmin?0:(t>e?(o=(Math.pow(t,Y.normBG)-Math.pow(e,Y.normTXT))*Y.scaleBoW,a=o<Y.loClip?0:o-Y.loBoWoffset):(s="WoB",o=(Math.pow(t,Y.revBG)-Math.pow(e,Y.revTXT))*Y.scaleWoB,a=o>-.1?0:o+Y.loWoBoffset),r<0?a*100:r==0?Math.round(Math.abs(a)*100)+"<sub>"+s+"</sub>":Number.isInteger(r)?(a*100).toFixed(r):0)}function Et(e=[0,0,0]){function t(r){return Math.pow(r/255,Y.mainTRC)}return Y.sRco*t(e[0])+Y.sGco*t(e[1])+Y.sBco*t(e[2])}const Ra=(e,t,r,n,o,a,s,c,i)=>{const u=1-i,l=u*u,f=l*u,d=i*i*i,b=f*e+l*3*i*r+u*3*i*i*o+d*s,_=f*t+l*3*i*n+u*3*i*i*a+d*c;return{x:b,y:_}},cu=(e,t)=>{const r=[];let n={x:+e[0],y:+e[1]};for(let o=0,a=e.length;a-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]}];a-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},iu=(e,t,r,n,o,a,s,c)=>{let u=e,l=t,f=0;for(let h=1;h<5;h++){const{x:d,y:b}=Ra(e,t,r,n,o,a,s,c,h/5);f+=Math.hypot(d-u,b-l),u=d,l=b}return f+=Math.hypot(s-u,c-l),f},uu=(e,t,r,n,o,a,s,c)=>{const i=Math.floor(iu(e,t,r,n,o,a,s,c)*.75),u=[];let l=0;for(let f=0;f<=i;f++){const h=f/i,d=Ra(e,t,r,n,o,a,s,c,h),b=Math.round(d.x);if(u[b]=d.y,b-l>1){const _=u[l],g=u[b];for(let v=l+1;v<b;v++)u[v]=_+(g-_)/(b-l)*(v-l)}l=b}return f=>u[Math.round(f)]||null},Ze={CAM02:"jab",CAM02p:"jch",HEX:"hex",HSL:"hsl",HSLuv:"hsluv",HSV:"hsv",LAB:"lab",LCH:"lch",RGB:"rgb",OKLAB:"oklab",OKLCH:"oklch"};function Ee(e,t=0){const r=10**t;return Math.round(e*r)/r}function fu(e,t){let r;return e>1?r=(e-1)*t+1:e<-1?r=(e+1)*t-1:r=1,Ee(r,2)}function lu(e){return O(String(e)).jch()}function hu(e){return O(String(e)).hsluv()}function du(e,t,r){const n=[[],[],[]];if(e.forEach((a,s)=>n.forEach((c,i)=>c.push(t[s],a[i]))),r==="hcl"){const a=n[1];for(let s=1;s<a.length;s+=2)Number.isNaN(a[s])&&(a[s]=0)}n.forEach(a=>{const s=[];for(let c=1;c<a.length;c+=2)if(Number.isNaN(a[c]))s.push(c);else{s.forEach(i=>{a[i]=a[c]}),s.length=0;break}if(s.length){const c=O("#ccc").jch()[2];s.forEach(i=>{a[i]=c})}s.length=0;for(let c=a.length-1;c>0;c-=2)if(Number.isNaN(a[c]))s.push(c);else{s.forEach(i=>{a[i]=a[c]});break}for(let c=1;c<a.length;c+=2)Number.isNaN(a[c])&&(a.splice(c-1,2),c-=2);if(r in{hcl:1,hsl:1,hsluv:1,hsv:1,jch:1}){let c=a[1],i=0;for(let u=3;u<a.length;u+=2){const l=a[u]+i,f=Math.abs(c-l),h=Math.abs(c-(l+360)),d=Math.abs(c-(l-360));h<f&&h<d&&(i+=360),d<f&&d<h&&(i-=360),a[u]+=i,c=a[u]}}});const o=n.map(a=>cu(a).map(s=>uu(...s)));return a=>{const s=o.map(c=>{for(let i=0;i<c.length;i++){const u=c[i](a);if(u!=null)return u}return null});return r==="jch"&&s[1]<0&&(s[1]=0),O[r](...s).hex()}}function bu(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 a=>n*a**e+o}function An({swatches:e,colorKeys:t,colorspace:r="LAB",shift:n=1,fullScale:o=!0,smooth:a=!1,distributeLightness:s="linear",sortColor:c=!0,asFun:i=!1}={}){const u=Ze[r];if(!u)throw new Error(`Colorspace “${r}” not supported`);if(!t)throw new Error(`Colorkeys missing: returned “${t}”`);let l;if(o)l=t.map(H=>e-e*(O(H).jch()[0]/100)).sort((H,x)=>H-x).concat(e),l.unshift(0);else{let H=t.map(A=>O(A).jch()[0]/100),x=Math.min(...H),N=Math.max(...H);l=H.map(A=>A===0||isNaN((A-x)/(N-x))?0:e-(A-x)/(N-x)*e).sort((A,R)=>A-R)}let f=bu(n,[1,e],[1,e]);if(f=l.map(H=>Math.max(0,f(H))),l=f,s==="polynomial"){const H=A=>Math.sqrt(Math.sqrt((Math.pow(A,2.25)+Math.pow(A,4))/2));l=f.map(A=>A/e).map(A=>H(A)*e)}const h=t.map((H,x)=>({colorKeys:lu(H),index:x})).sort((H,x)=>x.colorKeys[0]-H.colorKeys[0]).map(H=>t[H.index]);let d=[],b;if(o){const H=u==="lch"?O.lch(...O("#fff").lch()):"#ffffff",x=u==="lch"?O.lch(...O("#000").lch()):"#000000";d=[H,...h,x]}else c?d=h:d=t;let _;if(a){const H=d;if(d=d.map(x=>O(String(x))[u]()),u==="hcl"&&d.forEach(x=>{x[1]=Number.isNaN(x[1])?0:x[1]}),u==="jch")for(let x=0;x<H.length;x++){const N=O(H[x]).hcl();Number.isNaN(N[0])&&(d[x][2]=NaN)}b=du(d,l,u),_=new Array(e).fill().map((x,N)=>b(N))}else b=O.scale(d.map(H=>typeof H=="object"&&H.constructor===O.Color?H:String(H))).domain(l).mode(u);return i?b:(!a||a===!1?b.colors(e):_).filter(H=>H!=null)}function pu(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 mu(e){return Number.isNaN(e)?0:e}function Ln(e,t,r=!1){if(!e)throw new Error(`Cannot convert color value of “${e}”`);if(!Ze[t])throw new Error(`Cannot convert to colorspace “${t}”`);const n=Ze[t],o=O(String(e))[n]();if(t==="HSL"&&o.pop(),t==="HEX"){if(r){const u=O(String(e)).rgb();return{r:u[0],g:u[1],b:u[2]}}return o}const a={};let s=o.map(mu);s=s.map((u,l)=>{let f=Ee(u),h=l;n==="hsluv"&&(h+=2);let d=n.charAt(h);return n==="jch"&&d==="c"&&(d="C"),a[d==="j"?"J":d]=f,n in{lab:1,lch:1,jab:1,jch:1}?r||((d==="l"||d==="j")&&(f+="%"),d==="h"&&(f+="deg")):n!=="hsluv"&&(d==="s"||d==="l"||d==="v"?(a[d]=Ee(u,2),r||(f=Ee(u*100),f+="%")):d==="h"&&!r&&(f+="deg")),f});const i=`${n}(${s.join(", ")})`;return r?a:i}function Ha(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 gu(e,t,r,n="wcag2"){if(r===void 0){const o=O.rgb(...t).hsluv()[2];r=Ee(o/100,2)}if(n==="wcag2"){const o=Ha(e[0],e[1],e[2]),a=Ha(t[0],t[1],t[2]),s=(o+.05)/(a+.05),c=(a+.05)/(o+.05);return r<.5?s>=1?s:-c:s<1?c:s===1?s:-s}else{if(n==="wcag3")return r<.5?xa(Et(e),Et(t))*-1:xa(Et(e),Et(t));throw new Error(`Contrast calculation method ${n} unsupported; use 'wcag2' or 'wcag3'`)}}function vu(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 _u(e,t){if(!e)throw new Error("Ratios undefined");e=e.sort((c,i)=>c-i);const r=vu(e,t),n=e.indexOf(r),o=[],a=e.slice(0,n),s=e.slice(n,e.length);for(let c=0;c<a.length;c++){const l=1/(a.length+1)*100*(c+1);o.push(Ee(l))}for(let c=0;c<s.length;c++)o.push((c+1)*100);return o.sort((c,i)=>c-i),o}const yu=(e,t,r,n,o)=>{const s=An({swatches:3e3,colorKeys:e._modifiedKeys,colorspace:e._colorspace,shift:1,smooth:e._smooth,asFun:!0}),c={},i=f=>{if(c[f])return c[f];const h=O(s(f)).rgb(),d=gu(h,t,r,o);return c[f]=d,d},u=f=>{const h=i(0),d=i(3e3),b=h<d?1:-1,_=.01;f+=.005*Math.sign(f);let g=3e3/2,v=g,H=i(v),x=100;for(;Math.abs(H-f)>_&&x;)x--,g/=2,H<f?v+=g*b:v-=g*b,H=i(v);return Ee(v,3)},l=[];return n.forEach(f=>l.push(s(u(+f)))),l};let ae=class{constructor({name:t,colorKeys:r,colorspace:n="RGB",ratios:o,smooth:a=!1,output:s="HEX",saturation:c=100}){if(this._name=t,this._colorKeys=r,this._modifiedKeys=r,this._colorspace=n,this._ratios=o,this._smooth=a,this._output=s,this._saturation=c,!this._name)throw new Error("Color missing name");if(!this._colorKeys)throw new Error("Color Keys are undefined");if(!Ze[this._colorspace])throw new Error(`Colorspace “${n}” not supported`);if(!Ze[this._output])throw new Error(`Output “${n}” not supported`);for(let i=0;i<this._colorKeys.length;i++)if(!O.valid(this._colorKeys[i]))throw new Error(`Invalid Color Key “${this._colorKeys[i]}”`);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 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=O(`${r}`).oklch(),a=n[1]*(this._saturation/100),s=O.oklch(n[0],a,n[2]),c=O.rgb(s).hex();t.push(c)}),this._modifiedKeys=t,this._generateColorScale()}_generateColorScale(){this._colorScale=An({swatches:3e3,colorKeys:this._modifiedKeys,colorspace:this._colorspace,shift:1,smooth:this._smooth,asFun:!0})}};class qa extends ae{get backgroundColorScale(){return this._backgroundColorScale||this._generateColorScale(),this._backgroundColorScale}_generateColorScale(){ae.prototype._generateColorScale.call(this);const t=An({swatches:1e3,colorKeys:this._colorKeys,colorspace:this._colorspace,shift:1,smooth:this._smooth});t.push(...this.colorKeys);const r=t.map((a,s)=>({value:Math.round(hu(a)[2]),index:s})),o=pu(r,"value").map(a=>t[a.index]);return o.length>=101&&(o.length=100,o.push("#ffffff")),this._backgroundColorScale=o.map(a=>Ln(a,this._output)),this._backgroundColorScale}}class wu{constructor({colors:t,backgroundColor:r,lightness:n,contrast:o=1,saturation:a=100,output:s="HEX",formula:c="wcag2"}){if(this._output=s,this._colors=t,this._lightness=n,this._saturation=a,this._formula=c,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(i=>{if(!i.ratios)throw new Error(`Color ${i.name}'s ratios are undefined`)}),!Ze[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 a=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&&(n.colorspace=t[r].colorspace),t[r].smooth&&(n.smooth=t[r].smooth),n._generateColorScale(),a.splice(o,0,n),this._colors=a}else{let r=this._colors.filter(a=>a.name===t.color);r=r[0];let n=this._colors.indexOf(r);const o=this._colors.filter(a=>a.name!==t.color);t.name&&(r.name=t.name),t.colorKeys&&(r.colorKeys=t.colorKeys),t.ratios&&(r.ratios=t.ratios),t.colorspace&&(r.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 qa({name:"background",colorKeys:[t],output:"RGB"}),n=Ee(O(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=O(String(this._backgroundColorValue)).rgb(),r=this._lightness/100,o={background:Ln(this._backgroundColorValue,this._output)},a=[],s=[],c={...o};return a.push(o),this._colors.map(i=>{if(i.ratios!==void 0){let u;const l=[],f={name:i.name,values:l};let h;Array.isArray(i.ratios)?h=i.ratios:Array.isArray(i.ratios)||(u=Object.keys(i.ratios),h=Object.values(i.ratios)),h=h.map(b=>fu(+b,this._contrast));const d=yu(i,t,r,h,this._formula).map(b=>Ln(b,this._output));for(let b=0;b<d.length;b++){let _;if(u)_=u[b];else{const v=_u(i.ratios,this._formula)[b];_=i.name.concat(v).replace(/\s+/g,"")}const g={name:_,contrast:h[b],value:d[b]};l.push(g),c[_]=d[b],s.push(d[b])}a.push(f)}return null}),this._contrastColorValues=s,this._contrastColorPairs=c,this._contrastColors=a,this._contrastColors}_findContrastColorPairs(){return this._contrastColorPairs}_findContrastColorValues(){return this._contrastColorValues}}au(O);const{min:ku,max:$u}=Math,Be=(e,t=0,r=1)=>ku($u(t,e),r),En=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]=Be(e[t],0,255)):t===3&&(e[t]=Be(e[t],0,1));return e},Ma={};for(let e of["Boolean","Number","String","Function","Array","Date","RegExp","Undefined","Null"])Ma[`[object ${e}]`]=e.toLowerCase();function B(e){return Ma[Object.prototype.toString.call(e)]||"object"}const T=(e,t=null)=>e.length>=3?Array.prototype.slice.call(e):B(e[0])=="object"&&t?t.split("").filter(r=>e[0][r]!==void 0).map(r=>e[0][r]):e[0].slice(0),Je=e=>{if(e.length<2)return null;const t=e.length-1;return B(e[t])=="string"?e[t].toLowerCase():null},{PI:Tt,min:Oa,max:Na}=Math,ue=e=>Math.round(e*100)/100,Tn=e=>Math.round(e*100)/100,Ce=Tt*2,Sn=Tt/3,Cu=Tt/180,xu=180/Tt;function Aa(e){return[...e.slice(0,3).reverse(),...e.slice(3)]}const E={format:{},autodetect:[]};class k{constructor(...t){const r=this;if(B(t[0])==="object"&&t[0].constructor&&t[0].constructor===this.constructor)return t[0];let n=Je(t),o=!1;if(!n){o=!0,E.sorted||(E.autodetect=E.autodetect.sort((a,s)=>s.p-a.p),E.sorted=!0);for(let a of E.autodetect)if(n=a.test(...t),n)break}if(E.format[n]){const a=E.format[n].apply(null,o?t:t.slice(0,-1));r._rgb=En(a)}else throw new Error("unknown format: "+t);r._rgb.length===3&&r._rgb.push(1)}toString(){return B(this.hex)=="function"?this.hex():`[${this._rgb.join(",")}]`}}const Ru="3.2.0",G=(...e)=>new k(...e);G.version=Ru;const We={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"},Hu=/^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,qu=/^#?([A-Fa-f0-9]{8}|[A-Fa-f0-9]{4})$/,La=e=>{if(e.match(Hu)){(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(qu)){(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,a=Math.round((t&255)/255*100)/100;return[r,n,o,a]}throw new Error(`unknown hex color: ${e}`)},{round:St}=Math,Ea=(...e)=>{let[t,r,n,o]=T(e,"rgba"),a=Je(e)||"auto";o===void 0&&(o=1),a==="auto"&&(a=o<1?"rgba":"rgb"),t=St(t),r=St(r),n=St(n);let c="000000"+(t<<16|r<<8|n).toString(16);c=c.substr(c.length-6);let i="0"+St(o*255).toString(16);switch(i=i.substr(i.length-2),a.toLowerCase()){case"rgba":return`#${c}${i}`;case"argb":return`#${i}${c}`;default:return`#${c}`}};k.prototype.name=function(){const e=Ea(this._rgb,"rgb");for(let t of Object.keys(We))if(We[t]===e)return t.toLowerCase();return e},E.format.named=e=>{if(e=e.toLowerCase(),We[e])return La(We[e]);throw new Error("unknown color name: "+e)},E.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&B(e)==="string"&&We[e.toLowerCase()])return"named"}}),k.prototype.alpha=function(e,t=!1){return e!==void 0&&B(e)==="number"?t?(this._rgb[3]=e,this):new k([this._rgb[0],this._rgb[1],this._rgb[2],e],"rgb"):this._rgb[3]},k.prototype.clipped=function(){return this._rgb._clipped||!1};const _e={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}},Mu=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 xe(e){const t=Mu.get(String(e).toLowerCase());if(!t)throw new Error("unknown Lab illuminant "+e);_e.labWhitePoint=e,_e.Xn=t[0],_e.Zn=t[1]}function dt(){return _e.labWhitePoint}const Pn=(...e)=>{e=T(e,"lab");const[t,r,n]=e,[o,a,s]=Ou(t,r,n),[c,i,u]=Ta(o,a,s);return[c,i,u,e.length>3?e[3]:1]},Ou=(e,t,r)=>{const{kE:n,kK:o,kKE:a,Xn:s,Yn:c,Zn:i}=_e,u=(e+16)/116,l=.002*t+u,f=u-.005*r,h=l*l*l,d=f*f*f,b=h>n?h:(116*l-16)/o,_=e>a?Math.pow((e+16)/116,3):e/o,g=d>n?d:(116*f-16)/o,v=b*s,H=_*c,x=g*i;return[v,H,x]},jn=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},Ta=(e,t,r)=>{const{MtxAdaptMa:n,MtxAdaptMaI:o,MtxXYZ2RGB:a,RefWhiteRGB:s,Xn:c,Yn:i,Zn:u}=_e,l=c*n.m00+i*n.m10+u*n.m20,f=c*n.m01+i*n.m11+u*n.m21,h=c*n.m02+i*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,_=s.X*n.m02+s.Y*n.m12+s.Z*n.m22,g=(e*n.m00+t*n.m10+r*n.m20)*(d/l),v=(e*n.m01+t*n.m11+r*n.m21)*(b/f),H=(e*n.m02+t*n.m12+r*n.m22)*(_/h),x=g*o.m00+v*o.m10+H*o.m20,N=g*o.m01+v*o.m11+H*o.m21,A=g*o.m02+v*o.m12+H*o.m22,R=jn(x*a.m00+N*a.m10+A*a.m20),m=jn(x*a.m01+N*a.m11+A*a.m21),p=jn(x*a.m02+N*a.m12+A*a.m22);return[R*255,m*255,p*255]},Bn=(...e)=>{const[t,r,n,...o]=T(e,"rgb"),[a,s,c]=Sa(t,r,n),[i,u,l]=Nu(a,s,c);return[i,u,l,...o.length>0&&o[0]<1?[o[0]]:[]]};function Nu(e,t,r){const{Xn:n,Yn:o,Zn:a,kE:s,kK:c}=_e,i=e/n,u=t/o,l=r/a,f=i>s?Math.pow(i,1/3):(c*i+16)/116,h=u>s?Math.pow(u,1/3):(c*u+16)/116,d=l>s?Math.pow(l,1/3):(c*l+16)/116;return[116*h-16,500*(f-h),200*(h-d)]}function Gn(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 Sa=(e,t,r)=>{e=Gn(e/255),t=Gn(t/255),r=Gn(r/255);const{MtxRGB2XYZ:n,MtxAdaptMa:o,MtxAdaptMaI:a,Xn:s,Yn:c,Zn:i,As:u,Bs:l,Cs:f}=_e;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 _=s*o.m00+c*o.m10+i*o.m20,g=s*o.m01+c*o.m11+i*o.m21,v=s*o.m02+c*o.m12+i*o.m22;let H=h*o.m00+d*o.m10+b*o.m20,x=h*o.m01+d*o.m11+b*o.m21,N=h*o.m02+d*o.m12+b*o.m22;return H*=_/u,x*=g/l,N*=v/f,h=H*a.m00+x*a.m10+N*a.m20,d=H*a.m01+x*a.m11+N*a.m21,b=H*a.m02+x*a.m12+N*a.m22,[h,d,b]};k.prototype.lab=function(){return Bn(this._rgb)},Object.assign(G,{lab:(...e)=>new k(...e,"lab"),getLabWhitePoint:dt,setLabWhitePoint:xe}),E.format.lab=Pn,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"lab"),B(e)==="array"&&e.length===3)return"lab"}}),k.prototype.darken=function(e=1){const t=this,r=t.lab();return r[0]-=_e.Kn*e,new k(r,"lab").alpha(t.alpha(),!0)},k.prototype.brighten=function(e=1){return this.darken(-e)},k.prototype.darker=k.prototype.darken,k.prototype.brighter=k.prototype.brighten,k.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:Au}=Math,Lu=1e-7,Eu=20;k.prototype.luminance=function(e,t="rgb"){if(e!==void 0&&B(e)==="number"){if(e===0)return new k([0,0,0,this._rgb[3]],"rgb");if(e===1)return new k([255,255,255,this._rgb[3]],"rgb");let r=this.luminance(),n=Eu;const o=(s,c)=>{const i=s.interpolate(c,.5,t),u=i.luminance();return Math.abs(e-u)<Lu||!n--?i:u>e?o(s,i):o(i,c)},a=(r>e?o(new k([0,0,0]),this):o(this,new k([255,255,255]))).rgb();return new k([...a,this._rgb[3]])}return Tu(...this._rgb.slice(0,3))};const Tu=(e,t,r)=>(e=In(e),t=In(t),r=In(r),.2126*e+.7152*t+.0722*r),In=e=>(e/=255,e<=.03928?e/12.92:Au((e+.055)/1.055,2.4)),ne={},Ue=(e,t,r=.5,...n)=>{let o=n[0]||"lrgb";if(!ne[o]&&!n.length&&(o=Object.keys(ne)[0]),!ne[o])throw new Error(`interpolation mode ${o} is not defined`);return B(e)!=="object"&&(e=new k(e)),B(t)!=="object"&&(t=new k(t)),ne[o](e,t,r).alpha(e.alpha()+r*(t.alpha()-e.alpha()))};k.prototype.mix=k.prototype.interpolate=function(e,t=.5,...r){return Ue(this,e,t,...r)},k.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 k([t[0]*r,t[1]*r,t[2]*r,r],"rgb")};const{sin:Su,cos:Pu}=Math,Pa=(...e)=>{let[t,r,n]=T(e,"lch");return isNaN(n)&&(n=0),n=n*Cu,[t,Pu(n)*r,Su(n)*r]},zn=(...e)=>{e=T(e,"lch");const[t,r,n]=e,[o,a,s]=Pa(t,r,n),[c,i,u]=Pn(o,a,s);return[c,i,u,e.length>3?e[3]:1]},ju=(...e)=>{const t=Aa(T(e,"hcl"));return zn(...t)},{sqrt:Bu,atan2:Gu,round:Iu}=Math,ja=(...e)=>{const[t,r,n]=T(e,"lab"),o=Bu(r*r+n*n);let a=(Gu(n,r)*xu+360)%360;return Iu(o*1e4)===0&&(a=Number.NaN),[t,o,a]},Fn=(...e)=>{const[t,r,n,...o]=T(e,"rgb"),[a,s,c]=Bn(t,r,n),[i,u,l]=ja(a,s,c);return[i,u,l,...o.length>0&&o[0]<1?[o[0]]:[]]};k.prototype.lch=function(){return Fn(this._rgb)},k.prototype.hcl=function(){return Aa(Fn(this._rgb))},Object.assign(G,{lch:(...e)=>new k(...e,"lch"),hcl:(...e)=>new k(...e,"hcl")}),E.format.lch=zn,E.format.hcl=ju,["lch","hcl"].forEach(e=>E.autodetect.push({p:2,test:(...t)=>{if(t=T(t,e),B(t)==="array"&&t.length===3)return e}})),k.prototype.saturate=function(e=1){const t=this,r=t.lch();return r[1]+=_e.Kn*e,r[1]<0&&(r[1]=0),new k(r,"lch").alpha(t.alpha(),!0)},k.prototype.desaturate=function(e=1){return this.saturate(-e)},k.prototype.set=function(e,t,r=!1){const[n,o]=e.split("."),a=this[n]();if(o){const s=n.indexOf(o)-(n.substr(0,2)==="ok"?2:0);if(s>-1){if(B(t)=="string")switch(t.charAt(0)){case"+":a[s]+=+t;break;case"-":a[s]+=+t;break;case"*":a[s]*=+t.substr(1);break;case"/":a[s]/=+t.substr(1);break;default:a[s]=+t}else if(B(t)==="number")a[s]=t;else throw new Error("unsupported value for Color.set");const c=new k(a,n);return r?(this._rgb=c._rgb,this):c}throw new Error(`unknown channel ${o} in mode ${n}`)}else return a},k.prototype.tint=function(e=.5,...t){return Ue(this,"white",e,...t)},k.prototype.shade=function(e=.5,...t){return Ue(this,"black",e,...t)};const zu=(e,t,r)=>{const n=e._rgb,o=t._rgb;return new k(n[0]+r*(o[0]-n[0]),n[1]+r*(o[1]-n[1]),n[2]+r*(o[2]-n[2]),"rgb")};ne.rgb=zu;const{sqrt:Xn,pow:Qe}=Math,Fu=(e,t,r)=>{const[n,o,a]=e._rgb,[s,c,i]=t._rgb;return new k(Xn(Qe(n,2)*(1-r)+Qe(s,2)*r),Xn(Qe(o,2)*(1-r)+Qe(c,2)*r),Xn(Qe(a,2)*(1-r)+Qe(i,2)*r),"rgb")};ne.lrgb=Fu;const Xu=(e,t,r)=>{const n=e.lab(),o=t.lab();return new k(n[0]+r*(o[0]-n[0]),n[1]+r*(o[1]-n[1]),n[2]+r*(o[2]-n[2]),"lab")};ne.lab=Xu;const et=(e,t,r,n)=>{let o,a;n==="hsl"?(o=e.hsl(),a=t.hsl()):n==="hsv"?(o=e.hsv(),a=t.hsv()):n==="hcg"?(o=e.hcg(),a=t.hcg()):n==="hsi"?(o=e.hsi(),a=t.hsi()):n==="lch"||n==="hcl"?(n="hcl",o=e.hcl(),a=t.hcl()):n==="oklch"&&(o=e.oklch().reverse(),a=t.oklch().reverse());let s,c,i,u,l,f;(n.substr(0,1)==="h"||n==="oklch")&&([s,i,l]=o,[c,u,f]=a);let h,d,b,_;return!isNaN(s)&&!isNaN(c)?(c>s&&c-s>180?_=c-(s+360):c<s&&s-c>180?_=c+360-s:_=c-s,d=s+r*_):isNaN(s)?isNaN(c)?d=Number.NaN:(d=c,(l==1||l==0)&&n!="hsv"&&(h=u)):(d=s,(f==1||f==0)&&n!="hsv"&&(h=i)),h===void 0&&(h=i+r*(u-i)),b=l+r*(f-l),n==="oklch"?new k([b,h,d],n):new k([d,h,b],n)},Ba=(e,t,r)=>et(e,t,r,"lch");ne.lch=Ba,ne.hcl=Ba;const Ku=e=>{if(B(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)},Du=(...e)=>{const[t,r,n]=T(e,"rgb");return(t<<16)+(r<<8)+n};k.prototype.num=function(){return Du(this._rgb)},Object.assign(G,{num:(...e)=>new k(...e,"num")}),E.format.num=Ku,E.autodetect.push({p:5,test:(...e)=>{if(e.length===1&&B(e[0])==="number"&&e[0]>=0&&e[0]<=16777215)return"num"}});const Vu=(e,t,r)=>{const n=e.num(),o=t.num();return new k(n+r*(o-n),"num")};ne.num=Vu;const{floor:Yu}=Math,Zu=(...e)=>{e=T(e,"hcg");let[t,r,n]=e,o,a,s;n=n*255;const c=r*255;if(r===0)o=a=s=n;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;const i=Yu(t),u=t-i,l=n*(1-r),f=l+c*(1-u),h=l+c*u,d=l+c;switch(i){case 0:[o,a,s]=[d,h,l];break;case 1:[o,a,s]=[f,d,l];break;case 2:[o,a,s]=[l,d,h];break;case 3:[o,a,s]=[l,f,d];break;case 4:[o,a,s]=[h,l,d];break;case 5:[o,a,s]=[d,l,f];break}}return[o,a,s,e.length>3?e[3]:1]},Ju=(...e)=>{const[t,r,n]=T(e,"rgb"),o=Oa(t,r,n),a=Na(t,r,n),s=a-o,c=s*100/255,i=o/(255-s)*100;let u;return s===0?u=Number.NaN:(t===a&&(u=(r-n)/s),r===a&&(u=2+(n-t)/s),n===a&&(u=4+(t-r)/s),u*=60,u<0&&(u+=360)),[u,c,i]};k.prototype.hcg=function(){return Ju(this._rgb)};const Wu=(...e)=>new k(...e,"hcg");G.hcg=Wu,E.format.hcg=Zu,E.autodetect.push({p:1,test:(...e)=>{if(e=T(e,"hcg"),B(e)==="array"&&e.length===3)return"hcg"}});const Uu=(e,t,r)=>et(e,t,r,"hcg");ne.hcg=Uu;const{cos:tt}=Math,Qu=(...e)=>{e=T(e,"hsi");let[t,r,n]=e,o,a,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*tt(Ce*t)/tt(Sn-Ce*t))/3,a=1-(s+o)):t<2/3?(t-=1/3,o=(1-r)/3,a=(1+r*tt(Ce*t)/tt(Sn-Ce*t))/3,s=1-(o+a)):(t-=2/3,a=(1-r)/3,s=(1+r*tt(Ce*t)/tt(Sn-Ce*t))/3,o=1-(a+s)),o=Be(n*o*3),a=Be(n*a*3),s=Be(n*s*3),[o*255,a*255,s*255,e.length>3?e[3]:1]},{min:ef,sqrt:tf,acos:rf}=Math,nf=(...e)=>{let[t,r,n]=T(e,"rgb");t/=255,r/=255,n/=255;let o;const a=ef(t,r,n),s=(t+r+n)/3,c=s>0?1-a/s:0;return c===0?o=NaN:(o=(t-r+(t-n))/2,o/=tf((t-r)*(t-r)+(t-n)*(r-n)),o=rf(o),n>r&&(o=Ce-o),o/=Ce),[o*360,c,s]};k.prototype.hsi=function(){return nf(this._rgb)};const of=(...e)=>new k(...e,"hsi");G.hsi=of,E.format.hsi=Qu,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"hsi"),B(e)==="array"&&e.length===3)return"hsi"}});const sf=(e,t,r)=>et(e,t,r,"hsi");ne.hsi=sf;const Kn=(...e)=>{e=T(e,"hsl");const[t,r,n]=e;let o,a,s;if(r===0)o=a=s=n*255;else{const c=[0,0,0],i=[0,0,0],u=n<.5?n*(1+r):n+r-n*r,l=2*n-u,f=t/360;c[0]=f+1/3,c[1]=f,c[2]=f-1/3;for(let h=0;h<3;h++)c[h]<0&&(c[h]+=1),c[h]>1&&(c[h]-=1),6*c[h]<1?i[h]=l+(u-l)*6*c[h]:2*c[h]<1?i[h]=u:3*c[h]<2?i[h]=l+(u-l)*(2/3-c[h])*6:i[h]=l;[o,a,s]=[i[0]*255,i[1]*255,i[2]*255]}return e.length>3?[o,a,s,e[3]]:[o,a,s,1]},Ga=(...e)=>{e=T(e,"rgba");let[t,r,n]=e;t/=255,r/=255,n/=255;const o=Oa(t,r,n),a=Na(t,r,n),s=(a+o)/2;let c,i;return a===o?(c=0,i=Number.NaN):c=s<.5?(a-o)/(a+o):(a-o)/(2-a-o),t==a?i=(r-n)/(a-o):r==a?i=2+(n-t)/(a-o):n==a&&(i=4+(t-r)/(a-o)),i*=60,i<0&&(i+=360),e.length>3&&e[3]!==void 0?[i,c,s,e[3]]:[i,c,s]};k.prototype.hsl=function(){return Ga(this._rgb)};const af=(...e)=>new k(...e,"hsl");G.hsl=af,E.format.hsl=Kn,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"hsl"),B(e)==="array"&&e.length===3)return"hsl"}});const cf=(e,t,r)=>et(e,t,r,"hsl");ne.hsl=cf;const{floor:uf}=Math,ff=(...e)=>{e=T(e,"hsv");let[t,r,n]=e,o,a,s;if(n*=255,r===0)o=a=s=n;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;const c=uf(t),i=t-c,u=n*(1-r),l=n*(1-r*i),f=n*(1-r*(1-i));switch(c){case 0:[o,a,s]=[n,f,u];break;case 1:[o,a,s]=[l,n,u];break;case 2:[o,a,s]=[u,n,f];break;case 3:[o,a,s]=[u,l,n];break;case 4:[o,a,s]=[f,u,n];break;case 5:[o,a,s]=[n,u,l];break}}return[o,a,s,e.length>3?e[3]:1]},{min:lf,max:hf}=Math,df=(...e)=>{e=T(e,"rgb");let[t,r,n]=e;const o=lf(t,r,n),a=hf(t,r,n),s=a-o;let c,i,u;return u=a/255,a===0?(c=Number.NaN,i=0):(i=s/a,t===a&&(c=(r-n)/s),r===a&&(c=2+(n-t)/s),n===a&&(c=4+(t-r)/s),c*=60,c<0&&(c+=360)),[c,i,u]};k.prototype.hsv=function(){return df(this._rgb)};const bf=(...e)=>new k(...e,"hsv");G.hsv=bf,E.format.hsv=ff,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"hsv"),B(e)==="array"&&e.length===3)return"hsv"}});const pf=(e,t,r)=>et(e,t,r,"hsv");ne.hsv=pf;function Pt(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,c)=>t.map(i=>i[c])),a=e.map(s=>o.map(c=>Array.isArray(s)?s.reduce((i,u,l)=>i+u*(c[l]||0),0):c.reduce((i,u)=>i+u*s,0)));return r===1&&(a=a[0]),n===1?a.map(s=>s[0]):a}const Dn=(...e)=>{e=T(e,"lab");const[t,r,n,...o]=e,[a,s,c]=mf([t,r,n]),[i,u,l]=Ta(a,s,c);return[i,u,l,...o.length>0&&o[0]<1?[o[0]]:[]]};function mf(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=Pt(r,e);return Pt(t,n.map(o=>o**3))}const Vn=(...e)=>{const[t,r,n,...o]=T(e,"rgb"),a=Sa(t,r,n);return[...gf(a),...o.length>0&&o[0]<1?[o[0]]:[]]};function gf(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=Pt(t,e);return Pt(r,n.map(o=>Math.cbrt(o)))}k.prototype.oklab=function(){return Vn(this._rgb)},Object.assign(G,{oklab:(...e)=>new k(...e,"oklab")}),E.format.oklab=Dn,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"oklab"),B(e)==="array"&&e.length===3)return"oklab"}});const vf=(e,t,r)=>{const n=e.oklab(),o=t.oklab();return new k(n[0]+r*(o[0]-n[0]),n[1]+r*(o[1]-n[1]),n[2]+r*(o[2]-n[2]),"oklab")};ne.oklab=vf;const _f=(e,t,r)=>et(e,t,r,"oklch");ne.oklch=_f;const{pow:Yn,sqrt:Zn,PI:Jn,cos:Ia,sin:za,atan2:yf}=Math,wf=(e,t="lrgb",r=null)=>{const n=e.length;r||(r=Array.from(new Array(n)).map(()=>1));const o=n/r.reduce(function(f,h){return f+h});if(r.forEach((f,h)=>{r[h]*=o}),e=e.map(f=>new k(f)),t==="lrgb")return kf(e,r);const a=e.shift(),s=a.get(t),c=[];let i=0,u=0;for(let f=0;f<s.length;f++)if(s[f]=(s[f]||0)*r[0],c.push(isNaN(s[f])?0:r[0]),t.charAt(f)==="h"&&!isNaN(s[f])){const h=s[f]/180*Jn;i+=Ia(h)*r[0],u+=za(h)*r[0]}let l=a.alpha()*r[0];e.forEach((f,h)=>{const d=f.get(t);l+=f.alpha()*r[h+1];for(let b=0;b<s.length;b++)if(!isNaN(d[b]))if(c[b]+=r[h+1],t.charAt(b)==="h"){const _=d[b]/180*Jn;i+=Ia(_)*r[h+1],u+=za(_)*r[h+1]}else s[b]+=d[b]*r[h+1]});for(let f=0;f<s.length;f++)if(t.charAt(f)==="h"){let h=yf(u/c[f],i/c[f])/Jn*180;for(;h<0;)h+=360;for(;h>=360;)h-=360;s[f]=h}else s[f]=s[f]/c[f];return l/=n,new k(s,t).alpha(l>.99999?1:l,!0)},kf=(e,t)=>{const r=e.length,n=[0,0,0,0];for(let o=0;o<e.length;o++){const a=e[o],s=t[o]/r,c=a._rgb;n[0]+=Yn(c[0],2)*s,n[1]+=Yn(c[1],2)*s,n[2]+=Yn(c[2],2)*s,n[3]+=c[3]*s}return n[0]=Zn(n[0]),n[1]=Zn(n[1]),n[2]=Zn(n[2]),n[3]>.9999999&&(n[3]=1),new k(En(n))},{pow:$f}=Math;function jt(e){let t="rgb",r=G("#ccc"),n=0,o=[0,1],a=[0,1],s=[],c=[0,0],i=!1,u=[],l=!1,f=0,h=1,d=!1,b={},_=!0,g=1;const v=function(p){if(p=p||["#fff","#000"],p&&B(p)==="string"&&G.brewer&&G.brewer[p.toLowerCase()]&&(p=G.brewer[p.toLowerCase()]),B(p)==="array"){p.length===1&&(p=[p[0],p[0]]),p=p.slice(0);for(let y=0;y<p.length;y++)p[y]=G(p[y]);s.length=0;for(let y=0;y<p.length;y++)s.push(y/(p.length-1))}return R(),u=p},H=function(p){if(i!=null){const y=i.length-1;let w=0;for(;w<y&&p>=i[w];)w++;return w-1}return 0};let x=p=>p,N=p=>p;const A=function(p,y){let w,C;if(y==null&&(y=!1),isNaN(p)||p===null)return r;y?C=p:i&&i.length>2?C=H(p)/(i.length-2):h!==f?C=(p-f)/(h-f):C=1,C=N(C),y||(C=x(C)),g!==1&&(C=$f(C,g)),C=c[0]+C*(1-c[0]-c[1]),C=Be(C,0,1);const q=Math.floor(C*1e4);if(_&&b[q])w=b[q];else{if(B(u)==="array")for(let M=0;M<s.length;M++){const S=s[M];if(C<=S){w=u[M];break}if(C>=S&&M===s.length-1){w=u[M];break}if(C>S&&C<s[M+1]){C=(C-S)/(s[M+1]-S),w=G.interpolate(u[M],u[M+1],C,t);break}}else B(u)==="function"&&(w=u(C));_&&(b[q]=w)}return w};var R=()=>b={};v(e);const m=function(p){const y=G(A(p));return l&&y[l]?y[l]():y};return m.classes=function(p){if(p!=null){if(B(p)==="array")i=p,o=[p[0],p[p.length-1]];else{const y=G.analyze(o);p===0?i=[y.min,y.max]:i=G.limits(y,"e",p)}return m}return i},m.domain=function(p){if(!arguments.length)return a;a=p.slice(0),f=p[0],h=p[p.length-1],s=[];const y=u.length;if(p.length===y&&f!==h)for(let w of Array.from(p))s.push((w-f)/(h-f));else{for(let w=0;w<y;w++)s.push(w/(y-1));if(p.length>2){const w=p.map((q,M)=>M/(p.length-1)),C=p.map(q=>(q-f)/(h-f));C.every((q,M)=>w[M]===q)||(N=q=>{if(q<=0||q>=1)return q;let M=0;for(;q>=C[M+1];)M++;const S=(q-C[M])/(C[M+1]-C[M]);return w[M]+S*(w[M+1]-w[M])})}}return o=[f,h],m},m.mode=function(p){return arguments.length?(t=p,R(),m):t},m.range=function(p,y){return v(p),m},m.out=function(p){return l=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?x=function(y){const w=A(0,!0).lab()[0],C=A(1,!0).lab()[0],q=w>C;let M=A(y,!0).lab()[0];const S=w+(C-w)*y;let X=M-S,D=0,U=1,ce=20;for(;Math.abs(X)>.01&&ce-- >0;)(function(){return q&&(X*=-1),X<0?(D=y,y+=(U-y)*.5):(U=y,y+=(D-y)*.5),M=A(y,!0).lab()[0],X=M-S})();return y}:x=y=>y,m},m.padding=function(p){return p!=null?(B(p)==="number"&&(p=[p,p]),c=p,m):c},m.colors=function(p,y){arguments.length<2&&(y="hex");let w=[];if(arguments.length===0)w=u.slice(0);else if(p===1)w=[m(.5)];else if(p>1){const C=o[0],q=o[1]-C;w=Cf(0,p).map(M=>m(C+M/(p-1)*q))}else{e=[];let C=[];if(i&&i.length>2)for(let q=1,M=i.length,S=1<=M;S?q<M:q>M;S?q++:q--)C.push((i[q-1]+i[q])*.5);else C=o;w=C.map(q=>m(q))}return G[y]&&(w=w.map(C=>C[y]())),w},m.cache=function(p){return p!=null?(_=p,m):_},m.gamma=function(p){return p!=null?(g=p,m):g},m.nodata=function(p){return p!=null?(r=G(p),m):r},m}function Cf(e,t,r){let n=[],o=e<t,a=t;for(let s=e;o?s<a:s>a;o?s++:s--)n.push(s);return n}const xf=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},Rf=function(e){let t,r,n,o;if(e=e.map(a=>new k(a)),e.length===2)[r,n]=e.map(a=>a.lab()),t=function(a){const s=[0,1,2].map(c=>r[c]+a*(n[c]-r[c]));return new k(s,"lab")};else if(e.length===3)[r,n,o]=e.map(a=>a.lab()),t=function(a){const s=[0,1,2].map(c=>(1-a)*(1-a)*r[c]+2*(1-a)*a*n[c]+a*a*o[c]);return new k(s,"lab")};else if(e.length===4){let a;[r,n,o,a]=e.map(s=>s.lab()),t=function(s){const c=[0,1,2].map(i=>(1-s)*(1-s)*(1-s)*r[i]+3*(1-s)*(1-s)*s*n[i]+3*(1-s)*s*s*o[i]+s*s*s*a[i]);return new k(c,"lab")}}else if(e.length>=5){let a,s,c;a=e.map(i=>i.lab()),c=e.length-1,s=xf(c),t=function(i){const u=1-i,l=[0,1,2].map(f=>a.reduce((h,d,b)=>h+s[b]*u**(c-b)*i**b*d[f],0));return new k(l,"lab")}}else throw new RangeError("No point in running bezier with only one color.");return t},Hf=e=>{const t=Rf(e);return t.scale=()=>jt(t),t},{round:Fa}=Math;k.prototype.rgb=function(e=!0){return e===!1?this._rgb.slice(0,3):this._rgb.slice(0,3).map(Fa)},k.prototype.rgba=function(e=!0){return this._rgb.slice(0,4).map((t,r)=>r<3?e===!1?t:Fa(t):t)},Object.assign(G,{rgb:(...e)=>new k(...e,"rgb")}),E.format.rgb=(...e)=>{const t=T(e,"rgba");return t[3]===void 0&&(t[3]=1),t},E.autodetect.push({p:3,test:(...e)=>{if(e=T(e,"rgba"),B(e)==="array"&&(e.length===3||e.length===4&&B(e[3])=="number"&&e[3]>=0&&e[3]<=1))return"rgb"}});const me=(e,t,r)=>{if(!me[r])throw new Error("unknown blend mode "+r);return me[r](e,t)},Te=e=>(t,r)=>{const n=G(r).rgb(),o=G(t).rgb();return G.rgb(e(n,o))},Se=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},qf=e=>e,Mf=(e,t)=>e*t/255,Of=(e,t)=>e>t?t:e,Nf=(e,t)=>e>t?e:t,Af=(e,t)=>255*(1-(1-e/255)*(1-t/255)),Lf=(e,t)=>t<128?2*e*t/255:255*(1-2*(1-e/255)*(1-t/255)),Ef=(e,t)=>255*(1-(1-t/255)/(e/255)),Tf=(e,t)=>e===255?255:(e=255*(t/255)/(1-e/255),e>255?255:e);me.normal=Te(Se(qf)),me.multiply=Te(Se(Mf)),me.screen=Te(Se(Af)),me.overlay=Te(Se(Lf)),me.darken=Te(Se(Of)),me.lighten=Te(Se(Nf)),me.dodge=Te(Se(Tf)),me.burn=Te(Se(Ef));const{pow:Sf,sin:Pf,cos:jf}=Math;function Bf(e=300,t=-1.5,r=1,n=1,o=[0,1]){let a=0,s;B(o)==="array"?s=o[1]-o[0]:(s=0,o=[o,o]);const c=function(i){const u=Ce*((e+120)/360+t*i),l=Sf(o[0]+s*i,n),h=(a!==0?r[0]+i*a:r)*l*(1-l)/2,d=jf(u),b=Pf(u),_=l+h*(-.14861*d+1.78277*b),g=l+h*(-.29227*d-.90649*b),v=l+h*(1.97294*d);return G(En([_*255,g*255,v*255,1]))};return c.start=function(i){return i==null?e:(e=i,c)},c.rotations=function(i){return i==null?t:(t=i,c)},c.gamma=function(i){return i==null?n:(n=i,c)},c.hue=function(i){return i==null?r:(r=i,B(r)==="array"?(a=r[1]-r[0],a===0&&(r=r[1])):a=0,c)},c.lightness=function(i){return i==null?o:(B(i)==="array"?(o=i,s=i[1]-i[0]):(o=[i,i],s=0),c)},c.scale=()=>G.scale(c),c.hue(r),c}const Gf="0123456789abcdef",{floor:If,random:zf}=Math,Ff=(e=zf)=>{let t="#";for(let r=0;r<6;r++)t+=Gf.charAt(If(e()*16));return new k(t,"hex")},{log:Xa,pow:Xf,floor:Kf,abs:Df}=Math;function Ka(e,t=null){const r={min:Number.MAX_VALUE,max:Number.MAX_VALUE*-1,sum:0,values:[],count:0};return B(e)==="object"&&(e=Object.values(e)),e.forEach(n=>{t&&B(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)=>Da(r,n,o),r}function Da(e,t="equal",r=7){B(e)=="array"&&(e=Ka(e));const{min:n,max:o}=e,a=e.values.sort((c,i)=>c-i);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 c=1;c<r;c++)s.push(n+c/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 c=Math.LOG10E*Xa(n),i=Math.LOG10E*Xa(o);s.push(n);for(let u=1;u<r;u++)s.push(Xf(10,c+u/r*(i-c)));s.push(o)}else if(t.substr(0,1)==="q"){s.push(n);for(let c=1;c<r;c++){const i=(a.length-1)*c/r,u=Kf(i);if(u===i)s.push(a[u]);else{const l=i-u;s.push(a[u]*(1-l)+a[u+1]*l)}}s.push(o)}else if(t.substr(0,1)==="k"){let c;const i=a.length,u=new Array(i),l=new Array(r);let f=!0,h=0,d=null;d=[],d.push(n);for(let g=1;g<r;g++)d.push(n+g/r*(o-n));for(d.push(o);f;){for(let v=0;v<r;v++)l[v]=0;for(let v=0;v<i;v++){const H=a[v];let x=Number.MAX_VALUE,N;for(let A=0;A<r;A++){const R=Df(d[A]-H);R<x&&(x=R,N=A),l[N]++,u[v]=N}}const g=new Array(r);for(let v=0;v<r;v++)g[v]=null;for(let v=0;v<i;v++)c=u[v],g[c]===null?g[c]=a[v]:g[c]+=a[v];for(let v=0;v<r;v++)g[v]*=1/l[v];f=!1;for(let v=0;v<r;v++)if(g[v]!==d[v]){f=!0;break}d=g,h++,h>200&&(f=!1)}const b={};for(let g=0;g<r;g++)b[g]=[];for(let g=0;g<i;g++)c=u[g],b[c].push(a[g]);let _=[];for(let g=0;g<r;g++)_.push(b[g][0]),_.push(b[g][b[g].length-1]);_=_.sort((g,v)=>g-v),s.push(_[0]);for(let g=1;g<_.length;g+=2){const v=_[g];!isNaN(v)&&s.indexOf(v)===-1&&s.push(v)}}return s}const Vf=(e,t)=>{e=new k(e),t=new k(t);const r=e.luminance(),n=t.luminance();return r>n?(r+.05)/(n+.05):(n+.05)/(r+.05)};const Va=.027,Yf=5e-4,Zf=.1,Ya=1.14,Bt=.022,Za=1.414,Jf=(e,t)=>{e=new k(e),t=new k(t),e.alpha()<1&&(e=Ue(t,e,e.alpha(),"rgb"));const r=Ja(...e.rgb()),n=Ja(...t.rgb()),o=r>=Bt?r:r+Math.pow(Bt-r,Za),a=n>=Bt?n:n+Math.pow(Bt-n,Za),s=Math.pow(a,.56)-Math.pow(o,.57),c=Math.pow(a,.65)-Math.pow(o,.62),i=Math.abs(a-o)<Yf?0:o<a?s*Ya:c*Ya;return(Math.abs(i)<Zf?0:i>0?i-Va:i+Va)*100};function Ja(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:Re,pow:Z,min:Wf,max:Uf,atan2:Wa,abs:Ua,cos:Gt,sin:Qa,exp:Qf,PI:ec}=Math;function el(e,t,r=1,n=1,o=1){var a=function(he){return 360*he/(2*ec)},s=function(he){return 2*ec*he/360};e=new k(e),t=new k(t);const[c,i,u]=Array.from(e.lab()),[l,f,h]=Array.from(t.lab()),d=(c+l)/2,b=Re(Z(i,2)+Z(u,2)),_=Re(Z(f,2)+Z(h,2)),g=(b+_)/2,v=.5*(1-Re(Z(g,7)/(Z(g,7)+Z(25,7)))),H=i*(1+v),x=f*(1+v),N=Re(Z(H,2)+Z(u,2)),A=Re(Z(x,2)+Z(h,2)),R=(N+A)/2,m=a(Wa(u,H)),p=a(Wa(h,x)),y=m>=0?m:m+360,w=p>=0?p:p+360,C=Ua(y-w)>180?(y+w+360)/2:(y+w)/2,q=1-.17*Gt(s(C-30))+.24*Gt(s(2*C))+.32*Gt(s(3*C+6))-.2*Gt(s(4*C-63));let M=w-y;M=Ua(M)<=180?M:w<=y?M+360:M-360,M=2*Re(N*A)*Qa(s(M)/2);const S=l-c,X=A-N,D=1+.015*Z(d-50,2)/Re(20+Z(d-50,2)),U=1+.045*R,ce=1+.015*R*q,ye=30*Qf(-Z((C-275)/25,2)),le=-(2*Re(Z(R,7)/(Z(R,7)+Z(25,7))))*Qa(2*s(ye)),qe=Re(Z(S/(r*D),2)+Z(X/(n*U),2)+Z(M/(o*ce),2)+le*(X/(n*U))*(M/(o*ce)));return Uf(0,Wf(100,qe))}function tl(e,t,r="lab"){e=new k(e),t=new k(t);const n=e.get(r),o=t.get(r);let a=0;for(let s in n){const c=(n[s]||0)-(o[s]||0);a+=c*c}return Math.sqrt(a)}const rl=(...e)=>{try{return new k(...e),!0}catch{return!1}},nl={cool(){return jt([G.hsl(180,1,.9),G.hsl(250,.7,.4)])},hot(){return jt(["#000","#f00","#ff0","#fff"]).mode("rgb")}},Wn={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"]},tc=Object.keys(Wn),rc=new Map(tc.map(e=>[e.toLowerCase(),e])),ol=typeof Proxy=="function"?new Proxy(Wn,{get(e,t){const r=t.toLowerCase();if(rc.has(r))return e[rc.get(r)]},getOwnPropertyNames(){return Object.getOwnPropertyNames(tc)}}):Wn,sl=(...e)=>{e=T(e,"cmyk");const[t,r,n,o]=e,a=e.length>4?e[4]:1;return o===1?[0,0,0,a]:[t>=1?0:255*(1-t)*(1-o),r>=1?0:255*(1-r)*(1-o),n>=1?0:255*(1-n)*(1-o),a]},{max:nc}=Math,al=(...e)=>{let[t,r,n]=T(e,"rgb");t=t/255,r=r/255,n=n/255;const o=1-nc(t,nc(r,n)),a=o<1?1/(1-o):0,s=(1-t-o)*a,c=(1-r-o)*a,i=(1-n-o)*a;return[s,c,i,o]};k.prototype.cmyk=function(){return al(this._rgb)},Object.assign(G,{cmyk:(...e)=>new k(...e,"cmyk")}),E.format.cmyk=sl,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"cmyk"),B(e)==="array"&&e.length===4)return"cmyk"}});const cl=(...e)=>{const t=T(e,"hsla");let r=Je(e)||"lsa";return t[0]=ue(t[0]||0)+"deg",t[1]=ue(t[1]*100)+"%",t[2]=ue(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(" ")})`},il=(...e)=>{const t=T(e,"lab");let r=Je(e)||"lab";return t[0]=ue(t[0])+"%",t[1]=ue(t[1]),t[2]=ue(t[2]),r==="laba"||t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`lab(${t.join(" ")})`},ul=(...e)=>{const t=T(e,"lch");let r=Je(e)||"lab";return t[0]=ue(t[0])+"%",t[1]=ue(t[1]),t[2]=isNaN(t[2])?"none":ue(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(" ")})`},fl=(...e)=>{const t=T(e,"lab");return t[0]=ue(t[0]*100)+"%",t[1]=Tn(t[1]),t[2]=Tn(t[2]),t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`oklab(${t.join(" ")})`},oc=(...e)=>{const[t,r,n,...o]=T(e,"rgb"),[a,s,c]=Vn(t,r,n),[i,u,l]=ja(a,s,c);return[i,u,l,...o.length>0&&o[0]<1?[o[0]]:[]]},ll=(...e)=>{const t=T(e,"lch");return t[0]=ue(t[0]*100)+"%",t[1]=Tn(t[1]),t[2]=isNaN(t[2])?"none":ue(t[2])+"deg",t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`oklch(${t.join(" ")})`},{round:Un}=Math,hl=(...e)=>{const t=T(e,"rgba");let r=Je(e)||"rgb";if(r.substr(0,3)==="hsl")return cl(Ga(t),r);if(r.substr(0,3)==="lab"){const n=dt();xe("d50");const o=il(Bn(t),r);return xe(n),o}if(r.substr(0,3)==="lch"){const n=dt();xe("d50");const o=ul(Fn(t),r);return xe(n),o}return r.substr(0,5)==="oklab"?fl(Vn(t)):r.substr(0,5)==="oklch"?ll(oc(t)):(t[0]=Un(t[0]),t[1]=Un(t[1]),t[2]=Un(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(" ")})`)},sc=(...e)=>{e=T(e,"lch");const[t,r,n,...o]=e,[a,s,c]=Pa(t,r,n),[i,u,l]=Dn(a,s,c);return[i,u,l,...o.length>0&&o[0]<1?[o[0]]:[]]},He=/((?:-?\d+)|(?:-?\d+(?:\.\d+)?)%|none)/.source,ge=/((?:-?(?:\d+(?:\.\d*)?|\.\d+)%?)|none)/.source,It=/((?:-?(?:\d+(?:\.\d*)?|\.\d+)%)|none)/.source,fe=/\s*/.source,rt=/\s+/.source,Qn=/\s*,\s*/.source,zt=/((?:-?(?:\d+(?:\.\d*)?|\.\d+)(?:deg)?)|none)/.source,nt=/\s*(?:\/\s*((?:[01]|[01]?\.\d+)|\d+(?:\.\d+)?%))?/.source,ac=new RegExp("^rgba?\\("+fe+[He,He,He].join(rt)+nt+"\\)$"),cc=new RegExp("^rgb\\("+fe+[He,He,He].join(Qn)+fe+"\\)$"),ic=new RegExp("^rgba\\("+fe+[He,He,He,ge].join(Qn)+fe+"\\)$"),uc=new RegExp("^hsla?\\("+fe+[zt,It,It].join(rt)+nt+"\\)$"),fc=new RegExp("^hsl?\\("+fe+[zt,It,It].join(Qn)+fe+"\\)$"),lc=/^hsla\(\s*(-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*,\s*([01]|[01]?\.\d+)\)$/,hc=new RegExp("^lab\\("+fe+[ge,ge,ge].join(rt)+nt+"\\)$"),dc=new RegExp("^lch\\("+fe+[ge,ge,zt].join(rt)+nt+"\\)$"),bc=new RegExp("^oklab\\("+fe+[ge,ge,ge].join(rt)+nt+"\\)$"),pc=new RegExp("^oklch\\("+fe+[ge,ge,zt].join(rt)+nt+"\\)$"),{round:mc}=Math,ot=e=>e.map((t,r)=>r<=2?Be(mc(t),0,255):t),J=(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),oe=(e,t)=>e==="none"?t:e,eo=e=>{if(e=e.toLowerCase().trim(),e==="transparent")return[0,0,0,0];let t;if(E.format.named)try{return E.format.named(e)}catch{}if((t=e.match(ac))||(t=e.match(cc))){let r=t.slice(1,4);for(let o=0;o<3;o++)r[o]=+J(oe(r[o],0),0,255);r=ot(r);const n=t[4]!==void 0?+J(t[4],0,1):1;return r[3]=n,r}if(t=e.match(ic)){const r=t.slice(1,5);for(let n=0;n<4;n++)r[n]=+J(r[n],0,255);return r}if((t=e.match(uc))||(t=e.match(fc))){const r=t.slice(1,4);r[0]=+oe(r[0].replace("deg",""),0),r[1]=+J(oe(r[1],0),0,100)*.01,r[2]=+J(oe(r[2],0),0,100)*.01;const n=ot(Kn(r)),o=t[4]!==void 0?+J(t[4],0,1):1;return n[3]=o,n}if(t=e.match(lc)){const r=t.slice(1,4);r[1]*=.01,r[2]*=.01;const n=Kn(r);for(let o=0;o<3;o++)n[o]=mc(n[o]);return n[3]=+t[4],n}if(t=e.match(hc)){const r=t.slice(1,4);r[0]=J(oe(r[0],0),0,100),r[1]=J(oe(r[1],0),-125,125,!0),r[2]=J(oe(r[2],0),-125,125,!0);const n=dt();xe("d50");const o=ot(Pn(r));xe(n);const a=t[4]!==void 0?+J(t[4],0,1):1;return o[3]=a,o}if(t=e.match(dc)){const r=t.slice(1,4);r[0]=J(r[0],0,100),r[1]=J(oe(r[1],0),0,150,!1),r[2]=+oe(r[2].replace("deg",""),0);const n=dt();xe("d50");const o=ot(zn(r));xe(n);const a=t[4]!==void 0?+J(t[4],0,1):1;return o[3]=a,o}if(t=e.match(bc)){const r=t.slice(1,4);r[0]=J(oe(r[0],0),0,1),r[1]=J(oe(r[1],0),-.4,.4,!0),r[2]=J(oe(r[2],0),-.4,.4,!0);const n=ot(Dn(r)),o=t[4]!==void 0?+J(t[4],0,1):1;return n[3]=o,n}if(t=e.match(pc)){const r=t.slice(1,4);r[0]=J(oe(r[0],0),0,1),r[1]=J(oe(r[1],0),0,.4,!1),r[2]=+oe(r[2].replace("deg",""),0);const n=ot(sc(r)),o=t[4]!==void 0?+J(t[4],0,1):1;return n[3]=o,n}};eo.test=e=>ac.test(e)||uc.test(e)||hc.test(e)||dc.test(e)||bc.test(e)||pc.test(e)||cc.test(e)||ic.test(e)||fc.test(e)||lc.test(e)||e==="transparent",k.prototype.css=function(e){return hl(this._rgb,e)};const dl=(...e)=>new k(...e,"css");G.css=dl,E.format.css=eo,E.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&B(e)==="string"&&eo.test(e))return"css"}}),E.format.gl=(...e)=>{const t=T(e,"rgba");return t[0]*=255,t[1]*=255,t[2]*=255,t};const bl=(...e)=>new k(...e,"gl");G.gl=bl,k.prototype.gl=function(){const e=this._rgb;return[e[0]/255,e[1]/255,e[2]/255,e[3]]},k.prototype.hex=function(e){return Ea(this._rgb,e)};const pl=(...e)=>new k(...e,"hex");G.hex=pl,E.format.hex=La,E.autodetect.push({p:4,test:(e,...t)=>{if(!t.length&&B(e)==="string"&&[3,4,5,6,7,8,9].indexOf(e.length)>=0)return"hex"}});const{log:Ft}=Math,gc=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*Ft(n),o=t<20?0:-254.76935184120902+.8274096064007395*(o=t-10)+115.67994401066147*Ft(o)):(r=351.97690566805693+.114206453784165*(r=t-55)-40.25366309332127*Ft(r),n=325.4494125711974+.07943456536662342*(n=t-50)-28.0852963507957*Ft(n),o=255),[r,n,o,1]},{round:ml}=Math,gl=(...e)=>{const t=T(e,"rgb"),r=t[0],n=t[2];let o=1e3,a=4e4;const s=.4;let c;for(;a-o>s;){c=(a+o)*.5;const i=gc(c);i[2]/i[0]>=n/r?a=c:o=c}return ml(c)};k.prototype.temp=k.prototype.kelvin=k.prototype.temperature=function(){return gl(this._rgb)};const to=(...e)=>new k(...e,"temp");Object.assign(G,{temp:to,kelvin:to,temperature:to}),E.format.temp=E.format.kelvin=E.format.temperature=gc,k.prototype.oklch=function(){return oc(this._rgb)},Object.assign(G,{oklch:(...e)=>new k(...e,"oklch")}),E.format.oklch=sc,E.autodetect.push({p:2,test:(...e)=>{if(e=T(e,"oklch"),B(e)==="array"&&e.length===3)return"oklch"}}),Object.assign(G,{analyze:Ka,average:wf,bezier:Hf,blend:me,brewer:ol,Color:k,colors:We,contrast:Vf,contrastAPCA:Jf,cubehelix:Bf,deltaE:el,distance:tl,input:E,interpolate:Ue,limits:Da,mix:Ue,random:Ff,scale:jt,scales:nl,valid:rl});function vl(e){return+`${Math.ceil(`${e}e+2`)}e-2`}const vc=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)]},_c=(e,t,r)=>{const n=e/255,o=t/255,a=r/255,s=Math.min(n,o,a),c=Math.max(n,o,a),i=c-s;let u=0,l=0,f=0;return i===0?u=0:c===n?u=(o-a)/i%6:c===o?u=(a-n)/i+2:u=(n-o)/i+4,u=Math.round(u*60),u<0&&(u+=360),f=(c+s)/2,l=i===0?0:i/(1-Math.abs(2*f-1)),l=+(l*100).toFixed(1),f=+(f*100).toFixed(1),[u,l,Math.round(f)]},_l=(e,t,r,n)=>{const o=r/100,a=t*Math.min(o,1-o)/100,s=d=>{const b=(d+e/30)%12,_=o-a*Math.max(Math.min(b-3,9-b,1),-1);return Math.round(255*_).toString(16).padStart(2,"0").toUpperCase()},c=s(0),i=s(8),u=s(4),f=((d,b,_)=>Math.min(Math.max(d,b),_))(n,0,1),h=Math.round(f*255).toString(16).padStart(2,"0").toUpperCase();return`#${c}${i}${u}${h}`},yl=(e,t,r=1)=>{const n=vc(e),o=vc(t==="white"?"#FFFFFF":t==="black"?"#000000":t),a=n.map((u,l)=>[(u-o[l])/(255-o[l]),(u-o[l])/(0-o[l])]),s=vl(Math.max(...a.flat().filter(u=>/^-?\d+\.?\d*$/.test(u)))),c=n.map((u,l)=>Math.round((u-o[l]+o[l]*s)/s));if(c.includes(Number.NaN)){const u=_c(n[0],n[1],n[2]);return{h:u[0],s:Math.round(u[1]*r),l:u[2],a:1}}const i=_c(c[0],c[1],c[2]);return{h:i[0],s:Math.round(i[1]*r),l:i[2],a:s}},ro={backgroundColor:"gray",colorSpace:"OKLCH",colorSmoothing:!1,formula:"wcag2",output:"HEX",colors:{gray:[K(215,20,90),K(215,8,50),K(215,6,25)],red:[K(358,100,58),K(350,100,30)],orange:[K(32,100,48),K(12,100,30)],yellow:[K(50,100,50),K(25,100,20)],lime:[K(100,68,50),K(115,86,25)],green:[K(163,87,42),K(168,100,25)],cyan:[K(185,80,45),K(200,98,35)],blue:[K(212,98,46),K(222,95,25)],purple:[K(258,94,64),K(265,100,35)],fuchsia:[K(295,56,50),K(285,80,25)],pink:[K(334,90,50),K(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 K(e,t,r){return G.hsl(e,t/100,r/100).hex()}function wl(e,t){const r=e.colorSpace,n=e.colorSmoothing,o=e.themes[t].ratios,a=new qa({name:"gray",colorKeys:e.colors.gray,colorspace:r,ratios:o,smooth:n}),s=new ae({name:"blue",colorKeys:e.colors.blue,colorspace:r,ratios:o,smooth:n}),c=new ae({name:"cyan",colorKeys:e.colors.cyan,colorspace:r,ratios:o,smooth:n}),i=new ae({name:"fuchsia",colorKeys:e.colors.fuchsia,colorspace:r,ratios:o,smooth:n}),u=new ae({name:"green",colorKeys:e.colors.green,colorspace:r,ratios:o,smooth:n}),l=new ae({name:"lime",colorKeys:e.colors.lime,colorspace:r,ratios:o,smooth:n}),f=new ae({name:"orange",colorKeys:e.colors.orange,colorspace:r,ratios:o,smooth:n}),h=new ae({name:"pink",colorKeys:e.colors.pink,colorspace:r,ratios:o,smooth:n}),d=new ae({name:"purple",colorKeys:e.colors.purple,colorspace:r,ratios:o,smooth:n}),b=new ae({name:"red",colorKeys:e.colors.red,colorspace:r,ratios:o,smooth:n}),_=new ae({name:"yellow",colorKeys:e.colors.yellow,colorspace:r,ratios:o,smooth:n}),g={gray:a,red:b,orange:f,yellow:_,lime:l,green:u,cyan:c,blue:s,purple:d,fuchsia:i,pink:h};return e.colors.custom&&(g.custom=new ae({name:"custom",colorKeys:e.colors.custom,colorspace:r,ratios:o,smooth:n})),new wu({colors:Object.values(g),backgroundColor:g[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 yc(e){const t={};for(const r of Object.keys(e.themes))t[r]=wl(e,r);return t}function kl(e){ro.colors.custom=[e];const t=yc(ro);return Object.fromEntries(Object.entries(t).map(([r,n])=>{const o=n.find(s=>s&&s.name==="custom"),a=Object.fromEntries(o.values.map(({name:s,value:c})=>[s,c]));for(const[s,c]of Object.entries(a)){const i=yl(c,n[0].background);a[`alpha${s.charAt(0).toUpperCase()+s.slice(1)}`]=_l(i.h,i.s,i.l,i.a)}return[r,a]}))}return Fe.generateCustomColors=kl,Fe.generateThemesJson=yc,Fe.hslToHex=K,Fe.leonardoConfig=ro,Object.defineProperty(Fe,Symbol.toStringTag,{value:"Module"}),Fe})({});
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/annotations/CoreColorToken.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/annotations/CoreColorToken.kt
index a56ecb38a8..ad9e1eab7a 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/annotations/CoreColorToken.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/annotations/CoreColorToken.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/colors/SemanticColorsLightDark.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/colors/SemanticColorsLightDark.kt
new file mode 100644
index 0000000000..09064105ea
--- /dev/null
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/colors/SemanticColorsLightDark.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.compound.colors
+
+import io.element.android.compound.tokens.generated.SemanticColors
+import io.element.android.compound.tokens.generated.compoundColorsDark
+import io.element.android.compound.tokens.generated.compoundColorsLight
+
+data class SemanticColorsLightDark(
+    val light: SemanticColors,
+    val dark: SemanticColors,
+) {
+    companion object {
+        val default = SemanticColorsLightDark(
+            light = compoundColorsLight,
+            dark = compoundColorsDark,
+        )
+    }
+}
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorListPreview.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorListPreview.kt
index 715da1ebc3..761348804a 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorListPreview.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorListPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorPreview.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorPreview.kt
index 3248adeedf..396fd9e080 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorPreview.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorsSchemePreview.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorsSchemePreview.kt
index cf660ba236..f44e247dc1 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorsSchemePreview.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/ColorsSchemePreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0ee0546ca4..236e3627f4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -41,13 +42,13 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
-@Preview(widthDp = 730, heightDp = 1800)
+@Preview(widthDp = 730, heightDp = 1920)
 @Composable
 internal fun IconsCompoundPreviewLight() = ElementTheme {
     IconsCompoundPreview()
 }
 
-@Preview(widthDp = 730, heightDp = 1800)
+@Preview(widthDp = 730, heightDp = 1920)
 @Composable
 internal fun IconsCompoundPreviewRtl() = ElementTheme {
     CompositionLocalProvider(
@@ -59,7 +60,7 @@ internal fun IconsCompoundPreviewRtl() = ElementTheme {
     }
 }
 
-@Preview(widthDp = 730, heightDp = 1800)
+@Preview(widthDp = 730, heightDp = 1920)
 @Composable
 internal fun IconsCompoundPreviewDark() = ElementTheme(darkTheme = true) {
     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 d641ff39c5..3f5fb42149 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/Typography.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/Typography.kt
index 5d5f31f203..2f2ef942a7 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/Typography.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/Typography.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,13 +17,14 @@ import androidx.compose.ui.text.TextStyle
 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.tokens.compoundTypography
 
 @Preview
 @Composable
 internal fun TypographyPreview() = ElementTheme {
     Surface {
         Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-            with(ElementTheme.materialTypography) {
+            with(compoundTypography) {
                 TypographyTokenPreview(displayLarge, "Display large")
                 TypographyTokenPreview(displayMedium, "Display medium")
                 TypographyTokenPreview(displaySmall, "Display small")
@@ -43,6 +45,33 @@ internal fun TypographyPreview() = ElementTheme {
     }
 }
 
+@Preview
+@Composable
+internal fun CompoundTypographyPreview() = ElementTheme {
+    Surface {
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            with(ElementTheme.typography) {
+                TypographyTokenPreview(fontHeadingXlBold, "fontHeadingXlBold")
+                TypographyTokenPreview(fontHeadingXlRegular, "fontHeadingXlRegular")
+                TypographyTokenPreview(fontHeadingLgBold, "fontHeadingLgBold")
+                TypographyTokenPreview(fontHeadingLgRegular, "fontHeadingLgRegular")
+                TypographyTokenPreview(fontHeadingMdBold, "fontHeadingMdBold")
+                TypographyTokenPreview(fontHeadingMdRegular, "fontHeadingMdRegular")
+                TypographyTokenPreview(fontHeadingSmMedium, "fontHeadingSmMedium")
+                TypographyTokenPreview(fontHeadingSmRegular, "fontHeadingSmRegular")
+                TypographyTokenPreview(fontBodyLgMedium, "fontBodyLgMedium")
+                TypographyTokenPreview(fontBodyLgRegular, "fontBodyLgRegular")
+                TypographyTokenPreview(fontBodyMdMedium, "fontBodyMdMedium")
+                TypographyTokenPreview(fontBodyMdRegular, "fontBodyMdRegular")
+                TypographyTokenPreview(fontBodySmMedium, "fontBodySmMedium")
+                TypographyTokenPreview(fontBodySmRegular, "fontBodySmRegular")
+                TypographyTokenPreview(fontBodyXsMedium, "fontBodyXsMedium")
+                TypographyTokenPreview(fontBodyXsRegular, "fontBodyXsRegular")
+            }
+        }
+    }
+}
+
 @Composable
 private fun TypographyTokenPreview(style: TextStyle, text: String) {
     Text(text = text, style = style)
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/showkase/CompoundShowkaseRootModule.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/showkase/CompoundShowkaseRootModule.kt
index f1c7b3f8d7..4f36d0cc99 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/showkase/CompoundShowkaseRootModule.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/showkase/CompoundShowkaseRootModule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 506e1c8063..763f422a00 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7535de0acd..bb2ae2b62e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -61,14 +62,6 @@ object ElementTheme {
      */
     val typography: TypographyTokens = TypographyTokens
 
-    /**
-     * Material 3 [Typography] tokens. In Figma, these have the `M3 Typography/` prefix.
-     */
-    val materialTypography: Typography
-        @Composable
-        @ReadOnlyComposable
-        get() = MaterialTheme.typography
-
     /**
      * Returns whether the theme version used is the light or the dark one.
      */
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 cd168713ae..272245f199 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
+import io.element.android.compound.colors.SemanticColorsLightDark
 
 /**
  * Can be used to force a composable in dark theme.
@@ -23,6 +25,7 @@ import androidx.compose.ui.graphics.toArgb
  */
 @Composable
 fun ForcedDarkElementTheme(
+    colors: SemanticColorsLightDark,
     lightStatusBar: Boolean = false,
     content: @Composable () -> Unit,
 ) {
@@ -47,5 +50,11 @@ fun ForcedDarkElementTheme(
             )
         }
     }
-    ElementTheme(darkTheme = true, lightStatusBar = lightStatusBar, content = content)
+    ElementTheme(
+        darkTheme = true,
+        compoundLight = colors.light,
+        compoundDark = colors.dark,
+        lightStatusBar = lightStatusBar,
+        content = content,
+    )
 }
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/LegacyColors.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/LegacyColors.kt
index 6b7814d1e3..503804f0cb 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/LegacyColors.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/LegacyColors.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeDark.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeDark.kt
index 7ee6b631b5..6510b61a57 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeDark.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeDark.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeLight.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeLight.kt
index b179234429..df8fa572b6 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeLight.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialColorSchemeLight.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 724d440161..792c7fbabf 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f81b0a94f6..c2a923e926 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 06668e2952..131b14430c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/CompoundTypography.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/CompoundTypography.kt
index ab4d898ba4..9417a306bf 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/CompoundTypography.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/CompoundTypography.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 76b3275651..6c30eda7f9 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
@@ -1,11 +1,10 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-
 /**
  * !!! WARNING !!!
  * 
@@ -13,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated
 
@@ -55,6 +52,12 @@ object CompoundIcons {
     @Composable fun Audio(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_audio)
     }
+    @Composable fun Backspace(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_backspace)
+    }
+    @Composable fun BackspaceSolid(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_backspace_solid)
+    }
     @Composable fun Block(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_block)
     }
@@ -184,6 +187,9 @@ object CompoundIcons {
     @Composable fun ErrorSolid(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_error_solid)
     }
+    @Composable fun ExitFullScreen(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_exit_full_screen)
+    }
     @Composable fun Expand(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_expand)
     }
@@ -217,6 +223,9 @@ object CompoundIcons {
     @Composable fun Forward(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_forward)
     }
+    @Composable fun FullScreen(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_full_screen)
+    }
     @Composable fun Grid(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_grid)
     }
@@ -295,6 +304,12 @@ object CompoundIcons {
     @Composable fun Leave(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_leave)
     }
+    @Composable fun LeftPanelClose(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_left_panel_close)
+    }
+    @Composable fun LeftPanelOpen(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_left_panel_open)
+    }
     @Composable fun Link(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_link)
     }
@@ -502,6 +517,12 @@ object CompoundIcons {
     @Composable fun SignOut(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_sign_out)
     }
+    @Composable fun Space(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_space)
+    }
+    @Composable fun SpaceSolid(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_space_solid)
+    }
     @Composable fun Spinner(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_spinner)
     }
@@ -511,6 +532,9 @@ object CompoundIcons {
     @Composable fun SpotlightView(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_spotlight_view)
     }
+    @Composable fun Sticker(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_sticker)
+    }
     @Composable fun Strikethrough(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_strikethrough)
     }
@@ -619,12 +643,6 @@ object CompoundIcons {
     @Composable fun Windows(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_windows)
     }
-    @Composable fun Workspace(): ImageVector {
-        return ImageVector.vectorResource(R.drawable.ic_compound_workspace)
-    }
-    @Composable fun WorkspaceSolid(): ImageVector {
-        return ImageVector.vectorResource(R.drawable.ic_compound_workspace_solid)
-    }
 
     val all @Composable get() = persistentListOf<ImageVector>(
         Admin(),
@@ -637,6 +655,8 @@ object CompoundIcons {
         AskToJoinSolid(),
         Attachment(),
         Audio(),
+        Backspace(),
+        BackspaceSolid(),
         Block(),
         Bold(),
         Calendar(),
@@ -680,6 +700,7 @@ object CompoundIcons {
         EndCall(),
         Error(),
         ErrorSolid(),
+        ExitFullScreen(),
         Expand(),
         Explore(),
         ExportArchive(),
@@ -691,6 +712,7 @@ object CompoundIcons {
         Files(),
         Filter(),
         Forward(),
+        FullScreen(),
         Grid(),
         Group(),
         Guest(),
@@ -717,6 +739,8 @@ object CompoundIcons {
         Keyboard(),
         Labs(),
         Leave(),
+        LeftPanelClose(),
+        LeftPanelOpen(),
         Link(),
         Linux(),
         ListBulleted(),
@@ -786,9 +810,12 @@ object CompoundIcons {
         Shield(),
         Sidebar(),
         SignOut(),
+        Space(),
+        SpaceSolid(),
         Spinner(),
         Spotlight(),
         SpotlightView(),
+        Sticker(),
         Strikethrough(),
         SwitchCameraSolid(),
         TakePhoto(),
@@ -825,8 +852,6 @@ object CompoundIcons {
         Warning(),
         WebBrowser(),
         Windows(),
-        Workspace(),
-        WorkspaceSolid(),
     )
 
     val allResIds get() = persistentListOf(
@@ -840,6 +865,8 @@ object CompoundIcons {
         R.drawable.ic_compound_ask_to_join_solid,
         R.drawable.ic_compound_attachment,
         R.drawable.ic_compound_audio,
+        R.drawable.ic_compound_backspace,
+        R.drawable.ic_compound_backspace_solid,
         R.drawable.ic_compound_block,
         R.drawable.ic_compound_bold,
         R.drawable.ic_compound_calendar,
@@ -883,6 +910,7 @@ object CompoundIcons {
         R.drawable.ic_compound_end_call,
         R.drawable.ic_compound_error,
         R.drawable.ic_compound_error_solid,
+        R.drawable.ic_compound_exit_full_screen,
         R.drawable.ic_compound_expand,
         R.drawable.ic_compound_explore,
         R.drawable.ic_compound_export_archive,
@@ -894,6 +922,7 @@ object CompoundIcons {
         R.drawable.ic_compound_files,
         R.drawable.ic_compound_filter,
         R.drawable.ic_compound_forward,
+        R.drawable.ic_compound_full_screen,
         R.drawable.ic_compound_grid,
         R.drawable.ic_compound_group,
         R.drawable.ic_compound_guest,
@@ -920,6 +949,8 @@ object CompoundIcons {
         R.drawable.ic_compound_keyboard,
         R.drawable.ic_compound_labs,
         R.drawable.ic_compound_leave,
+        R.drawable.ic_compound_left_panel_close,
+        R.drawable.ic_compound_left_panel_open,
         R.drawable.ic_compound_link,
         R.drawable.ic_compound_linux,
         R.drawable.ic_compound_list_bulleted,
@@ -989,9 +1020,12 @@ object CompoundIcons {
         R.drawable.ic_compound_shield,
         R.drawable.ic_compound_sidebar,
         R.drawable.ic_compound_sign_out,
+        R.drawable.ic_compound_space,
+        R.drawable.ic_compound_space_solid,
         R.drawable.ic_compound_spinner,
         R.drawable.ic_compound_spotlight,
         R.drawable.ic_compound_spotlight_view,
+        R.drawable.ic_compound_sticker,
         R.drawable.ic_compound_strikethrough,
         R.drawable.ic_compound_switch_camera_solid,
         R.drawable.ic_compound_take_photo,
@@ -1028,7 +1062,5 @@ object CompoundIcons {
         R.drawable.ic_compound_warning,
         R.drawable.ic_compound_web_browser,
         R.drawable.ic_compound_windows,
-        R.drawable.ic_compound_workspace,
-        R.drawable.ic_compound_workspace_solid,
     )
 }
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/DO_NOT_MODIFY.txt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/DO_NOT_MODIFY.txt
index a6f7dd3f6a..4c88fb5a02 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/DO_NOT_MODIFY.txt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/DO_NOT_MODIFY.txt
@@ -1 +1 @@
-Files inside this package are generated automatically from the Compound project (https://github.com/vector-im/compound-design-tokens) and will be batch-replaced when new tokens are generated.
+Files inside this package are generated automatically from the Compound project (https://github.com/element-hq/compound-design-tokens) and will be batch-replaced when new tokens are generated.
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 8da51213f8..6136b04d4b 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
@@ -1,18 +1,10 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-
-@file:Suppress("all")
-package io.element.android.compound.tokens.generated
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.ui.graphics.Color
-
-
 /**
  * !!! WARNING !!!
  * 
@@ -20,13 +12,14 @@ import androidx.compose.ui.graphics.Color
  * DO NOT EDIT MANUALLY.
  */
 
+@file:Suppress("all")
+package io.element.android.compound.tokens.generated
 
-
+import androidx.compose.ui.graphics.Color
 
 /**
-  * This class holds all the semantic tokens of the Compound theme.
-  */
-@Immutable
+ * This class holds all the semantic tokens of the Compound theme.
+ */
 data class SemanticColors(
     /** Background colour for accent or brand actions. State: Hover */
     val bgAccentHovered: Color,
@@ -50,17 +43,21 @@ data class SemanticColors(
     val bgActionSecondaryPressed: Color,
     /** Background colour for secondary actions. State: Rest. */
     val bgActionSecondaryRest: Color,
+    /** Background colour for tertiary actions. State: Hover */
+    val bgActionTertiaryHovered: Color,
+    /** Background colour for tertiary actions. State: Rest */
+    val bgActionTertiaryRest: Color,
+    /** Background colour for tertiary actions. State: Selected */
+    val bgActionTertiarySelected: Color,
     /** Badge accent background colour */
     val bgBadgeAccent: Color,
     /** Badge default background colour */
     val bgBadgeDefault: Color,
     /** Badge info background colour */
     val bgBadgeInfo: Color,
-    /** Default global background for the user interface.
-Elevation: Default (Level 0) */
+    /** Default global background for the user interface. Elevation: Default (Level 0) */
     val bgCanvasDefault: Color,
-    /** Default global background for the user interface.
-Elevation: Level 1. */
+    /** Default global background for the user interface. Elevation: Level 1. */
     val bgCanvasDefaultLevel1: Color,
     /** Default background for disabled elements. There's no minimum contrast requirement. */
     val bgCanvasDisabled: Color,
@@ -86,14 +83,11 @@ Elevation: Level 1. */
     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 2). */
     val bgSubtlePrimary: Color,
-    /** Low contrast surfaces.
-Elevation: Default (Level 1). */
+    /** Low contrast surfaces. Elevation: Default (Level 1). */
     val bgSubtleSecondary: Color,
-    /** Lower contrast surfaces.
-Elevation: Level 0. */
+    /** Lower contrast surfaces. Elevation: Level 0. */
     val bgSubtleSecondaryLevel0: Color,
     /** Subtle background colour for success state elements. State: Rest. */
     val bgSuccessSubtle: Color,
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 5ccdfaa308..60afe79ae2 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
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated
 
@@ -36,9 +34,12 @@ val compoundColorsDark = SemanticColors(
     bgActionSecondaryHovered = DarkColorTokens.colorAlphaGray200,
     bgActionSecondaryPressed = DarkColorTokens.colorAlphaGray300,
     bgActionSecondaryRest = DarkColorTokens.colorThemeBg,
-    bgBadgeAccent = DarkColorTokens.colorAlphaGreen300,
-    bgBadgeDefault = DarkColorTokens.colorAlphaGray300,
-    bgBadgeInfo = DarkColorTokens.colorAlphaBlue300,
+    bgActionTertiaryHovered = DarkColorTokens.colorGray300,
+    bgActionTertiaryRest = DarkColorTokens.colorThemeBg,
+    bgActionTertiarySelected = DarkColorTokens.colorGray400,
+    bgBadgeAccent = DarkColorTokens.colorAlphaGreen500,
+    bgBadgeDefault = DarkColorTokens.colorAlphaGray500,
+    bgBadgeInfo = DarkColorTokens.colorAlphaBlue500,
     bgCanvasDefault = DarkColorTokens.colorThemeBg,
     bgCanvasDefaultLevel1 = DarkColorTokens.colorGray300,
     bgCanvasDisabled = DarkColorTokens.colorGray200,
@@ -88,7 +89,7 @@ val compoundColorsDark = SemanticColors(
     iconAccentTertiary = DarkColorTokens.colorGreen800,
     iconCriticalPrimary = DarkColorTokens.colorRed900,
     iconDisabled = DarkColorTokens.colorGray700,
-    iconInfoPrimary = DarkColorTokens.colorBlue900,
+    iconInfoPrimary = DarkColorTokens.colorBlue1100,
     iconOnSolidPrimary = DarkColorTokens.colorThemeBg,
     iconPrimary = DarkColorTokens.colorGray1400,
     iconPrimaryAlpha = DarkColorTokens.colorAlphaGray1400,
@@ -111,8 +112,8 @@ val compoundColorsDark = SemanticColors(
     textDecorative5 = DarkColorTokens.colorPink1100,
     textDecorative6 = DarkColorTokens.colorOrange1100,
     textDisabled = DarkColorTokens.colorGray800,
-    textInfoPrimary = DarkColorTokens.colorBlue900,
-    textLinkExternal = DarkColorTokens.colorBlue900,
+    textInfoPrimary = DarkColorTokens.colorBlue1100,
+    textLinkExternal = DarkColorTokens.colorBlue1100,
     textOnSolidPrimary = DarkColorTokens.colorThemeBg,
     textPrimary = DarkColorTokens.colorGray1400,
     textSecondary = DarkColorTokens.colorGray900,
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 88d2ef3abe..c718caeeeb 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
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated
 
@@ -36,9 +34,12 @@ val compoundColorsHcDark = SemanticColors(
     bgActionSecondaryHovered = DarkHcColorTokens.colorAlphaGray200,
     bgActionSecondaryPressed = DarkHcColorTokens.colorAlphaGray300,
     bgActionSecondaryRest = DarkHcColorTokens.colorThemeBg,
-    bgBadgeAccent = DarkHcColorTokens.colorAlphaGreen300,
-    bgBadgeDefault = DarkHcColorTokens.colorAlphaGray300,
-    bgBadgeInfo = DarkHcColorTokens.colorAlphaBlue300,
+    bgActionTertiaryHovered = DarkHcColorTokens.colorGray300,
+    bgActionTertiaryRest = DarkHcColorTokens.colorThemeBg,
+    bgActionTertiarySelected = DarkHcColorTokens.colorGray400,
+    bgBadgeAccent = DarkHcColorTokens.colorAlphaGreen500,
+    bgBadgeDefault = DarkHcColorTokens.colorAlphaGray500,
+    bgBadgeInfo = DarkHcColorTokens.colorAlphaBlue500,
     bgCanvasDefault = DarkHcColorTokens.colorThemeBg,
     bgCanvasDefaultLevel1 = DarkHcColorTokens.colorGray300,
     bgCanvasDisabled = DarkHcColorTokens.colorGray200,
@@ -88,7 +89,7 @@ val compoundColorsHcDark = SemanticColors(
     iconAccentTertiary = DarkHcColorTokens.colorGreen800,
     iconCriticalPrimary = DarkHcColorTokens.colorRed900,
     iconDisabled = DarkHcColorTokens.colorGray700,
-    iconInfoPrimary = DarkHcColorTokens.colorBlue900,
+    iconInfoPrimary = DarkHcColorTokens.colorBlue1100,
     iconOnSolidPrimary = DarkHcColorTokens.colorThemeBg,
     iconPrimary = DarkHcColorTokens.colorGray1400,
     iconPrimaryAlpha = DarkHcColorTokens.colorAlphaGray1400,
@@ -111,8 +112,8 @@ val compoundColorsHcDark = SemanticColors(
     textDecorative5 = DarkHcColorTokens.colorPink1100,
     textDecorative6 = DarkHcColorTokens.colorOrange1100,
     textDisabled = DarkHcColorTokens.colorGray800,
-    textInfoPrimary = DarkHcColorTokens.colorBlue900,
-    textLinkExternal = DarkHcColorTokens.colorBlue900,
+    textInfoPrimary = DarkHcColorTokens.colorBlue1100,
+    textLinkExternal = DarkHcColorTokens.colorBlue1100,
     textOnSolidPrimary = DarkHcColorTokens.colorThemeBg,
     textPrimary = DarkHcColorTokens.colorGray1400,
     textSecondary = DarkHcColorTokens.colorGray900,
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 03173ad24e..377997ec79 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
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated
 
@@ -36,9 +34,12 @@ val compoundColorsLight = SemanticColors(
     bgActionSecondaryHovered = LightColorTokens.colorAlphaGray200,
     bgActionSecondaryPressed = LightColorTokens.colorAlphaGray300,
     bgActionSecondaryRest = LightColorTokens.colorThemeBg,
-    bgBadgeAccent = LightColorTokens.colorAlphaGreen300,
-    bgBadgeDefault = LightColorTokens.colorAlphaGray300,
-    bgBadgeInfo = LightColorTokens.colorAlphaBlue300,
+    bgActionTertiaryHovered = LightColorTokens.colorGray300,
+    bgActionTertiaryRest = LightColorTokens.colorThemeBg,
+    bgActionTertiarySelected = LightColorTokens.colorGray400,
+    bgBadgeAccent = LightColorTokens.colorAlphaGreen400,
+    bgBadgeDefault = LightColorTokens.colorAlphaGray400,
+    bgBadgeInfo = LightColorTokens.colorAlphaBlue400,
     bgCanvasDefault = LightColorTokens.colorThemeBg,
     bgCanvasDefaultLevel1 = LightColorTokens.colorThemeBg,
     bgCanvasDisabled = LightColorTokens.colorGray200,
@@ -88,7 +89,7 @@ val compoundColorsLight = SemanticColors(
     iconAccentTertiary = LightColorTokens.colorGreen800,
     iconCriticalPrimary = LightColorTokens.colorRed900,
     iconDisabled = LightColorTokens.colorGray700,
-    iconInfoPrimary = LightColorTokens.colorBlue900,
+    iconInfoPrimary = LightColorTokens.colorBlue1100,
     iconOnSolidPrimary = LightColorTokens.colorThemeBg,
     iconPrimary = LightColorTokens.colorGray1400,
     iconPrimaryAlpha = LightColorTokens.colorAlphaGray1400,
@@ -111,8 +112,8 @@ val compoundColorsLight = SemanticColors(
     textDecorative5 = LightColorTokens.colorPink1100,
     textDecorative6 = LightColorTokens.colorOrange1100,
     textDisabled = LightColorTokens.colorGray800,
-    textInfoPrimary = LightColorTokens.colorBlue900,
-    textLinkExternal = LightColorTokens.colorBlue900,
+    textInfoPrimary = LightColorTokens.colorBlue1100,
+    textLinkExternal = LightColorTokens.colorBlue1100,
     textOnSolidPrimary = LightColorTokens.colorThemeBg,
     textPrimary = LightColorTokens.colorGray1400,
     textSecondary = LightColorTokens.colorGray900,
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 00100f7ea8..b32a0dd9f0 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
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated
 
@@ -36,9 +34,12 @@ val compoundColorsHcLight = SemanticColors(
     bgActionSecondaryHovered = LightHcColorTokens.colorAlphaGray200,
     bgActionSecondaryPressed = LightHcColorTokens.colorAlphaGray300,
     bgActionSecondaryRest = LightHcColorTokens.colorThemeBg,
-    bgBadgeAccent = LightHcColorTokens.colorAlphaGreen300,
-    bgBadgeDefault = LightHcColorTokens.colorAlphaGray300,
-    bgBadgeInfo = LightHcColorTokens.colorAlphaBlue300,
+    bgActionTertiaryHovered = LightHcColorTokens.colorGray300,
+    bgActionTertiaryRest = LightHcColorTokens.colorThemeBg,
+    bgActionTertiarySelected = LightHcColorTokens.colorGray400,
+    bgBadgeAccent = LightHcColorTokens.colorAlphaGreen400,
+    bgBadgeDefault = LightHcColorTokens.colorAlphaGray400,
+    bgBadgeInfo = LightHcColorTokens.colorAlphaBlue400,
     bgCanvasDefault = LightHcColorTokens.colorThemeBg,
     bgCanvasDefaultLevel1 = LightHcColorTokens.colorThemeBg,
     bgCanvasDisabled = LightHcColorTokens.colorGray200,
@@ -88,7 +89,7 @@ val compoundColorsHcLight = SemanticColors(
     iconAccentTertiary = LightHcColorTokens.colorGreen800,
     iconCriticalPrimary = LightHcColorTokens.colorRed900,
     iconDisabled = LightHcColorTokens.colorGray700,
-    iconInfoPrimary = LightHcColorTokens.colorBlue900,
+    iconInfoPrimary = LightHcColorTokens.colorBlue1100,
     iconOnSolidPrimary = LightHcColorTokens.colorThemeBg,
     iconPrimary = LightHcColorTokens.colorGray1400,
     iconPrimaryAlpha = LightHcColorTokens.colorAlphaGray1400,
@@ -111,8 +112,8 @@ val compoundColorsHcLight = SemanticColors(
     textDecorative5 = LightHcColorTokens.colorPink1100,
     textDecorative6 = LightHcColorTokens.colorOrange1100,
     textDisabled = LightHcColorTokens.colorGray800,
-    textInfoPrimary = LightHcColorTokens.colorBlue900,
-    textLinkExternal = LightHcColorTokens.colorBlue900,
+    textInfoPrimary = LightHcColorTokens.colorBlue1100,
+    textLinkExternal = LightHcColorTokens.colorBlue1100,
     textOnSolidPrimary = LightHcColorTokens.colorThemeBg,
     textPrimary = LightHcColorTokens.colorGray1400,
     textSecondary = LightHcColorTokens.colorGray900,
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/TypographyTokens.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/TypographyTokens.kt
index a25b79234c..0f450776ef 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/TypographyTokens.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/TypographyTokens.kt
@@ -1,11 +1,10 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-
 /**
  * !!! WARNING !!!
  * 
@@ -13,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkColorTokens.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkColorTokens.kt
index 1272c0df16..04dbf6b9f2 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkColorTokens.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkColorTokens.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated.internal
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkHcColorTokens.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkHcColorTokens.kt
index 31406f6ffc..8b2c04a93a 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkHcColorTokens.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/DarkHcColorTokens.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated.internal
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightColorTokens.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightColorTokens.kt
index 119db9dade..c7561c7ce9 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightColorTokens.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightColorTokens.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated.internal
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightHcColorTokens.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightHcColorTokens.kt
index 86624bb597..40c91c5b53 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightHcColorTokens.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/internal/LightHcColorTokens.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +12,6 @@
  * DO NOT EDIT MANUALLY.
  */
 
-
-
 @file:Suppress("all")
 package io.element.android.compound.tokens.generated.internal
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/utils/ColorUtils.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/utils/ColorUtils.kt
index f0c6c12fb0..778f5d70d2 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/utils/ColorUtils.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/utils/ColorUtils.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_admin.xml b/libraries/compound/src/main/res/drawable/ic_compound_admin.xml
index 8762195e7f..6cedd3ac01 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_admin.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_admin.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M12 4.24l-6 3V12c0 5.16 4.24 7.25 6 7.9 1.76-0.65 6-2.74 6-7.9V7.24z m-0.9-1.8a2 2 0 0 1 1.8 0l6 3a2 2 0 0 1 1.1 1.8V12c0 6.74-5.77 9.25-7.51 9.85-0.32 0.1-0.66 0.1-0.98 0C9.77 21.25 4 18.75 4 12V7.24a2 2 0 0 1 1.1-1.8z"/>
+  <path
+      android:pathData="m12,4.236 l-6,3L6,12c0,5.156 4.239,7.254 6,7.898 1.761,-0.644 6,-2.742 6,-7.898L18,7.236zM11.106,2.447a2,2 0,0 1,1.788 0l6,3A2,2 0,0 1,20 7.236L20,12c0,6.742 -5.773,9.246 -7.51,9.846 -0.32,0.111 -0.66,0.111 -0.98,0C9.774,21.246 4,18.743 4,12L4,7.236a2,2 0,0 1,1.106 -1.789z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_arrow_down.xml b/libraries/compound/src/main/res/drawable/ic_compound_arrow_down.xml
index 6d311ac7a2..ceb5dbf670 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_arrow_down.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_arrow_down.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 4.5a1 1 0 0 1 1 1v10.59l4.3-4.3a1 1 0 0 1 1.4 1.42l-6 6a1 1 0 0 1-1.4 0l-6-6a1 1 0 1 1 1.4-1.42l4.3 4.3V5.5a1 1 0 0 1 1-1"/>
+  <path
+      android:pathData="M12,4.5a1,1 0,0 1,1 1v10.586l4.293,-4.293a1,1 0,0 1,1.414 1.414l-6,6a1,1 0,0 1,-1.414 0l-6,-6a1,1 0,1 1,1.414 -1.414L11,16.086V5.5a1,1 0,0 1,1 -1"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_arrow_left.xml b/libraries/compound/src/main/res/drawable/ic_compound_arrow_left.xml
index 4e1949895f..0c87601fad 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_arrow_left.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_arrow_left.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.2 5.3a1 1 0 0 1 0 1.4L7.92 11H18.5a1 1 0 1 1 0 2H7.91l4.3 4.3a1 1 0 0 1-1.42 1.4l-6-6a1 1 0 0 1 0-1.4l6-6a1 1 0 0 1 1.42 0"/>
+  <path
+      android:pathData="M12.207,5.293a1,1 0,0 1,0 1.414L7.914,11H18.5a1,1 0,1 1,0 2H7.914l4.293,4.293a1,1 0,0 1,-1.414 1.414l-6,-6a1,1 0,0 1,0 -1.414l6,-6a1,1 0,0 1,1.414 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_arrow_right.xml b/libraries/compound/src/main/res/drawable/ic_compound_arrow_right.xml
index 4a42e3c16f..5703b5e079 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_arrow_right.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_arrow_right.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.8 5.3a1 1 0 0 1 1.4 0l6 6a1 1 0 0 1 0 1.4l-6 6a1 1 0 0 1-1.4-1.4l4.29-4.3H5.5a1 1 0 1 1 0-2h10.59l-4.3-4.3a1 1 0 0 1 0-1.4"/>
+  <path
+      android:pathData="M11.793,5.293a1,1 0,0 1,1.414 0l6,6a1,1 0,0 1,0 1.414l-6,6a1,1 0,0 1,-1.414 -1.414L16.086,13H5.5a1,1 0,1 1,0 -2h10.586l-4.293,-4.293a1,1 0,0 1,0 -1.414"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_arrow_up.xml b/libraries/compound/src/main/res/drawable/ic_compound_arrow_up.xml
index 7ff26b539a..8591911af3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_arrow_up.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_arrow_up.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 19.5a1 1 0 0 0 1-1V7.91l4.3 4.3a1 1 0 0 0 1.4-1.42l-6-6a1 1 0 0 0-1.4 0l-6 6a1 1 0 1 0 1.4 1.42L11 7.9V18.5a1 1 0 0 0 1 1"/>
+  <path
+      android:pathData="M12,19.5a1,1 0,0 0,1 -1V7.914l4.293,4.293a1,1 0,0 0,1.414 -1.414l-6,-6a1,1 0,0 0,-1.414 0l-6,6a1,1 0,1 0,1.414 1.414L11,7.914V18.5a1,1 0,0 0,1 1"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_arrow_up_right.xml b/libraries/compound/src/main/res/drawable/ic_compound_arrow_up_right.xml
index ea686b6cff..9f04df4b91 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_arrow_up_right.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_arrow_up_right.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.92 6.62A1 1 0 0 1 18 7v8a1 1 0 1 1-2 0V9.41l-8.3 8.3a1 1 0 0 1-1.4-1.42L14.58 8H9a1 1 0 0 1 0-2h8a1 1 0 0 1 0.92 0.62"/>
+  <path
+      android:pathData="M17.924,6.617a1,1 0,0 1,0.076 0.38V15a1,1 0,1 1,-2 0V9.414l-8.293,8.293a1,1 0,0 1,-1.414 -1.414L14.586,8H9a1,1 0,0 1,0 -2h8a1,1 0,0 1,0.924 0.617"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join.xml b/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join.xml
index 2c2f779ab6..3d92b4c18a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 18.16q0.48 0 0.8-0.33 0.32-0.32 0.32-0.8h-2.24q0 0.48 0.32 0.8 0.32 0.33 0.8 0.33m-3.94-1.69h7.88a0.54 0.54 0 0 0 0.4-0.17 0.54 0.54 0 0 0 0-0.79 0.54 0.54 0 0 0-0.4-0.17h-0.57V12.7q0-1.24-0.67-2.25a3 3 0 0 0-1.86-1.3V8.88a0.82 0.82 0 0 0-0.24-0.6 0.82 0.82 0 0 0-0.6-0.24 0.82 0.82 0 0 0-0.84 0.84v0.29a3 3 0 0 0-1.86 1.29 3.97 3.97 0 0 0-0.68 2.25v2.64H8.06a0.54 0.54 0 0 0-0.4 0.17 0.54 0.54 0 0 0 0 0.79 0.54 0.54 0 0 0 0.4 0.17M3 19.84V9.72Q3 9.18 3.24 8.7 3.48 8.23 3.9 7.9l6.75-5.05q0.31-0.23 0.65-0.34Q11.63 2.4 12 2.4q0.37 0 0.7 0.1 0.34 0.12 0.65 0.35l6.75 5.06q0.42 0.3 0.66 0.79Q21 9.19 21 9.72v10.13q0 0.92-0.66 1.58t-1.59 0.66H5.25q-0.93 0-1.59-0.66T3 19.84m2.25 0h13.5V9.72L12 4.66 5.25 9.72z"/>
+  <path
+      android:pathData="M12,18.156q0.478,0 0.802,-0.323 0.323,-0.324 0.323,-0.802h-2.25q0,0.478 0.323,0.802 0.324,0.323 0.802,0.323M8.063,16.47h7.874a0.54,0.54 0,0 0,0.394 -0.169,0.54 0.54,0 0,0 0,-0.788 0.54,0.54 0,0 0,-0.393 -0.168h-0.563V12.7q0,-1.237 -0.675,-2.25a3,3 0,0 0,-1.856 -1.294v-0.281a0.82,0.82 0,0 0,-0.24 -0.605,0.82 0.82,0 0,0 -0.604,-0.239 0.82,0.82 0,0 0,-0.844 0.844v0.281A3,3 0,0 0,9.3 10.45a3.97,3.97 0,0 0,-0.675 2.25v2.644h-0.562a0.54,0.54 0,0 0,-0.394 0.168,0.54 0.54,0 0,0 0,0.788 0.54,0.54 0,0 0,0.394 0.169M3,19.844V9.719q0,-0.534 0.24,-1.013 0.238,-0.478 0.66,-0.787l6.75,-5.063q0.31,-0.225 0.647,-0.337 0.338,-0.113 0.703,-0.113 0.366,0 0.703,0.113 0.337,0.112 0.647,0.337L20.1,7.92q0.422,0.309 0.66,0.787 0.24,0.479 0.24,1.013v10.125q0,0.927 -0.66,1.589 -0.662,0.66 -1.59,0.66H5.25q-0.928,0 -1.59,-0.66 -0.66,-0.66 -0.66,-1.59m2.25,0h13.5V9.719L12,4.656 5.25,9.72z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join_solid.xml
index 1346e2c889..5bd208e44c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_ask_to_join_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 17.75q0.48 0 0.8-0.32 0.32-0.33 0.32-0.8h-2.24q0 0.47 0.32 0.8 0.32 0.32 0.8 0.32m-3.94-1.69h7.88a0.54 0.54 0 0 0 0.4-0.17 0.54 0.54 0 0 0 0-0.79 0.54 0.54 0 0 0-0.4-0.16h-0.57v-2.65q0-1.23-0.67-2.25a3 3 0 0 0-1.86-1.29V8.47a0.82 0.82 0 0 0-0.24-0.6 0.82 0.82 0 0 0-0.6-0.25 0.82 0.82 0 0 0-0.84 0.85v0.28a3 3 0 0 0-1.86 1.3 3.97 3.97 0 0 0-0.68 2.24v2.65H8.06a0.54 0.54 0 0 0-0.4 0.17 0.54 0.54 0 0 0 0 0.78 0.54 0.54 0 0 0 0.4 0.17M3 19.44V9.3Q3 8.78 3.24 8.3T3.9 7.51l6.75-5.06q0.31-0.23 0.65-0.34Q11.63 2 12 2q0.37 0 0.7 0.11 0.34 0.12 0.65 0.34l6.75 5.06q0.42 0.31 0.66 0.79Q21 8.78 21 9.31v10.13q0 0.93-0.66 1.59t-1.59 0.66H5.25q-0.93 0-1.59-0.66T3 19.43"/>
+  <path
+      android:pathData="M12,17.75q0.478,0 0.802,-0.323 0.323,-0.324 0.323,-0.802h-2.25q0,0.478 0.323,0.802 0.324,0.323 0.802,0.323m-3.937,-1.687h7.874a0.54,0.54 0,0 0,0.394 -0.17,0.54 0.54,0 0,0 0,-0.788 0.54,0.54 0,0 0,-0.393 -0.168h-0.563v-2.643q0,-1.237 -0.675,-2.25a3,3 0,0 0,-1.856 -1.294v-0.281a0.82,0.82 0,0 0,-0.24 -0.605,0.82 0.82,0 0,0 -0.604,-0.239 0.82,0.82 0,0 0,-0.844 0.844v0.281A3,3 0,0 0,9.3 10.044a3.97,3.97 0,0 0,-0.675 2.25v2.643h-0.562a0.54,0.54 0,0 0,-0.394 0.17,0.54 0.54,0 0,0 0,0.787 0.54,0.54 0,0 0,0.394 0.168M3,19.438V9.313q0,-0.535 0.24,-1.013 0.238,-0.478 0.66,-0.788l6.75,-5.062q0.31,-0.225 0.647,-0.338Q11.635,2 12,2q0.366,0 0.703,0.112 0.337,0.113 0.647,0.338l6.75,5.063q0.422,0.309 0.66,0.787 0.24,0.478 0.24,1.012v10.126q0,0.927 -0.66,1.589 -0.662,0.66 -1.59,0.66H5.25q-0.928,0 -1.59,-0.66 -0.66,-0.66 -0.66,-1.59"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_attachment.xml b/libraries/compound/src/main/res/drawable/ic_compound_attachment.xml
index 4ddf7f4df7..7d96cfc20b 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_attachment.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_attachment.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.5 22q-2.3 0-3.9-1.6T6 16.5V6q0-1.65 1.18-2.83T10 2t2.83 1.18T14 6v9.5q0 1.05-0.72 1.77T11.5 18t-1.77-0.72T9 15.5V6.75A0.73 0.73 0 0 1 9.75 6a0.73 0.73 0 0 1 0.75 0.75v8.75q0 0.42 0.29 0.71t0.71 0.29q0.42 0 0.71-0.29a0.97 0.97 0 0 0 0.29-0.71V6q0-1.05-0.72-1.77T10 3.5 8.23 4.22 7.5 6v10.5q0 1.65 1.18 2.83t2.82 1.17 2.83-1.18 1.17-2.82V6.75A0.73 0.73 0 0 1 16.25 6 0.73 0.73 0 0 1 17 6.75v9.75q0 2.3-1.6 3.9T11.5 22"/>
+  <path
+      android:pathData="M11.5,22q-2.3,0 -3.9,-1.6T6,16.5V6q0,-1.65 1.175,-2.825T10,2t2.825,1.175T14,6v9.5q0,1.05 -0.725,1.775T11.5,18t-1.775,-0.725T9,15.5V6.75A0.73,0.73 0,0 1,9.75 6a0.73,0.73 0,0 1,0.75 0.75v8.75q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288 0.424,0 0.713,-0.288a0.97,0.97 0,0 0,0.287 -0.712V6q0,-1.05 -0.725,-1.775T10,3.5t-1.775,0.725T7.5,6v10.5q0,1.65 1.175,2.825T11.5,20.5t2.825,-1.175T15.5,16.5V6.75a0.73,0.73 0,0 1,0.75 -0.75,0.73 0.73,0 0,1 0.75,0.75v9.75q0,2.3 -1.6,3.9T11.5,22"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_audio.xml b/libraries/compound/src/main/res/drawable/ic_compound_audio.xml
index 5fb9365470..adb53a9675 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_audio.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_audio.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 3a1 1 0 0 1 1 1v16a1 1 0 1 1-2 0V4a1 1 0 0 1 1-1m4 3a1 1 0 0 1 1 1v10a1 1 0 1 1-2 0V7a1 1 0 0 1 1-1m5 4a1 1 0 1 0-2 0v4a1 1 0 1 0 2 0zM4 9a1 1 0 0 1 1 1v4a1 1 0 1 1-2 0v-4a1 1 0 0 1 1-1m5-2a1 1 0 0 0-2 0v10a1 1 0 1 0 2 0z"/>
+  <path
+      android:pathData="M12,3a1,1 0,0 1,1 1v16a1,1 0,1 1,-2 0V4a1,1 0,0 1,1 -1m4,3a1,1 0,0 1,1 1v10a1,1 0,1 1,-2 0V7a1,1 0,0 1,1 -1m5,4a1,1 0,1 0,-2 0v4a1,1 0,1 0,2 0zM4,9a1,1 0,0 1,1 1v4a1,1 0,1 1,-2 0v-4a1,1 0,0 1,1 -1m5,-2a1,1 0,0 0,-2 0v10a1,1 0,1 0,2 0z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_backspace.xml b/libraries/compound/src/main/res/drawable/ic_compound_backspace.xml
new file mode 100644
index 0000000000..90464cb595
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_backspace.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24H0z"/>
+    <path
+        android:pathData="M21.167,3.75L7.417,3.75c-0.633,0 -1.128,0.32 -1.458,0.807L1,12l4.96,7.434c0.33,0.486 0.824,0.816 1.457,0.816h13.75A1.84,1.84 0,0 0,23 18.417L23,5.583a1.84,1.84 0,0 0,-1.833 -1.833m0,14.667L7.48,18.417L3.2,12l4.272,-6.417h13.695zM10.542,16.583 L13.833,13.293 17.124,16.583 18.417,15.291L15.126,12l3.29,-3.29 -1.292,-1.293 -3.29,3.29 -3.291,-3.29L9.25,8.709 12.54,12l-3.29,3.29z"
+        android:fillColor="#FF000000"/>
+  </group>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_backspace_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_backspace_solid.xml
new file mode 100644
index 0000000000..27d5805811
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_backspace_solid.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.15,4H7.283c-0.638,0 -1.137,0.311 -1.47,0.782l-4.66,6.73a0.87,0.87 0,0 0,0 0.986l4.66,6.72c0.333,0.462 0.832,0.782 1.47,0.782h13.869C22.168,20 23,19.2 23,18.222V5.778C23,4.8 22.168,4 21.15,4m-3.42,11.822a0.947,0.947 0,0 1,-1.304 0l-2.672,-2.569 -2.672,2.57a0.947,0.947 0,0 1,-1.303 0,0.86 0.86,0 0,1 0,-1.254L12.45,12 9.779,9.431a0.86,0.86 0,0 1,0 -1.253,0.947 0.947,0 0,1 1.303,0l2.672,2.569 2.672,-2.57a0.947,0.947 0,0 1,1.304 0c0.36,0.347 0.36,0.907 0,1.254L15.058,12l2.672,2.569a0.877,0.877 0,0 1,0 1.253"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_block.xml b/libraries/compound/src/main/res/drawable/ic_compound_block.xml
index 08ef51dce3..4519a8bb9c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_block.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_block.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 22a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.67-2.33T20 12q0-1.35-0.44-2.6a8 8 0 0 0-1.26-2.3L7.1 18.3q1.05 0.82 2.3 1.26T12 20m-6.3-3.1L16.9 5.7a8 8 0 0 0-2.3-1.26A7.8 7.8 0 0 0 12 4Q8.65 4 6.33 6.33T4 12q0 1.35 0.44 2.6a8 8 0 0 0 1.26 2.3"/>
+  <path
+      android:pathData="M12,22a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22m0,-2q3.35,0 5.675,-2.325T20,12q0,-1.35 -0.437,-2.6A8,8 0,0 0,18.3 7.1L7.1,18.3q1.05,0.825 2.3,1.262T12,20m-6.3,-3.1L16.9,5.7a8,8 0,0 0,-2.3 -1.263A7.8,7.8 0,0 0,12 4Q8.65,4 6.325,6.325T4,12q0,1.35 0.438,2.6A8,8 0,0 0,5.7 16.9"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_bold.xml b/libraries/compound/src/main/res/drawable/ic_compound_bold.xml
index 2546a230cc..ca871203db 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_bold.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_bold.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.8 19q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 6.8 17V7q0-0.82 0.59-1.41A1.93 1.93 0 0 1 8.8 5h3.52q1.63 0 3 1t1.38 2.78q0 1.27-0.57 1.96-0.58 0.68-1.08 0.98 0.63 0.28 1.39 1.03Q17.2 13.5 17.2 15q0 2.22-1.62 3.11Q13.95 19 12.53 19z m1.02-2.8h2.6q1.2 0 1.47-0.61 0.26-0.62 0.26-0.89 0-0.28-0.26-0.89-0.27-0.61-1.54-0.61H9.82z m0-5.7h2.33q0.83 0 1.2-0.42a1.4 1.4 0 0 0 0.38-0.96q0-0.6-0.43-0.97t-1.1-0.38H9.82z"/>
+  <path
+      android:pathData="M8.8,19q-0.824,0 -1.413,-0.587A1.93,1.93 0,0 1,6.8 17L6.8,7q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,8.8 5h3.525q1.624,0 3,1T16.7,8.775q0,1.275 -0.575,1.963 -0.575,0.687 -1.075,0.987 0.626,0.275 1.387,1.025 0.763,0.75 0.763,2.25 0,2.224 -1.625,3.113 -1.625,0.887 -3.05,0.887zM9.825,16.2h2.6q1.2,0 1.462,-0.612 0.263,-0.614 0.263,-0.888 0,-0.275 -0.263,-0.887 -0.262,-0.613 -1.537,-0.613L9.825,13.2zM9.825,10.5h2.325q0.825,0 1.2,-0.425a1.4,1.4 0,0 0,0.375 -0.95q0,-0.6 -0.425,-0.975t-1.1,-0.375L9.825,7.775z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_calendar.xml b/libraries/compound/src/main/res/drawable/ic_compound_calendar.xml
index 72a9fe5868..490317cf85 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_calendar.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_calendar.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 22q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 20V6q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 4h1V2h2v2h8V2h2v2h1q0.82 0 1.41 0.59Q21 5.17 21 6v14q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 22z m0-2h14V10H5zM5 8h14V6H5z m7 6a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 13q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 12q0.42 0 0.71 0.29T13 13q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 14m-4 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 7 13q0-0.42 0.29-0.71A0.97 0.97 0 0 1 8 12q0.42 0 0.71 0.29T9 13t-0.29 0.71A0.97 0.97 0 0 1 8 14m8 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 15 13q0-0.42 0.29-0.71A0.97 0.97 0 0 1 16 12q0.42 0 0.71 0.29T17 13q0 0.42-0.29 0.71A0.97 0.97 0 0 1 16 14m-4 4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 17q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 16q0.42 0 0.71 0.29T13 17q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 18m-4 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 7 17q0-0.42 0.29-0.71A0.97 0.97 0 0 1 8 16q0.42 0 0.71 0.29T9 17q0 0.42-0.29 0.71A0.97 0.97 0 0 1 8 18m8 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 15 17q0-0.42 0.29-0.71A0.97 0.97 0 0 1 16 16q0.42 0 0.71 0.29T17 17q0 0.42-0.29 0.71A0.97 0.97 0 0 1 16 18"/>
+  <path
+      android:pathData="M5,22q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 20L3,6q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 4h1L6,2h2v2h8L16,2h2v2h1q0.824,0 1.413,0.588Q21,5.175 21,6v14q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 22zM5,20h14L19,10L5,10zM5,8h14L19,6L5,6zM12,14a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 13q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 12q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713 0,0.424 -0.287,0.713A0.97,0.97 0,0 1,12 14m-4,0a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,7 13q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,8 12q0.424,0 0.713,0.287Q9,12.576 9,13t-0.287,0.713A0.97,0.97 0,0 1,8 14m8,0a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,15 13q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,16 12q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713A0.97,0.97 0,0 1,16 14m-4,4a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,11 17q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,12 16q0.424,0 0.713,0.288 0.287,0.287 0.287,0.712 0,0.424 -0.287,0.712A0.97,0.97 0,0 1,12 18m-4,0a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,7 17q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,8 16q0.424,0 0.713,0.288Q9,16.575 9,17q0,0.424 -0.287,0.712A0.97,0.97 0,0 1,8 18m8,0a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,15 17q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,16 16q0.424,0 0.712,0.288 0.288,0.287 0.288,0.712 0,0.424 -0.288,0.712A0.97,0.97 0,0 1,16 18"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chart.xml b/libraries/compound/src/main/res/drawable/ic_compound_chart.xml
index cc1c8fb662..c729cf8599 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chart.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chart.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8 17q0.42 0 0.71-0.29A0.97 0.97 0 0 0 9 16v-5a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 8 10a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 7 11v5q0 0.42 0.29 0.71T8 17m4 0q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 16V8a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 7a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 8v8q0 0.42 0.29 0.71T12 17m4 0q0.42 0 0.71-0.29A0.97 0.97 0 0 0 17 16v-2a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 16 13a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 15 14v2q0 0.42 0.29 0.71T16 17M5 21q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 3h14q0.82 0 1.41 0.59T21 5v14q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 21z m0-2h14V5H5z"/>
+  <path
+      android:pathData="M8,17q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,9 16v-5a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,8 10a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,7 11v5q0,0.424 0.287,0.712Q7.576,17 8,17m4,0q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,13 16L13,8a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 7a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 8v8q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288m4,0q0.424,0 0.712,-0.288A0.97,0.97 0,0 0,17 16v-2a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,16 13a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,15 14v2q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288M5,21q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19L3,5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 3h14q0.824,0 1.413,0.587Q21,4.176 21,5v14q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 21zM5,19h14L19,5L5,5z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chat.xml b/libraries/compound/src/main/res/drawable/ic_compound_chat.xml
index 3a7e70841b..f27c3d9c1e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chat.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chat.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M1.5 21.25l1.45-4.95a10.2 10.2 0 0 1-0.71-2.1A10.2 10.2 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22q-1.13 0-2.2-0.24a10.2 10.2 0 0 1-2.1-0.71L2.75 22.5a0.94 0.94 0 0 1-1-0.25 0.94 0.94 0 0 1-0.25-1m2.45-1.2l3.2-0.95a1 1 0 0 1 0.28-0.06l0.27-0.01q0.23 0 0.44 0.03 0.21 0.04 0.41 0.14a7.4 7.4 0 0 0 1.68 0.6Q11.1 20 12 20q3.35 0 5.67-2.33T20 12t-2.33-5.67T12 4 6.33 6.33 4 12q0 0.9 0.2 1.77t0.6 1.68q0.18 0.33 0.19 0.69T4.9 16.85z"/>
+  <path
+      android:pathData="m1.5,21.25 l1.45,-4.95a10.2,10.2 0,0 1,-0.712 -2.1A10.2,10.2 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22q-1.125,0 -2.2,-0.238a10.2,10.2 0,0 1,-2.1 -0.712L2.75,22.5a0.94,0.94 0,0 1,-1 -0.25,0.94 0.94,0 0,1 -0.25,-1m2.45,-1.2 l3.2,-0.95a1,1 0,0 1,0.275 -0.062q0.15,-0.013 0.275,-0.013 0.225,0 0.438,0.038 0.212,0.036 0.412,0.137a7.4,7.4 0,0 0,1.675 0.6Q11.1,20 12,20q3.35,0 5.675,-2.325T20,12t-2.325,-5.675T12,4 6.325,6.325 4,12q0,0.9 0.2,1.775t0.6,1.675q0.176,0.325 0.188,0.688t-0.088,0.712z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chat_new.xml b/libraries/compound/src/main/res/drawable/ic_compound_chat_new.xml
index 8bf9f6762f..73e84889f8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chat_new.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chat_new.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19 6h-2a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 16 5q0-0.42 0.29-0.71A0.97 0.97 0 0 1 17 4h2V2q0-0.42 0.29-0.71A0.97 0.97 0 0 1 20 1q0.42 0 0.71 0.29Q21 1.57 21 2v2h2q0.42 0 0.71 0.29T24 5t-0.29 0.71A0.97 0.97 0 0 1 23 6h-2v2q0 0.42-0.29 0.71A0.97 0.97 0 0 1 20 9a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 19 8z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22 17v-6.34A6 6 0 0 1 20 11v6H6a2 2 0 0 0-1.41 0.59L4 18.17V5h10c0-0.7 0.12-1.37 0.34-2H4a2 2 0 0 0-2 2v15.59c0 0.89 1.08 1.33 1.7 0.7L6 19h14a2 2 0 0 0 2-2"/>
+  <path
+      android:pathData="M19,6h-2a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,16 5q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,17 4h2V2q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,20 1q0.424,0 0.712,0.288Q21,1.575 21,2v2h2q0.424,0 0.712,0.287Q24,4.576 24,5t-0.288,0.713A0.97,0.97 0,0 1,23 6h-2v2q0,0.424 -0.288,0.713A0.97,0.97 0,0 1,20 9a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,19 8z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M22,17v-6.341A6,6 0,0 1,20 11v6H6a2,2 0,0 0,-1.414 0.586L4,18.172V5h10c0,-0.701 0.12,-1.374 0.341,-2H4a2,2 0,0 0,-2 2v15.586c0,0.89 1.077,1.337 1.707,0.707L6,19h14a2,2 0,0 0,2 -2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chat_problem.xml b/libraries/compound/src/main/res/drawable/ic_compound_chat_problem.xml
index 380358478a..ada411cb95 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chat_problem.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chat_problem.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.71 16.71A0.97 0.97 0 0 1 12 17a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 16q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 15q0.42 0 0.71 0.29T13 16q0 0.42-0.29 0.71m0-4A0.97 0.97 0 0 1 12 13a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 12V8q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 7q0.42 0 0.71 0.29T13 8v4q0 0.42-0.29 0.71"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.95 16.3a10.2 10.2 0 0 1-0.71-2.1A10.2 10.2 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22q-1.13 0-2.2-0.24a10.2 10.2 0 0 1-2.1-0.71L2.75 22.5a0.94 0.94 0 0 1-1-0.25 0.94 0.94 0 0 1-0.25-1z m4.2 2.8a1 1 0 0 1 0.28-0.06l0.27-0.01q0.23 0 0.44 0.03 0.21 0.04 0.41 0.14a7.4 7.4 0 0 0 1.68 0.6Q11.1 20 12 20q3.35 0 5.67-2.33T20 12t-2.33-5.67T12 4 6.33 6.33 4 12q0 0.9 0.2 1.77t0.6 1.68q0.18 0.33 0.19 0.69T4.9 16.85l-0.95 3.2z"/>
+  <path
+      android:pathData="M12.713,16.713A0.97,0.97 0,0 1,12 17a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,11 16q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 15q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713 0,0.424 -0.287,0.712m0,-3.999A0.97,0.97 0,0 1,12 13a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 12V8q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 7q0.424,0 0.713,0.287Q13,7.576 13,8v4q0,0.424 -0.287,0.713"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M2.95,16.3a10.2,10.2 0,0 1,-0.712 -2.1A10.2,10.2 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22q-1.125,0 -2.2,-0.238a10.2,10.2 0,0 1,-2.1 -0.712L2.75,22.5a0.94,0.94 0,0 1,-1 -0.25,0.94 0.94,0 0,1 -0.25,-1zM7.15,19.1a1,1 0,0 1,0.275 -0.062q0.15,-0.013 0.275,-0.013 0.225,0 0.438,0.038 0.212,0.036 0.412,0.137a7.4,7.4 0,0 0,1.675 0.6Q11.1,20 12,20q3.35,0 5.675,-2.325T20,12t-2.325,-5.675T12,4 6.325,6.325 4,12q0,0.9 0.2,1.775t0.6,1.675q0.176,0.325 0.188,0.688t-0.088,0.712l-0.95,3.2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chat_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_chat_solid.xml
index d08def35fe..28b82f2f12 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chat_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chat_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.95 16.3L1.5 21.25a0.94 0.94 0 0 0 0.25 1 0.94 0.94 0 0 0 1 0.25l4.95-1.45a10.2 10.2 0 0 0 2.1 0.71Q10.87 22 12 22a9.7 9.7 0 0 0 3.9-0.79 10.1 10.1 0 0 0 3.17-2.14q1.35-1.35 2.14-3.17A9.7 9.7 0 0 0 22 12a9.7 9.7 0 0 0-0.79-3.9 10.1 10.1 0 0 0-2.14-3.17q-1.35-1.35-3.17-2.14A9.7 9.7 0 0 0 12 2a9.7 9.7 0 0 0-3.9 0.79 10.1 10.1 0 0 0-3.17 2.14Q3.57 6.28 2.78 8.1A9.7 9.7 0 0 0 2 12q0 1.13 0.24 2.2 0.23 1.08 0.71 2.1"/>
+  <path
+      android:pathData="M2.95,16.3 L1.5,21.25a0.94,0.94 0,0 0,0.25 1,0.94 0.94,0 0,0 1,0.25l4.95,-1.45a10.2,10.2 0,0 0,2.1 0.712Q10.875,22 12,22a9.7,9.7 0,0 0,3.9 -0.788,10.1 10.1,0 0,0 3.175,-2.137q1.35,-1.35 2.137,-3.175A9.7,9.7 0,0 0,22 12a9.7,9.7 0,0 0,-0.788 -3.9,10.1 10.1,0 0,0 -2.137,-3.175q-1.35,-1.35 -3.175,-2.137A9.7,9.7 0,0 0,12 2a9.7,9.7 0,0 0,-3.9 0.788,10.1 10.1,0 0,0 -3.175,2.137Q3.575,6.275 2.788,8.1A9.7,9.7 0,0 0,2 12q0,1.125 0.238,2.2 0.237,1.076 0.712,2.1"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_check.xml b/libraries/compound/src/main/res/drawable/ic_compound_check.xml
index 78f935c940..8a823ed3d7 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_check.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_check.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9.55 17.57q-0.2 0-0.38-0.06a0.9 0.9 0 0 1-0.32-0.21L4.55 13q-0.27-0.27-0.26-0.71 0.01-0.44 0.29-0.71a0.95 0.95 0 0 1 0.7-0.28q0.42 0 0.7 0.28l3.57 3.57 8.47-8.47Q18.3 6.4 18.74 6.4q0.44 0 0.71 0.28 0.28 0.27 0.28 0.7 0 0.45-0.28 0.72l-9.2 9.2q-0.15 0.15-0.33 0.21a1.1 1.1 0 0 1-0.37 0.06"/>
+  <path
+      android:pathData="M9.55,17.575q-0.2,0 -0.375,-0.062a0.9,0.9 0,0 1,-0.325 -0.213L4.55,13q-0.274,-0.274 -0.262,-0.713 0.012,-0.437 0.287,-0.712a0.95,0.95 0,0 1,0.7 -0.275q0.425,0 0.7,0.275L9.55,15.15l8.475,-8.475q0.274,-0.275 0.713,-0.275 0.437,0 0.712,0.275 0.275,0.274 0.275,0.713 0,0.437 -0.275,0.712l-9.2,9.2q-0.15,0.15 -0.325,0.212a1.1,1.1 0,0 1,-0.375 0.063"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_check_circle.xml b/libraries/compound/src/main/res/drawable/ic_compound_check_circle.xml
index 8d6147246b..6522854364 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_check_circle.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_check_circle.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10.6 13.8l-2.15-2.15a0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28 0.95 0.95 0 0 0-0.28 0.7q0 0.42 0.28 0.7L9.9 15.9q0.3 0.3 0.7 0.3t0.7-0.3l5.65-5.65a0.95 0.95 0 0 0 0.28-0.7 0.95 0.95 0 0 0-0.28-0.7 0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28zM12 22a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.67-2.33T20 12t-2.33-5.67T12 4 6.33 6.33 4 12t2.33 5.67T12 20"/>
+  <path
+      android:pathData="m10.6,13.8 l-2.15,-2.15a0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275 0.95,0.95 0,0 0,-0.275 0.7q0,0.425 0.275,0.7L9.9,15.9q0.3,0.3 0.7,0.3t0.7,-0.3l5.65,-5.65a0.95,0.95 0,0 0,0.275 -0.7,0.95 0.95,0 0,0 -0.275,-0.7 0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275zM12,22a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22m0,-2q3.35,0 5.675,-2.325T20,12t-2.325,-5.675T12,4 6.325,6.325 4,12t2.325,5.675T12,20"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_check_circle_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_check_circle_solid.xml
index d258a5c97a..7c35f577de 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_check_circle_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_check_circle_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10.6 13.8l-2.15-2.15a0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28 0.95 0.95 0 0 0-0.28 0.7q0 0.42 0.28 0.7L9.9 15.9q0.3 0.3 0.7 0.3t0.7-0.3l5.65-5.65a0.95 0.95 0 0 0 0.28-0.7 0.95 0.95 0 0 0-0.28-0.7 0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28zM12 22a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22"/>
+  <path
+      android:pathData="m10.6,13.8 l-2.15,-2.15a0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275 0.95,0.95 0,0 0,-0.275 0.7q0,0.425 0.275,0.7L9.9,15.9q0.3,0.3 0.7,0.3t0.7,-0.3l5.65,-5.65a0.95,0.95 0,0 0,0.275 -0.7,0.95 0.95,0 0,0 -0.275,-0.7 0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275zM12,22a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chevron_down.xml b/libraries/compound/src/main/res/drawable/ic_compound_chevron_down.xml
index 2ac456e988..1adf6f4126 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chevron_down.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chevron_down.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 14.95q-0.2 0-0.38-0.06a0.9 0.9 0 0 1-0.32-0.22l-4.6-4.6a0.95 0.95 0 0 1-0.27-0.7q0-0.42 0.27-0.7A0.95 0.95 0 0 1 7.4 8.4q0.43 0 0.7 0.28l3.9 3.9 3.9-3.9a0.95 0.95 0 0 1 0.7-0.28q0.42 0 0.7 0.28a0.95 0.95 0 0 1 0.28 0.7 0.95 0.95 0 0 1-0.28 0.7l-4.6 4.6q-0.15 0.15-0.32 0.2A1.1 1.1 0 0 1 12 14.96"/>
+  <path
+      android:pathData="M12,14.95q-0.2,0 -0.375,-0.062a0.9,0.9 0,0 1,-0.325 -0.213l-4.6,-4.6a0.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.275l3.9,3.9 3.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-4.6,4.6q-0.15,0.15 -0.325,0.212a1.1,1.1 0,0 1,-0.375 0.063"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chevron_left.xml b/libraries/compound/src/main/res/drawable/ic_compound_chevron_left.xml
index 50316a4e81..8251b035da 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chevron_left.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chevron_left.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13.3 17.3l-4.6-4.6a0.9 0.9 0 0 1-0.21-0.32A1.1 1.1 0 0 1 8.43 12q0-0.2 0.06-0.38A0.9 0.9 0 0 1 8.7 11.3l4.6-4.6A0.95 0.95 0 0 1 14 6.43q0.42 0 0.7 0.27a0.95 0.95 0 0 1 0.27 0.7 0.95 0.95 0 0 1-0.27 0.7L10.8 12l3.9 3.9a0.95 0.95 0 0 1 0.28 0.7 0.95 0.95 0 0 1-0.28 0.7 0.95 0.95 0 0 1-0.7 0.28 0.95 0.95 0 0 1-0.7-0.28"/>
+  <path
+      android:pathData="m13.3,17.3 l-4.6,-4.6a0.9,0.9 0,0 1,-0.213 -0.325A1.1,1.1 0,0 1,8.425 12q0,-0.2 0.062,-0.375A0.9,0.9 0,0 1,8.7 11.3l4.6,-4.6a0.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.7L10.8,12l3.9,3.9a0.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.275"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chevron_right.xml b/libraries/compound/src/main/res/drawable/ic_compound_chevron_right.xml
index d19a9daa4d..6e22300e68 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chevron_right.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chevron_right.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.7 17.3a0.95 0.95 0 0 1-0.28-0.7q0-0.42 0.28-0.7l3.9-3.9-3.9-3.9a0.95 0.95 0 0 1-0.28-0.7q0-0.42 0.28-0.7a0.95 0.95 0 0 1 0.7-0.27q0.42 0 0.7 0.27l4.6 4.6q0.15 0.15 0.21 0.33 0.06 0.17 0.06 0.37t-0.06 0.38a0.9 0.9 0 0 1-0.21 0.32l-4.6 4.6a0.95 0.95 0 0 1-0.7 0.27 0.95 0.95 0 0 1-0.7-0.27"/>
+  <path
+      android:pathData="M8.7,17.3a0.95,0.95 0,0 1,-0.275 -0.7q0,-0.425 0.275,-0.7l3.9,-3.9 -3.9,-3.9a0.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.275l4.6,4.6q0.15,0.15 0.213,0.325 0.062,0.175 0.062,0.375t-0.062,0.375a0.9,0.9 0,0 1,-0.213 0.325l-4.6,4.6a0.95,0.95 0,0 1,-0.7 0.275,0.95 0.95,0 0,1 -0.7,-0.275"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_chevron_up.xml b/libraries/compound/src/main/res/drawable/ic_compound_chevron_up.xml
index d84ebade9c..063b1cf179 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chevron_up.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chevron_up.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 10.78l-3.9 3.9a0.95 0.95 0 0 1-0.7 0.27 0.95 0.95 0 0 1-0.7-0.27 0.95 0.95 0 0 1-0.28-0.7q0-0.43 0.28-0.7l4.6-4.6q0.15-0.15 0.32-0.22Q11.8 8.4 12 8.4t0.38 0.06a0.9 0.9 0 0 1 0.32 0.22l4.6 4.6a0.95 0.95 0 0 1 0.27 0.7 0.95 0.95 0 0 1-0.27 0.7 0.95 0.95 0 0 1-0.7 0.27 0.95 0.95 0 0 1-0.7-0.28z"/>
+  <path
+      android:pathData="m12,10.775 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.7l4.6,-4.6q0.15,-0.15 0.325,-0.212Q11.8,8.4 12,8.4t0.375,0.063a0.9,0.9 0,0 1,0.325 0.212l4.6,4.6a0.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_chevron_up_down.xml b/libraries/compound/src/main/res/drawable/ic_compound_chevron_up_down.xml
index 213dfbef9f..6add4ed5ab 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_chevron_up_down.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_chevron_up_down.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.22 8.32Q7.96 8.05 7.96 7.6t0.28-0.72L11.3 3.8q0.15-0.15 0.33-0.21Q11.8 3.52 12 3.52t0.39 0.07 0.31 0.21l3.1 3.1q0.27 0.27 0.26 0.71-0.01 0.44-0.28 0.72T15.04 8.6t-0.72-0.27L12 6 9.65 8.35Q9.38 8.62 8.94 8.61a1 1 0 0 1-0.71-0.28M12 20.56a0.9 0.9 0 0 1-0.38-0.07 1.3 1.3 0 0 1-0.32-0.2l-3.08-3.08q-0.27-0.27-0.27-0.72t0.28-0.72 0.72-0.28 0.73 0.28L12 18.1l2.35-2.35q0.27-0.27 0.71-0.26 0.44 0.01 0.71 0.29t0.28 0.72-0.28 0.73L12.7 20.3a1.03 1.03 0 0 1-0.7 0.28"/>
+  <path
+      android:pathData="M8.225,8.325Q7.95,8.05 7.95,7.6t0.275,-0.725L11.3,3.8q0.15,-0.15 0.325,-0.212 0.175,-0.063 0.375,-0.063t0.387,0.063 0.313,0.212l3.1,3.1q0.274,0.274 0.262,0.713 -0.012,0.437 -0.287,0.712t-0.725,0.275 -0.725,-0.275L12,6 9.65,8.35q-0.274,0.274 -0.713,0.263a1,1 0,0 1,-0.712 -0.288M12,20.575a0.9,0.9 0,0 1,-0.375 -0.075,1.3 1.3,0 0,1 -0.325,-0.2l-3.075,-3.075q-0.275,-0.275 -0.275,-0.725t0.275,-0.725 0.725,-0.275 0.725,0.275L12,18.1l2.35,-2.35q0.274,-0.274 0.713,-0.262 0.437,0.012 0.712,0.287t0.275,0.725 -0.275,0.725L12.7,20.3a1.03,1.03 0,0 1,-0.7 0.275"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_circle.xml b/libraries/compound/src/main/res/drawable/ic_compound_circle.xml
index d5a292aa3c..ef828f6627 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_circle.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_circle.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 22a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.13-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.07 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.67-2.33T20 12t-2.33-5.67T12 4 6.33 6.33 4 12t2.33 5.67T12 20"/>
+  <path
+      android:pathData="M12,22a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.138,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.787,-3.9a10.1,10.1 0,0 1,2.138 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.074,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22m0,-2q3.35,0 5.675,-2.325T20,12t-2.325,-5.675T12,4 6.325,6.325 4,12t2.325,5.675T12,20"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_close.xml b/libraries/compound/src/main/res/drawable/ic_compound_close.xml
index ef8a75f08a..c655fbd832 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_close.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_close.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.3 6.3a1 1 0 0 1 1.4 0l4.3 4.29 4.3-4.3a1 1 0 1 1 1.4 1.42L13.42 12l4.3 4.3a1 1 0 0 1-1.42 1.4L12 13.42l-4.3 4.3a1 1 0 0 1-1.4-1.42L10.58 12l-4.3-4.3a1 1 0 0 1 0-1.4"/>
+  <path
+      android:pathData="M6.293,6.293a1,1 0,0 1,1.414 0L12,10.586l4.293,-4.293a1,1 0,1 1,1.414 1.414L13.414,12l4.293,4.293a1,1 0,0 1,-1.414 1.414L12,13.414l-4.293,4.293a1,1 0,0 1,-1.414 -1.414L10.586,12 6.293,7.707a1,1 0,0 1,0 -1.414"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_cloud.xml b/libraries/compound/src/main/res/drawable/ic_compound_cloud.xml
index b96fd18250..689d7d770e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_cloud.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_cloud.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.5 20q-2.27 0-3.89-1.57T1 14.57q0-1.95 1.18-3.47 1.17-1.53 3.07-1.95 0.63-2.3 2.5-3.73T12 4q2.92 0 4.96 2.04T19 11q1.73 0.2 2.86 1.49A4.4 4.4 0 0 1 23 15.5q0 1.88-1.31 3.19Q20.37 20 18.5 20z m0-2h12q1.05 0 1.77-0.72T21 15.5t-0.72-1.77T18.5 13H17v-2q0-2.08-1.46-3.54T12 6 8.46 7.46 7 11H6.5q-1.45 0-2.48 1.02A3.37 3.37 0 0 0 3 14.5q0 1.45 1.02 2.48A3.37 3.37 0 0 0 6.5 18"/>
+  <path
+      android:pathData="M6.5,20q-2.275,0 -3.887,-1.575T1,14.575q0,-1.95 1.175,-3.475Q3.349,9.575 5.25,9.15q0.625,-2.3 2.5,-3.725T12,4q2.925,0 4.962,2.037T19,11q1.725,0.2 2.863,1.488A4.4,4.4 0,0 1,23 15.5q0,1.875 -1.312,3.188Q20.375,20 18.5,20zM6.5,18h12q1.05,0 1.775,-0.725T21,15.5t-0.725,-1.775T18.5,13L17,13v-2q0,-2.075 -1.463,-3.537Q14.075,6 12,6T8.463,7.463 7,11h-0.5q-1.45,0 -2.475,1.025A3.37,3.37 0,0 0,3 14.5q0,1.45 1.025,2.475A3.37,3.37 0,0 0,6.5 18"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_cloud_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_cloud_solid.xml
index 09a91809f3..784aef7d10 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_cloud_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_cloud_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7 20a5 5 0 0 1-0.98-9.9A5.5 5.5 0 0 1 15.75 7H16a4 4 0 0 1 3.94 4.72A4.5 4.5 0 0 1 18 19.97V20z"/>
+  <path
+      android:pathData="M7,20a5,5 0,0 1,-0.985 -9.903,5.5 5.5,0 0,1 9.734,-3.09Q15.874,7.002 16,7a4,4 0,0 1,3.936 4.716A4.5,4.5 0,0 1,18 19.973V20z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_code.xml b/libraries/compound/src/main/res/drawable/ic_compound_code.xml
index c17c73c201..08b2c47fcb 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_code.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_code.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.82 12l1.48-1.48q0.3-0.3 0.3-0.7t-0.3-0.7-0.71-0.3-0.72 0.3L6.7 11.3q-0.15 0.15-0.21 0.33A1.1 1.1 0 0 0 6.42 12q0 0.2 0.07 0.38A0.9 0.9 0 0 0 6.7 12.7l2.17 2.17q0.3 0.3 0.72 0.3 0.41 0 0.71-0.3t0.3-0.7-0.3-0.7z m6.35 0l-1.47 1.47q-0.3 0.3-0.3 0.7t0.3 0.7 0.71 0.3 0.71-0.3l2.18-2.17q0.15-0.15 0.21-0.33 0.06-0.17 0.06-0.37t-0.06-0.38a0.9 0.9 0 0 0-0.21-0.32l-2.18-2.17a1 1 0 0 0-1.42 0q-0.3 0.3-0.3 0.7t0.3 0.7zM5 21q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 3h14q0.82 0 1.41 0.59T21 5v14q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 21z m0-2h14V5H5z"/>
+  <path
+      android:pathData="m8.825,12 l1.475,-1.475q0.3,-0.3 0.3,-0.7t-0.3,-0.7 -0.713,-0.3 -0.712,0.3L6.7,11.3q-0.15,0.15 -0.213,0.325a1.1,1.1 0,0 0,-0.062 0.375q0,0.2 0.063,0.375a0.9,0.9 0,0 0,0.212 0.325l2.175,2.175q0.3,0.3 0.713,0.3 0.412,0 0.712,-0.3t0.3,-0.7 -0.3,-0.7zM15.175,12L13.7,13.475q-0.3,0.3 -0.3,0.7t0.3,0.7 0.713,0.3 0.712,-0.3L17.3,12.7q0.15,-0.15 0.212,-0.325 0.063,-0.175 0.063,-0.375t-0.062,-0.375a0.9,0.9 0,0 0,-0.213 -0.325l-2.175,-2.175a1,1 0,0 0,-1.425 0q-0.3,0.3 -0.3,0.7t0.3,0.7zM5,21q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19L3,5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 3h14q0.824,0 1.413,0.587Q21,4.176 21,5v14q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 21zM5,19h14L19,5L5,5z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_collapse.xml b/libraries/compound/src/main/res/drawable/ic_compound_collapse.xml
index 8cc9302197..55f25455b0 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_collapse.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_collapse.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 11.03a1 1 0 0 0 0.29 0.7v0.01c0.19 0.18 0.44 0.3 0.71 0.3h8a1 1 0 0 0 0-2h-5.59L22 3.43a1 1 0 0 0-1.41-1.4L14 8.61V3.03a1 1 0 1 0-2 0zM12 13a1 1 0 0 0-0.29-0.7A1 1 0 0 0 11 12H3a1 1 0 1 0 0 2h5.59L2 20.59A1 1 0 1 0 3.41 22L10 15.41V21a1 1 0 0 0 2 0z"/>
+  <path
+      android:pathData="M12,11.034a1,1 0,0 0,0.29 0.702l0.005,0.005c0.18,0.18 0.43,0.29 0.705,0.29h8a1,1 0,0 0,0 -2h-5.586L22,3.445a1,1 0,0 0,-1.414 -1.414L14,8.617L14,3.031a1,1 0,1 0,-2 0zM12,12.997a1,1 0,0 0,-0.29 -0.702l-0.005,-0.004A1,1 0,0 0,11 12L3,12a1,1 0,1 0,0 2h5.586L2,20.586A1,1 0,1 0,3.414 22L10,15.414L10,21a1,1 0,0 0,2 0z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_company.xml b/libraries/compound/src/main/res/drawable/ic_compound_company.xml
index 28a9232c13..d8397efc5b 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_company.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_company.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14 7h5a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h7a2 2 0 0 1 2 2z m-2-2H5v2h3a1 1 0 0 1 0 2H5v2h3a1 1 0 1 1 0 2H5v2h3a1 1 0 1 1 0 2H5v2h7z m2 4v2h2a1 1 0 1 1 0 2h-2v2h2a1 1 0 1 1 0 2h-2v2h5V9z"/>
+  <path
+      android:pathData="M14,7h5a2,2 0,0 1,2 2v10a2,2 0,0 1,-2 2L5,21a2,2 0,0 1,-2 -2L3,5a2,2 0,0 1,2 -2h7a2,2 0,0 1,2 2zM12,5L5,5v2h3a1,1 0,0 1,0 2L5,9v2h3a1,1 0,1 1,0 2L5,13v2h3a1,1 0,1 1,0 2L5,17v2h7zM14,9v2h2a1,1 0,1 1,0 2h-2v2h2a1,1 0,1 1,0 2h-2v2h5L19,9z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_compose.xml b/libraries/compound/src/main/res/drawable/ic_compound_compose.xml
index eaa9ca0ef1..fff7a7550a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_compose.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_compose.xml
@@ -4,11 +4,11 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M16.94 2.82a2 2 0 0 1 2.82 0l1.42 1.41a2 2 0 0 1 0 2.83l-7.07 7.07c-0.2 0.2-0.42 0.35-0.66 0.44a1 1 0 0 1-0.17 0.08l-4 1.33a1 1 0 0 1-1.26-1.27l1.33-4 0.08-0.16m10.33-4.9l-6.71 6.72-1.42-1.42 6.72-6.72z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
+  <path
+      android:pathData="M16.937,2.82a2,2 0,0 1,2.828 0l1.415,1.414a2,2 0,0 1,0 2.829l-7.071,7.07c-0.195,0.196 -0.42,0.342 -0.66,0.44a1,1 0,0 1,-0.168 0.072l-3.993,1.331a1,1 0,0 1,-1.265 -1.265l1.331,-3.992q0.03,-0.09 0.073,-0.168m10.338,-4.903 l-6.717,6.718 -1.414,-1.414 6.717,-6.718z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3,5a2,2 0,0 1,2 -2h6a1,1 0,1 1,0 2H5v14h14v-6a1,1 0,1 1,2 0v6a2,2 0,0 1,-2 2H5a2,2 0,0 1,-2 -2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_computer.xml b/libraries/compound/src/main/res/drawable/ic_compound_computer.xml
index 97748e8ffd..e3483f52e8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_computer.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_computer.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 18q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 2 16V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 4 3h16q0.82 0 1.41 0.59T22 5v11q0 0.82-0.59 1.41A1.93 1.93 0 0 1 20 18z m0-2h16V5H4z m-2 5a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 1 20q0-0.42 0.29-0.71A0.97 0.97 0 0 1 2 19h20q0.42 0 0.71 0.29T23 20q0 0.42-0.29 0.71A0.97 0.97 0 0 1 22 21z"/>
+  <path
+      android:pathData="M4,18q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,2 16L2,5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,4 3h16q0.824,0 1.413,0.587Q22,4.176 22,5v11q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,20 18zM4,16h16L20,5L4,5zM2,21a0.97,0.97 0,0 1,-0.712 -0.288A0.97,0.97 0,0 1,1 20q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,2 19h20q0.424,0 0.712,0.288 0.288,0.287 0.288,0.712 0,0.424 -0.288,0.712A0.97,0.97 0,0 1,22 21z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_copy.xml b/libraries/compound/src/main/res/drawable/ic_compound_copy.xml
index 4492c5aca9..b163c0c61e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_copy.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_copy.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14 5H5v9h1a1 1 0 1 1 0 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1a1 1 0 1 1-2 0z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8 10a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-9a2 2 0 0 1-2-2z m2 0v9h9v-9z"/>
+  <path
+      android:pathData="M14,5H5v9h1a1,1 0,1 1,0 2H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h9a2,2 0,0 1,2 2v1a1,1 0,1 1,-2 0z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M8,10a2,2 0,0 1,2 -2h9a2,2 0,0 1,2 2v9a2,2 0,0 1,-2 2h-9a2,2 0,0 1,-2 -2zM10,10v9h9v-9z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_dark_mode.xml b/libraries/compound/src/main/res/drawable/ic_compound_dark_mode.xml
index bc4fa89cd4..74a9123108 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_dark_mode.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_dark_mode.xml
@@ -4,8 +4,8 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M17.98 17.31C13.33 15.66 10 11.22 10 6q0-0.9 0.13-1.78a8 8 0 1 0 7.85 13.1m1.82-1.56c0.67 0.15 1.1 0.86 0.74 1.45A10 10 0 0 1 12 22C6.48 22 2 17.52 2 12S6.48 2 12 2c0.4 0 0.65 0.42 0.52 0.8A10 10 0 0 0 12 6c0 4.77 3.34 8.76 7.8 9.76"/>
+  <path
+      android:pathData="M17.983,17.31C13.332,15.66 10,11.22 10,6q0,-0.907 0.132,-1.78a8,8 0,1 0,7.852 13.091m1.82,-1.552c0.668,0.15 1.094,0.863 0.737,1.447A10,10 0,0 1,12 22C6.477,22 2,17.523 2,12S6.477,2 12,2c0.402,0 0.653,0.416 0.524,0.797A10,10 0,0 0,12 6c0,4.768 3.337,8.757 7.803,9.758"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_delete.xml b/libraries/compound/src/main/res/drawable/ic_compound_delete.xml
index dd2e3b50d0..e072ce70c5 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_delete.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_delete.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7 21q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 5 19V6a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 4 5q0-0.42 0.29-0.71A0.97 0.97 0 0 1 5 4h4q0-0.42 0.29-0.71A0.97 0.97 0 0 1 10 3h4q0.42 0 0.71 0.29T15 4h4q0.42 0 0.71 0.29T20 5t-0.29 0.71A0.97 0.97 0 0 1 19 6v13q0 0.82-0.59 1.41A1.93 1.93 0 0 1 17 21zM7 6v13h10V6z m2 10q0 0.42 0.29 0.71T10 17t0.71-0.29A0.97 0.97 0 0 0 11 16V9a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 10 8a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 9 9z m4 0q0 0.42 0.29 0.71T14 17q0.42 0 0.71-0.29A0.97 0.97 0 0 0 15 16V9a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 14 8a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 13 9z"/>
+  <path
+      android:pathData="M7,21q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,5 19L5,6a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,4 5q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,5 4h4q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,10 3h4q0.424,0 0.713,0.288Q15,3.575 15,4h4q0.424,0 0.712,0.287Q20,4.576 20,5t-0.288,0.713A0.97,0.97 0,0 1,19 6v13q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,17 21zM7,6v13h10L17,6zM9,16q0,0.424 0.287,0.712Q9.576,17 10,17t0.713,-0.288A0.97,0.97 0,0 0,11 16L11,9a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,10 8a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,9 9zM13,16q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288 0.424,0 0.713,-0.288A0.97,0.97 0,0 0,15 16L15,9a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,14 8a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,13 9z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_devices.xml b/libraries/compound/src/main/res/drawable/ic_compound_devices.xml
index a399d675cf..e2bb7c1b33 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_devices.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_devices.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.5 20q-0.63 0-1.06-0.44A1.45 1.45 0 0 1 2 18.5q0-0.63 0.44-1.06A1.45 1.45 0 0 1 3.5 17H4V6q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 4h14q0.42 0 0.71 0.29T21 5t-0.29 0.71A0.97 0.97 0 0 1 20 6H6v11h4.5q0.62 0 1.06 0.44Q12 17.87 12 18.5t-0.44 1.06A1.45 1.45 0 0 1 10.5 20zM15 20a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 14 19V9q0-0.42 0.29-0.71A0.97 0.97 0 0 1 15 8h6q0.42 0 0.71 0.29T22 9v10q0 0.42-0.29 0.71A0.97 0.97 0 0 1 21 20z m1-3h4v-7h-4z"/>
+  <path
+      android:pathData="M3.5,20q-0.625,0 -1.062,-0.437A1.45,1.45 0,0 1,2 18.5q0,-0.625 0.438,-1.062A1.45,1.45 0,0 1,3.5 17L4,17L4,6q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,6 4h14q0.424,0 0.712,0.287Q21,4.576 21,5t-0.288,0.713A0.97,0.97 0,0 1,20 6L6,6v11h4.5q0.624,0 1.063,0.438 0.437,0.437 0.437,1.062t-0.437,1.063A1.45,1.45 0,0 1,10.5 20zM15,20a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,14 19L14,9q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,15 8h6q0.424,0 0.712,0.287Q22,8.576 22,9v10q0,0.424 -0.288,0.712A0.97,0.97 0,0 1,21 20zM16,17h4v-7h-4z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_dial_pad.xml b/libraries/compound/src/main/res/drawable/ic_compound_dial_pad.xml
index 1967b8df77..a6cbc94255 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_dial_pad.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_dial_pad.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 18.6c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8M6.6 2.4c-0.99 0-1.8 0.81-1.8 1.8S5.61 6 6.6 6s1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8m0 5.4c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8m0 5.4c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8M17.4 6c0.99 0 1.8-0.81 1.8-1.8s-0.81-1.8-1.8-1.8-1.8 0.81-1.8 1.8S16.41 6 17.4 6M12 13.2c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8m5.4 0c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8m0-5.4c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8m-5.4 0c-0.99 0-1.8 0.81-1.8 1.8s0.81 1.8 1.8 1.8 1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8m0-5.4c-0.99 0-1.8 0.81-1.8 1.8S11.01 6 12 6s1.8-0.81 1.8-1.8-0.81-1.8-1.8-1.8"/>
+  <path
+      android:pathData="M12,18.6c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8M6.6,2.4c-0.99,0 -1.8,0.81 -1.8,1.8S5.61,6 6.6,6s1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8m0,5.4c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8m0,5.4c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8M17.4,6c0.99,0 1.8,-0.81 1.8,-1.8s-0.81,-1.8 -1.8,-1.8 -1.8,0.81 -1.8,1.8 0.81,1.8 1.8,1.8M12,13.2c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8m5.4,0c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8m0,-5.4c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8m-5.4,0c-0.99,0 -1.8,0.81 -1.8,1.8s0.81,1.8 1.8,1.8 1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8m0,-5.4c-0.99,0 -1.8,0.81 -1.8,1.8S11.01,6 12,6s1.8,-0.81 1.8,-1.8 -0.81,-1.8 -1.8,-1.8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_document.xml b/libraries/compound/src/main/res/drawable/ic_compound_document.xml
index 830a36597a..ad96267f8c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_document.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_document.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9 18h6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 16 17a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 15 16H9a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 8 17q0 0.42 0.29 0.71T9 18m0-4h6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 16 13a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 15 12H9a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 8 13q0 0.42 0.29 0.71T9 14m-3 8q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 20V4q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 2h7.17a1.98 1.98 0 0 1 1.4 0.57l4.86 4.86q0.27 0.27 0.42 0.63Q20 8.42 20 8.83V20q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 22z m7-14V4H6v16h12V9h-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 13 8"/>
+  <path
+      android:pathData="M9,18h6q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,16 17a0.97,0.97 0,0 0,-0.287 -0.712A0.97,0.97 0,0 0,15 16L9,16a0.97,0.97 0,0 0,-0.713 0.288A0.97,0.97 0,0 0,8 17q0,0.424 0.287,0.712Q8.576,18 9,18m0,-4h6q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,16 13a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,15 12L9,12a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,8 13q0,0.424 0.287,0.713Q8.576,14 9,14m-3,8q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 20L4,4q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,6 2h7.175a1.98,1.98 0,0 1,1.4 0.575l4.85,4.85q0.275,0.275 0.425,0.638 0.15,0.361 0.15,0.762L20,20q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 22zM13,8L13,4L6,4v16h12L18,9h-4a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,13 8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_download.xml b/libraries/compound/src/main/res/drawable/ic_compound_download.xml
index bf4c24ec26..04fa025ada 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_download.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_download.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 15.57q-0.2 0-0.38-0.06a0.9 0.9 0 0 1-0.32-0.21l-3.6-3.6A0.95 0.95 0 0 1 7.43 11q0-0.42 0.27-0.7 0.27-0.27 0.71-0.29t0.72 0.27L11 12.15V5q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 4q0.42 0 0.71 0.29T13 5v7.15l1.88-1.88q0.27-0.27 0.7-0.26 0.44 0.02 0.72 0.29a0.95 0.95 0 0 1 0.28 0.7 0.95 0.95 0 0 1-0.28 0.7l-3.6 3.6q-0.15 0.15-0.32 0.21A1.1 1.1 0 0 1 12 15.57M6 20q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 18v-2q0-0.42 0.29-0.71A0.97 0.97 0 0 1 5 15q0.42 0 0.71 0.29T6 16v2h12v-2q0-0.42 0.29-0.71A0.97 0.97 0 0 1 19 15q0.42 0 0.71 0.29T20 16v2q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 20z"/>
+  <path
+      android:pathData="M12,15.575q-0.2,0 -0.375,-0.062a0.9,0.9 0,0 1,-0.325 -0.213l-3.6,-3.6a0.95,0.95 0,0 1,-0.275 -0.7q0,-0.425 0.275,-0.7 0.274,-0.275 0.712,-0.288t0.713,0.263L11,12.15V5q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 4q0.424,0 0.713,0.287Q13,4.576 13,5v7.15l1.875,-1.875q0.274,-0.274 0.713,-0.263 0.437,0.014 0.712,0.288a0.95,0.95 0,0 1,0.275 0.7,0.95 0.95,0 0,1 -0.275,0.7l-3.6,3.6q-0.15,0.15 -0.325,0.212a1.1,1.1 0,0 1,-0.375 0.063M6,20q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 18v-2q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,5 15q0.424,0 0.713,0.287Q6,15.576 6,16v2h12v-2q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,19 15q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713v2q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 20z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_download_ios.xml b/libraries/compound/src/main/res/drawable/ic_compound_download_ios.xml
index 16a45ee188..7d17468555 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_download_ios.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_download_ios.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.76 17.65a1 1 0 0 1-1.52 0l-2.5-2.96a1 1 0 1 1 1.52-1.3L11 14.28V4a1 1 0 1 1 2 0v10.27l0.74-0.87a1 1 0 0 1 1.52 1.3z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 20V10h2a1 1 0 0 0 0-2H6a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V10a2 2 0 0 0-2-2h-2a1 1 0 1 0 0 2h2v10z"/>
+  <path
+      android:pathData="M12.763,17.646a1,1 0,0 1,-1.526 0l-2.5,-2.955a1,1 0,1 1,1.526 -1.292l0.737,0.871V4a1,1 0,1 1,2 0v10.27l0.737,-0.87a1,1 0,0 1,1.526 1.291z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M6,20V10h2a1,1 0,0 0,0 -2H6a2,2 0,0 0,-2 2v10a2,2 0,0 0,2 2h12a2,2 0,0 0,2 -2V10a2,2 0,0 0,-2 -2h-2a1,1 0,1 0,0 2h2v10z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_drag_grid.xml b/libraries/compound/src/main/res/drawable/ic_compound_drag_grid.xml
index 96697b574d..6f2825d45c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_drag_grid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_drag_grid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9 20q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 7 18q0-0.82 0.59-1.41A1.93 1.93 0 0 1 9 16q0.82 0 1.41 0.59T11 18t-0.59 1.41A1.93 1.93 0 0 1 9 20m6 0q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 13 18q0-0.82 0.59-1.41A1.93 1.93 0 0 1 15 16q0.82 0 1.41 0.59T17 18t-0.59 1.41A1.93 1.93 0 0 1 15 20m-6-6q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 7 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 9 10q0.82 0 1.41 0.59T11 12t-0.59 1.41A1.93 1.93 0 0 1 9 14m6 0q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 13 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 15 10q0.82 0 1.41 0.59T17 12t-0.59 1.41A1.93 1.93 0 0 1 15 14M9 8Q8.18 8 7.59 7.41A1.93 1.93 0 0 1 7 6q0-0.82 0.59-1.41A1.93 1.93 0 0 1 9 4q0.82 0 1.41 0.59Q11 5.17 11 6q0 0.82-0.59 1.41A1.93 1.93 0 0 1 9 8m6 0q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 13 6q0-0.82 0.59-1.41A1.93 1.93 0 0 1 15 4q0.82 0 1.41 0.59Q17 5.17 17 6q0 0.82-0.59 1.41A1.93 1.93 0 0 1 15 8"/>
+  <path
+      android:pathData="M9,20q-0.825,0 -1.412,-0.587A1.93,1.93 0,0 1,7 18q0,-0.824 0.588,-1.413A1.93,1.93 0,0 1,9 16q0.825,0 1.412,0.587Q11,17.176 11,18t-0.588,1.413A1.93,1.93 0,0 1,9 20m6,0q-0.825,0 -1.412,-0.587A1.93,1.93 0,0 1,13 18q0,-0.824 0.588,-1.413A1.93,1.93 0,0 1,15 16q0.824,0 1.413,0.587Q17,17.176 17,18t-0.587,1.413A1.93,1.93 0,0 1,15 20m-6,-6q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,7 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,9 10q0.825,0 1.412,0.588Q11,11.175 11,12t-0.588,1.412A1.93,1.93 0,0 1,9 14m6,0q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,13 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,15 10q0.824,0 1.413,0.588Q17,11.175 17,12t-0.587,1.412A1.93,1.93 0,0 1,15 14M9,8q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,7 6q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,9 4q0.825,0 1.412,0.588Q11,5.175 11,6q0,0.824 -0.588,1.412A1.93,1.93 0,0 1,9 8m6,0q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,13 6q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,15 4q0.824,0 1.413,0.588Q17,5.175 17,6q0,0.824 -0.587,1.412A1.93,1.93 0,0 1,15 8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_drag_list.xml b/libraries/compound/src/main/res/drawable/ic_compound_drag_list.xml
index 57fe86c0e8..f1b4a9818a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_drag_list.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_drag_list.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 15a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 4 14q0-0.42 0.29-0.71A0.97 0.97 0 0 1 5 13h14q0.42 0 0.71 0.29T20 14q0 0.42-0.29 0.71A0.97 0.97 0 0 1 19 15z m0-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 4 10q0-0.42 0.29-0.71A0.97 0.97 0 0 1 5 9h14q0.42 0 0.71 0.29T20 10t-0.29 0.71A0.97 0.97 0 0 1 19 11z"/>
+  <path
+      android:pathData="M5,15a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,4 14q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,5 13h14q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713A0.97,0.97 0,0 1,19 15zM5,11a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,4 10q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,5 9h14q0.424,0 0.712,0.287Q20,9.576 20,10t-0.288,0.713A0.97,0.97 0,0 1,19 11z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_earpiece.xml b/libraries/compound/src/main/res/drawable/ic_compound_earpiece.xml
index 66b495b304..d16021dfcf 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_earpiece.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_earpiece.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14 2c3.93 0 7 3.07 7 7a1 1 0 0 1-2 0c0-2.8-2.2-5-5-5S9 6.2 9 9c0 0.93 0.29 1.98 0.82 2.94 0.71 1.29 1.53 1.92 2.32 2.53 0.92 0.71 1.88 1.44 2.39 3 0.5 1.5 1 2.01 1.71 2.38C16.44 19.94 16.71 20 17 20c1.1 0 2-0.9 2-2a1 1 0 1 1 2 0 4 4 0 0 1-5.64 3.65c-1.36-0.71-2.13-1.73-2.73-3.55-0.32-0.98-0.9-1.43-1.71-2.05-0.87-0.67-1.94-1.5-2.85-3.15C7.38 11.65 7 10.26 7 9c0-3.93 3.07-7 7-7"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.14 1.3a1 1 0 0 1 1.43 1.4A8.97 8.97 0 0 0 5 9c0 2.3 0.86 4.4 2.28 5.99l0.3 0.31 0.06 0.08a1 1 0 0 1-1.42 1.39L6.15 16.7l-0.36-0.38A10.96 10.96 0 0 1 3 9c0-3 1.2-5.72 3.15-7.7M14 6.5a2.5 2.5 0 0 1 0 5 2.5 2.5 0 0 1 0-5"/>
+  <path
+      android:pathData="M14,2c3.93,0 7,3.07 7,7a1,1 0,0 1,-2 0c0,-2.8 -2.2,-5 -5,-5S9,6.2 9,9c0,0.93 0.29,1.98 0.82,2.94 0.71,1.29 1.53,1.92 2.32,2.53 0.92,0.71 1.88,1.44 2.39,3 0.5,1.5 1,2.01 1.71,2.38 0.2,0.09 0.47,0.15 0.76,0.15 1.1,0 2,-0.9 2,-2a1,1 0,1 1,2 0,4 4,0 0,1 -5.64,3.65c-1.36,-0.71 -2.13,-1.73 -2.73,-3.55 -0.32,-0.98 -0.9,-1.43 -1.71,-2.05 -0.87,-0.67 -1.94,-1.5 -2.85,-3.15C7.38,11.65 7,10.26 7,9c0,-3.93 3.07,-7 7,-7"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M6.145,1.3a1,1 0,0 1,1.427 1.4A8.97,8.97 0,0 0,5 9c0,2.3 0.862,4.397 2.281,5.988l0.291,0.312 0.069,0.077A1,1 0,0 1,6.22 16.77l-0.075,-0.07 -0.356,-0.38A10.96,10.96 0,0 1,3 9c0,-2.998 1.2,-5.717 3.145,-7.7M14,6.5a2.5,2.5 0,0 1,0 5,2.501 2.501,0 0,1 0,-5"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_edit.xml b/libraries/compound/src/main/res/drawable/ic_compound_edit.xml
index de0c0b345a..756c3f0347 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_edit.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_edit.xml
@@ -4,8 +4,8 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M15.7 2.64a2 2 0 0 1 2.84 0l2.82 2.82a2 2 0 0 1 0 2.83L9.61 20.05a1 1 0 0 1-0.47 0.26l-5.66 1.42a1 1 0 0 1-1.2-1.21l1.4-5.66a1 1 0 0 1 0.27-0.47z m1.23 7.26L14.1 7.07l-8.54 8.54-0.94 3.78 3.77-0.95z"/>
+  <path
+      android:pathData="M15.706,2.637a2,2 0,0 1,2.829 0l2.828,2.828a2,2 0,0 1,0 2.829L9.605,20.052a1,1 0,0 1,-0.465 0.263L3.483,21.73a1,1 0,0 1,-1.212 -1.213l1.414,-5.657a1,1 0,0 1,0.263 -0.465zM16.93,9.899L14.102,7.07l-8.544,8.544 -0.943,3.771 3.771,-0.943z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_edit_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_edit_solid.xml
index 33da283f4d..15bae108d0 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_edit_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_edit_solid.xml
@@ -4,8 +4,8 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M4.4 13.95l-0.03 0.02-0.42 0.42a1 1 0 0 0-0.26 0.46l-1.41 5.66a1 1 0 0 0 1.2 1.21l5.67-1.4a1 1 0 0 0 0.46-0.27L21.36 8.29a2 2 0 0 0 0-2.82l-2.82-2.83a2 2 0 0 0-2.83 0z m12.72-9.9l-2.97 2.97 2.83 2.83 2.97-2.97z"/>
+  <path
+      android:pathData="m4.393,13.95 l-0.02,0.02 -0.42,0.42a1,1 0,0 0,-0.264 0.465l-1.414,5.657a1,1 0,0 0,1.213 1.213l5.657,-1.414a1,1 0,0 0,0.464 -0.263L21.363,8.294a2,2 0,0 0,0 -2.829l-2.828,-2.828a2,2 0,0 0,-2.829 0zM17.12,4.052l-2.973,2.972 2.829,2.829 2.972,-2.972z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_email.xml b/libraries/compound/src/main/res/drawable/ic_compound_email.xml
index 223c9620f3..a63a85bc45 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_email.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_email.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2 6a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2z m2 0v1.41l8 4.45 8-4.45V6z m0 3.7V18h16V9.7l-7.51 4.17a1 1 0 0 1-0.98 0z"/>
+  <path
+      android:pathData="M2,6a2,2 0,0 1,2 -2h16a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2L4,20a2,2 0,0 1,-2 -2zM4,6v1.412l8,4.444 8,-4.444L20,6zM4,9.7L4,18h16L20,9.7l-7.514,4.174a1,1 0,0 1,-0.972 0z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_email_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_email_solid.xml
index f5c98f8cfa..f69732b0b3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_email_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_email_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 4h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2m0 5.11A1 1 0 0 0 4.51 10l7 3.89a1 1 0 0 0 0.98 0l7-3.9a1 1 0 1 0-0.98-1.74L12 11.86 5.49 8.24A1 1 0 0 0 4 9.1"/>
+  <path
+      android:pathData="M4,4h16a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2H4a2,2 0,0 1,-2 -2V6a2,2 0,0 1,2 -2m0,5.111a1,1 0,0 0,0.514 0.874l7,3.89a1,1 0,0 0,0.972 0l7,-3.89a1,1 0,1 0,-0.972 -1.748L12,11.856 5.486,8.237A1,1 0,0 0,4 9.111"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_end_call.xml b/libraries/compound/src/main/res/drawable/ic_compound_end_call.xml
index f58a645c6e..129af0a6b7 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_end_call.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_end_call.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.77 16.02L0.29 13.6A1.02 1.02 0 0 1 0 12.85q0-0.45 0.3-0.75A15.6 15.6 0 0 1 5.6 8.32 15.9 15.9 0 0 1 12 7q3.35 0 6.39 1.33a16 16 0 0 1 5.32 3.77Q24 12.4 24 12.85t-0.3 0.75l-2.46 2.42a1.05 1.05 0 0 1-1.4 0.1l-3.11-2.36a1.1 1.1 0 0 1-0.33-0.37 1.1 1.1 0 0 1-0.1-0.48v-2.27a13.6 13.6 0 0 0-2.12-0.53C13.46 10 12 9.94 12 9.94S10.54 10 9.83 10.1Q8.75 10.3 7.7 10.64v2.27q0 0.26-0.11 0.48a1.1 1.1 0 0 1-0.32 0.37l-3.12 2.37a1.05 1.05 0 0 1-1.4-0.1"/>
+  <path
+      android:pathData="m2.765,16.02 l-2.47,-2.416A1.02,1.02 0,0 1,0 12.852q0,-0.456 0.295,-0.751a15.6,15.6 0,0 1,5.316 -3.786A15.9,15.9 0,0 1,12 7q3.355,0 6.39,1.329a16,16 0,0 1,5.315 3.772q0.295,0.294 0.295,0.751t-0.295,0.752l-2.47,2.416a1.047,1.047 0,0 1,-1.396 0.108l-3.114,-2.363a1.1,1.1 0,0 1,-0.322 -0.376,1.1 1.1,0 0,1 -0.108,-0.483v-2.27a13.6,13.6 0,0 0,-2.12 -0.524C13.459,9.996 12,9.937 12,9.937s-1.459,0.059 -2.174,0.175q-1.074,0.174 -2.121,0.523v2.271q0,0.268 -0.108,0.483a1.1,1.1 0,0 1,-0.322 0.376l-3.114,2.363a1.047,1.047 0,0 1,-1.396 -0.107"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_error.xml b/libraries/compound/src/main/res/drawable/ic_compound_error.xml
index a4ea2f0016..97422a0cbd 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_error.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_error.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 17q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 16a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 15a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 16q0 0.42 0.29 0.71T12 17m0-4q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 12V8a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 7a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 8v4q0 0.42 0.29 0.71T12 13m0 9a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.67-2.33T20 12t-2.33-5.67T12 4 6.33 6.33 4 12t2.33 5.67T12 20"/>
+  <path
+      android:pathData="M12,17q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,13 16a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 15a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 16q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288m0,-4q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,13 12V8a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 7a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 8v4q0,0.424 0.287,0.713 0.288,0.287 0.713,0.287m0,9a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22m0,-2q3.35,0 5.675,-2.325T20,12t-2.325,-5.675T12,4 6.325,6.325 4,12t2.325,5.675T12,20"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_error_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_error_solid.xml
index 97b8ece183..1a3f07fa41 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_error_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_error_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 17q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 16a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 15a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 16q0 0.42 0.29 0.71T12 17m0-4q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 12V8a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 7a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 8v4q0 0.42 0.29 0.71T12 13m0 9a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22"/>
+  <path
+      android:pathData="M12,17q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,13 16a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 15a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 16q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288m0,-4q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,13 12V8a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 7a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 8v4q0,0.424 0.287,0.713 0.288,0.287 0.713,0.287m0,9a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_exit_full_screen.xml b/libraries/compound/src/main/res/drawable/ic_compound_exit_full_screen.xml
new file mode 100644
index 0000000000..2b806f8992
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_exit_full_screen.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="M10,20a1,1 0,1 1,-2 0v-4L4,16a1,1 0,1 1,0 -2h6zM20,14a1,1 0,1 1,0 2h-4v4a1,1 0,1 1,-2 0v-6zM9,3a1,1 0,0 1,1 1v6L4,10a1,1 0,0 1,0 -2h4L8,4a1,1 0,0 1,1 -1m6,0a1,1 0,0 1,1 1v4h4a1,1 0,1 1,0 2h-6L14,4a1,1 0,0 1,1 -1"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_expand.xml b/libraries/compound/src/main/res/drawable/ic_compound_expand.xml
index 88aef8abc1..50520c0689 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_expand.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_expand.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21 4a1 1 0 0 0-0.29-0.7A1 1 0 0 0 20 3h-8a1 1 0 1 0 0 2h5.59L5 17.59V12a1 1 0 1 0-2 0v8a1 1 0 0 0 0.29 0.7C3.48 20.9 3.73 21 4 21h8a1 1 0 1 0 0-2H6.41L19 6.41V12a1 1 0 1 0 2 0z"/>
+  <path
+      android:pathData="M21,3.997a1,1 0,0 0,-0.29 -0.702l-0.005,-0.004A1,1 0,0 0,20 3h-8a1,1 0,1 0,0 2h5.586L5,17.586V12a1,1 0,1 0,-2 0v8.003a1,1 0,0 0,0.29 0.702l0.005,0.004c0.18,0.18 0.43,0.291 0.705,0.291h8a1,1 0,1 0,0 -2H6.414L19,6.414V12a1,1 0,1 0,2 0z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_explore.xml b/libraries/compound/src/main/res/drawable/ic_compound_explore.xml
index 9b62efa291..51cf8c32be 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_explore.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_explore.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 13a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 12q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 11q0.42 0 0.71 0.29T13 12q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.67-2.33T20 12t-2.33-5.67T12 4 6.33 6.33 4 12t2.33 5.67T12 20m0 0q-3.35 0-5.67-2.33T4 12t2.33-5.67T12 4t5.67 2.33T20 12t-2.33 5.67T12 20m1.68-5.85q0.15-0.07 0.27-0.2t0.2-0.27l2.92-6.25q0.13-0.25-0.06-0.44t-0.44-0.06l-6.25 2.92q-0.15 0.08-0.27 0.2t-0.2 0.28l-2.92 6.25Q6.8 16.83 6.98 17q0.18 0.19 0.43 0.07z"/>
+  <path
+      android:pathData="M12,13a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 12q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 11q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713 0,0.424 -0.287,0.713A0.97,0.97 0,0 1,12 13m0,9a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22m0,-2q3.35,0 5.675,-2.325T20,12t-2.325,-5.675T12,4 6.325,6.325 4,12t2.325,5.675T12,20m0,0q-3.35,0 -5.675,-2.325T4,12t2.325,-5.675T12,4t5.675,2.325T20,12t-2.325,5.675T12,20m1.675,-5.85q0.15,-0.075 0.275,-0.2t0.2,-0.275l2.925,-6.25q0.125,-0.25 -0.062,-0.437 -0.188,-0.188 -0.438,-0.063l-6.25,2.925q-0.15,0.075 -0.275,0.2t-0.2,0.275l-2.925,6.25q-0.125,0.25 0.063,0.438 0.186,0.186 0.437,0.062z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_export_archive.xml b/libraries/compound/src/main/res/drawable/ic_compound_export_archive.xml
index f09775d0be..94ed347175 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_export_archive.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_export_archive.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 21q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19V6.5q0-0.38 0.13-0.68t0.32-0.57l1.4-1.7q0.2-0.27 0.5-0.41T6 3h12q0.35 0 0.65 0.14 0.3 0.13 0.5 0.41l1.4 1.7q0.2 0.28 0.32 0.57T21 6.5V19q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 21zM5.4 6h13.2l-0.85-1H6.25zM5 19h14V8H5z m7-1.43q0.2 0 0.38-0.06a0.9 0.9 0 0 0 0.32-0.21l2.6-2.6a0.95 0.95 0 0 0 0.27-0.7 0.95 0.95 0 0 0-0.27-0.7 0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28L13 14.2V11a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 10a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 11v3.2l-0.9-0.9a0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28 0.95 0.95 0 0 0-0.27 0.7q0 0.42 0.27 0.7l2.6 2.6q0.15 0.15 0.33 0.21 0.17 0.06 0.37 0.06"/>
+  <path
+      android:pathData="M5,21q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19L3,6.5q0,-0.375 0.125,-0.675t0.325,-0.575l1.4,-1.7q0.2,-0.274 0.5,-0.412T6,3h12q0.35,0 0.65,0.138 0.3,0.137 0.5,0.412l1.4,1.7q0.2,0.275 0.325,0.575T21,6.5L21,19q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 21zM5.4,6h13.2l-0.85,-1L6.25,5zM5,19h14L19,8L5,8zM12,17.575q0.2,0 0.375,-0.062a0.9,0.9 0,0 0,0.325 -0.213l2.6,-2.6a0.95,0.95 0,0 0,0.275 -0.7,0.95 0.95,0 0,0 -0.275,-0.7 0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275l-0.9,0.9L13,11a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 10a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 11v3.2l-0.9,-0.9a0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275 0.95,0.95 0,0 0,-0.275 0.7q0,0.425 0.275,0.7l2.6,2.6q0.15,0.15 0.325,0.212 0.175,0.063 0.375,0.063"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_extensions.xml b/libraries/compound/src/main/res/drawable/ic_compound_extensions.xml
index 1bd8ae7bce..d4c6aaa2f0 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_extensions.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_extensions.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.25 11.67a0.9 0.9 0 0 1-0.66-0.28L12.6 7.41a0.9 0.9 0 0 1-0.28-0.66q0-0.38 0.28-0.66l3.98-3.98a0.9 0.9 0 0 1 0.66-0.28q0.38 0 0.66 0.28l3.98 3.98a0.9 0.9 0 0 1 0.28 0.66 0.9 0.9 0 0 1-0.28 0.66l-3.98 3.98a0.9 0.9 0 0 1-0.66 0.28m2.48-4.92l-2.48-2.47-2.47 2.47 2.47 2.48zM4 11a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 3 10V4q0-0.42 0.29-0.71A0.97 0.97 0 0 1 4 3h6q0.42 0 0.71 0.29T11 4v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 10 11z m5-2V5H5v4z m5 12a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 13 20v-6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 14 13h6q0.42 0 0.71 0.29T21 14v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 20 21z m5-2v-4h-4v4zM4 21a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 3 20v-6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 4 13h6q0.42 0 0.71 0.29T11 14v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 10 21z m5-2v-4H5v4z"/>
+  <path
+      android:pathData="M17.25,11.672a0.9,0.9 0,0 1,-0.663 -0.282L12.61,7.413a0.9,0.9 0,0 1,-0.282 -0.663q0,-0.381 0.282,-0.663l3.977,-3.977a0.9,0.9 0,0 1,0.663 -0.282q0.381,0 0.663,0.282l3.977,3.977a0.9,0.9 0,0 1,0.282 0.663,0.9 0.9,0 0,1 -0.282,0.663l-3.977,3.977a0.9,0.9 0,0 1,-0.663 0.282m2.475,-4.922L17.25,4.275 14.775,6.75l2.475,2.475zM4,11a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,3 10L3,4q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,4 3h6q0.424,0 0.713,0.288Q11,3.575 11,4v6q0,0.424 -0.287,0.713A0.97,0.97 0,0 1,10 11zM9,9L9,5L5,5v4zM14,21a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,13 20v-6q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,14 13h6q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713v6q0,0.424 -0.288,0.712A0.97,0.97 0,0 1,20 21zM19,19v-4h-4v4zM4,21a0.97,0.97 0,0 1,-0.712 -0.288A0.97,0.97 0,0 1,3 20v-6q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,4 13h6q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713v6q0,0.424 -0.287,0.712A0.97,0.97 0,0 1,10 21zM9,19v-4L5,15v4z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_extensions_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_extensions_solid.xml
index 7873a49ed6..1b2a265084 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_extensions_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_extensions_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.91 11.39a0.9 0.9 0 0 1-0.66 0.28 0.9 0.9 0 0 1-0.66-0.28L12.6 7.41a0.9 0.9 0 0 1-0.28-0.66q0-0.38 0.28-0.66l3.98-3.98a0.9 0.9 0 0 1 0.66-0.28q0.38 0 0.66 0.28l3.98 3.98a0.9 0.9 0 0 1 0.28 0.66 0.9 0.9 0 0 1-0.28 0.66zM3.3 10.71Q3.58 11 4 11h6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 11 10V4a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 10 3H4a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 3 4v6q0 0.42 0.29 0.71m10 10Q13.58 21 14 21h6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 20v-6a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 13h-6a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 13 14v6q0 0.42 0.29 0.71m-10 0Q3.58 21 4 21h6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 11 20v-6a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 10 13H4a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 3 14v6q0 0.42 0.29 0.71"/>
+  <path
+      android:pathData="M17.913,11.39a0.9,0.9 0,0 1,-0.663 0.282,0.9 0.9,0 0,1 -0.663,-0.282L12.61,7.413a0.9,0.9 0,0 1,-0.282 -0.663q0,-0.381 0.282,-0.663l3.977,-3.977a0.9,0.9 0,0 1,0.663 -0.282q0.381,0 0.663,0.282l3.977,3.977a0.9,0.9 0,0 1,0.282 0.663,0.9 0.9,0 0,1 -0.282,0.663zM3.288,10.713Q3.575,11 4,11h6q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,11 10L11,4a0.97,0.97 0,0 0,-0.287 -0.712A0.97,0.97 0,0 0,10 3L4,3a0.97,0.97 0,0 0,-0.712 0.288A0.97,0.97 0,0 0,3 4v6q0,0.424 0.288,0.713m10,10Q13.575,21 14,21h6q0.424,0 0.712,-0.288A0.97,0.97 0,0 0,21 20v-6a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 13h-6a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,13 14v6q0,0.424 0.287,0.712m-9.999,0.001Q3.575,21 4,21h6q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,11 20v-6a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,10 13L4,13a0.97,0.97 0,0 0,-0.712 0.287A0.97,0.97 0,0 0,3 14v6q0,0.424 0.288,0.712"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_favourite.xml b/libraries/compound/src/main/res/drawable/ic_compound_favourite.xml
index f7845dc080..2d56178045 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_favourite.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_favourite.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13.9 9.38L12 5.52l-1.9 3.86L5.84 10l3.08 3-0.73 4.24 3.81-2 3.81 2L15.08 13l3.08-3zM8.77 7.55l2.33-4.73a1 1 0 0 1 1.8 0l2.33 4.73 5.23 0.76a1 1 0 0 1 0.55 1.7l-3.78 3.69 0.9 5.2a1 1 0 0 1-1.46 1.06L12 17.5l-4.67 2.46a1 1 0 0 1-1.45-1.06l0.89-5.2-3.78-3.68A1 1 0 0 1 3.54 8.3z"/>
+  <path
+      android:pathData="M13.905,9.378 L12,5.52l-1.905,3.86 -4.259,0.618 3.082,3.004 -0.727,4.242L12,15.24l3.81,2.003 -0.728,-4.242 3.082,-3.004zM8.767,7.55l2.336,-4.733a1,1 0,0 1,1.794 0l2.336,4.733 5.223,0.76a1,1 0,0 1,0.555 1.705L17.23,13.7l0.892,5.202a1,1 0,0 1,-1.45 1.054L12,17.5l-4.672,2.456a1,1 0,0 1,-1.451 -1.054l0.892,-5.202 -3.78,-3.685a1,1 0,0 1,0.555 -1.706z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_favourite_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_favourite_solid.xml
index 3fc393c572..21a77a1f2e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_favourite_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_favourite_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.9 2.82l2.33 4.73 5.23 0.76a1 1 0 0 1 0.55 1.7l-3.78 3.69 0.9 5.2a1 1 0 0 1-1.46 1.06L12 17.5l-4.67 2.46a1 1 0 0 1-1.45-1.06l0.89-5.2-3.78-3.68A1 1 0 0 1 3.54 8.3l5.23-0.76 2.33-4.73a1 1 0 0 1 1.8 0"/>
+  <path
+      android:pathData="m12.897,2.817 l2.336,4.733 5.223,0.76a1,1 0,0 1,0.555 1.705L17.23,13.7l0.892,5.202a1,1 0,0 1,-1.45 1.054L12,17.5l-4.672,2.456a1,1 0,0 1,-1.451 -1.054l0.892,-5.202 -3.78,-3.685a1,1 0,0 1,0.555 -1.706l5.223,-0.759 2.336,-4.733a1,1 0,0 1,1.794 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_file_error.xml b/libraries/compound/src/main/res/drawable/ic_compound_file_error.xml
index 13b3571ef8..b1c60efae3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_file_error.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_file_error.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 22q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 20V4q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 2h7.17a1.98 1.98 0 0 1 1.4 0.57l4.86 4.86q0.27 0.27 0.42 0.63Q20 8.42 20 8.83v3.51A6 6 0 0 0 18 12V9h-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 13 8V4H6v16h6.34c0.27 0.74 0.67 1.42 1.19 2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18 14a1 1 0 0 1 1 1v3a1 1 0 1 1-2 0v-3a1 1 0 0 1 1-1m-1 7a1 1 0 1 1 2 0 1 1 0 0 1-2 0"/>
+  <path
+      android:pathData="M6,22q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 20V4q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,6 2h7.175a1.98,1.98 0,0 1,1.4 0.575l4.85,4.85q0.275,0.275 0.425,0.638 0.15,0.361 0.15,0.762v3.516A6,6 0,0 0,18 12V9h-4a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,13 8V4H6v16h6.341c0.264,0.745 0.67,1.423 1.187,2z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M18,14a1,1 0,0 1,1 1v3a1,1 0,1 1,-2 0v-3a1,1 0,0 1,1 -1m-1,7a1,1 0,1 1,2 0,1 1,0 0,1 -2,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_files.xml b/libraries/compound/src/main/res/drawable/ic_compound_files.xml
index 67a30b6bd8..16b71ffbc2 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_files.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_files.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 22q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 20V4q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 2h7.17a1.98 1.98 0 0 1 1.4 0.57l4.86 4.86q0.27 0.27 0.42 0.63Q20 8.42 20 8.83V20q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 22z m7-14V4H6v16h12V9h-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 13 8"/>
+  <path
+      android:pathData="M6,22q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 20L4,4q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,6 2h7.175a1.98,1.98 0,0 1,1.4 0.575l4.85,4.85q0.275,0.275 0.425,0.638 0.15,0.361 0.15,0.762L20,20q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 22zM13,8L13,4L6,4v16h12L18,9h-4a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,13 8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_filter.xml b/libraries/compound/src/main/res/drawable/ic_compound_filter.xml
index 2f2b0e5f10..4fcbec8ffe 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_filter.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_filter.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 7a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2z m3 4a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2z m2 5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1"/>
+  <path
+      android:pathData="M5,7a1,1 0,0 0,0 2h14a1,1 0,1 0,0 -2zM8,11a1,1 0,1 0,0 2h8a1,1 0,1 0,0 -2zM10,16a1,1 0,0 1,1 -1h2a1,1 0,1 1,0 2h-2a1,1 0,0 1,-1 -1"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_forward.xml b/libraries/compound/src/main/res/drawable/ic_compound_forward.xml
index e614fabb4e..c489c159f8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_forward.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_forward.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.6 5.7a1 1 0 0 1 0-1.4 1 1 0 0 1 1.4 0L20.7 9c0.4 0.4 0.4 1.03 0 1.42L16 15.14a1 1 0 0 1-1.4 0 1 1 0 0 1 0-1.42l3.04-3.05H8.49c-1.9 0-3.49 1.6-3.49 3.66C5 16.4 6.6 18 8.5 18h2.09a1 1 0 1 1 0 2h-2.1C5.43 20 3 17.42 3 14.33S5.42 8.67 8.5 8.67h9.06z"/>
+  <path
+      android:pathData="M14.597,5.708a1.004,1.004 0,0 1,0 -1.416,0.996 0.996,0 0,1 1.412,0l4.699,4.714c0.39,0.391 0.39,1.025 0,1.416l-4.7,4.714a0.996,0.996 0,0 1,-1.411 0,1.004 1.004,0 0,1 0,-1.416l3.043,-3.053H8.487c-1.888,0 -3.485,1.604 -3.485,3.666C5.002,16.396 6.599,18 8.487,18h2.093a1,1 0,1 1,0 2H8.487c-3.067,0 -5.485,-2.575 -5.485,-5.667S5.42,8.667 8.487,8.667h9.059z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_full_screen.xml b/libraries/compound/src/main/res/drawable/ic_compound_full_screen.xml
new file mode 100644
index 0000000000..8042ed32c9
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_full_screen.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="M4,14a1,1 0,0 1,1 1v4h4a1,1 0,1 1,0 2L3,21v-6a1,1 0,0 1,1 -1m16,0a1,1 0,0 1,1 1v6h-6a1,1 0,1 1,0 -2h4v-4a1,1 0,0 1,1 -1M9,3a1,1 0,0 1,0 2L5,5v4a1,1 0,0 1,-2 0L3,3zM21,9a1,1 0,1 1,-2 0L19,5h-4a1,1 0,1 1,0 -2h6z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_grid.xml b/libraries/compound/src/main/res/drawable/ic_compound_grid.xml
index 223ed40a2f..023f9542b4 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_grid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_grid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 11a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 3 10V4q0-0.42 0.29-0.71A0.97 0.97 0 0 1 4 3h6q0.42 0 0.71 0.29T11 4v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 10 11z m5-2V5H5v4z m5 12a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 13 20v-6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 14 13h6q0.42 0 0.71 0.29T21 14v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 20 21z m5-2v-4h-4v4zM4 21a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 3 20v-6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 4 13h6q0.42 0 0.71 0.29T11 14v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 10 21z m5-2v-4H5v4z m5-8a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 13 10V4q0-0.42 0.29-0.71A0.97 0.97 0 0 1 14 3h6q0.42 0 0.71 0.29T21 4v6q0 0.42-0.29 0.71A0.97 0.97 0 0 1 20 11z m5-2V5h-4v4z"/>
+  <path
+      android:pathData="M4,11a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,3 10L3,4q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,4 3h6q0.424,0 0.713,0.288Q11,3.575 11,4v6q0,0.424 -0.287,0.713A0.97,0.97 0,0 1,10 11zM9,9L9,5L5,5v4zM14,21a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,13 20v-6q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,14 13h6q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713v6q0,0.424 -0.288,0.712A0.97,0.97 0,0 1,20 21zM19,19v-4h-4v4zM4,21a0.97,0.97 0,0 1,-0.712 -0.288A0.97,0.97 0,0 1,3 20v-6q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,4 13h6q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713v6q0,0.424 -0.287,0.712A0.97,0.97 0,0 1,10 21zM9,19v-4L5,15v4zM14,11a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,13 10L13,4q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,14 3h6q0.424,0 0.712,0.288Q21,3.575 21,4v6q0,0.424 -0.288,0.713A0.97,0.97 0,0 1,20 11zM19,9L19,5h-4v4z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_group.xml b/libraries/compound/src/main/res/drawable/ic_compound_group.xml
index 4781d1306b..800a941134 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_group.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_group.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M1 17.2q0-0.85 0.44-1.56 0.43-0.72 1.16-1.09a14.8 14.8 0 0 1 3.15-1.16A13.8 13.8 0 0 1 9 13q1.65 0 3.25 0.39 1.6 0.38 3.15 1.16 0.72 0.38 1.16 1.09Q17 16.35 17 17.2V18q0 0.82-0.59 1.41A1.93 1.93 0 0 1 15 20H3q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 1 18zM21 20h-2.55q0.27-0.45 0.41-0.96Q19 18.52 19 18v-1q0-1.1-0.61-2.11-0.62-1.02-1.74-1.74 1.27 0.15 2.4 0.51 1.12 0.37 2.1 0.89 0.9 0.5 1.38 1.11T23 17v1q0 0.82-0.59 1.41A1.93 1.93 0 0 1 21 20M9 12q-1.65 0-2.83-1.18T5 8t1.18-2.83T9 4t2.83 1.18T13 8t-1.18 2.83T9 12m10-4q0 1.65-1.18 2.83T15 12q-0.28 0-0.7-0.06a6 6 0 0 1-0.7-0.14 6 6 0 0 0 1.04-1.77Q15 9.04 15 8t-0.36-2.02A6 6 0 0 0 13.6 4.2a3 3 0 0 1 0.7-0.16Q14.65 4 15 4q1.65 0 2.83 1.18T19 8M3 18h12v-0.8a0.97 0.97 0 0 0-0.5-0.85q-1.35-0.68-2.73-1.01a11.6 11.6 0 0 0-5.54 0q-1.38 0.34-2.73 1.01A0.97 0.97 0 0 0 3 17.2z m6-8q0.82 0 1.41-0.59Q11 8.83 11 8q0-0.82-0.59-1.41A1.93 1.93 0 0 0 9 6Q8.18 6 7.59 6.59A1.93 1.93 0 0 0 7 8q0 0.82 0.59 1.41T9 10"/>
+  <path
+      android:pathData="M1,17.2q0,-0.85 0.438,-1.562 0.437,-0.713 1.162,-1.088a14.8,14.8 0,0 1,3.15 -1.163A13.8,13.8 0,0 1,9 13q1.65,0 3.25,0.387 1.6,0.388 3.15,1.163 0.724,0.375 1.162,1.087Q17,16.35 17,17.2v0.8q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,15 20L3,20q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,1 18zM21,20h-2.55q0.274,-0.45 0.413,-0.962Q19,18.525 19,18v-1q0,-1.1 -0.613,-2.113 -0.612,-1.012 -1.737,-1.737 1.275,0.15 2.4,0.512 1.125,0.363 2.1,0.888 0.9,0.5 1.375,1.112T23,17v1q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,21 20M9,12q-1.65,0 -2.825,-1.175T5,8t1.175,-2.825T9,4t2.825,1.175T13,8t-1.175,2.825T9,12m10,-4q0,1.65 -1.175,2.825T15,12q-0.275,0 -0.7,-0.062a6,6 0,0 1,-0.7 -0.138,6 6,0 0,0 1.037,-1.775Q15,9.05 15,8t-0.363,-2.025A6,6 0,0 0,13.6 4.2a3,3 0,0 1,0.7 -0.163Q14.65,4 15,4q1.65,0 2.825,1.175T19,8M3,18h12v-0.8a0.97,0.97 0,0 0,-0.5 -0.85q-1.35,-0.675 -2.725,-1.012a11.6,11.6 0,0 0,-5.55 0Q4.85,15.675 3.5,16.35a0.97,0.97 0,0 0,-0.5 0.85zM9,10q0.825,0 1.412,-0.588Q11,8.826 11,8q0,-0.824 -0.588,-1.412A1.93,1.93 0,0 0,9 6q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,7 8q0,0.825 0.588,1.412Q8.175,10 9,10"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_guest.xml b/libraries/compound/src/main/res/drawable/ic_compound_guest.xml
index 1bb2d99842..cdba0d5f58 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_guest.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_guest.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.15 4.3a1.04 1.04 0 0 1 1.47 0l1.34 1.35-5.5 5.5a1.04 1.04 0 0 0 0 1.47l5.5 5.5-1.34 1.34a1.04 1.04 0 0 1-1.47 0L1.3 12.62a1.04 1.04 0 0 1 0-1.47z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.38 4.3a1.04 1.04 0 0 1 1.47 0l6.85 6.85a1.04 1.04 0 0 1 0 1.47l-6.85 6.84a1.04 1.04 0 0 1-1.47 0l-6.84-6.84a1.04 1.04 0 0 1 0-1.47z"/>
+  <path
+      android:pathData="M8.148,4.304a1.04,1.04 0,0 1,1.47 0l1.343,1.344 -5.5,5.5a1.04,1.04 0,0 0,0 1.47l5.5,5.5 -1.344,1.343a1.04,1.04 0,0 1,-1.47 0l-6.843,-6.843a1.04,1.04 0,0 1,0 -1.47z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M14.383,4.304a1.04,1.04 0,0 1,1.469 0l6.844,6.844a1.04,1.04 0,0 1,0 1.47l-6.844,6.843a1.04,1.04 0,0 1,-1.469 0L7.54,12.618a1.04,1.04 0,0 1,0 -1.47z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_headphones_off_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_headphones_off_solid.xml
index af81d29c1d..551f0fc21e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_headphones_off_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_headphones_off_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 3a7.96 7.96 0 0 0-4.67 1.5L5.9 3.07A9.96 9.96 0 0 1 12 1c5.52 0 10 4.48 10 10v8.17l-4.93-4.94A2 2 0 0 1 18 14h2v-3a8 8 0 0 0-8-8M4.45 4.44l1.42 1.42L16 16.02v-0.02l5.25 5.26q0.09 0.08 0.19 0.14l-0.05 0.05a1 1 0 0 1-1.56 1.23L19.17 22H18a2 2 0 0 1-2-2v-1.17L4.76 7.6A8 8 0 0 0 4 11v3h2a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-9c0-1.78 0.46-3.44 1.27-4.89L1.33 4.17a1 1 0 0 1 1.42-1.42l1.7 1.7z"/>
+  <path
+      android:pathData="M12,3a7.96,7.96 0,0 0,-4.665 1.5l-1.43,-1.429A9.96,9.96 0,0 1,12 1c5.523,0 10,4.477 10,10v8.166l-4.934,-4.935A2,2 0,0 1,18 14h2v-3a8,8 0,0 0,-8 -8M4.45,4.443l1.418,1.42 -0.005,0.005L16,16.006v-0.012l5.253,5.253q0.085,0.085 0.183,0.145l-0.044,0.044a1,1 0,0 1,-1.56 1.231L19.167,22H18a2,2 0,0 1,-2 -2v-1.166L4.76,7.594A8,8 0,0 0,4 11v3h2a2,2 0,0 1,2 2v4a2,2 0,0 1,-2 2H4a2,2 0,0 1,-2 -2v-9c0,-1.776 0.463,-3.445 1.275,-4.89L1.333,4.167a1,1 0,0 1,1.414 -1.414L4.444,4.45z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_headphones_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_headphones_solid.xml
index eac3a666d0..e8fdf3afb1 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_headphones_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_headphones_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 3a8 8 0 0 0-8 8v3h2a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-9C2 5.48 6.48 1 12 1s10 4.48 10 10v9a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2h2v-3a8 8 0 0 0-8-8"/>
+  <path
+      android:pathData="M12,3a8,8 0,0 0,-8 8v3h2a2,2 0,0 1,2 2v4a2,2 0,0 1,-2 2H4a2,2 0,0 1,-2 -2v-9C2,5.477 6.477,1 12,1s10,4.477 10,10v9a2,2 0,0 1,-2 2h-2a2,2 0,0 1,-2 -2v-4a2,2 0,0 1,2 -2h2v-3a8,8 0,0 0,-8 -8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_help.xml b/libraries/compound/src/main/res/drawable/ic_compound_help.xml
index 293120e8cd..667f268fa8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_help.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_help.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 8a1.5 1.5 0 0 0-1.5 1.5 1 1 0 1 1-2 0 3.5 3.5 0 1 1 6.01 2.44l-0.35 0.35c-0.29 0.3-0.54 0.54-0.76 0.83C13.1 13.49 13 13.77 13 14a1 1 0 1 1-2 0c0-0.87 0.4-1.58 0.82-2.11 0.3-0.4 0.69-0.78 1-1.08l0.26-0.27A1.5 1.5 0 0 0 12 8m1 9a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.1 21.21A9.7 9.7 0 0 0 12 22a9.7 9.7 0 0 0 3.9-0.79 10.1 10.1 0 0 0 3.17-2.14q1.35-1.35 2.14-3.17A9.7 9.7 0 0 0 22 12a9.7 9.7 0 0 0-0.79-3.9 10.1 10.1 0 0 0-2.14-3.17q-1.35-1.35-3.17-2.14A9.7 9.7 0 0 0 12 2a9.7 9.7 0 0 0-3.9 0.79 10.1 10.1 0 0 0-3.17 2.14Q3.57 6.28 2.78 8.1A9.7 9.7 0 0 0 2 12q0 2.08 0.79 3.9a10.1 10.1 0 0 0 2.14 3.17q1.35 1.35 3.17 2.14m9.58-3.54Q15.35 20 12 20t-5.67-2.33T4 12t2.33-5.67T12 4t5.67 2.33T20 12t-2.33 5.67"/>
+  <path
+      android:pathData="M12,8a1.5,1.5 0,0 0,-1.5 1.5,1 1,0 1,1 -2,0 3.5,3.5 0,1 1,6.01 2.439q-0.183,0.188 -0.352,0.355c-0.287,0.288 -0.54,0.54 -0.76,0.824 -0.293,0.375 -0.398,0.651 -0.398,0.882a1,1 0,1 1,-2 0c0,-0.874 0.407,-1.58 0.819,-2.11 0.305,-0.392 0.688,-0.775 1,-1.085l0.257,-0.26A1.5,1.5 0,0 0,12 8m1,9a1,1 0,1 1,-2 0,1 1,0 0,1 2,0"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M8.1,21.213A9.7,9.7 0,0 0,12 22a9.7,9.7 0,0 0,3.9 -0.788,10.1 10.1,0 0,0 3.175,-2.137q1.35,-1.35 2.137,-3.175A9.7,9.7 0,0 0,22 12a9.7,9.7 0,0 0,-0.788 -3.9,10.1 10.1,0 0,0 -2.137,-3.175q-1.35,-1.35 -3.175,-2.137A9.7,9.7 0,0 0,12 2a9.7,9.7 0,0 0,-3.9 0.788,10.1 10.1,0 0,0 -3.175,2.137Q3.575,6.275 2.788,8.1A9.7,9.7 0,0 0,2 12q0,2.075 0.788,3.9a10.1,10.1 0,0 0,2.137 3.175q1.35,1.35 3.175,2.137m9.575,-3.538Q15.35,20 12,20t-5.675,-2.325T4,12t2.325,-5.675T12,4t5.675,2.325T20,12t-2.325,5.675"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_help_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_help_solid.xml
index 80332718c2..29b11c6687 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_help_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_help_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 22a9.7 9.7 0 0 0 3.9-0.79 10.1 10.1 0 0 0 3.17-2.14q1.35-1.35 2.14-3.17A9.7 9.7 0 0 0 22 12a9.7 9.7 0 0 0-0.79-3.9 10.1 10.1 0 0 0-2.14-3.17q-1.35-1.35-3.17-2.14A9.7 9.7 0 0 0 12 2a9.7 9.7 0 0 0-3.9 0.79 10.1 10.1 0 0 0-3.17 2.14Q3.57 6.28 2.78 8.1A9.7 9.7 0 0 0 2 12q0 2.08 0.79 3.9a10.1 10.1 0 0 0 2.14 3.17q1.35 1.35 3.17 2.14A9.7 9.7 0 0 0 12 22m0-14a1.5 1.5 0 0 0-1.5 1.5 1 1 0 1 1-2 0 3.5 3.5 0 1 1 6.01 2.44l-0.35 0.35c-0.29 0.3-0.54 0.54-0.76 0.83C13.1 13.49 13 13.77 13 14a1 1 0 1 1-2 0c0-0.87 0.4-1.58 0.82-2.11 0.3-0.4 0.69-0.78 1-1.08l0.26-0.27A1.5 1.5 0 0 0 12 8m1 9a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/>
+  <path
+      android:pathData="M12,22a9.7,9.7 0,0 0,3.9 -0.788,10.1 10.1,0 0,0 3.175,-2.137q1.35,-1.35 2.137,-3.175A9.7,9.7 0,0 0,22 12a9.7,9.7 0,0 0,-0.788 -3.9,10.1 10.1,0 0,0 -2.137,-3.175q-1.35,-1.35 -3.175,-2.137A9.7,9.7 0,0 0,12 2a9.7,9.7 0,0 0,-3.9 0.788,10.1 10.1,0 0,0 -3.175,2.137Q3.575,6.275 2.788,8.1A9.7,9.7 0,0 0,2 12q0,2.075 0.788,3.9a10.1,10.1 0,0 0,2.137 3.175q1.35,1.35 3.175,2.137A9.7,9.7 0,0 0,12 22m0,-14a1.5,1.5 0,0 0,-1.5 1.5,1 1,0 1,1 -2,0 3.5,3.5 0,1 1,6.01 2.439q-0.183,0.188 -0.352,0.355c-0.287,0.288 -0.54,0.54 -0.76,0.824 -0.293,0.375 -0.398,0.651 -0.398,0.882a1,1 0,1 1,-2 0c0,-0.874 0.407,-1.58 0.819,-2.11 0.305,-0.392 0.688,-0.775 1,-1.085l0.257,-0.26A1.5,1.5 0,0 0,12 8m1,9a1,1 0,1 1,-2 0,1 1,0 0,1 2,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_history.xml b/libraries/compound/src/main/res/drawable/ic_compound_history.xml
index 25d4c68509..10e4f222d3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_history.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_history.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18.93 8A8 8 0 1 1 4 12a1 1 0 1 0-2 0c0 5.52 4.48 10 10 10s10-4.48 10-10a10 10 0 0 0-0.83-4A10 10 0 0 0 12 2a9.99 9.99 0 0 0-8 4V4a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2H5.75A7.99 7.99 0 0 1 12 4a8 8 0 0 1 6.93 4"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13 8a1 1 0 1 0-2 0v4a1 1 0 0 0 0.3 0.7l2.82 2.84a1 1 0 0 0 1.42-1.42L13 11.6z"/>
+  <path
+      android:pathData="M18.93,8A8,8 0,1 1,4 12a1,1 0,1 0,-2 0c0,5.523 4.477,10 10,10s10,-4.477 10,-10a10,10 0,0 0,-0.832 -4A10,10 0,0 0,12 2a9.99,9.99 0,0 0,-8 3.999V4a1,1 0,0 0,-2 0v4a1,1 0,0 0,1 1h4a1,1 0,0 0,0 -2H5.755A7.99,7.99 0,0 1,12 4a8,8 0,0 1,6.93 4"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M13,8a1,1 0,1 0,-2 0v4a1,1 0,0 0,0.293 0.707l2.83,2.83a1,1 0,0 0,1.414 -1.414L13,11.586z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_home.xml b/libraries/compound/src/main/res/drawable/ic_compound_home.xml
index 0feb167199..8cdb4fc202 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_home.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_home.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M16 11v8h3V9.18l-7-3.9-7 3.9V19h3v-8z m-6 10H5a2 2 0 0 1-2-2V9.18a2 2 0 0 1 1.03-1.75l7-3.9a2 2 0 0 1 1.94 0l7 3.9A2 2 0 0 1 21 9.18V19a2 2 0 0 1-2 2h-5v-8h-4z"/>
+  <path
+      android:pathData="M16,11v8h3L19,9.177l-7,-3.889 -7,3.889L5,19h3v-8zM10,21L5,21a2,2 0,0 1,-2 -2L3,9.177a2,2 0,0 1,1.029 -1.748l7,-3.89a2,2 0,0 1,1.942 0l7,3.89A2,2 0,0 1,21 9.177L21,19a2,2 0,0 1,-2 2h-5v-8h-4z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_home_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_home_solid.xml
index 10cca67a37..ce94991fdd 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_home_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_home_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.97 3.54l7 3.89A2 2 0 0 1 21 9.18V19a2 2 0 0 1-2 2h-4v-9H9v9H5a2 2 0 0 1-2-2V9.18a2 2 0 0 1 1.03-1.75l7-3.9a2 2 0 0 1 1.94 0"/>
+  <path
+      android:pathData="m12.971,3.54 l7,3.889A2,2 0,0 1,21 9.177V19a2,2 0,0 1,-2 2h-4v-9H9v9H5a2,2 0,0 1,-2 -2V9.177a2,2 0,0 1,1.029 -1.748l7,-3.89a2,2 0,0 1,1.942 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_host.xml b/libraries/compound/src/main/res/drawable/ic_compound_host.xml
index d45d1c0278..048d4c1c3d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_host.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_host.xml
@@ -4,11 +4,11 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.71 6.71A0.97 0.97 0 0 1 16 7a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 15 6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 16 5q0.42 0 0.71 0.29T17 6t-0.29 0.71"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M6 2a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z m12 2H6v4h12zM6 12v-2h12v2z m0 2v2h12v-2z m0 6v-2h12v2z"/>
+  <path
+      android:pathData="M16.713,6.713A0.97,0.97 0,0 1,16 7a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,15 6q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,16 5q0.424,0 0.712,0.287Q17,5.576 17,6t-0.288,0.713"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M6,2a2,2 0,0 0,-2 2v16a2,2 0,0 0,2 2h12a2,2 0,0 0,2 -2L20,4a2,2 0,0 0,-2 -2zM18,4L6,4v4h12zM6,12v-2h12v2zM6,14v2h12v-2zM6,20v-2h12v2z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_image.xml b/libraries/compound/src/main/res/drawable/ic_compound_image.xml
index 58a3525b3a..55728750a1 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_image.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_image.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17 9a2 2 0 1 1-4 0 2 2 0 0 1 4 0"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 3a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z m14 2v14H5v-3.17l4-4L16.17 19H19l-8.59-8.59a2 2 0 0 0-2.82 0L5 13V5z"/>
+  <path
+      android:pathData="M17,9a2,2 0,1 1,-4 0,2 2,0 0,1 4,0"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M5,3a2,2 0,0 0,-2 2v14a2,2 0,0 0,2 2h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2zM19,5v14L5,19v-3.172l4,-4L16.172,19L19,19l-8.586,-8.586a2,2 0,0 0,-2.828 0L5,13L5,5z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_image_error.xml b/libraries/compound/src/main/res/drawable/ic_compound_image_error.xml
index 1c8d716166..6f660f76a1 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_image_error.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_image_error.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 3a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h7.8a6 6 0 0 1-0.72-2H5v-3.17l4-4 3.58 3.58a6 6 0 0 1 1.18-1.65L10.4 10.4a2 2 0 0 0-2.82 0L5 13V5h14v7.08c0.72 0.12 1.4 0.37 2 0.72V5a2 2 0 0 0-2-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17 9a2 2 0 1 1-4 0 2 2 0 0 1 4 0m1 5a1 1 0 0 1 1 1v3a1 1 0 1 1-2 0v-3a1 1 0 0 1 1-1m-1 7a1 1 0 1 1 2 0 1 1 0 0 1-2 0"/>
+  <path
+      android:pathData="M5,3a2,2 0,0 0,-2 2v14a2,2 0,0 0,2 2h7.803a6,6 0,0 1,-0.72 -2H5v-3.172l4,-4 3.585,3.585a6,6 0,0 1,1.172 -1.656l-3.343,-3.343a2,2 0,0 0,-2.828 0L5,13V5h14v7.083c0.718,0.12 1.393,0.368 2,0.72V5a2,2 0,0 0,-2 -2z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M17,9a2,2 0,1 1,-4 0,2 2,0 0,1 4,0m1,5a1,1 0,0 1,1 1v3a1,1 0,1 1,-2 0v-3a1,1 0,0 1,1 -1m-1,7a1,1 0,1 1,2 0,1 1,0 0,1 -2,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_indent_decrease.xml b/libraries/compound/src/main/res/drawable/ic_compound_indent_decrease.xml
index 5ada985743..5fba2cd371 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_indent_decrease.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_indent_decrease.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.29 18.71Q3.58 19 4 19h16q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 18a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 17H4a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 3 18q0 0.42 0.29 0.71m8-4Q11.58 15 12 15h8q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 14a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 13h-8a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 14q0 0.42 0.29 0.71m0-4Q11.58 11 12 11h8q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 10a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 9h-8a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 10q0 0.42 0.29 0.71m0-4Q11.58 7 12 7h8q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 6a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 5h-8a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 6q0 0.42 0.29 0.71m-5.14 6.44l-2.8-2.8a0.48 0.48 0 0 1 0-0.7l2.8-2.8Q6.4 6.6 6.7 6.73T7 7.2v5.6q0 0.35-0.3 0.47t-0.55-0.12"/>
+  <path
+      android:pathData="M3.288,18.713Q3.575,19 4,19h16q0.424,0 0.712,-0.288A0.97,0.97 0,0 0,21 18a0.97,0.97 0,0 0,-0.288 -0.712A0.97,0.97 0,0 0,20 17H4a0.97,0.97 0,0 0,-0.712 0.288A0.97,0.97 0,0 0,3 18q0,0.424 0.288,0.712m8,-3.999Q11.575,15 12,15h8q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 14a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 13h-8a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 14q0,0.424 0.287,0.713m0.001,-4Q11.575,11 12,11h8q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 10a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 9h-8a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 10q0,0.424 0.287,0.713m0.001,-4Q11.575,7 12,7h8q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 6a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 5h-8a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 6q0,0.424 0.287,0.713M6.15,13.15l-2.8,-2.8a0.48,0.48 0,0 1,0 -0.7l2.8,-2.8q0.25,-0.25 0.55,-0.125T7,7.2v5.6q0,0.35 -0.3,0.475t-0.55,-0.125"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_indent_increase.xml b/libraries/compound/src/main/res/drawable/ic_compound_indent_increase.xml
index de5df3977a..2cad4690fb 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_indent_increase.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_indent_increase.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 19a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 3 18q0-0.42 0.29-0.71A0.97 0.97 0 0 1 4 17h16q0.42 0 0.71 0.29T21 18q0 0.42-0.29 0.71A0.97 0.97 0 0 1 20 19z m8-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 14q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 13h8q0.42 0 0.71 0.29T21 14q0 0.42-0.29 0.71A0.97 0.97 0 0 1 20 15z m0-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 10q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 9h8q0.42 0 0.71 0.29T21 10t-0.29 0.71A0.97 0.97 0 0 1 20 11z m0-4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 5h8q0.42 0 0.71 0.29T21 6t-0.29 0.71A0.97 0.97 0 0 1 20 7z m-8.15 6.15Q3.6 13.4 3.3 13.28T3 12.8V7.2q0-0.35 0.3-0.47t0.55 0.12l2.8 2.8a0.48 0.48 0 0 1 0 0.7z"/>
+  <path
+      android:pathData="M4,19a0.97,0.97 0,0 1,-0.712 -0.288A0.97,0.97 0,0 1,3 18q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,4 17h16q0.424,0 0.712,0.288 0.288,0.287 0.288,0.712 0,0.424 -0.288,0.712A0.97,0.97 0,0 1,20 19zM12,15a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 14q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 13h8q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713A0.97,0.97 0,0 1,20 15zM12,11a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 10q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 9h8q0.424,0 0.712,0.287Q21,9.576 21,10t-0.288,0.713A0.97,0.97 0,0 1,20 11zM12,7a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 6q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 5h8q0.424,0 0.712,0.287Q21,5.576 21,6t-0.288,0.713A0.97,0.97 0,0 1,20 7zM3.85,13.15q-0.25,0.25 -0.55,0.125T3,12.8L3,7.2q0,-0.35 0.3,-0.475t0.55,0.125l2.8,2.8a0.48,0.48 0,0 1,0 0.7z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_info.xml b/libraries/compound/src/main/res/drawable/ic_compound_info.xml
index cf0318bb61..02808d1855 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_info.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_info.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.29 7.29A0.97 0.97 0 0 1 12 7q0.42 0 0.71 0.29T13 8t-0.29 0.71A0.97 0.97 0 0 1 12 9a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 8q0-0.42 0.29-0.71m0 4A0.97 0.97 0 0 1 12 11q0.42 0 0.71 0.29T13 12v4q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 17a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 16v-4q0-0.42 0.29-0.71"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M22 12c0 5.52-4.48 10-10 10S2 17.52 2 12 6.48 2 12 2s10 4.48 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"/>
+  <path
+      android:pathData="M11.288,7.288A0.97,0.97 0,0 1,12 7q0.424,0 0.713,0.287Q13,7.576 13,8t-0.287,0.713A0.97,0.97 0,0 1,12 9a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 8q0,-0.424 0.287,-0.713m0.001,4.001A0.97,0.97 0,0 1,12 11q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713v4q0,0.424 -0.287,0.712A0.97,0.97 0,0 1,12 17a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,11 16v-4q0,-0.424 0.287,-0.713"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M22,12c0,5.523 -4.477,10 -10,10S2,17.523 2,12 6.477,2 12,2s10,4.477 10,10m-2,0a8,8 0,1 1,-16 0,8 8,0 0,1 16,0"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_info_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_info_solid.xml
index 9101aacffc..7155a382c7 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_info_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_info_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 17q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 16v-4a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 11a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 12v4q0 0.42 0.29 0.71T12 17m0-8q0.42 0 0.71-0.29A0.97 0.97 0 0 0 13 8a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 12 7a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 11 8q0 0.42 0.29 0.71T12 9m0 13a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22"/>
+  <path
+      android:pathData="M12,17q0.424,0 0.713,-0.288A0.97,0.97 0,0 0,13 16v-4a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 11a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 12v4q0,0.424 0.287,0.712 0.288,0.288 0.713,0.288m0,-8q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,13 8a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,12 7a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,11 8q0,0.424 0.287,0.713Q11.576,9 12,9m0,13a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_inline_code.xml b/libraries/compound/src/main/res/drawable/ic_compound_inline_code.xml
index 9f78e1f8c2..2b047fac71 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_inline_code.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_inline_code.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.96 5.62a1 1 0 0 0-1.92-0.57l-4 13.33a1 1 0 0 0 1.92 0.57zM5.97 7.23a1 1 0 0 0-1.4 0.13l-3.34 4a1 1 0 0 0 0 1.28l3.34 4a1 1 0 1 0 1.53-1.28L3.3 12l2.8-3.36a1 1 0 0 0-0.13-1.4m12.06 0a1 1 0 0 1 1.4 0.12l3.34 4a1 1 0 0 1 0 1.28l-3.33 4a1 1 0 1 1-1.54-1.28L20.7 12l-2.8-3.36a1 1 0 0 1 0.13-1.4"/>
+  <path
+      android:pathData="M14.958,5.62a1,1 0,0 0,-1.916 -0.574l-4,13.333a1,1 0,0 0,1.916 0.575zM5.974,7.232a1,1 0,0 0,-1.409 0.128l-3.333,4a1,1 0,0 0,0 1.28l3.333,4a1,1 0,1 0,1.537 -1.28L3.302,12l2.8,-3.36a1,1 0,0 0,-0.128 -1.408m12.053,0a1,1 0,0 1,1.408 0.128l3.333,4a1,1 0,0 1,0 1.28l-3.333,4a1,1 0,1 1,-1.537 -1.28l2.8,-3.36 -2.8,-3.36a1,1 0,0 1,0.128 -1.408"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_italic.xml b/libraries/compound/src/main/res/drawable/ic_compound_italic.xml
index e3fee1f82e..e47a0971f6 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_italic.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_italic.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.25 19q-0.53 0-0.89-0.36A1.2 1.2 0 0 1 5 17.75q0-0.53 0.36-0.89t0.89-0.36H9l3-9H9.25q-0.53 0-0.89-0.36A1.2 1.2 0 0 1 8 6.25q0-0.53 0.36-0.89Q8.73 5 9.25 5h7.5q0.53 0 0.89 0.36T18 6.25t-0.36 0.89a1.2 1.2 0 0 1-0.89 0.36H14.5l-3 9h2.25q0.53 0 0.89 0.36Q15 17.23 15 17.75t-0.36 0.89A1.2 1.2 0 0 1 13.75 19z"/>
+  <path
+      android:pathData="M6.25,19q-0.525,0 -0.888,-0.363A1.2,1.2 0,0 1,5 17.75q0,-0.525 0.362,-0.887 0.363,-0.363 0.888,-0.363H9l3,-9H9.25q-0.525,0 -0.887,-0.362A1.2,1.2 0,0 1,8 6.25q0,-0.525 0.363,-0.888Q8.725,5 9.25,5h7.5q0.525,0 0.887,0.362 0.363,0.363 0.363,0.888t-0.363,0.888a1.2,1.2 0,0 1,-0.887 0.362H14.5l-3,9h2.25q0.525,0 0.887,0.363 0.363,0.362 0.363,0.887t-0.363,0.887a1.2,1.2 0,0 1,-0.887 0.363z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_key.xml b/libraries/compound/src/main/res/drawable/ic_compound_key.xml
index 112c16d78f..0bd5d8d7f1 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_key.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_key.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7 14q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 5 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 7 10q0.82 0 1.41 0.59T9 12t-0.59 1.41A1.93 1.93 0 0 1 7 14m0 4q-2.5 0-4.25-1.75T1 12t1.75-4.25T7 6q1.68 0 3.04 0.82A6.2 6.2 0 0 1 12.2 9h8.38q0.2 0 0.38 0.07 0.19 0.08 0.34 0.23l2 2q0.15 0.15 0.21 0.32 0.06 0.18 0.06 0.38t-0.06 0.37a0.9 0.9 0 0 1-0.21 0.33l-3.18 3.17a1 1 0 0 1-0.3 0.2q-0.17 0.08-0.35 0.1a0.8 0.8 0 0 1-0.35-0.02 0.9 0.9 0 0 1-0.32-0.17L17.5 15l-1.43 1.07a0.95 0.95 0 0 1-0.88 0.15 0.9 0.9 0 0 1-0.29-0.15L13.37 15H12.2a6.2 6.2 0 0 1-2.16 2.17Q8.68 18 7 18m0-2q1.4 0 2.46-0.85A4.03 4.03 0 0 0 10.87 13H14l1.45 1.02 2.05-1.52 1.77 1.38L21.15 12l-1-1h-9.28a4.03 4.03 0 0 0-1.4-2.15Q8.4 8 7 8 5.35 8 4.17 9.18T3 12t1.18 2.83T7 16"/>
+  <path
+      android:pathData="M7,14q-0.824,0 -1.412,-0.588A1.93,1.93 0,0 1,5 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,7 10q0.824,0 1.412,0.588Q9,11.175 9,12t-0.588,1.412A1.93,1.93 0,0 1,7 14m0,4q-2.5,0 -4.25,-1.75T1,12t1.75,-4.25T7,6q1.676,0 3.037,0.825A6.2,6.2 0,0 1,12.2 9h8.375q0.2,0 0.387,0.075 0.188,0.075 0.338,0.225l2,2q0.15,0.15 0.212,0.325 0.063,0.175 0.063,0.375t-0.062,0.375a0.9,0.9 0,0 1,-0.213 0.325l-3.175,3.175a1,1 0,0 1,-0.3 0.2q-0.175,0.075 -0.35,0.1a0.8,0.8 0,0 1,-0.35 -0.025,0.9 0.9,0 0,1 -0.325,-0.175L17.5,15l-1.425,1.075a0.95,0.95 0,0 1,-0.887 0.15,0.9 0.9,0 0,1 -0.288,-0.15L13.375,15H12.2a6.2,6.2 0,0 1,-2.162 2.175Q8.675,18 7,18m0,-2q1.4,0 2.463,-0.85A4.03,4.03 0,0 0,10.875 13H14l1.45,1.025L17.5,12.5l1.775,1.375L21.15,12l-1,-1h-9.275a4.03,4.03 0,0 0,-1.412 -2.15Q8.4,8 7,8 5.35,8 4.175,9.175T3,12t1.175,2.825T7,16"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_key_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_key_off.xml
index b160e81c73..ce8ed0df0d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_key_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_key_off.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7 14q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 5 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 7 10q0.82 0 1.41 0.59T9 12q0 0.82-0.59 1.41A1.93 1.93 0 0 1 7 14"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4.92 2.08A1 1 0 0 0 3.5 3.5l2.57 2.56q-1.9 0.27-3.32 1.69Q1 9.5 1 12t1.75 4.25T7 18q1.68 0 3.04-0.82A6.2 6.2 0 0 0 12.2 15h1.18l1.52 1.07q0.13 0.1 0.29 0.15 0.16 0.05 0.31 0.05a0.95 0.95 0 0 0 0.58-0.2l4.42 4.43a1 1 0 0 0 1.42-1.42zM13 13h-2.13a4.03 4.03 0 0 1-1.42 2.15Q8.4 16 7 16q-1.65 0-2.83-1.18T3 12t1.18-2.83T7 8q0.62 0 1.17 0.17l2.65 2.65 0.06 0.18H11z m8.14-1l-1.75 1.75 1.43 1.43 2.47-2.48q0.15-0.15 0.21-0.33 0.06-0.17 0.06-0.37 0-0.2-0.06-0.38a0.9 0.9 0 0 0-0.21-0.32l-2-2a1 1 0 0 0-0.34-0.23A1 1 0 0 0 20.57 9h-5.92l2 2h3.5z"/>
+  <path
+      android:pathData="M7,14q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,5 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,7 10q0.824,0 1.412,0.588Q9,11.175 9,12q0,0.824 -0.588,1.413A1.93,1.93 0,0 1,7 14"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M4.917,2.083a1,1 0,0 0,-1.414 1.414L6.07,6.064q-1.905,0.27 -3.32,1.686Q1,9.5 1,12t1.75,4.25T7,18q1.676,0 3.037,-0.825A6.2,6.2 0,0 0,12.2 15h1.175l1.525,1.075q0.126,0.1 0.287,0.15 0.163,0.05 0.313,0.05a0.95,0.95 0,0 0,0.575 -0.2l0.003,-0.002 4.425,4.424a1,1 0,0 0,1.414 -1.414zM13.006,13h-2.131a4.03,4.03 0,0 1,-1.412 2.15Q8.4,16 7,16q-1.65,0 -2.825,-1.175T3,12t1.175,-2.825T7,8q0.619,0 1.172,0.166l2.649,2.65q0.03,0.09 0.054,0.184h0.13zM21.15,12 L19.4,13.75 20.826,15.175L23.3,12.7q0.15,-0.15 0.212,-0.325 0.063,-0.176 0.063,-0.375 0,-0.2 -0.062,-0.375a0.9,0.9 0,0 0,-0.213 -0.325l-2,-2a1,1 0,0 0,-0.338 -0.225A1,1 0,0 0,20.575 9h-5.924l2,2h3.499z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_key_off_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_key_off_solid.xml
index c1961ec390..4dbf8c9eb2 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_key_off_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_key_off_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4.92 2.08A1 1 0 0 0 3.5 3.5l2.57 2.56q-1.9 0.27-3.32 1.69Q1 9.5 1 12t1.75 4.25T7 18a5.86 5.86 0 0 0 3.48-1.1 5.8 5.8 0 0 0 2.17-2.9H13l1.3 1.3q0.15 0.15 0.33 0.21 0.17 0.07 0.37 0.07t0.38-0.07a1 1 0 0 0 0.1-0.04l5.02 5.03a1 1 0 0 0 1.42-1.42z m0.67 11.33A1.93 1.93 0 0 1 5 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 7 10q0.82 0 1.41 0.59T9 12q0 0.82-0.59 1.41A1.93 1.93 0 0 1 7 14q-0.82 0-1.41-0.59m14.9 1.43L15.65 10h4.95q0.2 0 0.39 0.07 0.19 0.08 0.34 0.23l1.02 1.02q0.13 0.13 0.2 0.3t0.07 0.36-0.06 0.37a1.1 1.1 0 0 1-0.18 0.33z"/>
+  <path
+      android:pathData="M4.917,2.083a1,1 0,0 0,-1.414 1.414L6.07,6.064q-1.905,0.27 -3.32,1.686Q1,9.5 1,12t1.75,4.25T7,18a5.86,5.86 0,0 0,3.475 -1.1A5.8,5.8 0,0 0,12.65 14L13,14l1.3,1.3q0.15,0.15 0.325,0.213 0.175,0.062 0.375,0.062t0.375,-0.062a1,1 0,0 0,0.1 -0.044l5.028,5.028a1,1 0,0 0,1.414 -1.414zM5.587,13.413A1.93,1.93 0,0 1,5 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,7 10q0.824,0 1.412,0.588Q9,11.175 9,12q0,0.824 -0.588,1.413A1.93,1.93 0,0 1,7 14q-0.824,0 -1.412,-0.587m14.899,1.423L15.65,10h4.95q0.2,0 0.387,0.075 0.189,0.075 0.338,0.225l1.025,1.025q0.125,0.125 0.2,0.288t0.075,0.362 -0.062,0.375a1.1,1.1 0,0 1,-0.188 0.325z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_key_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_key_solid.xml
index 29f9ad1a42..79253ea934 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_key_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_key_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10.47 16.9A5.86 5.86 0 0 1 7 18q-2.5 0-4.25-1.75T1 12t1.75-4.25T7 6q2.03 0 3.54 1.15Q12.05 8.3 12.65 10h7.95q0.2 0 0.39 0.07 0.19 0.08 0.34 0.23l1.02 1.02a1 1 0 0 1 0.2 0.3q0.07 0.16 0.07 0.36t-0.06 0.37a1.1 1.1 0 0 1-0.18 0.33l-2.25 2.57a0.97 0.97 0 0 1-1.04 0.31 1 1 0 0 1-0.34-0.18L17 14l-1.3 1.3q-0.15 0.15-0.33 0.21A1.1 1.1 0 0 1 15 15.58q-0.2 0-0.38-0.07a0.9 0.9 0 0 1-0.32-0.21L13 14h-0.35a5.8 5.8 0 0 1-2.17 2.9m-4.9-3.49Q6.19 14 7 14t1.41-0.59Q9 12.83 9 12t-0.59-1.41A1.93 1.93 0 0 0 7 10q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 5 12q0 0.82 0.59 1.41"/>
+  <path
+      android:pathData="M10.475,16.9A5.86,5.86 0,0 1,7 18q-2.5,0 -4.25,-1.75T1,12t1.75,-4.25T7,6q2.026,0 3.537,1.15Q12.05,8.3 12.65,10h7.95q0.2,0 0.387,0.075 0.189,0.075 0.338,0.225l1.025,1.025a1,1 0,0 1,0.2 0.288q0.075,0.162 0.075,0.362t-0.062,0.375a1.1,1.1 0,0 1,-0.188 0.325l-2.25,2.575a0.97,0.97 0,0 1,-1.038 0.313,1 1,0 0,1 -0.337,-0.188L17,14l-1.3,1.3q-0.15,0.15 -0.325,0.212a1.1,1.1 0,0 1,-0.375 0.063q-0.2,0 -0.375,-0.062a0.9,0.9 0,0 1,-0.325 -0.213L13,14h-0.35a5.8,5.8 0,0 1,-2.175 2.9m-4.887,-3.487Q6.175,14 7,14q0.824,0 1.412,-0.588Q9,12.826 9,12t-0.588,-1.412A1.93,1.93 0,0 0,7 10q-0.824,0 -1.412,0.588A1.93,1.93 0,0 0,5 12q0,0.825 0.588,1.412"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_keyboard.xml b/libraries/compound/src/main/res/drawable/ic_compound_keyboard.xml
index 6216c1ccf8..19ebbab54c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_keyboard.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_keyboard.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5.19 8v2h2V8z m3.87 0v2h2V8z m3.88 0v2h2V8z m3.87 0v2h2V8zM5.2 11.53v2h2v-2z m3.87 0v2h2v-2z m3.88 0v2h2v-2z m3.87 0v2h2v-2zM9 15a1 1 0 1 0 0 2h6a1 1 0 1 0 0-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M2 6a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2z m2 0h16v12H4z"/>
+  <path
+      android:pathData="M5.188,8v2h2L7.188,8zM9.063,8v2h2L11.063,8zM12.938,8v2h2L14.938,8zM16.813,8v2h2L18.813,8zM5.188,11.531v2h2v-2zM9.063,11.531v2h2v-2zM12.938,11.531v2h2v-2zM16.813,11.531v2h2v-2zM9,15a1,1 0,1 0,0 2h6a1,1 0,1 0,0 -2z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M2,6a2,2 0,0 1,2 -2h16a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2L4,20a2,2 0,0 1,-2 -2zM4,6h16v12L4,18z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_labs.xml b/libraries/compound/src/main/res/drawable/ic_compound_labs.xml
index d0bcae3bab..9d64b768e0 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_labs.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_labs.xml
@@ -3,14 +3,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 5a1 1 0 0 1-1-1V3a1 1 0 1 1 2 0v1a1 1 0 0 1-1 1M4.93 4.93a1 1 0 0 1 1.41 0l0.71 0.7a1 1 0 0 1-1.41 1.42l-0.71-0.7a1 1 0 0 1 0-1.42"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M15.73 15.32C15.32 15.8 15 16.38 15 17v2a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-2c0-0.63-0.32-1.2-0.73-1.68a5 5 0 1 1 7.46 0M14.24 14a3 3 0 1 0-4.48 0c0.43 0.5 0.9 1.17 1.11 2.01h2.26c0.22-0.84 0.68-1.52 1.11-2M13 18h-2v1h2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2 12a1 1 0 0 1 1-1h1a1 1 0 1 1 0 2H3a1 1 0 0 1-1-1m18-1a1 1 0 1 0 0 2h1a1 1 0 1 0 0-2z m-3.05-5.36a1 1 0 0 0 1.41 1.41l0.71-0.7a1 1 0 0 0-1.41-1.42z"/>
+  <path
+      android:pathData="M12,5a1,1 0,0 1,-1 -1V3a1,1 0,1 1,2 0v1a1,1 0,0 1,-1 1m-7.071,-0.071a1,1 0,0 1,1.414 0l0.707,0.707A1,1 0,0 1,5.636 7.05l-0.707,-0.707a1,1 0,0 1,0 -1.414"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M15.734,15.325C15.316,15.795 15,16.371 15,17v2a2,2 0,0 1,-2 2h-2a2,2 0,0 1,-2 -2v-2c0,-0.63 -0.316,-1.205 -0.734,-1.675a5,5 0,1 1,7.468 0m-1.493,-1.33a3,3 0,1 0,-4.482 0c0.433,0.486 0.894,1.166 1.112,2.005h2.258c0.218,-0.84 0.679,-1.52 1.112,-2.005M13,18h-2v1h2z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2,12a1,1 0,0 1,1 -1h1a1,1 0,1 1,0 2L3,13a1,1 0,0 1,-1 -1m18,-1a1,1 0,1 0,0 2h1a1,1 0,1 0,0 -2zM16.95,5.636a1,1 0,0 0,1.414 1.414l0.707,-0.707a1,1 0,0 0,-1.414 -1.414z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_leave.xml b/libraries/compound/src/main/res/drawable/ic_compound_leave.xml
index ad5897d4f2..f1c1869dd4 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_leave.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_leave.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14 13q0.42 0 0.71-0.29A0.97 0.97 0 0 0 15 12a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 14 11a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 13 12q0 0.42 0.29 0.71T14 13"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10.38 21.79A1 1 0 0 1 10 21V3a1 1 0 0 1 1.24-0.97l8 2A1 1 0 0 1 20 5v14a1 1 0 0 1-0.76 0.97l-8 2a1 1 0 0 1-0.85-0.18m7.61-16l-6-1.5v15.43l6-1.5zM9 6H7v12h2v2H7a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2z"/>
+  <path
+      android:pathData="M14,13q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,15 12a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,14 11a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,13 12q0,0.424 0.287,0.713 0.288,0.287 0.713,0.287"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M10.385,21.788A1,1 0,0 1,10 21V3a1.003,1.003 0,0 1,1.242 -0.97l8,2A1,1 0,0 1,20 5v14a1,1 0,0 1,-0.758 0.97l-8,2a1,1 0,0 1,-0.857 -0.182M18,5.781l-6,-1.5v15.438l6,-1.5zM9,6H7v12h2v2H7a2,2 0,0 1,-2 -2V6a2,2 0,0 1,2 -2h2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_left_panel_close.xml b/libraries/compound/src/main/res/drawable/ic_compound_left_panel_close.xml
new file mode 100644
index 0000000000..60e11c6f4f
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_left_panel_close.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="M16.5,14.8L16.5,9.2q0,-0.35 -0.3,-0.475t-0.55,0.125L13.2,11.3q-0.3,0.3 -0.3,0.7t0.3,0.7l2.45,2.45q0.25,0.25 0.55,0.125t0.3,-0.475M5,19q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 17L3,7q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 5h14q0.824,0 1.413,0.588Q21,6.175 21,7v10q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 19zM8,17L8,7L5,7v10zM10,17h9L19,7h-9z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_left_panel_open.xml b/libraries/compound/src/main/res/drawable/ic_compound_left_panel_open.xml
new file mode 100644
index 0000000000..78c21c0625
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_left_panel_open.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.5,9.2v5.6q0,0.35 0.3,0.475t0.55,-0.125l2.45,-2.45q0.3,-0.3 0.3,-0.7t-0.3,-0.7l-2.45,-2.45q-0.25,-0.25 -0.55,-0.125t-0.3,0.475M5,19q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 17L3,7q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 5h14q0.824,0 1.413,0.588Q21,6.175 21,7v10q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 19zM8,17L8,7L5,7v10zM10,17h9L19,7h-9z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_link.xml b/libraries/compound/src/main/res/drawable/ic_compound_link.xml
index 3787cf3981..fc3e50450d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_link.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_link.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 19.07q-1.47 1.47-3.54 1.47-2.06 0-3.53-1.47t-1.47-3.53q0-2.07 1.47-3.54l2.12-2.12q0.3-0.3 0.7-0.3t0.71 0.3 0.3 0.7-0.3 0.71l-2.12 2.12a2.9 2.9 0 0 0-0.88 2.13q0 1.23 0.88 2.12 0.89 0.88 2.12 0.88t2.13-0.88l2.12-2.12q0.3-0.3 0.7-0.3t0.71 0.3 0.3 0.7q0 0.4-0.3 0.71z m-1.41-4.24q-0.3 0.3-0.71 0.3a0.97 0.97 0 0 1-0.7-0.3q-0.3-0.3-0.3-0.7 0-0.41 0.3-0.72l4.23-4.24q0.3-0.3 0.71-0.3t0.7 0.3 0.3 0.7-0.3 0.72z m6.36-0.7q-0.3 0.3-0.7 0.3a0.97 0.97 0 0 1-0.71-0.3q-0.3-0.3-0.3-0.72 0-0.4 0.3-0.7l2.12-2.12q0.88-0.89 0.88-2.13 0-1.23-0.88-2.12a2.9 2.9 0 0 0-2.12-0.88q-1.24 0-2.13 0.88L11.3 8.46q-0.3 0.3-0.7 0.3a0.97 0.97 0 0 1-0.71-0.3q-0.3-0.3-0.3-0.7 0-0.4 0.3-0.71L12 4.93q1.47-1.47 3.54-1.47t3.53 1.47 1.47 3.54T19.07 12z"/>
+  <path
+      android:pathData="M12,19.071q-1.467,1.467 -3.536,1.467 -2.067,0 -3.535,-1.467t-1.467,-3.535q0,-2.07 1.467,-3.536L7.05,9.879q0.3,-0.3 0.707,-0.3t0.707,0.3 0.301,0.707 -0.3,0.707l-2.122,2.121a2.9,2.9 0,0 0,-0.884 2.122q0,1.237 0.884,2.12 0.884,0.885 2.121,0.885t2.122,-0.884l2.121,-2.121q0.3,-0.3 0.707,-0.3t0.707,0.3 0.3,0.707q0,0.405 -0.3,0.707zM10.586,14.828q-0.3,0.3 -0.707,0.301a0.97,0.97 0,0 1,-0.707 -0.3q-0.3,-0.3 -0.301,-0.708 0,-0.405 0.3,-0.707l4.243,-4.242q0.3,-0.3 0.707,-0.3t0.707,0.3 0.3,0.707 -0.3,0.707zM16.95,14.121q-0.3,0.3 -0.707,0.3a0.97,0.97 0,0 1,-0.707 -0.3q-0.3,-0.3 -0.301,-0.707 0,-0.405 0.3,-0.707l2.122,-2.121q0.884,-0.885 0.884,-2.121 0,-1.238 -0.884,-2.122a2.9,2.9 0,0 0,-2.121 -0.884q-1.237,0 -2.122,0.884l-2.121,2.122q-0.3,0.3 -0.707,0.3a0.97,0.97 0,0 1,-0.707 -0.3q-0.3,-0.3 -0.3,-0.708 0,-0.405 0.3,-0.707L12,4.93q1.467,-1.467 3.536,-1.467t3.535,1.467 1.467,3.536T19.071,12z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_linux.xml b/libraries/compound/src/main/res/drawable/ic_compound_linux.xml
index bb3216e729..9b766dac9e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_linux.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_linux.xml
@@ -3,15 +3,17 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group>
-        <path
-            android:fillColor="#FF000000"
-            android:pathData="M13.2 20.64a2.7 2.7 0 0 1-1.1 0.25 2.8 2.8 0 0 1-1.56-0.5c-0.15 0.39-0.39 0.73-0.7 1A2.8 2.8 0 0 1 8.76 22h6.15a2.8 2.8 0 0 1-1-0.5 2.8 2.8 0 0 1-0.7-0.86m-6.5-3.97a0.2 0.2 0 0 0 0.07-0.03q0.05-0.49 0.13-0.94c-0.01-0.17 0.01-0.34 0.08-0.5 0.34-1.9 0.83-3.23 1.5-4.04a0.13 0.13 0 0 1 0.18-0.02 0.12 0.12 0 0 1 0.02 0.17 4 4 0 0 0-0.2 0.27q-0.77 1.12-1.2 3.4h0.03a0.6 0.6 0 0 1 0.16 0C7.68 15 8 15.17 8.47 15.63c0.06-2.72 1.66-4.91 3.64-4.91 1.75 0 3.2 1.71 3.56 4a1.7 1.7 0 0 1 0.76-0.75 0.8 0.8 0 0 1 0.25-0.04 7.5 7.5 0 0 0-0.95-2.34 4 4 0 0 0-0.2-0.28 0.12 0.12 0 0 1-0.03-0.09 0.12 0.12 0 0 1 0.05-0.08 0.13 0.13 0 0 1 0.1-0.03 0.13 0.13 0 0 1 0.08 0.05c0.5 0.62 0.93 1.55 1.24 2.82 0.68 0.25 0.7 1.36 0.71 2.27 0 0.43 0 0.87 0.1 0.99 0.11 0.11 0.33 0.09 0.64-0.04 0.04-0.4 0.06-0.75 0.07-1.04V15.1c0-2.48-3.27-6.76-3.27-6.76l-0.38-3.21c0-2.96-2.73-2.93-2.73-2.93S9.37 2.16 9.37 5.1L9 8.33s-3.26 4.28-3.26 6.76v0.3s-0.02 0.3 0 0.78v0.22c0.4 0.16 0.83 0.32 0.97 0.28m5.39-10.4c0.76 0.06 1.97 0.24 2.03 0.6 0.04 0.29-0.43 0.83-0.52 0.93-0.2 0.22-0.88 0.92-1.5 0.92-0.6 0-1.29-0.7-1.48-0.92-0.1-0.1-0.57-0.64-0.53-0.92 0.05-0.38 1.28-0.55 2-0.62"/>
-        <path
-            android:fillColor="#FF000000"
-            android:pathData="M12.11 8.47c0.33 0 0.84-0.33 1.3-0.83 0.35-0.39 0.47-0.67 0.46-0.73-0.06-0.13-0.89-0.32-1.77-0.4-0.86 0.08-1.7 0.27-1.75 0.4 0.09 0.28 0.25 0.53 0.46 0.72 0.46 0.51 0.97 0.84 1.3 0.84m0.69 10.67c-0.3-2.6-0.03-3.15 0.2-3.33a0.42 0.42 0 0 1 0.4-0.05c0.23 0.1 0.43 0.27 0.59 0.47 0.28 0.3 0.49 0.5 0.67 0.39 0.13-0.08 0.32-0.5 0.5-0.88l0.31-0.64c-0.25-2.33-1.65-4.12-3.35-4.12-1.87 0-3.4 2.16-3.4 4.83v0.1c0.32 0.3 0.69 0.73 1.14 1.3q0.26 0.32 0.49 0.68a2.7 2.7 0 0 1 0.29 2.25c0.42 0.32 0.94 0.49 1.47 0.5 0.34 0 0.68-0.07 1-0.21a2.6 2.6 0 0 1-0.17-0.46 7 7 0 0 1-0.15-0.83"/>
-        <path
-            android:fillColor="#FF000000"
-            android:pathData="M9.65 17.35C9.3 16.91 9 16.56 8.73 16.28L8.6 16.14 8.47 16c-0.58-0.6-0.9-0.76-1.06-0.78a0.2 0.2 0 0 0-0.07 0 0.15 0.15 0 0 0-0.1 0.08v0.02a0.9 0.9 0 0 0-0.07 0.4v0.33c0.04 0.25-0.02 0.5-0.15 0.72a0.4 0.4 0 0 1-0.08 0.07l-0.06 0.04a0.6 0.6 0 0 1-0.1 0.04H6.75c-0.21 0.03-0.55-0.09-0.99-0.25l-0.12-0.05c-0.55-0.21-1.18-0.45-1.65-0.45a0.63 0.63 0 0 0-0.55 0.23c-0.34 0.5 0.42 1.27 1.03 1.9 0.38 0.39 0.68 0.7 0.71 0.92 0.06 0.42-0.4 0.58-0.79 0.73a1.5 1.5 0 0 0-0.56 0.27c-0.06 0.07-0.06 0.12-0.05 0.15 0.06 0.2 0.5 0.61 2.9 1.29q0.4 0.11 0.8 0.18c0.5 0.07 1 0 1.45-0.18a2.64 2.64 0 0 0 1.13-0.9q0.17-0.25 0.27-0.53l0.05-0.12c0-0.04 0.03-0.09 0.04-0.13a2.48 2.48 0 0 0-0.3-1.98 7 7 0 0 0-0.47-0.65m9.62-0.17c-0.21 0.02-0.42 0.08-0.6 0.19l-0.28 0.11c-0.3 0.12-0.61 0.17-0.8-0.1a0.6 0.6 0 0 1-0.1-0.22 3.6 3.6 0 0 1-0.06-0.6v-0.31c0-0.72-0.02-1.59-0.37-1.93a0.5 0.5 0 0 0-0.26-0.14h-0.03a0.5 0.5 0 0 0-0.26 0.04c-0.3 0.12-0.56 0.5-0.79 0.93l-0.1 0.22-0.12 0.25-0.1 0.22c-0.23 0.5-0.4 0.87-0.6 1-0.39 0.2-0.71-0.14-1-0.45a1.5 1.5 0 0 0-0.48-0.4 0.2 0.2 0 0 0-0.08-0.01q-0.04 0-0.08 0.03c-0.16 0.12-0.38 0.69-0.11 3.1q0.04 0.4 0.13 0.8l0.14 0.4 0.06 0.1 0.05 0.12c0.21 0.38 0.51 0.7 0.88 0.93a2.66 2.66 0 0 0 2.5 0.17c0.4-0.18 0.75-0.46 1-0.8a7 7 0 0 0 0.46-0.68c1.22-2.11 1.24-2.72 1.15-2.9a0.15 0.15 0 0 0-0.15-0.07"/>
-    </group>
+  <group>
+    <clip-path
+        android:pathData="M3.167,2.19H20.5V22H3.165z"/>
+    <path
+        android:pathData="M13.206,20.644a2.7,2.7 0,0 1,-1.097 0.248,2.8 2.8,0 0,1 -1.567,-0.495c-0.153,0.38 -0.392,0.723 -0.7,1a2.8,2.8 0,0 1,-1.078 0.604h6.141a2.8,2.8 0,0 1,-0.99 -0.51,2.8 2.8,0 0,1 -0.709,-0.847M6.71,16.673a0.2,0.2 0,0 0,0.067 -0.03q0.056,-0.49 0.13,-0.94c-0.01,-0.169 0.017,-0.338 0.08,-0.495 0.348,-1.904 0.834,-3.24 1.504,-4.052a0.13,0.13 0,0 1,0.18 -0.018,0.123 0.123,0 0,1 0.018,0.174 4,4 0,0 0,-0.203 0.272q-0.764,1.113 -1.199,3.389h0.03a0.6,0.6 0,0 1,0.166 0c0.198,0.042 0.508,0.203 0.985,0.67 0.061,-2.72 1.661,-4.913 3.642,-4.913 1.748,0 3.208,1.715 3.556,3.997a1.7,1.7 0,0 1,0.762 -0.742,0.8 0.8,0 0,1 0.254,-0.047 7.5,7.5 0,0 0,-0.948 -2.342,4 4,0 0,0 -0.2,-0.272 0.12,0.12 0,0 1,-0.03 -0.09,0.12 0.12,0 0,1 0.048,-0.083 0.13,0.13 0,0 1,0.092 -0.028,0.13 0.13,0 0,1 0.085,0.045c0.508,0.624 0.93,1.557 1.245,2.822 0.678,0.247 0.696,1.361 0.71,2.267 0,0.43 0,0.877 0.105,0.99 0.104,0.114 0.325,0.09 0.635,-0.04 0.036,-0.393 0.053,-0.742 0.063,-1.036v-1.082c0,-2.475 -3.266,-6.755 -3.266,-6.755l-0.378,-3.218c0,-2.953 -2.733,-2.926 -2.733,-2.926s-2.743,-0.027 -2.743,2.914l-0.365,3.23s-3.267,4.277 -3.267,6.755v0.31s-0.012,0.299 0,0.767v0.227c0.414,0.154 0.839,0.315 0.976,0.28m5.388,-10.41c0.761,0.068 1.975,0.247 2.031,0.613 0.04,0.282 -0.429,0.822 -0.523,0.926 -0.195,0.215 -0.876,0.92 -1.49,0.92 -0.615,0 -1.296,-0.705 -1.49,-0.92 -0.093,-0.104 -0.563,-0.644 -0.525,-0.926 0.046,-0.374 1.273,-0.545 1.996,-0.614"
+        android:fillColor="#FF000000"/>
+    <path
+        android:pathData="M12.111,8.475c0.333,0 0.843,-0.33 1.298,-0.837 0.348,-0.384 0.475,-0.666 0.465,-0.73 -0.064,-0.127 -0.894,-0.317 -1.778,-0.401 -0.856,0.084 -1.687,0.274 -1.75,0.406 0.091,0.275 0.252,0.523 0.467,0.722 0.457,0.51 0.965,0.84 1.298,0.84m0.684,10.664c-0.292,-2.607 -0.023,-3.146 0.206,-3.324a0.42,0.42 0,0 1,0.4 -0.057c0.23,0.11 0.431,0.271 0.587,0.47 0.287,0.304 0.488,0.495 0.674,0.391 0.131,-0.077 0.32,-0.495 0.507,-0.879 0.097,-0.205 0.196,-0.425 0.305,-0.636 -0.254,-2.33 -1.65,-4.126 -3.355,-4.126 -1.872,0 -3.393,2.166 -3.393,4.827v0.096c0.31,0.317 0.68,0.743 1.133,1.3q0.266,0.328 0.487,0.685a2.7,2.7 0,0 1,0.29 2.258c0.426,0.312 0.943,0.485 1.476,0.495 0.341,-0.002 0.679,-0.073 0.99,-0.21a2.6,2.6 0,0 1,-0.16 -0.46,7 7,0 0,1 -0.147,-0.83"
+        android:fillColor="#FF000000"/>
+    <path
+        android:pathData="M9.651,17.35c-0.355,-0.44 -0.657,-0.789 -0.916,-1.071l-0.13,-0.139 -0.132,-0.138c-0.587,-0.594 -0.897,-0.758 -1.06,-0.785a0.2,0.2 0,0 0,-0.068 0,0.15 0.15,0 0,0 -0.114,0.082v0.017a0.9,0.9 0,0 0,-0.058 0.406v0.327c0.034,0.25 -0.019,0.505 -0.15,0.723a0.4,0.4 0,0 1,-0.087 0.071l-0.053,0.032a0.6,0.6 0,0 1,-0.107 0.043H6.75c-0.211,0.037 -0.554,-0.084 -0.988,-0.248l-0.127,-0.05c-0.544,-0.21 -1.179,-0.452 -1.644,-0.452a0.63,0.63 0,0 0,-0.553 0.232c-0.34,0.495 0.421,1.273 1.036,1.901 0.378,0.389 0.675,0.693 0.708,0.921 0.059,0.42 -0.393,0.582 -0.792,0.725a1.5,1.5 0,0 0,-0.564 0.278c-0.06,0.069 -0.058,0.116 -0.045,0.15 0.055,0.191 0.507,0.61 2.897,1.285q0.398,0.112 0.806,0.178c0.49,0.073 0.992,0.01 1.448,-0.182a2.64,2.64 0,0 0,1.13 -0.902q0.165,-0.245 0.271,-0.522l0.05,-0.121c0,-0.042 0.024,-0.09 0.037,-0.131a2.48,2.48 0,0 0,-0.293 -1.98,7 7,0 0,0 -0.475,-0.65m9.618,-0.17c-0.212,0.02 -0.418,0.084 -0.604,0.186l-0.277,0.117c-0.305,0.113 -0.61,0.168 -0.807,-0.095a0.6,0.6 0,0 1,-0.094 -0.227,3.6 3.6,0 0,1 -0.056,-0.592v-0.322c0,-0.72 -0.026,-1.586 -0.373,-1.925a0.5,0.5 0,0 0,-0.255 -0.14h-0.038a0.5,0.5 0,0 0,-0.254 0.035c-0.3,0.12 -0.56,0.496 -0.79,0.936l-0.109,0.215 -0.117,0.248 -0.104,0.225c-0.223,0.495 -0.398,0.874 -0.601,0.99 -0.376,0.216 -0.704,-0.13 -0.991,-0.438a1.5,1.5 0,0 0,-0.48 -0.4,0.2 0.2,0 0,0 -0.076,-0.016q-0.048,0 -0.084,0.03c-0.158,0.124 -0.384,0.69 -0.112,3.104q0.044,0.4 0.137,0.792 0.052,0.207 0.137,0.404 0.027,0.056 0.056,0.111c0.02,0.037 0.033,0.074 0.054,0.111 0.208,0.377 0.51,0.696 0.879,0.928a2.66,2.66 0,0 0,2.504 0.171c0.398,-0.18 0.743,-0.454 1.003,-0.8a7,7 0,0 0,0.45 -0.675c1.218,-2.116 1.241,-2.722 1.147,-2.896a0.15,0.15 0,0 0,-0.144 -0.077"
+        android:fillColor="#FF000000"/>
+  </group>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_list_bulleted.xml b/libraries/compound/src/main/res/drawable/ic_compound_list_bulleted.xml
index f7fe7a8256..3e50a2b7a1 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_list_bulleted.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_list_bulleted.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4.5 7.5q-0.62 0-1.06-0.44A1.44 1.44 0 0 1 3 6q0-0.62 0.44-1.06Q3.88 4.5 4.5 4.5t1.06 0.44Q6 5.38 6 6T5.56 7.06Q5.12 7.5 4.5 7.5m4.79 11.21Q9.58 19 10 19h10q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 18a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 17H10a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 9 18q0 0.42 0.29 0.71m0-6Q9.58 13 10 13h10q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 12a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 11H10a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 9 12q0 0.42 0.29 0.71m0-6Q9.58 7 10 7h10q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 6a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 5H10a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 9 6q0 0.42 0.29 0.71M3.44 19.06Q3.88 19.5 4.5 19.5t1.06-0.44Q6 18.62 6 18t-0.44-1.06A1.45 1.45 0 0 0 4.5 16.5q-0.62 0-1.06 0.44Q3 17.38 3 18t0.44 1.06M4.5 13.5q-0.62 0-1.06-0.44A1.45 1.45 0 0 1 3 12q0-0.62 0.44-1.06 0.44-0.44 1.06-0.44t1.06 0.44Q6 11.38 6 12t-0.44 1.06Q5.12 13.5 4.5 13.5"/>
+  <path
+      android:pathData="M4.5,7.5q-0.618,0 -1.06,-0.44A1.44,1.44 0,0 1,3 6q0,-0.618 0.44,-1.06 0.442,-0.44 1.06,-0.44t1.06,0.44Q6,5.383 6,6t-0.44,1.06q-0.44,0.44 -1.06,0.44m4.788,11.213Q9.575,19 10,19h10q0.424,0 0.712,-0.288A0.97,0.97 0,0 0,21 18a0.97,0.97 0,0 0,-0.288 -0.712A0.97,0.97 0,0 0,20 17H10a0.97,0.97 0,0 0,-0.713 0.288A0.97,0.97 0,0 0,9 18q0,0.424 0.287,0.712m0.001,-5.999Q9.575,13 10,13h10q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 12a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 11H10a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,9 12q0,0.424 0.287,0.713m0.001,-6Q9.575,7 10,7h10q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 6a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 5H10a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,9 6q0,0.424 0.287,0.713M3.44,19.06q0.442,0.44 1.06,0.44t1.06,-0.44Q6,18.62 6,18t-0.44,-1.06a1.45,1.45 0,0 0,-1.06 -0.44q-0.618,0 -1.06,0.44Q3,17.38 3,18t0.44,1.06M4.5,13.5q-0.618,0 -1.06,-0.44A1.45,1.45 0,0 1,3 12q0,-0.619 0.44,-1.06 0.442,-0.44 1.06,-0.44t1.06,0.44Q6,11.383 6,12t-0.44,1.06q-0.44,0.44 -1.06,0.44"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_list_numbered.xml b/libraries/compound/src/main/res/drawable/ic_compound_list_numbered.xml
index d3fbeb2d2d..a35008936e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_list_numbered.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_list_numbered.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9 6a1 1 0 0 1 1-1h10a1 1 0 1 1 0 2H10a1 1 0 0 1-1-1m0 6a1 1 0 0 1 1-1h10a1 1 0 1 1 0 2H10a1 1 0 0 1-1-1m0 6a1 1 0 0 1 1-1h10a1 1 0 1 1 0 2H10a1 1 0 0 1-1-1M5.6 5.09A0.75 0.75 0 0 1 6 5.75v4.5a0.75 0.75 0 0 1-1.5 0v-3.1L4.17 7.37a0.75 0.75 0 0 1-0.84-1.24l1.5-1A0.75 0.75 0 0 1 5.6 5.09M5 13a2 2 0 0 0-1.14 0.32 1.85 1.85 0 0 0-0.63 0.72A2.3 2.3 0 0 0 3 14.96v0.02V15L3.75 15H3a0.75 0.75 0 0 0 1.5 0.01V15l0.01-0.07a0.8 0.8 0 0 1 0.07-0.22 0.35 0.35 0 0 1 0.11-0.14C4.73 14.54 4.82 14.5 5 14.5s0.27 0.04 0.3 0.07a0.35 0.35 0 0 1 0.12 0.14A0.8 0.8 0 0 1 5.5 15a0.53 0.53 0 0 1-0.14 0.36L3.2 17.71A0.75 0.75 0 0 0 3 18.23v0.02C3 18.66 3.34 19 3.75 19h2.5a0.75 0.75 0 0 0 0-1.5H5.43l1.03-1.12C6.81 16 7 15.5 7 15H6.25 7v-0.04-0.07a2.3 2.3 0 0 0-0.23-0.85 1.85 1.85 0 0 0-0.63-0.72A2 2 0 0 0 5 13m-0.5 2v0.01z"/>
+  <path
+      android:pathData="M9,6a1,1 0,0 1,1 -1h10a1,1 0,1 1,0 2H10a1,1 0,0 1,-1 -1m0,6a1,1 0,0 1,1 -1h10a1,1 0,1 1,0 2H10a1,1 0,0 1,-1 -1m0,6a1,1 0,0 1,1 -1h10a1,1 0,1 1,0 2H10a1,1 0,0 1,-1 -1M5.604,5.089A0.75,0.75 0,0 1,6 5.75v4.5a0.75,0.75 0,0 1,-1.5 0V7.151l-0.334,0.223a0.75,0.75 0,0 1,-0.832 -1.248l1.5,-1a0.75,0.75 0,0 1,0.77 -0.037M5,13a2,2 0,0 0,-1.139 0.321,1.85 1.85,0 0,0 -0.626,0.719 2.3,2.3 0,0 0,-0.234 0.921v0.023l-0.001,0.01v0.005l0.75,0.001H3a0.75,0.75 0,0 0,1.5 0.01V15l0.01,-0.072a0.8,0.8 0,0 1,0.067 -0.218,0.35 0.35,0 0,1 0.116,-0.14c0.04,-0.027 0.126,-0.07 0.307,-0.07s0.267,0.043 0.307,0.07a0.35,0.35 0,0 1,0.116 0.14,0.8 0.8,0 0,1 0.076,0.29v0.008a0.53,0.53 0,0 1,-0.14 0.352l-2.161,2.351a0.75,0.75 0,0 0,-0.198 0.523v0.016c0,0.414 0.336,0.75 0.75,0.75h2.5a0.75,0.75 0,0 0,0 -1.5h-0.82l1.034,-1.124C6.809,16 7,15.51 7,15h-0.75H7v-0.039l-0.004,-0.068a2.3,2.3 0,0 0,-0.231 -0.853,1.85 1.85,0 0,0 -0.626,-0.719A2,2 0,0 0,5 13m-0.5,2.003V15v0.01z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_list_view.xml b/libraries/compound/src/main/res/drawable/ic_compound_list_view.xml
index ffd3359cfa..8af526ae39 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_list_view.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_list_view.xml
@@ -3,14 +3,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17 5a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M4 7a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2z m8 2H4v6h8z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16 10a1 1 0 0 1 1-1h4a1 1 0 1 1 0 2h-4a1 1 0 0 1-1-1m0 4a1 1 0 0 1 1-1h4a1 1 0 1 1 0 2h-4a1 1 0 0 1-1-1m1 3a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2z"/>
+  <path
+      android:pathData="M17,5a1,1 0,1 0,0 2h4a1,1 0,1 0,0 -2z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M4,7a2,2 0,0 0,-2 2v6a2,2 0,0 0,2 2h8a2,2 0,0 0,2 -2L14,9a2,2 0,0 0,-2 -2zM12,9L4,9v6h8z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16,10a1,1 0,0 1,1 -1h4a1,1 0,1 1,0 2h-4a1,1 0,0 1,-1 -1m0,4a1,1 0,0 1,1 -1h4a1,1 0,1 1,0 2h-4a1,1 0,0 1,-1 -1m1,3a1,1 0,1 0,0 2h4a1,1 0,1 0,0 -2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_location_navigator.xml b/libraries/compound/src/main/res/drawable/ic_compound_location_navigator.xml
index bffa2d9f9d..54d07dc296 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_location_navigator.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_location_navigator.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11 22v-1q-3.12-0.35-5.36-2.59t-2.59-5.36h-1a0.97 0.97 0 0 1-0.71-0.29 0.97 0.97 0 0 1-0.29-0.71q0-0.42 0.29-0.71a0.97 0.97 0 0 1 0.71-0.29h1Q3.4 7.93 5.64 5.69 7.88 3.45 11 3.1v-1q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 1.1q0.42 0 0.71 0.29T13 2.1v1q3.12 0.35 5.36 2.59 2.24 2.23 2.59 5.36h1q0.42 0 0.71 0.29t0.29 0.71q0 0.42-0.29 0.71a0.97 0.97 0 0 1-0.71 0.29h-1q-0.35 3.12-2.59 5.36Q16.13 20.65 13 21v1q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 23a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 22m1-2.95q2.9 0 4.95-2.05T19 12.05 16.95 7.1 12 5.05 7.05 7.1 5 12.05 7.05 17 12 19.05"/>
+  <path
+      android:pathData="M11,22v-1q-3.124,-0.35 -5.362,-2.587T3.05,13.05h-1a0.97,0.97 0,0 1,-0.712 -0.288,0.97 0.97,0 0,1 -0.288,-0.712q0,-0.424 0.288,-0.713a0.97,0.97 0,0 1,0.712 -0.287h1q0.35,-3.124 2.588,-5.363Q7.875,3.45 11,3.1v-1q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 1.1q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713v1q3.124,0.35 5.363,2.587Q20.6,7.925 20.95,11.05h1q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713 0,0.424 -0.287,0.712a0.97,0.97 0,0 1,-0.713 0.288h-1q-0.35,3.124 -2.587,5.363Q16.125,20.65 13,21v1q0,0.424 -0.287,0.712A0.97,0.97 0,0 1,12 23a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,11 22m1,-2.95q2.9,0 4.95,-2.05T19,12.05 16.95,7.1 12,5.05 7.05,7.1 5,12.05 7.05,17 12,19.05"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_location_navigator_centred.xml b/libraries/compound/src/main/res/drawable/ic_compound_location_navigator_centred.xml
index 50f8ac655d..b6afaa6620 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_location_navigator_centred.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_location_navigator_centred.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11 21.95v-1q-3.12-0.35-5.36-2.59T3.05 13h-1a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 1.05 12q0-0.42 0.29-0.71A0.97 0.97 0 0 1 2.05 11h1Q3.4 7.88 5.64 5.64T11 3.05v-1q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 1.05q0.42 0 0.71 0.29Q13 1.62 13 2.05v1q3.12 0.35 5.36 2.59Q20.6 7.88 20.95 11h1q0.42 0 0.71 0.29T22.95 12q0 0.42-0.29 0.71A0.97 0.97 0 0 1 21.95 13h-1q-0.35 3.12-2.59 5.36-2.23 2.24-5.36 2.59v1q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 22.95a0.97 0.97 0 0 1-0.71-0.29 0.97 0.97 0 0 1-0.29-0.71M12 19q2.9 0 4.95-2.05T19 12t-2.05-4.95T12 5 7.05 7.05 5 12t2.05 4.95T12 19m0-3q-1.65 0-2.83-1.18T8 12t1.18-2.83T12 8t2.83 1.18T16 12t-1.18 2.83T12 16"/>
+  <path
+      android:pathData="M11,21.95v-1q-3.124,-0.35 -5.362,-2.587T3.05,13h-1a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,1.05 12q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,2.05 11h1q0.35,-3.124 2.588,-5.362T11,3.05v-1q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,12 1.05q0.424,0 0.713,0.288 0.287,0.287 0.287,0.712v1q3.124,0.35 5.363,2.588Q20.6,7.875 20.95,11h1q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713 0,0.424 -0.287,0.713a0.97,0.97 0,0 1,-0.713 0.287h-1q-0.35,3.124 -2.587,5.363Q16.125,20.6 13,20.95v1q0,0.424 -0.287,0.713a0.97,0.97 0,0 1,-0.713 0.287,0.97 0.97,0 0,1 -0.713,-0.287 0.97,0.97 0,0 1,-0.287 -0.713M12,19q2.9,0 4.95,-2.05T19,12t-2.05,-4.95T12,5 7.05,7.05 5,12t2.05,4.95T12,19m0,-3q-1.65,0 -2.825,-1.175T8,12t1.175,-2.825T12,8t2.825,1.175T16,12t-1.175,2.825T12,16"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_location_pin.xml b/libraries/compound/src/main/res/drawable/ic_compound_location_pin.xml
index 063076d4ae..08101cd217 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_location_pin.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_location_pin.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 19.35q3.05-2.8 4.53-5.09Q18 11.98 18 10.2q0-2.73-1.74-4.46Q14.53 4 12 4T7.74 5.74Q6 7.48 6 10.2q0 1.77 1.48 4.06 1.47 2.29 4.52 5.09m0 1.98a2.1 2.1 0 0 1-0.7-0.13 1.8 1.8 0 0 1-0.63-0.37A39 39 0 0 1 7.8 17.9q-1.25-1.43-2.09-2.76-0.84-1.34-1.27-2.58Q4 11.32 4 10.2q0-3.75 2.41-5.97T12 2t5.59 2.23T20 10.2q0 1.13-0.44 2.36-0.43 1.24-1.27 2.58a22 22 0 0 1-2.09 2.76 39 39 0 0 1-2.88 2.92 1.8 1.8 0 0 1-0.62 0.38 2.1 2.1 0 0 1-0.7 0.13M12 12q0.82 0 1.41-0.59Q14 10.83 14 10t-0.59-1.41A1.93 1.93 0 0 0 12 8q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 10 10q0 0.82 0.59 1.41T12 12"/>
+  <path
+      android:pathData="M12,19.35q3.05,-2.8 4.525,-5.088Q18,11.976 18,10.2q0,-2.725 -1.738,-4.462Q14.526,4 12,4T7.738,5.737Q6,7.476 6,10.2q0,1.775 1.475,4.063Q8.95,16.549 12,19.35m0,1.975a2.1,2.1 0,0 1,-0.7 -0.125,1.8 1.8,0 0,1 -0.625,-0.375A39,39 0,0 1,7.8 17.9q-1.25,-1.425 -2.087,-2.762 -0.838,-1.338 -1.275,-2.575Q4,11.325 4,10.2q0,-3.75 2.412,-5.975T12,2t5.587,2.225T20,10.2q0,1.125 -0.437,2.363 -0.438,1.237 -1.275,2.574A22,22 0,0 1,16.2 17.9a39,39 0,0 1,-2.875 2.925,1.8 1.8,0 0,1 -0.625,0.375 2.1,2.1 0,0 1,-0.7 0.125M12,12q0.825,0 1.412,-0.588Q14,10.826 14,10t-0.588,-1.412A1.93,1.93 0,0 0,12 8q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,10 10q0,0.825 0.588,1.412Q11.175,12 12,12"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_location_pin_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_location_pin_solid.xml
index defb2d4e42..a03272a0a8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_location_pin_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_location_pin_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 21.32a2.1 2.1 0 0 1-0.7-0.12 1.8 1.8 0 0 1-0.63-0.38A39 39 0 0 1 7.8 17.9q-1.25-1.43-2.09-2.76-0.84-1.34-1.27-2.58Q4 11.32 4 10.2q0-3.75 2.41-5.97T12 2t5.59 2.23T20 10.2q0 1.13-0.44 2.36-0.43 1.24-1.27 2.58a22 22 0 0 1-2.09 2.76 39 39 0 0 1-2.88 2.92 1.8 1.8 0 0 1-0.62 0.38 2.1 2.1 0 0 1-0.7 0.13M12 12q0.82 0 1.41-0.59Q14 10.83 14 10t-0.59-1.41A1.93 1.93 0 0 0 12 8q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 10 10q0 0.82 0.59 1.41T12 12"/>
+  <path
+      android:pathData="M12,21.325a2.1,2.1 0,0 1,-0.7 -0.125,1.8 1.8,0 0,1 -0.625,-0.375A39,39 0,0 1,7.8 17.9q-1.25,-1.425 -2.087,-2.762 -0.838,-1.338 -1.275,-2.575Q4,11.325 4,10.2q0,-3.75 2.412,-5.975T12,2t5.587,2.225T20,10.2q0,1.125 -0.437,2.363 -0.438,1.237 -1.275,2.574A22,22 0,0 1,16.2 17.9a39,39 0,0 1,-2.875 2.925,1.8 1.8,0 0,1 -0.625,0.375 2.1,2.1 0,0 1,-0.7 0.125M12,12q0.825,0 1.412,-0.588Q14,10.826 14,10t-0.588,-1.412A1.93,1.93 0,0 0,12 8q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,10 10q0,0.825 0.588,1.412Q11.175,12 12,12"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_lock.xml b/libraries/compound/src/main/res/drawable/ic_compound_lock.xml
index 9715295d94..2225361a2d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_lock.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_lock.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 22q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 20V10q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 8h1V6q0-2.08 1.46-3.54Q9.93 1 12 1q2.08 0 3.54 1.46T17 6v2h1q0.82 0 1.41 0.59T20 10v10q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 22z m0-2h12V10H6zM9 8h6V6q0-1.25-0.88-2.13A2.9 2.9 0 0 0 12 3q-1.25 0-2.13 0.88A2.9 2.9 0 0 0 9 6z"/>
+  <path
+      android:pathData="M6,22q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 20L4,10q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,6 8h1L7,6q0,-2.075 1.463,-3.537Q9.926,1 12,1q2.075,0 3.537,1.463Q17,3.925 17,6v2h1q0.824,0 1.413,0.588Q20,9.175 20,10v10q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 22zM6,20h12L18,10L6,10zM9,8h6L15,6q0,-1.25 -0.875,-2.125A2.9,2.9 0,0 0,12 3q-1.25,0 -2.125,0.875A2.9,2.9 0,0 0,9 6z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_lock_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_lock_off.xml
index a19bac4811..3f34eb50b8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_lock_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_lock_off.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 22q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 20V10q0-0.82 0.59-1.41a2 2 0 0 1 0.7-0.46L1.33 4.17a1 1 0 0 1 1.42-1.42L7 7.01V6.99l13 13v0.02l1.25 1.24a1 1 0 1 1-1.42 1.42l-0.9-0.9A1.94 1.94 0 0 1 18 22z m14-4.83V10q0-0.82-0.59-1.41A1.93 1.93 0 0 0 18 8h-1V6q0-2.08-1.46-3.54T12 1 8.46 2.46a4.9 4.9 0 0 0-1.22 1.95L9 6.17V6q0-1.25 0.88-2.13A2.9 2.9 0 0 1 12 3q1.25 0 2.13 0.88T15 6v2h-4.17z"/>
+  <path
+      android:pathData="M6,22q-0.825,0 -1.412,-0.587A1.93,1.93 0,0 1,4 20L4,10q0,-0.825 0.588,-1.412a2,2 0,0 1,0.702 -0.463L1.333,4.167a1,1 0,0 1,1.414 -1.414L7,7.006v-0.012l13,13v0.012l1.247,1.247a1,1 0,1 1,-1.414 1.414l-0.896,-0.896A1.94,1.94 0,0 1,18 22zM20,17.166L20,10q0,-0.825 -0.587,-1.412A1.93,1.93 0,0 0,18 8h-1L17,6q0,-2.075 -1.463,-3.537Q14.075,1 12,1T8.463,2.463a4.9,4.9 0,0 0,-1.22 1.946L9,6.166L9,6q0,-1.25 0.875,-2.125A2.9,2.9 0,0 1,12 3q1.25,0 2.125,0.875T15,6v2h-4.166z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_lock_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_lock_solid.xml
index 6a5a11b4de..d39e85a9a2 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_lock_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_lock_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 22q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 20V10q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 8h1V6q0-2.08 1.46-3.54Q9.93 1 12 1q2.08 0 3.54 1.46T17 6v2h1q0.82 0 1.41 0.59T20 10v10q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 22zM9 8h6V6q0-1.25-0.88-2.13A2.9 2.9 0 0 0 12 3q-1.25 0-2.13 0.88A2.9 2.9 0 0 0 9 6z"/>
+  <path
+      android:pathData="M6,22q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 20V10q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,6 8h1V6q0,-2.075 1.463,-3.537Q9.926,1 12,1q2.075,0 3.537,1.463Q17,3.925 17,6v2h1q0.824,0 1.413,0.588Q20,9.175 20,10v10q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 22zM9,8h6V6q0,-1.25 -0.875,-2.125A2.9,2.9 0,0 0,12 3q-1.25,0 -2.125,0.875A2.9,2.9 0,0 0,9 6z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mac.xml b/libraries/compound/src/main/res/drawable/ic_compound_mac.xml
index 6f72038f43..47a4d690ef 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mac.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mac.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M16.1 2.4a4.1 4.1 0 0 1-1.06 3.07c-0.74 0.87-1.88 1.36-3.07 1.35-0.07-1.08 0.32-2.15 1.09-2.96 0.78-0.82 1.86-1.35 3.04-1.46m3.77 6.54c-1.37 0.78-2.22 2.16-2.24 3.66 0 1.69 1.1 3.21 2.77 3.87a9.4 9.4 0 0 1-1.44 2.72c-0.85 1.18-1.74 2.33-3.15 2.35-0.67 0.02-1.12-0.16-1.6-0.35-0.49-0.2-1-0.4-1.8-0.4-0.86 0-1.4 0.21-1.9 0.42-0.46 0.17-0.89 0.34-1.5 0.36-1.34 0.05-2.37-1.25-3.25-2.42C4 16.77 2.64 12.43 4.47 9.48c0.86-1.43 2.47-2.35 4.24-2.4 0.76-0.01 1.5 0.26 2.14 0.5 0.49 0.18 0.93 0.35 1.28 0.35 0.32 0 0.74-0.16 1.24-0.34 0.78-0.3 1.74-0.64 2.71-0.55C17.6 7.1 19 7.8 19.87 8.94"/>
+  <path
+      android:pathData="M16.099,2.4a4.1,4.1 0,0 1,-1.057 3.074c-0.747,0.862 -1.878,1.358 -3.07,1.347 -0.075,-1.081 0.315,-2.146 1.085,-2.96 0.78,-0.825 1.866,-1.346 3.042,-1.461m3.767,6.54c-1.37,0.783 -2.213,2.163 -2.234,3.657 0.002,1.69 1.092,3.215 2.768,3.873a9.4,9.4 0,0 1,-1.44 2.723c-0.848,1.178 -1.737,2.329 -3.149,2.35 -0.67,0.015 -1.124,-0.165 -1.596,-0.351 -0.493,-0.195 -1.006,-0.398 -1.809,-0.398 -0.851,0 -1.388,0.21 -1.905,0.412 -0.447,0.174 -0.88,0.343 -1.49,0.367 -1.343,0.046 -2.37,-1.258 -3.25,-2.425 -1.756,-2.383 -3.124,-6.716 -1.29,-9.664 0.861,-1.437 2.471,-2.349 4.241,-2.402 0.763,-0.015 1.494,0.258 2.136,0.497 0.49,0.183 0.928,0.347 1.286,0.347 0.315,0 0.74,-0.157 1.237,-0.34 0.78,-0.288 1.737,-0.64 2.71,-0.545 1.514,0.044 2.917,0.748 3.785,1.9"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mark_as_read.xml b/libraries/compound/src/main/res/drawable/ic_compound_mark_as_read.xml
index 8de67ac4e8..7798596fec 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mark_as_read.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mark_as_read.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21.32 9.13c0-0.66-0.33-1.24-0.86-1.56L13.1 3.25a1.81 1.81 0 0 0-1.85 0L3.87 7.57C3.35 7.9 3 8.47 3 9.13v9.17c0 1 0.82 1.83 1.83 1.83H19.5a1.84 1.84 0 0 0 1.83-1.83zM11.2 13.11L4.6 8.98l6.64-3.9a1.81 1.81 0 0 1 1.85 0l6.65 3.9-6.6 4.13a1.85 1.85 0 0 1-1.94 0"/>
+  <path
+      android:pathData="M21.324,9.13c0,-0.66 -0.339,-1.237 -0.862,-1.558l-7.37,-4.318a1.81,1.81 0,0 0,-1.851 0L3.87,7.572C3.348,7.892 3,8.47 3,9.13v9.167c0,1.008 0.825,1.833 1.833,1.833L19.5,20.13a1.84,1.84 0,0 0,1.833 -1.833zM11.195,13.108 L4.595,8.984 11.241,5.088a1.81,1.81 0,0 1,1.851 0l6.646,3.896 -6.6,4.124a1.85,1.85 0,0 1,-1.943 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mark_as_unread.xml b/libraries/compound/src/main/res/drawable/ic_compound_mark_as_unread.xml
index 6b3c53144a..0ec3991f85 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mark_as_unread.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mark_as_unread.xml
@@ -4,11 +4,11 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20 7a2 2 0 1 0 0-4 2 2 0 0 0 0 4"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M17 5H5a2 2 0 0 0-2 2v10.4a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V7.83a3 3 0 0 1-2 0q-0.32-0.11-0.6-0.29L12 11.9 5 7.14V7h12.76A3 3 0 0 1 17 5m-4.44 8.93L19 9.55v7.85H5V9.56l6.44 4.37a1 1 0 0 0 1.12 0"/>
+  <path
+      android:pathData="M20,7a2,2 0,1 0,0 -4,2 2,0 0,0 0,4"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M17,5H5a2,2 0,0 0,-2 2v10.4a2,2 0,0 0,2 2h14a2,2 0,0 0,2 -2V7.83a3,3 0,0 1,-2 0q-0.316,-0.113 -0.595,-0.288L12,11.89 5,7.138V7h12.764A3,3 0,0 1,17 5m-4.438,8.927L19,9.555V17.4H5V9.555l6.438,4.372a1,1 0,0 0,1.124 0"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mark_threads_as_read.xml b/libraries/compound/src/main/res/drawable/ic_compound_mark_threads_as_read.xml
index 5d6c12a557..82bf433d20 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mark_threads_as_read.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mark_threads_as_read.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 5a1 1 0 0 0 0 2h16a1 1 0 1 0 0-2z m0 5a1 1 0 1 0 0 2h16a1 1 0 1 0 0-2z m-1 6a1 1 0 0 1 1-1h6a1 1 0 1 1 0 2H4a1 1 0 0 1-1-1m18.7-0.3a1 1 0 0 0-1.4-1.4L17 17.58l-1.3-1.3a1 1 0 0 0-1.4 1.42l2 2a1 1 0 0 0 1.4 0z"/>
+  <path
+      android:pathData="M4,5a1,1 0,0 0,0 2h16a1,1 0,1 0,0 -2zM4,10a1,1 0,1 0,0 2h16a1,1 0,1 0,0 -2zM3,16a1,1 0,0 1,1 -1h6a1,1 0,1 1,0 2L4,17a1,1 0,0 1,-1 -1m18.707,-0.293a1,1 0,0 0,-1.414 -1.414L17,17.586l-1.293,-1.293a1,1 0,0 0,-1.414 1.414l2,2a1,1 0,0 0,1.414 0z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_marker_read_receipts.xml b/libraries/compound/src/main/res/drawable/ic_compound_marker_read_receipts.xml
index c70cfd3e51..6205a6a982 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_marker_read_receipts.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_marker_read_receipts.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.7 10.7a1 1 0 0 0-1.4-1.4L10 12.58l-1.3-1.3a1 1 0 0 0-1.4 1.42l2 2a1 1 0 0 0 1.4 0z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.4 12.63q0.1-0.3 0.1-0.63t-0.1-0.63a2.1 2.1 0 0 0-0.3-0.57l-4.5-6A1.99 1.99 0 0 0 16 4H4Q3.18 4 2.59 4.59A1.93 1.93 0 0 0 2 6v12q0 0.82 0.59 1.41T4 20h12a1.99 1.99 0 0 0 1.6-0.8l4.5-6q0.2-0.28 0.3-0.57M16 6l4.5 6-4.5 6H4V6z"/>
+  <path
+      android:pathData="M14.707,10.707a1,1 0,0 0,-1.414 -1.414L10,12.586l-1.293,-1.293a1,1 0,0 0,-1.414 1.414l2,2a1,1 0,0 0,1.414 0z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M22.4,12.625q0.1,-0.3 0.1,-0.625t-0.1,-0.625a2.1,2.1 0,0 0,-0.3 -0.575l-4.5,-6A1.99,1.99 0,0 0,16 4H4q-0.824,0 -1.412,0.588A1.93,1.93 0,0 0,2 6v12q0,0.824 0.587,1.413Q3.176,20 4,20h12a1.99,1.99 0,0 0,1.6 -0.8l4.5,-6q0.2,-0.275 0.3,-0.575M16,6l4.5,6 -4.5,6H4V6z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mention.xml b/libraries/compound/src/main/res/drawable/ic_compound_mention.xml
index 274ccb3775..0ec8a49e99 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mention.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mention.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 4a8 8 0 1 0 0 16 1 1 0 1 1 0 2C6.48 22 2 17.52 2 12S6.48 2 12 2s10 4.48 10 10v1.5a3.5 3.5 0 0 1-6.4 1.97A5 5 0 1 1 17 12v1.5a1.5 1.5 0 0 0 3 0V12a8 8 0 0 0-8-8m3 8a3 3 0 1 0-6 0 3 3 0 0 0 6 0"/>
+  <path
+      android:pathData="M12,4a8,8 0,1 0,0 16,1 1,0 1,1 0,2C6.477,22 2,17.523 2,12S6.477,2 12,2s10,4.477 10,10v1.5a3.5,3.5 0,0 1,-6.396 1.966A5,5 0,1 1,17 12v1.5a1.5,1.5 0,0 0,3 0V12a8,8 0,0 0,-8 -8m3,8a3,3 0,1 0,-6 0,3 3,0 0,0 6,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_menu.xml b/libraries/compound/src/main/res/drawable/ic_compound_menu.xml
index c3ee1a2ee1..87f961708c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_menu.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_menu.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 8a1 1 0 0 1 1-1h14a1 1 0 1 1 0 2H5a1 1 0 0 1-1-1m0 4a1 1 0 0 1 1-1h14a1 1 0 1 1 0 2H5a1 1 0 0 1-1-1m1 3a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2z"/>
+  <path
+      android:pathData="M4,8a1,1 0,0 1,1 -1h14a1,1 0,1 1,0 2H5a1,1 0,0 1,-1 -1m0,4a1,1 0,0 1,1 -1h14a1,1 0,1 1,0 2H5a1,1 0,0 1,-1 -1m1,3a1,1 0,1 0,0 2h14a1,1 0,1 0,0 -2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mic_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_mic_off.xml
index e28210c07d..8ce70e59b9 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mic_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mic_off.xml
@@ -4,11 +4,11 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M8 8l2 2 3.41 3.41 1.42 1.42 1.41 1.41 1.42 1.41 2.84 2.85a1 1 0 0 1-1.41 1.41l-3.03-3.02A7.95 7.95 0 0 1 13 19.94V21a1 1 0 1 1-2 0v-1.06A8 8 0 0 1 4 12a1 1 0 1 1 2 0 6 6 0 0 0 8.59 5.42l-1.55-1.56A4 4 0 0 1 8 12v-1.17L2.09 4.9A1 1 0 0 1 3.5 3.5z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14 6v5.17l1.87 1.86Q16 12.53 16 12V6a4 4 0 0 0-7.93-0.76L10 7.17V6a2 2 0 1 1 4 0m3.42 8.58l1.47 1.48A7.96 7.96 0 0 0 20 12a1 1 0 1 0-2 0c0 0.93-0.21 1.8-0.58 2.58"/>
+  <path
+      android:pathData="M8,8v-0.006l2,2V10l3.414,3.414 0.003,-0.003 1.414,1.415 -0.002,0.002 1.414,1.415 0.003,-0.003 1.414,1.414 -0.003,0.003L20.5,20.5a1,1 0,0 1,-1.414 1.414l-3.022,-3.022A7.95,7.95 0,0 1,13 19.938V21a1,1 0,1 1,-2 0v-1.062A8,8 0,0 1,4 12a1,1 0,1 1,2 0,6 6,0 0,0 8.587,5.415l-1.55,-1.55A4.005,4.005 0,0 1,8 12v-1.172L2.086,4.914A1,1 0,0 1,3.5 3.5z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,6v5.166l1.866,1.866q0.132,-0.496 0.134,-1.032V6a4,4 0,0 0,-7.928 -0.762L10,7.166V6a2,2 0,1 1,4 0m3.417,8.583 l1.477,1.477A7.96,7.96 0,0 0,20 12a1,1 0,1 0,-2 0c0,0.925 -0.21,1.8 -0.583,2.583"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mic_off_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_mic_off_solid.xml
index 686809342a..ca3bd707d2 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mic_off_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mic_off_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8 8l6.83 6.83 1.41 1.41 1.42 1.41 2.84 2.85a1 1 0 0 1-1.41 1.41l-3.03-3.02A7.95 7.95 0 0 1 13 19.94V21a1 1 0 0 1-2 0v-1.06A8 8 0 0 1 4 12a1 1 0 1 1 2 0 6 6 0 0 0 8.59 5.42l-1.55-1.56A4 4 0 0 1 8 12v-1.17L2.09 4.9A1 1 0 0 1 3.5 3.5z m9.42 6.58l1.47 1.48A7.96 7.96 0 0 0 20 12a1 1 0 0 0-2 0c0 0.93-0.21 1.8-0.58 2.58M8.07 5.24l7.8 7.8Q16 12.53 16 12V6a4 4 0 0 0-7.93-0.76"/>
+  <path
+      android:pathData="M8,8v-0.006l6.831,6.832 -0.002,0.002 1.414,1.415 0.003,-0.003 1.414,1.414 -0.003,0.003L20.5,20.5a1,1 0,0 1,-1.414 1.414l-3.022,-3.022A7.95,7.95 0,0 1,13 19.938L13,21a1,1 0,0 1,-2 0v-1.062A8,8 0,0 1,4 12a1,1 0,1 1,2 0,6 6,0 0,0 8.587,5.415l-1.55,-1.55A4.005,4.005 0,0 1,8 12v-1.172L2.086,4.914A1,1 0,0 1,3.5 3.5zM17.417,14.583 L18.895,16.06A7.96,7.96 0,0 0,20 12a1,1 0,0 0,-2 0c0,0.925 -0.21,1.8 -0.583,2.583M8.073,5.238l7.793,7.793q0.132,-0.495 0.134,-1.031L16,6a4,4 0,0 0,-7.927 -0.762"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mic_on.xml b/libraries/compound/src/main/res/drawable/ic_compound_mic_on.xml
index 793b9c8f83..2c6cdd5869 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mic_on.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mic_on.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 12a1 1 0 1 0-2 0 8 8 0 0 0 7 7.94V21a1 1 0 1 0 2 0v-1.06A8 8 0 0 0 20 12a1 1 0 1 0-2 0 6 6 0 0 1-12 0"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M14 12V6a2 2 0 1 0-4 0v6a2 2 0 1 0 4 0M12 2a4 4 0 0 0-4 4v6a4 4 0 0 0 8 0V6a4 4 0 0 0-4-4"/>
+  <path
+      android:pathData="M6,12a1,1 0,1 0,-2 0,8 8,0 0,0 7,7.938V21a1,1 0,1 0,2 0v-1.062A8,8 0,0 0,20 12a1,1 0,1 0,-2 0,6 6,0 0,1 -12,0"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M14,12V6a2,2 0,1 0,-4 0v6a2,2 0,1 0,4 0M12,2a4,4 0,0 0,-4 4v6a4,4 0,0 0,8 0V6a4,4 0,0 0,-4 -4"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mic_on_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_mic_on_solid.xml
index 026f477e75..8b7027cda5 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mic_on_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mic_on_solid.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8 6a4 4 0 1 1 8 0v6a4 4 0 0 1-8 0z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 11a1 1 0 0 1 1 1 6 6 0 0 0 12 0 1 1 0 1 1 2 0 8 8 0 0 1-7 7.94V21a1 1 0 1 1-2 0v-1.06A8 8 0 0 1 4 12a1 1 0 0 1 1-1"/>
+  <path
+      android:pathData="M8,6a4,4 0,1 1,8 0v6a4,4 0,0 1,-8 0z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M5,11a1,1 0,0 1,1 1,6 6,0 0,0 12,0 1,1 0,1 1,2 0,8 8,0 0,1 -7,7.938V21a1,1 0,1 1,-2 0v-1.062A8,8 0,0 1,4 12a1,1 0,0 1,1 -1"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_minus.xml b/libraries/compound/src/main/res/drawable/ic_compound_minus.xml
index 064946b6dc..85f71f8692 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_minus.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_minus.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 13a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 5 12q0-0.42 0.29-0.71A0.97 0.97 0 0 1 6 11h12q0.42 0 0.71 0.29T19 12q0 0.42-0.29 0.71A0.97 0.97 0 0 1 18 13z"/>
+  <path
+      android:pathData="M6,13a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,5 12q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,6 11h12q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713A0.97,0.97 0,0 1,18 13z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_mobile.xml b/libraries/compound/src/main/res/drawable/ic_compound_mobile.xml
index 8257628868..48c11f62c8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_mobile.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_mobile.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7 23q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 5 21V3q0-0.82 0.59-1.41A1.93 1.93 0 0 1 7 1h10q0.82 0 1.41 0.59T19 3v18q0 0.82-0.59 1.41A1.93 1.93 0 0 1 17 23z m0-5h10V6H7z"/>
+  <path
+      android:pathData="M7,23q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,5 21L5,3q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,7 1h10q0.824,0 1.413,0.587Q19,2.176 19,3v18q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,17 23zM7,18h10L17,6L7,6z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_notifications.xml b/libraries/compound/src/main/res/drawable/ic_compound_notifications.xml
index afd16aa8e9..b7af3f06b6 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_notifications.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_notifications.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 3c7 0 7 7 7 7v6l1.3 1.3c0.62 0.62 0.18 1.7-0.71 1.7H4.4c-0.89 0-1.33-1.08-0.7-1.7L5 16v-6s0-7 7-7m5 7.01V9.99 9.84a7 7 0 0 0-0.08-0.6 6.6 6.6 0 0 0-0.58-1.85c-0.32-0.63-0.77-1.21-1.4-1.63C14.32 5.34 13.4 5 12 5S9.68 5.34 9.06 5.76c-0.63 0.42-1.08 1-1.4 1.63a6.6 6.6 0 0 0-0.58 1.85A7 7 0 0 0 7 9.98v6.84L6.83 17h10.34L17 16.83zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"/>
+  <path
+      android:pathData="M12,3c7,0 7,7 7,7v6l1.293,1.293c0.63,0.63 0.184,1.707 -0.707,1.707H4.414c-0.89,0 -1.337,-1.077 -0.707,-1.707L5,16v-6s0,-7 7,-7m5,7.01v-0.022l-0.009,-0.146a7,7 0,0 0,-0.073 -0.607,6.6 6.6,0 0,0 -0.582,-1.84c-0.319,-0.638 -0.766,-1.215 -1.398,-1.637C14.318,5.344 13.4,5 12,5s-2.317,0.344 -2.937,0.758c-0.633,0.422 -1.08,0.999 -1.4,1.636a6.6,6.6 0,0 0,-0.58 1.841A7,7 0,0 0,7 9.988v6.84L6.828,17h10.344L17,16.828zM12,22a2,2 0,0 1,-2 -2h4a2,2 0,0 1,-2 2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_notifications_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_notifications_off.xml
index e4fca897a3..6542c704eb 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_notifications_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_notifications_off.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4.92 2.08l17 17a1 1 0 0 1-1.42 1.42L19 19H4.42c-0.89 0-1.33-1.08-0.7-1.7L5 16v-6s0-2.03 1.1-3.91l-2.6-2.6a1 1 0 0 1 1.42-1.4M17 17L7.58 7.57a6.7 6.7 0 0 0-0.5 1.67A7 7 0 0 0 7 9.98V10v6.82L6.83 17zM17 11.35V9.99 9.84a7 7 0 0 0-0.08-0.6 6.6 6.6 0 0 0-0.58-1.85c-0.32-0.63-0.77-1.21-1.4-1.63C14.32 5.34 13.4 5 12 5c-0.47 0-0.88 0.04-1.25 0.1L9.14 3.5C9.93 3.19 10.87 3 12 3c7 0 7 7 7 7v3.35z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10 20h4a2 2 0 0 1-4 0"/>
+  <path
+      android:pathData="m4.917,2.083 l17,17a1,1 0,0 1,-1.414 1.414L19.006,19H4.414c-0.89,0 -1.337,-1.077 -0.707,-1.707L5,16v-6s0,-2.034 1.096,-3.91L3.504,3.498a1,1 0,0 1,1.414 -1.414M17.006,17 L7.579,7.573a6.7,6.7 0,0 0,-0.497 1.662,7 7,0 0,0 -0.081,0.753L7,10.011v6.817L6.828,17zM17,11.35V9.987l-0.009,-0.146a7,7 0,0 0,-0.073 -0.607,6.6 6.6,0 0,0 -0.582,-1.84c-0.319,-0.638 -0.766,-1.215 -1.398,-1.637C14.318,5.344 13.4,5 12,5c-0.466,0 -0.879,0.038 -1.245,0.104L9.136,3.485C9.93,3.181 10.874,3 12,3c7,0 7,7 7,7v3.35z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M10,20h4a2,2 0,0 1,-4 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_notifications_off_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_notifications_off_solid.xml
index 4bc9fdd2ab..502f899de3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_notifications_off_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_notifications_off_solid.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4.92 2.08l17 17a1 1 0 0 1-1.42 1.42L19 19H4.42c-0.89 0-1.33-1.08-0.7-1.7L5 16v-6s0-2.03 1.1-3.91l-2.6-2.6a1 1 0 0 1 1.42-1.4M19 13.34L9.14 3.48C9.93 3.18 10.87 3 12 3c7 0 7 7 7 7z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10 20h4a2 2 0 0 1-4 0"/>
+  <path
+      android:pathData="m4.917,2.083 l17,17a1,1 0,0 1,-1.414 1.414L19.006,19H4.414c-0.89,0 -1.337,-1.077 -0.707,-1.707L5,16v-6s0,-2.034 1.096,-3.91L3.504,3.498a1,1 0,0 1,1.414 -1.414M19,13.35 L9.136,3.484C9.93,3.181 10.874,3 12,3c7,0 7,7 7,7z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M10,20h4a2,2 0,0 1,-4 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_notifications_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_notifications_solid.xml
index 358a18c83e..1e025f929a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_notifications_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_notifications_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20.3 17.3c0.62 0.62 0.18 1.7-0.71 1.7H4.4c-0.89 0-1.33-1.08-0.7-1.7L5 16v-6s0-7 7-7 7 7 7 7v6zM12 22a2 2 0 0 1-2-2h4a2 2 0 0 1-2 2"/>
+  <path
+      android:pathData="M20.293,17.293c0.63,0.63 0.184,1.707 -0.707,1.707H4.414c-0.89,0 -1.337,-1.077 -0.707,-1.707L5,16v-6s0,-7 7,-7 7,7 7,7v6zM12,22a2,2 0,0 1,-2 -2h4a2,2 0,0 1,-2 2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_offline.xml b/libraries/compound/src/main/res/drawable/ic_compound_offline.xml
index 322954e4b0..66862b5b6c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_offline.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_offline.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.5 3.5a1 1 0 1 0-1.41 1.41l4.1 4.12a5.5 5.5 0 0 0-0.17 1.07A5 5 0 0 0 7 20h10.17l1.92 1.91a1 1 0 1 0 1.41-1.41l-0.98-0.98L7.15 7.14z m18.5 12a4.48 4.48 0 0 1-0.93 2.74L8.64 5.8A5.47 5.47 0 0 1 11.5 5a5.49 5.49 0 0 1 4.25 2 4 4 0 0 1 4.19 4.72A4.5 4.5 0 0 1 22 15.5"/>
+  <path
+      android:pathData="M3.5,3.5a1,1 0,1 0,-1.414 1.414l4.113,4.114a5.5,5.5 0,0 0,-0.184 1.07A5.002,5.002 0,0 0,7 20h10.172l1.914,1.914A1,1 0,1 0,20.5 20.5l-0.979,-0.979 0.004,-0.001L7.145,7.14l-0.002,0.003zM22,15.5a4.48,4.48 0,0 1,-0.928 2.738L8.637,5.803A5.47,5.47 0,0 1,11.5 5a5.49,5.49 0,0 1,4.25 2.008,4 4,0 0,1 4.187,4.708A4.5,4.5 0,0 1,22 15.5"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_overflow_horizontal.xml b/libraries/compound/src/main/res/drawable/ic_compound_overflow_horizontal.xml
index c85d1e8da2..5de8de32f5 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_overflow_horizontal.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_overflow_horizontal.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 14q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 6 10q0.82 0 1.41 0.59T8 12t-0.59 1.41A1.93 1.93 0 0 1 6 14m6 0q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 10 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 12 10q0.82 0 1.41 0.59T14 12t-0.59 1.41A1.93 1.93 0 0 1 12 14m6 0q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 16 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 18 10q0.82 0 1.41 0.59T20 12t-0.59 1.41A1.93 1.93 0 0 1 18 14"/>
+  <path
+      android:pathData="M6,14q-0.824,0 -1.412,-0.588A1.93,1.93 0,0 1,4 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,6 10q0.824,0 1.412,0.588Q8,11.175 8,12t-0.588,1.412A1.93,1.93 0,0 1,6 14m6,0q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,10 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,12 10q0.825,0 1.412,0.588Q14,11.175 14,12t-0.588,1.412A1.93,1.93 0,0 1,12 14m6,0q-0.824,0 -1.413,-0.588A1.93,1.93 0,0 1,16 12q0,-0.825 0.587,-1.412A1.93,1.93 0,0 1,18 10q0.824,0 1.413,0.588Q20,11.175 20,12t-0.587,1.412A1.93,1.93 0,0 1,18 14"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_overflow_vertical.xml b/libraries/compound/src/main/res/drawable/ic_compound_overflow_vertical.xml
index 269e28613c..09af569897 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_overflow_vertical.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_overflow_vertical.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 20q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 10 18q0-0.82 0.59-1.41A1.93 1.93 0 0 1 12 16q0.82 0 1.41 0.59T14 18t-0.59 1.41A1.93 1.93 0 0 1 12 20m0-6q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 10 12q0-0.82 0.59-1.41A1.93 1.93 0 0 1 12 10q0.82 0 1.41 0.59T14 12t-0.59 1.41A1.93 1.93 0 0 1 12 14m0-6q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 10 6q0-0.82 0.59-1.41A1.93 1.93 0 0 1 12 4q0.82 0 1.41 0.59Q14 5.17 14 6q0 0.82-0.59 1.41A1.93 1.93 0 0 1 12 8"/>
+  <path
+      android:pathData="M12,20q-0.825,0 -1.412,-0.587A1.93,1.93 0,0 1,10 18q0,-0.824 0.588,-1.413A1.93,1.93 0,0 1,12 16q0.825,0 1.412,0.587Q14,17.176 14,18t-0.588,1.413A1.93,1.93 0,0 1,12 20m0,-6q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,10 12q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,12 10q0.825,0 1.412,0.588Q14,11.175 14,12t-0.588,1.412A1.93,1.93 0,0 1,12 14m0,-6q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,10 6q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,12 4q0.825,0 1.412,0.588Q14,5.175 14,6q0,0.824 -0.588,1.412A1.93,1.93 0,0 1,12 8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_pause.xml b/libraries/compound/src/main/res/drawable/ic_compound_pause.xml
index bcd8325107..7ccfb0108d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_pause.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_pause.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 6a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2z m2 0v12h2V6z m6 0a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2z m2 0v12h2V6z"/>
+  <path
+      android:pathData="M5,6a2,2 0,0 1,2 -2h2a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2L7,20a2,2 0,0 1,-2 -2zM7,6v12h2L9,6zM13,6a2,2 0,0 1,2 -2h2a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2h-2a2,2 0,0 1,-2 -2zM15,6v12h2L17,6z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_pause_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_pause_solid.xml
index f25a7cbcfc..94545f891e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_pause_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_pause_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8 4a2 2 0 0 0-2 2v12a2 2 0 1 0 4 0V6a2 2 0 0 0-2-2m8 0a2 2 0 0 0-2 2v12a2 2 0 1 0 4 0V6a2 2 0 0 0-2-2"/>
+  <path
+      android:pathData="M8,4a2,2 0,0 0,-2 2v12a2,2 0,1 0,4 0V6a2,2 0,0 0,-2 -2m8,0a2,2 0,0 0,-2 2v12a2,2 0,1 0,4 0V6a2,2 0,0 0,-2 -2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_pin.xml b/libraries/compound/src/main/res/drawable/ic_compound_pin.xml
index 0aa36f53e9..343ca14ab2 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_pin.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_pin.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M6.12 2a0.5 0.5 0 0 0-0.35 0.86L7.85 4.9A0.5 0.5 0 0 1 8 5.26v4.48a0.5 0.5 0 0 1-0.15 0.36l-3.7 3.64A0.5 0.5 0 0 0 4 14.1v1.4A0.5 0.5 0 0 0 4.5 16H11v6a1 1 0 1 0 2 0v-6h6.5a0.5 0.5 0 0 0 0.5-0.5v-1.4a0.5 0.5 0 0 0-0.15-0.36l-3.7-3.64A0.5 0.5 0 0 1 16 9.74V5.26a0.5 0.5 0 0 1 0.15-0.36l2.08-2.04A0.5 0.5 0 0 0 17.88 2zM10 4h4v5.74a2.5 2.5 0 0 0 0.75 1.78L17.26 14H6.74l2.51-2.48A2.5 2.5 0 0 0 10 9.75z"/>
+  <path
+      android:pathData="M6.119,2a0.5,0.5 0,0 0,-0.35 0.857L7.85,4.9a0.5,0.5 0,0 1,0.15 0.357v4.487a0.5,0.5 0,0 1,-0.15 0.356l-3.7,3.644A0.5,0.5 0,0 0,4 14.1v1.4a0.5,0.5 0,0 0,0.5 0.5H11v6a1,1 0,1 0,2 0v-6h6.5a0.5,0.5 0,0 0,0.5 -0.5v-1.4a0.5,0.5 0,0 0,-0.15 -0.356l-3.7,-3.644a0.5,0.5 0,0 1,-0.15 -0.356V5.257a0.5,0.5 0,0 1,0.15 -0.357l2.081,-2.043a0.5,0.5 0,0 0,-0.35 -0.857zM10,4h4v5.744a2.5,2.5 0,0 0,0.746 1.781L17.26,14H6.74l2.514,-2.475A2.5,2.5 0,0 0,10 9.744z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_pin_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_pin_solid.xml
index 9326b0fd75..4f277512d0 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_pin_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_pin_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5.77 2.86A0.5 0.5 0 0 1 6.12 2h11.76a0.5 0.5 0 0 1 0.35 0.86L16.15 4.9A0.5 0.5 0 0 0 16 5.26v4.48a0.5 0.5 0 0 0 0.15 0.36l3.7 3.64A0.5 0.5 0 0 1 20 14.1v1.4a0.5 0.5 0 0 1-0.5 0.5H13v6a1 1 0 1 1-2 0v-6H4.5A0.5 0.5 0 0 1 4 15.5v-1.4a0.5 0.5 0 0 1 0.15-0.36l3.7-3.64A0.5 0.5 0 0 0 8 9.74V5.26A0.5 0.5 0 0 0 7.85 4.9z"/>
+  <path
+      android:pathData="M5.769,2.857A0.5,0.5 0,0 1,6.119 2h11.762a0.5,0.5 0,0 1,0.35 0.857L16.15,4.9a0.5,0.5 0,0 0,-0.15 0.357v4.487a0.5,0.5 0,0 0,0.15 0.356l3.7,3.644a0.5,0.5 0,0 1,0.15 0.356v1.4a0.5,0.5 0,0 1,-0.5 0.5H13v6a1,1 0,1 1,-2 0v-6H4.5a0.5,0.5 0,0 1,-0.5 -0.5v-1.4a0.5,0.5 0,0 1,0.15 -0.356l3.7,-3.644A0.5,0.5 0,0 0,8 9.744V5.257a0.5,0.5 0,0 0,-0.15 -0.357z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_play.xml b/libraries/compound/src/main/res/drawable/ic_compound_play.xml
index d7b8d3c5e5..372cdfed4c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_play.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_play.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.92 12L8 17.58V6.42z m0.98-1.74L8.98 4.68C7.65 3.93 6 4.89 6 6.42v11.16c0 1.53 1.65 2.5 2.98 1.74l9.92-5.58c1.36-0.76 1.36-2.72 0-3.48"/>
+  <path
+      android:pathData="M17.92,12 L8,17.58L8,6.42zM18.901,10.257 L8.981,4.677C7.647,3.927 6,4.89 6,6.42v11.16c0,1.53 1.647,2.493 2.98,1.743l9.921,-5.58c1.36,-0.764 1.36,-2.722 0,-3.486"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_play_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_play_solid.xml
index fca650ccd8..e20b1e5c0e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_play_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_play_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.98 4.68l9.92 5.58c1.36 0.76 1.36 2.72 0 3.48l-9.92 5.58C7.65 20.07 6 19.11 6 17.58V6.42c0-1.53 1.65-2.5 2.98-1.74"/>
+  <path
+      android:pathData="m8.98,4.677 l9.921,5.58c1.36,0.764 1.36,2.722 0,3.486l-9.92,5.58C7.647,20.073 6,19.11 6,17.58V6.42c0,-1.53 1.647,-2.493 2.98,-1.743"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_plus.xml b/libraries/compound/src/main/res/drawable/ic_compound_plus.xml
index a20a59aac9..c4b3d11824 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_plus.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_plus.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11 13H6a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 5 12q0-0.42 0.29-0.71A0.97 0.97 0 0 1 6 11h5V6q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 5q0.42 0 0.71 0.29T13 6v5h5q0.42 0 0.71 0.29T19 12q0 0.42-0.29 0.71A0.97 0.97 0 0 1 18 13h-5v5q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 19a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 18z"/>
+  <path
+      android:pathData="M11,13H6a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,5 12q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,6 11h5V6q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 5q0.424,0 0.713,0.287Q13,5.576 13,6v5h5q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713A0.97,0.97 0,0 1,18 13h-5v5q0,0.424 -0.287,0.712A0.97,0.97 0,0 1,12 19a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,11 18z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_polls.xml b/libraries/compound/src/main/res/drawable/ic_compound_polls.xml
index 8c0e2b5a45..0877d2caf8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_polls.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_polls.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16 10q0.42 0 0.71-0.29A0.97 0.97 0 0 0 17 9a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 16 8h-3a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 12 9q0 0.42 0.29 0.71T13 10z m0 6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 17 15a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 16 14h-3a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 12 15q0 0.42 0.29 0.71T13 16z m-7-5q0.82 0 1.41-0.59Q11 9.83 11 9t-0.59-1.41A1.93 1.93 0 0 0 9 7Q8.18 7 7.59 7.59A1.93 1.93 0 0 0 7 9q0 0.82 0.59 1.41T9 11m0 6q0.82 0 1.41-0.59T11 15t-0.59-1.41A1.93 1.93 0 0 0 9 13q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 7 15q0 0.82 0.59 1.41T9 17m-4 4q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 3h14q0.82 0 1.41 0.59T21 5v14q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 21z m0-2h14V5H5z"/>
+  <path
+      android:pathData="M16,10q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,17 9a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,16 8h-3a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,12 9q0,0.424 0.287,0.713 0.288,0.287 0.713,0.287zM16,16q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,17 15a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,16 14h-3a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,12 15q0,0.424 0.287,0.713 0.288,0.287 0.713,0.287zM9,11q0.825,0 1.412,-0.588Q11,9.826 11,9t-0.588,-1.412A1.93,1.93 0,0 0,9 7q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,7 9q0,0.825 0.588,1.412Q8.175,11 9,11m0,6q0.825,0 1.412,-0.587Q11,15.825 11,15t-0.588,-1.412A1.93,1.93 0,0 0,9 13q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,7 15q0,0.824 0.588,1.413Q8.175,17 9,17m-4,4q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19L3,5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 3h14q0.824,0 1.413,0.587Q21,4.176 21,5v14q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 21zM5,19h14L19,5L5,5z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_polls_end.xml b/libraries/compound/src/main/res/drawable/ic_compound_polls_end.xml
index 8cfe2be80e..eab0f9af59 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_polls_end.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_polls_end.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21 10.66V19q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 21H5q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 3h8.34A6 6 0 0 0 13 5H5v14h14v-8a6 6 0 0 0 2-0.34"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13.8 8a6 6 0 0 0 1.88 2H13a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 12 9q0-0.42 0.29-0.71A0.97 0.97 0 0 1 13 8z m2.91 7.71A0.97 0.97 0 0 1 16 16h-3a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 12 15q0-0.42 0.29-0.71A0.97 0.97 0 0 1 13 14h3q0.42 0 0.71 0.29T17 15q0 0.42-0.29 0.71m-6.3-5.3A1.93 1.93 0 0 1 9 11q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 7 9q0-0.82 0.59-1.41A1.93 1.93 0 0 1 9 7q0.82 0 1.41 0.59T11 9t-0.59 1.41m0 6A1.93 1.93 0 0 1 9 17q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 7 15q0-0.82 0.59-1.41A1.93 1.93 0 0 1 9 13q0.82 0 1.41 0.59T11 15q0 0.82-0.59 1.41M22.71 2.3a1 1 0 0 1 0 1.42l-4 4a1 1 0 0 1-1.42 0l-2-2a1 1 0 0 1 1.42-1.42L18 5.6l3.3-3.3a1 1 0 0 1 1.4 0"/>
+  <path
+      android:pathData="M21,10.659V19q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 21H5q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19V5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 3h8.341A6,6 0,0 0,13 5H5v14h14v-8a6,6 0,0 0,2 -0.341"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M13.803,8a6,6 0,0 0,1.88 2L13,10a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,12 9q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,13 8zM16.713,15.713A0.97,0.97 0,0 1,16 16h-3a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,12 15q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,13 14h3q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713m-6.299,-5.3A1.93,1.93 0,0 1,9 11q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,7 9q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,9 7q0.825,0 1.412,0.588Q11,8.175 11,9t-0.588,1.412m0.001,6.001A1.93,1.93 0,0 1,9 17q-0.825,0 -1.412,-0.587A1.93,1.93 0,0 1,7 15q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,9 13q0.825,0 1.412,0.588Q11,14.175 11,15q0,0.824 -0.588,1.413m12.295,-14.12a1,1 0,0 1,0 1.414l-4,4a1,1 0,0 1,-1.414 0l-2,-2a1,1 0,0 1,1.414 -1.414L18,5.586l3.293,-3.293a1,1 0,0 1,1.414 0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_pop_out.xml b/libraries/compound/src/main/res/drawable/ic_compound_pop_out.xml
index 7b5b07b969..0feace457d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_pop_out.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_pop_out.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 3h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15 3h5a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V6.41l-6.3 6.3a1 1 0 0 1-1.4-1.42L17.58 5H15a1 1 0 1 1 0-2"/>
+  <path
+      android:pathData="M5,3h6a1,1 0,1 1,0 2H5v14h14v-6a1,1 0,1 1,2 0v6a2,2 0,0 1,-2 2H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M15,3h5a1,1 0,0 1,1 1v5a1,1 0,1 1,-2 0V6.414l-6.293,6.293a1,1 0,0 1,-1.414 -1.414L17.586,5H15a1,1 0,1 1,0 -2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_preferences.xml b/libraries/compound/src/main/res/drawable/ic_compound_preferences.xml
index fbc271730d..d7089e0eda 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_preferences.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_preferences.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M6.5 2h11a4.5 4.5 0 1 1 0 9h-11a4.5 4.5 0 0 1 0-9m0 2h7.26A4.5 4.5 0 0 0 13 6.5c0 0.93 0.28 1.78 0.76 2.5H6.5a2.5 2.5 0 0 1 0-5M15 6.5a2.5 2.5 0 1 1 5 0 2.5 2.5 0 0 1-5 0m-13 11A4.5 4.5 0 0 1 6.5 13h11a4.5 4.5 0 1 1 0 9h-11l-0.46-0.02A4.5 4.5 0 0 1 2 17.5m8.24-2.5h7.26a2.5 2.5 0 0 1 0 5h-7.26A4.5 4.5 0 0 0 11 17.5c0-0.93-0.28-1.78-0.76-2.5M6.5 15a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5"/>
+  <path
+      android:pathData="M6.5,2h11a4.5,4.5 0,1 1,0 9h-11a4.5,4.5 0,0 1,0 -9m0,2h7.258A4.5,4.5 0,0 0,13 6.5c0,0.925 0.28,1.785 0.758,2.5H6.5a2.5,2.5 0,0 1,0 -5M15,6.5a2.5,2.5 0,1 1,5 0,2.5 2.5,0 0,1 -5,0m-13,11A4.5,4.5 0,0 1,6.5 13h11a4.5,4.5 0,1 1,0 9h-11q-0.233,0 -0.46,-0.023A4.5,4.5 0,0 1,2 17.5m8.242,-2.5H17.5a2.5,2.5 0,0 1,0 5h-7.258A4.5,4.5 0,0 0,11 17.5c0,-0.925 -0.28,-1.785 -0.758,-2.5M6.5,15a2.5,2.5 0,1 0,0 5,2.5 2.5,0 0,0 0,-5"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_presence_outline_8_x_8.xml b/libraries/compound/src/main/res/drawable/ic_compound_presence_outline_8_x_8.xml
index 3d815c0696..603bc8a12c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_presence_outline_8_x_8.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_presence_outline_8_x_8.xml
@@ -3,10 +3,12 @@
     android:height="8dp"
     android:viewportWidth="8"
     android:viewportHeight="8">
-    <group>
-        <path
-            android:fillColor="#FF000000"
-            android:fillType="evenOdd"
-            android:pathData="M4 6.5a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5M4 8a4 4 0 1 0 0-8 4 4 0 0 0 0 8"/>
-    </group>
+  <group>
+    <clip-path
+        android:pathData="M0,0h8v8H0z"/>
+    <path
+        android:pathData="M4,6.5a2.5,2.5 0,1 0,0 -5,2.5 2.5,0 0,0 0,5M4,8a4,4 0,1 0,0 -8,4 4,0 0,0 0,8"
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"/>
+  </group>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_presence_solid_8_x_8.xml b/libraries/compound/src/main/res/drawable/ic_compound_presence_solid_8_x_8.xml
index ab82df2441..3be8cc0283 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_presence_solid_8_x_8.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_presence_solid_8_x_8.xml
@@ -3,9 +3,11 @@
     android:height="8dp"
     android:viewportWidth="8"
     android:viewportHeight="8">
-    <group>
-        <path
-            android:fillColor="#FF000000"
-            android:pathData="M8 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0"/>
-    </group>
+  <group>
+    <clip-path
+        android:pathData="M0,0h8v8H0z"/>
+    <path
+        android:pathData="M8,4a4,4 0,1 1,-8 0,4 4,0 0,1 8,0"
+        android:fillColor="#FF000000"/>
+  </group>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_presence_strikethrough_8_x_8.xml b/libraries/compound/src/main/res/drawable/ic_compound_presence_strikethrough_8_x_8.xml
index 1ed8a1e492..6bd7114024 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_presence_strikethrough_8_x_8.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_presence_strikethrough_8_x_8.xml
@@ -3,10 +3,12 @@
     android:height="8dp"
     android:viewportWidth="8"
     android:viewportHeight="8">
-    <group>
-        <path
-            android:fillColor="#FF000000"
-            android:fillType="evenOdd"
-            android:pathData="M8 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0M5.43 6.05a2.5 2.5 0 0 1-3.74-3z m0.92-1.2L2.65 1.9a2.5 2.5 0 0 1 3.7 2.96"/>
-    </group>
+  <group>
+    <clip-path
+        android:pathData="M0,0h8v8H0z"/>
+    <path
+        android:pathData="M8,4a4,4 0,1 1,-8 0,4 4,0 0,1 8,0M5.435,6.048A2.5,2.5 0,0 1,1.687 3.05zM6.349,4.858L2.648,1.897a2.5,2.5 0,0 1,3.701 2.961"
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"/>
+  </group>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_public.xml b/libraries/compound/src/main/res/drawable/ic_compound_public.xml
index 3dfd7046ea..7ed4a2244d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_public.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_public.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 22a9.7 9.7 0 0 1-3.9-0.79 10.1 10.1 0 0 1-3.17-2.14q-1.35-1.35-2.14-3.17A9.7 9.7 0 0 1 2 12q0-2.08 0.79-3.9a10.1 10.1 0 0 1 2.14-3.17Q6.28 3.57 8.1 2.78A9.7 9.7 0 0 1 12 2q2.08 0 3.9 0.79a10.1 10.1 0 0 1 3.17 2.14q1.35 1.35 2.14 3.17A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17q-1.35 1.35-3.17 2.14A9.7 9.7 0 0 1 12 22m-1-2.05V18q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 9 16v-1l-4.8-4.8-0.14 0.9Q4 11.55 4 12q0 3.02 1.99 5.3T11 19.95m6.9-2.55q0.5-0.55 0.9-1.19 0.4-0.64 0.66-1.32 0.26-0.69 0.4-1.42Q20 12.75 20 12a7.85 7.85 0 0 0-1.36-4.47A7.7 7.7 0 0 0 15 4.6V5q0 0.82-0.59 1.41A1.93 1.93 0 0 1 13 7h-2v2q0 0.42-0.29 0.71A0.97 0.97 0 0 1 10 10H8v2h6q0.42 0 0.71 0.29T15 13v3h1q0.65 0 1.18 0.39 0.52 0.38 0.72 1.01"/>
+  <path
+      android:pathData="M12,22a9.7,9.7 0,0 1,-3.9 -0.788,10.1 10.1,0 0,1 -3.175,-2.137q-1.35,-1.35 -2.137,-3.175A9.7,9.7 0,0 1,2 12q0,-2.075 0.788,-3.9a10.1,10.1 0,0 1,2.137 -3.175q1.35,-1.35 3.175,-2.137A9.7,9.7 0,0 1,12 2q2.075,0 3.9,0.788a10.1,10.1 0,0 1,3.175 2.137q1.35,1.35 2.137,3.175A9.7,9.7 0,0 1,22 12a9.7,9.7 0,0 1,-0.788 3.9,10.1 10.1,0 0,1 -2.137,3.175q-1.35,1.35 -3.175,2.137A9.7,9.7 0,0 1,12 22m-1,-2.05V18q-0.825,0 -1.412,-0.587A1.93,1.93 0,0 1,9 16v-1l-4.8,-4.8q-0.075,0.45 -0.138,0.9Q4,11.55 4,12q0,3.025 1.987,5.3T11,19.95m6.9,-2.55q0.5,-0.55 0.9,-1.187 0.4,-0.638 0.662,-1.326 0.263,-0.687 0.4,-1.412Q20,12.75 20,12a7.85,7.85 0,0 0,-1.363 -4.475A7.7,7.7 0,0 0,15 4.6V5q0,0.824 -0.588,1.412A1.93,1.93 0,0 1,13 7h-2v2q0,0.424 -0.287,0.713A0.97,0.97 0,0 1,10 10H8v2h6q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713v3h1q0.65,0 1.175,0.387 0.525,0.388 0.725,1.013"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_qr_code.xml b/libraries/compound/src/main/res/drawable/ic_compound_qr_code.xml
index 4befbcef95..75b3f9f5e7 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_qr_code.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_qr_code.xml
@@ -4,14 +4,14 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M3 4a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z m2 5V5h4v4z m-2 5a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z m2 5v-4h4v4z m9-16a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1z m1 2v4h4V5z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15 16v-3h-2v3z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17 16h-2v2h-2v3h2v-3h2v2h4v-2h-2v-5h-2z"/>
+  <path
+      android:pathData="M3,4a1,1 0,0 1,1 -1h6a1,1 0,0 1,1 1v6a1,1 0,0 1,-1 1L4,11a1,1 0,0 1,-1 -1zM5,9L5,5h4v4zM3,14a1,1 0,0 1,1 -1h6a1,1 0,0 1,1 1v6a1,1 0,0 1,-1 1L4,21a1,1 0,0 1,-1 -1zM5,19v-4h4v4zM14,3a1,1 0,0 0,-1 1v6a1,1 0,0 0,1 1h6a1,1 0,0 0,1 -1L21,4a1,1 0,0 0,-1 -1zM15,5v4h4L19,5z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,16v-3h-2v3z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M17,16h-2v2h-2v3h2v-3h2v2h4v-2h-2v-5h-2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_quote.xml b/libraries/compound/src/main/res/drawable/ic_compound_quote.xml
index 728fe07e43..550d7c818a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_quote.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_quote.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4.72 4.34C4.82 3.7 4.35 3.1 3.69 3.01c-0.66-0.09-1.27 0.36-1.37 1l-0.8 5.48c-0.1 0.64 0.36 1.23 1.02 1.32 0.66 0.1 1.28-0.35 1.37-1z m12.11 10.17c0.1-0.64-0.36-1.23-1.02-1.32-0.67-0.1-1.28 0.35-1.37 1l-0.81 5.47c-0.1 0.64 0.36 1.24 1.02 1.33 0.67 0.09 1.28-0.36 1.38-1zM9.32 3.01c0.66 0.08 1.14 0.66 1.06 1.3L10.35 4.5a221 221 0 0 1-0.26 2C9.93 7.68 9.72 9.09 9.55 9.9c-0.13 0.63-0.77 1.04-1.42 0.91s-1.08-0.74-0.95-1.38C7.33 8.7 7.52 7.37 7.68 6.2A191 191 0 0 0 7.96 4.2l0.02-0.17c0.08-0.64 0.68-1.1 1.35-1.02m13.17 11.5c0.1-0.64-0.37-1.23-1.03-1.32-0.66-0.1-1.28 0.35-1.37 1l-0.8 5.47c-0.1 0.64 0.36 1.24 1.02 1.33 0.66 0.09 1.28-0.36 1.37-1z"/>
+  <path
+      android:pathData="M4.719,4.34c0.094,-0.642 -0.366,-1.236 -1.028,-1.328 -0.663,-0.092 -1.276,0.354 -1.371,0.996l-0.808,5.478c-0.094,0.642 0.366,1.237 1.028,1.328 0.663,0.092 1.276,-0.354 1.371,-0.996zM16.834,14.514c0.095,-0.642 -0.366,-1.237 -1.028,-1.328 -0.662,-0.092 -1.276,0.354 -1.37,0.996l-0.809,5.478c-0.094,0.642 0.366,1.236 1.028,1.328 0.663,0.092 1.277,-0.354 1.371,-0.996zM9.318,3.009c0.665,0.077 1.138,0.662 1.058,1.306l-0.022,0.175a221,221 0,0 1,-0.266 2.006c-0.161,1.171 -0.368,2.579 -0.535,3.386 -0.13,0.636 -0.769,1.049 -1.425,0.921s-1.082,-0.745 -0.95,-1.381c0.148,-0.72 0.345,-2.052 0.509,-3.237a191,191 0,0 0,0.262 -1.981l0.021,-0.17c0.08,-0.644 0.684,-1.103 1.348,-1.025m13.17,11.505c0.094,-0.642 -0.366,-1.237 -1.028,-1.328 -0.663,-0.092 -1.276,0.354 -1.371,0.996l-0.808,5.478c-0.094,0.642 0.366,1.236 1.028,1.328 0.663,0.092 1.276,-0.354 1.371,-0.996z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_raised_hand_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_raised_hand_solid.xml
index d345569ead..aa16cae569 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_raised_hand_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_raised_hand_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11 3a1 1 0 1 1 2 0v8.5a0.5 0.5 0 0 0 1 0V4a1 1 0 1 1 2 0v10.2l3.28-2.6a1.08 1.08 0 0 1 1.47 1.58l-1.81 2.06c-1.27 1.47-2.55 2.94-3.95 4.24A6 6 0 0 1 5 15V7a1 1 0 0 1 2 0v5.5a0.5 0.5 0 0 0 1 0V4a1 1 0 0 1 2 0v7.5a0.5 0.5 0 0 0 1 0z"/>
+  <path
+      android:pathData="M11,3a1,1 0,1 1,2 0v8.5a0.5,0.5 0,0 0,1 0V4a1,1 0,1 1,2 0v10.2l3.284,-2.597a1.081,1.081 0,0 1,1.47 1.577c-0.613,0.673 -1.214,1.367 -1.818,2.064 -1.267,1.463 -2.541,2.934 -3.943,4.235A6,6 0,0 1,5 15V7a1,1 0,0 1,1.999 0v5.5a0.5,0.5 0,0 0,1 0V4a1,1 0,0 1,2 0v7.5a0.5,0.5 0,0 0,1 0z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_reaction.xml b/libraries/compound/src/main/res/drawable/ic_compound_reaction.xml
index f85f57d002..f0dc9f2a7e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_reaction.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_reaction.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.54 15.54a1 1 0 0 0-1.42-1.42A3 3 0 0 1 12 15a3 3 0 0 1-2.12-0.88 1 1 0 1 0-1.42 1.42A5 5 0 0 0 12 17c1.38 0 2.63-0.56 3.54-1.46M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22 12c0 5.52-4.48 10-10 10S2 17.52 2 12 6.48 2 12 2s10 4.48 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"/>
+  <path
+      android:pathData="M15.536,15.536a1,1 0,0 0,-1.415 -1.415,3 3,0 0,1 -2.12,0.879 3,3 0,0 1,-2.122 -0.879,1 1,0 1,0 -1.414,1.415A5,5 0,0 0,12 17c1.38,0 2.632,-0.56 3.536,-1.464M10,10.5a1.5,1.5 0,1 1,-3 0,1.5 1.5,0 0,1 3,0m5.5,1.5a1.5,1.5 0,1 0,0 -3,1.5 1.5,0 0,0 0,3"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M22,12c0,5.523 -4.477,10 -10,10S2,17.523 2,12 6.477,2 12,2s10,4.477 10,10m-2,0a8,8 0,1 0,-16 0,8 8,0 0,0 16,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_reaction_add.xml b/libraries/compound/src/main/res/drawable/ic_compound_reaction_add.xml
index 3fe88d4f8a..34716dbd59 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_reaction_add.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_reaction_add.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.74 2.38C13.87 2.13 12.95 2 12 2 6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10c0-0.95-0.13-1.87-0.38-2.74a5 5 0 0 1-1.89 0.69 8 8 0 1 1-5.68-5.68c0.1-0.69 0.34-1.33 0.7-1.89"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.54 14.12a1 1 0 0 1 0 1.42A5 5 0 0 1 12 17c-1.38 0-2.63-0.56-3.54-1.46a1 1 0 1 1 1.42-1.42A3 3 0 0 0 12 15c0.83 0 1.58-0.34 2.12-0.88a1 1 0 0 1 1.42 0M8.5 12a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3m8.5-1.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0M18 6h-1a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 16 5q0-0.42 0.29-0.71A0.97 0.97 0 0 1 17 4h1V3q0-0.42 0.29-0.71A0.97 0.97 0 0 1 19 2q0.42 0 0.71 0.29T20 3v1h1q0.42 0 0.71 0.29T22 5t-0.29 0.71A0.97 0.97 0 0 1 21 6h-1v1q0 0.42-0.29 0.71A0.97 0.97 0 0 1 19 8a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 18 7z"/>
+  <path
+      android:pathData="M14.74,2.38C13.87,2.133 12.95,2 12,2 6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10c0,-0.95 -0.133,-1.87 -0.38,-2.74a5,5 0,0 1,-1.886 0.687,8 8,0 1,1 -5.68,-5.68c0.1,-0.684 0.339,-1.323 0.687,-1.887"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M15.536,14.121a1,1 0,0 1,0 1.415A5,5 0,0 1,12 17c-1.38,0 -2.632,-0.56 -3.535,-1.464a1,1 0,1 1,1.414 -1.415A3,3 0,0 0,12 15c0.829,0 1.577,-0.335 2.121,-0.879a1,1 0,0 1,1.415 0M8.5,12a1.5,1.5 0,1 0,0 -3,1.5 1.5,0 0,0 0,3m8.5,-1.5a1.5,1.5 0,1 1,-3 0,1.5 1.5,0 0,1 3,0M18,6h-1a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,16 5q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,17 4h1V3q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,19 2q0.424,0 0.712,0.288Q20,2.575 20,3v1h1q0.424,0 0.712,0.287Q22,4.576 22,5t-0.288,0.713A0.97,0.97 0,0 1,21 6h-1v1q0,0.424 -0.288,0.713A0.97,0.97 0,0 1,19 8a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,18 7z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_reaction_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_reaction_solid.xml
index 826ac69830..3604031fb3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_reaction_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_reaction_solid.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M12 22c5.52 0 10-4.48 10-10S17.52 2 12 2 2 6.48 2 12s4.48 10 10 10m3.54-6.46a1 1 0 0 0-1.42-1.42A3 3 0 0 1 12 15a3 3 0 0 1-2.12-0.88 1 1 0 1 0-1.42 1.42A5 5 0 0 0 12 17c1.38 0 2.63-0.56 3.54-1.46M10 10.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m5.5 1.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3"/>
+  <path
+      android:pathData="M12,22c5.523,0 10,-4.477 10,-10S17.523,2 12,2 2,6.477 2,12s4.477,10 10,10m3.536,-6.464a1,1 0,0 0,-1.415 -1.415A3,3 0,0 1,12 15a3,3 0,0 1,-2.121 -0.879,1 1,0 1,0 -1.414,1.415A5,5 0,0 0,12 17c1.38,0 2.632,-0.56 3.536,-1.464M10,10.5a1.5,1.5 0,1 1,-3 0,1.5 1.5,0 0,1 3,0m5.5,1.5a1.5,1.5 0,1 0,0 -3,1.5 1.5,0 0,0 0,3"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_reply.xml b/libraries/compound/src/main/res/drawable/ic_compound_reply.xml
index 45a797deda..a4f7a6d368 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_reply.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_reply.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9.4 5.7c0.4-0.38 0.4-1.02 0-1.4a1 1 0 0 0-1.4 0L3.3 9a1 1 0 0 0 0 1.42L8 15.14a1 1 0 0 0 1.4 0c0.4-0.4 0.4-1.03 0-1.42l-3.04-3.05h9.15c1.9 0 3.49 1.6 3.49 3.66C19 16.4 17.4 18 15.52 18h-2.1a1 1 0 1 0 0 2h2.1c3.06 0 5.48-2.57 5.48-5.67s-2.42-5.66-5.49-5.66H6.46z"/>
+  <path
+      android:pathData="M9.405,5.708c0.39,-0.39 0.39,-1.025 0,-1.416a0.996,0.996 0,0 0,-1.412 0L3.294,9.006a1.004,1.004 0,0 0,0 1.416l4.699,4.714a0.996,0.996 0,0 0,1.412 0c0.39,-0.39 0.39,-1.025 0,-1.416l-3.043,-3.053h9.153c1.887,0 3.485,1.604 3.485,3.666C19,16.396 17.402,18 15.515,18h-2.093a1,1 0,1 0,0 2h2.093C18.58,20 21,17.425 21,14.333s-2.419,-5.666 -5.485,-5.666H6.456z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_restart.xml b/libraries/compound/src/main/res/drawable/ic_compound_restart.xml
index 9360979845..6f862bd628 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_restart.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_restart.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18.93 8A8 8 0 1 1 4 12a1 1 0 1 0-2 0c0 5.52 4.48 10 10 10s10-4.48 10-10a10 10 0 0 0-0.83-4A10 10 0 0 0 12 2a9.99 9.99 0 0 0-8 4V4a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2H5.75A7.99 7.99 0 0 1 12 4a8 8 0 0 1 6.93 4"/>
+  <path
+      android:pathData="M18.93,8A8,8 0,1 1,4 12a1,1 0,1 0,-2 0c0,5.523 4.477,10 10,10s10,-4.477 10,-10a10,10 0,0 0,-0.832 -4A10,10 0,0 0,12 2a9.99,9.99 0,0 0,-8 3.999V4a1,1 0,0 0,-2 0v4a1,1 0,0 0,1 1h4a1,1 0,0 0,0 -2H5.755A7.99,7.99 0,0 1,12 4a8,8 0,0 1,6.93 4"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_room.xml b/libraries/compound/src/main/res/drawable/ic_compound_room.xml
index a0a278eab7..3f57015467 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_room.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_room.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.57 17l-0.95 4.1q-0.08 0.4-0.37 0.65T6.56 22q-0.54 0-0.88-0.47a1.18 1.18 0 0 1-0.2-1.03l0.8-3.5H3.16q-0.57 0-0.92-0.48a1.27 1.27 0 0 1-0.2-1.08 1.12 1.12 0 0 1 1.12-0.94h3.69L8 9.5H4.86q-0.57 0-0.91-0.48a1.27 1.27 0 0 1-0.2-1.08A1.12 1.12 0 0 1 4.88 7h3.69L9.5 2.9Q9.6 2.5 9.88 2.26 10.17 2 10.57 2q0.54 0 0.89 0.47 0.34 0.47 0.2 1.03L10.86 7h4.57l0.95-4.1q0.08-0.4 0.37-0.65T17.44 2q0.54 0 0.88 0.47t0.2 1.03L17.72 7h3.12q0.57 0 0.92 0.48 0.34 0.49 0.2 1.08a1.12 1.12 0 0 1-1.12 0.94h-3.69l-1.15 5h3.12q0.57 0 0.92 0.48 0.34 0.49 0.2 1.08A1.12 1.12 0 0 1 19.12 17h-3.69l-0.94 4.1q-0.09 0.4-0.37 0.65T13.43 22q-0.54 0-0.89-0.47a1.18 1.18 0 0 1-0.2-1.03l0.8-3.5z m0.57-2.5h4.58l1.14-5h-4.58z"/>
+  <path
+      android:pathData="m8.566,17 l-0.944,4.094q-0.086,0.406 -0.372,0.656t-0.687,0.25q-0.543,0 -0.887,-0.469a1.18,1.18 0,0 1,-0.2 -1.031l0.801,-3.5L3.158,17q-0.572,0 -0.916,-0.484a1.27,1.27 0,0 1,-0.2 -1.078,1.12 1.12,0 0,1 1.116,-0.938L6.85,14.5l1.145,-5h-3.12q-0.57,0 -0.915,-0.484a1.27,1.27 0,0 1,-0.2 -1.078A1.12,1.12 0,0 1,4.875 7h3.691l0.945,-4.094q0.085,-0.406 0.372,-0.656 0.286,-0.25 0.686,-0.25 0.544,0 0.887,0.469 0.345,0.468 0.2,1.031l-0.8,3.5h4.578l0.944,-4.094q0.085,-0.406 0.372,-0.656 0.286,-0.25 0.687,-0.25 0.543,0 0.887,0.469t0.2,1.031L17.723,7h3.119q0.573,0 0.916,0.484 0.343,0.485 0.2,1.079a1.12,1.12 0,0 1,-1.116 0.937L17.15,9.5l-1.145,5h3.12q0.57,0 0.915,0.484 0.343,0.485 0.2,1.079a1.12,1.12 0,0 1,-1.116 0.937h-3.691l-0.944,4.094q-0.087,0.406 -0.373,0.656t-0.686,0.25q-0.544,0 -0.887,-0.469a1.18,1.18 0,0 1,-0.2 -1.031l0.8,-3.5zM9.139,14.5h4.578l1.144,-5h-4.578z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_search.xml b/libraries/compound/src/main/res/drawable/ic_compound_search.xml
index 8e1ec94374..76638caf49 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_search.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_search.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.05 16.46a7.5 7.5 0 1 1 1.41-1.41l3.25 3.24a1 1 0 0 1-1.42 1.42zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"/>
+  <path
+      android:pathData="M15.05,16.463a7.5,7.5 0,1 1,1.414 -1.414l3.243,3.244a1,1 0,0 1,-1.414 1.414zM16,10.5a5.5,5.5 0,1 0,-11 0,5.5 5.5,0 0,0 11,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_send.xml b/libraries/compound/src/main/res/drawable/ic_compound_send.xml
index 8c0d5e1159..a37b499cc6 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_send.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_send.xml
@@ -4,8 +4,8 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M5.07 20.96l16.14-8.07a1 1 0 0 0 0-1.79L5.07 3.04c-0.78-0.4-1.66 0.34-1.4 1.18l2.24 7.5a1 1 0 0 1 0 0.57l-2.25 7.5c-0.25 0.83 0.63 1.57 1.41 1.18M6.25 5.86L18.53 12 6.25 18.14 7.79 13h4.46a1 1 0 1 0 0-2H7.79z"/>
+  <path
+      android:pathData="m5.07,20.965 l16.141,-8.07a1,1 0,0 0,0 -1.79l-16.14,-8.07c-0.785,-0.392 -1.658,0.342 -1.406,1.182l2.249,7.496a1,1 0,0 1,0 0.574l-2.249,7.496c-0.252,0.84 0.621,1.574 1.405,1.182M6.246,5.859 L18.528,12 6.246,18.141 7.788,13h4.462a1,1 0,1 0,0 -2H7.788z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_send_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_send_solid.xml
index 3ac0bc6f62..0d41f4fe1a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_send_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_send_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21.21 12.9L5.07 20.95c-0.78 0.4-1.66-0.34-1.4-1.18L5.7 13h6.55a1 1 0 1 0 0-2H5.7L3.66 4.22C3.42 3.38 4.3 2.64 5.08 3.03l16.14 8.07a1 1 0 0 1 0 1.8"/>
+  <path
+      android:pathData="m21.211,12.895 l-16.14,8.07c-0.785,0.392 -1.658,-0.342 -1.406,-1.182L5.7,13h6.55a1,1 0,1 0,0 -2H5.7L3.665,4.217c-0.252,-0.84 0.621,-1.574 1.405,-1.182l16.141,8.07a1,1 0,0 1,0 1.79"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_settings.xml b/libraries/compound/src/main/res/drawable/ic_compound_settings.xml
index 7a79aa33ec..3606bf2317 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_settings.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_settings.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-2 0a2 2 0 1 0-4 0 2 2 0 0 0 4 0"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.31 2h1.38A2.31 2.31 0 0 1 15 4.31v0.25c0.01 0.02 0.03 0.04 0.07 0.05 0.03 0.01 0.05 0.01 0.07 0l0.18-0.17a2.31 2.31 0 0 1 3.27 0l0.97 0.98a2.31 2.31 0 0 1 0 3.27l-0.18 0.17a0.13 0.13 0 0 0 0.01 0.08A0.15 0.15 0 0 0 19.44 9h0.25A2.31 2.31 0 0 1 22 11.31v1.38A2.31 2.31 0 0 1 19.69 15h-0.25a0.15 0.15 0 0 0-0.05 0.07 0.13 0.13 0 0 0 0 0.07l0.17 0.18a2.31 2.31 0 0 1 0 3.27l-0.98 0.97a2.31 2.31 0 0 1-3.27 0l-0.17-0.18a0.13 0.13 0 0 0-0.08 0.01 0.15 0.15 0 0 0-0.06 0.05v0.25A2.31 2.31 0 0 1 12.69 22H11.3A2.31 2.31 0 0 1 9 19.69v-0.25a0.15 0.15 0 0 0-0.07-0.05 0.13 0.13 0 0 0-0.07 0l-0.18 0.17a2.31 2.31 0 0 1-3.27 0l-0.97-0.98a2.31 2.31 0 0 1 0-3.27l0.18-0.17a0.14 0.14 0 0 0-0.01-0.08A0.15 0.15 0 0 0 4.56 15H4.3A2.31 2.31 0 0 1 2 12.69V11.3A2.31 2.31 0 0 1 4.31 9h0.25a0.15 0.15 0 0 0 0.05-0.07 0.14 0.14 0 0 0 0-0.07L4.45 8.68a2.31 2.31 0 0 1 0-3.27l0.98-0.97a2.31 2.31 0 0 1 3.27 0l0.17 0.18A0.14 0.14 0 0 0 8.95 4.6 0.15 0.15 0 0 0 9 4.56V4.3A2.31 2.31 0 0 1 11.31 2M11 4.31v0.26c0 0.9-0.59 1.6-1.3 1.89C9 6.76 8.08 6.66 7.45 6.04L7.27 5.86a0.31 0.31 0 0 0-0.44 0L5.86 6.83a0.31 0.31 0 0 0 0 0.44l0.18 0.18C6.67 8.08 6.75 8.98 6.46 9.7c-0.3 0.71-1 1.3-1.9 1.3H4.32A0.31 0.31 0 0 0 4 11.31v1.38C4 12.86 4.14 13 4.31 13h0.26c0.9 0 1.6 0.59 1.89 1.3 0.3 0.71 0.2 1.62-0.42 2.25l-0.18 0.18a0.31 0.31 0 0 0 0 0.44l0.97 0.97a0.31 0.31 0 0 0 0.44 0l0.18-0.18c0.63-0.63 1.53-0.71 2.25-0.42 0.71 0.3 1.3 1 1.3 1.9v0.25c0 0.17 0.14 0.31 0.31 0.31h1.38c0.17 0 0.31-0.14 0.31-0.31v-0.26c0-0.9 0.59-1.6 1.3-1.89 0.71-0.3 1.62-0.2 2.25 0.42l0.18 0.18c0.12 0.12 0.32 0.12 0.44 0l0.97-0.97a0.31 0.31 0 0 0 0-0.44l-0.18-0.18c-0.63-0.63-0.71-1.54-0.42-2.25 0.3-0.71 1-1.3 1.9-1.3h0.25c0.17 0 0.31-0.14 0.31-0.31V11.3A0.31 0.31 0 0 0 19.69 11h-0.26c-0.9 0-1.6-0.59-1.89-1.3-0.3-0.72-0.2-1.62 0.42-2.25l0.18-0.18a0.31 0.31 0 0 0 0-0.44l-0.97-0.97a0.31 0.31 0 0 0-0.44 0l-0.18 0.18C15.92 6.66 15 6.75 14.3 6.46c-0.71-0.3-1.3-1-1.3-1.9V4.32A0.31 0.31 0 0 0 12.69 4H11.3A0.31 0.31 0 0 0 11 4.31"/>
+  <path
+      android:pathData="M16,12a4,4 0,1 1,-8 0,4 4,0 0,1 8,0m-2,0a2,2 0,1 0,-4 0,2 2,0 0,0 4,0"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M11.312,2h1.376A2.31,2.31 0,0 1,15 4.312v0.247l0.002,0.003c0.01,0.014 0.031,0.033 0.064,0.047 0.03,0.013 0.056,0.013 0.07,0.01h0.002l0.177,-0.177a2.31,2.31 0,0 1,3.27 0l0.973,0.974a2.31,2.31 0,0 1,0 3.269l-0.177,0.177v0.003a0.13,0.13 0,0 0,0.01 0.07,0.15 0.15,0 0,0 0.047,0.063l0.003,0.002h0.247A2.31,2.31 0,0 1,22 11.312v1.376A2.31,2.31 0,0 1,19.688 15h-0.247l-0.003,0.002a0.15,0.15 0,0 0,-0.047 0.064,0.13 0.13,0 0,0 -0.01,0.07v0.002l0.177,0.177a2.31,2.31 0,0 1,0 3.27l-0.974,0.973a2.31,2.31 0,0 1,-3.269 0l-0.177,-0.177h-0.003a0.13,0.13 0,0 0,-0.07 0.01,0.15 0.15,0 0,0 -0.063,0.047l-0.002,0.003v0.247A2.31,2.31 0,0 1,12.688 22h-1.376A2.31,2.31 0,0 1,9 19.688v-0.247l-0.002,-0.003a0.15,0.15 0,0 0,-0.064 -0.047,0.13 0.13,0 0,0 -0.07,-0.01h-0.002l-0.177,0.177a2.31,2.31 0,0 1,-3.27 0l-0.973,-0.974a2.31,2.31 0,0 1,0 -3.269l0.177,-0.177v-0.003a0.14,0.14 0,0 0,-0.01 -0.07,0.15 0.15,0 0,0 -0.047,-0.063L4.559,15h-0.247A2.31,2.31 0,0 1,2 12.688v-1.376A2.31,2.31 0,0 1,4.312 9h0.247l0.003,-0.002a0.15,0.15 0,0 0,0.047 -0.064,0.14 0.14,0 0,0 0.01,-0.07v-0.002l-0.177,-0.177a2.31,2.31 0,0 1,0 -3.27l0.974,-0.973a2.31,2.31 0,0 1,3.269 0l0.177,0.177h0.003a0.14,0.14 0,0 0,0.07 -0.01,0.15 0.15,0 0,0 0.063,-0.047L9,4.559v-0.247A2.31,2.31 0,0 1,11.312 2M11,4.312v0.257c0,0.893 -0.59,1.593 -1.299,1.887 -0.716,0.297 -1.622,0.21 -2.248,-0.418l-0.182,-0.182a0.31,0.31 0,0 0,-0.441 0l-0.974,0.974a0.31,0.31 0,0 0,0 0.44l0.182,0.183c0.627,0.626 0.715,1.531 0.418,2.248C6.162,10.41 5.462,11 4.569,11h-0.257a0.31,0.31 0,0 0,-0.312 0.312v1.376c0,0.172 0.14,0.312 0.312,0.312h0.257c0.893,0 1.593,0.59 1.887,1.299 0.297,0.716 0.21,1.622 -0.418,2.248l-0.182,0.182a0.31,0.31 0,0 0,0 0.441l0.974,0.973a0.31,0.31 0,0 0,0.44 0l0.183,-0.181c0.626,-0.627 1.532,-0.715 2.248,-0.418 0.709,0.294 1.299,0.994 1.299,1.887v0.257c0,0.172 0.14,0.312 0.312,0.312h1.376c0.172,0 0.312,-0.14 0.312,-0.312v-0.257c0,-0.893 0.59,-1.593 1.299,-1.887 0.716,-0.297 1.622,-0.21 2.249,0.418l0.181,0.181c0.122,0.122 0.32,0.122 0.441,0l0.973,-0.973a0.31,0.31 0,0 0,0 -0.44l-0.181,-0.183c-0.627,-0.626 -0.715,-1.532 -0.418,-2.248 0.294,-0.709 0.994,-1.299 1.887,-1.299h0.257c0.172,0 0.312,-0.14 0.312,-0.312v-1.376a0.31,0.31 0,0 0,-0.312 -0.312h-0.257c-0.893,0 -1.593,-0.59 -1.887,-1.299 -0.297,-0.717 -0.21,-1.622 0.418,-2.248l0.181,-0.182a0.31,0.31 0,0 0,0 -0.441l-0.973,-0.974a0.31,0.31 0,0 0,-0.44 0l-0.183,0.182c-0.626,0.627 -1.532,0.715 -2.248,0.418C13.59,6.162 13,5.462 13,4.569v-0.257A0.31,0.31 0,0 0,12.688 4h-1.376a0.31,0.31 0,0 0,-0.312 0.312"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_settings_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_settings_solid.xml
index 7a75b037ba..b7f6bb4dc8 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_settings_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_settings_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.73 2C13.43 2 14 2.57 14 3.27c0 0.58 0.4 1.07 0.94 1.29l0.25 0.1c0.53 0.23 1.16 0.16 1.57-0.25a1.27 1.27 0 0 1 1.8 0l1.03 1.04a1.27 1.27 0 0 1 0 1.79c-0.41 0.41-0.48 1.04-0.25 1.57l0.1 0.26C19.66 9.6 20.16 10 20.75 10c0.7 0 1.26 0.57 1.26 1.27v1.46c0 0.7-0.57 1.27-1.27 1.27-0.58 0-1.07 0.4-1.29 0.94l-0.1 0.25c-0.23 0.53-0.16 1.16 0.25 1.57a1.27 1.27 0 0 1 0 1.8l-1.04 1.03a1.27 1.27 0 0 1-1.79 0c-0.41-0.41-1.04-0.48-1.57-0.25a8 8 0 0 1-0.25 0.1C14.4 19.66 14 20.16 14 20.75c0 0.7-0.57 1.26-1.27 1.26h-1.46c-0.7 0-1.27-0.57-1.27-1.27 0-0.58-0.4-1.07-0.94-1.29a8 8 0 0 1-0.25-0.1c-0.53-0.23-1.16-0.16-1.57 0.25a1.27 1.27 0 0 1-1.8 0l-1.03-1.04a1.27 1.27 0 0 1 0-1.79c0.41-0.41 0.48-1.04 0.25-1.57a8 8 0 0 1-0.1-0.25C4.33 14.4 3.84 14 3.26 14 2.57 14 2 13.43 2 12.73v-1.46C2 10.57 2.57 10 3.27 10c0.58 0 1.07-0.4 1.29-0.94l0.1-0.25C4.9 8.28 4.82 7.65 4.41 7.24a1.27 1.27 0 0 1 0-1.8l1.04-1.03a1.27 1.27 0 0 1 1.79 0C7.65 4.82 8.28 4.9 8.81 4.66a8 8 0 0 1 0.26-0.1C9.6 4.33 10 3.84 10 3.25 10 2.57 10.57 2 11.27 2zM12 16a4 4 0 1 0 0-8 4 4 0 0 0 0 8"/>
+  <path
+      android:pathData="M12.731,2C13.432,2 14,2.568 14,3.269c0,0.578 0.396,1.074 0.935,1.286q0.128,0.052 0.253,0.106c0.531,0.23 1.162,0.16 1.572,-0.25a1.27,1.27 0,0 1,1.794 0l1.034,1.035a1.27,1.27 0,0 1,0 1.794c-0.41,0.41 -0.48,1.04 -0.248,1.572l0.105,0.253c0.212,0.539 0.708,0.935 1.286,0.935 0.701,0 1.269,0.568 1.269,1.269v1.462c0,0.701 -0.568,1.269 -1.269,1.269 -0.578,0 -1.074,0.396 -1.287,0.935q-0.05,0.128 -0.104,0.253c-0.232,0.531 -0.161,1.162 0.248,1.572a1.27,1.27 0,0 1,0 1.794l-1.034,1.034a1.27,1.27 0,0 1,-1.794 0c-0.41,-0.41 -1.04,-0.48 -1.572,-0.248a8,8 0,0 1,-0.253 0.105c-0.539,0.212 -0.935,0.708 -0.935,1.286 0,0.701 -0.568,1.269 -1.269,1.269H11.27c-0.702,0 -1.27,-0.568 -1.27,-1.269 0,-0.578 -0.396,-1.074 -0.935,-1.287a8,8 0,0 1,-0.253 -0.104c-0.531,-0.232 -1.162,-0.161 -1.572,0.248a1.27,1.27 0,0 1,-1.794 0l-1.034,-1.034a1.27,1.27 0,0 1,0 -1.794c0.41,-0.41 0.48,-1.04 0.249,-1.572a8,8 0,0 1,-0.106 -0.253C4.343,14.396 3.847,14 3.27,14 2.568,14 2,13.432 2,12.731V11.27c0,-0.702 0.568,-1.27 1.269,-1.27 0.578,0 1.074,-0.396 1.286,-0.935q0.052,-0.128 0.106,-0.253c0.23,-0.531 0.16,-1.162 -0.25,-1.572a1.27,1.27 0,0 1,0 -1.794l1.035,-1.034a1.27,1.27 0,0 1,1.794 0c0.41,0.41 1.04,0.48 1.572,0.249a8,8 0,0 1,0.253 -0.106c0.539,-0.212 0.935,-0.708 0.935,-1.286C10,2.568 10.568,2 11.269,2zM12,16a4,4 0,1 0,0 -8,4 4,0 0,0 0,8"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_share.xml b/libraries/compound/src/main/res/drawable/ic_compound_share.xml
index 6abf169f20..58bb31bd11 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_share.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_share.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 16a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 15V7.85L9.12 9.73q-0.3 0.3-0.7 0.3T7.7 9.7a0.93 0.93 0 0 1-0.29-0.71A0.98 0.98 0 0 1 7.7 8.3l3.6-3.6q0.15-0.15 0.33-0.21Q11.8 4.43 12 4.43t0.38 0.06A0.9 0.9 0 0 1 12.7 4.7l3.6 3.6q0.3 0.3 0.29 0.71A0.98 0.98 0 0 1 16.3 9.7Q16 10 15.59 10.01a0.93 0.93 0 0 1-0.71-0.28L13 7.85V15q0 0.42-0.29 0.71A0.97 0.97 0 0 1 12 16m-6 4q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 18v-2q0-0.42 0.29-0.71A0.97 0.97 0 0 1 5 15q0.42 0 0.71 0.29T6 16v2h12v-2q0-0.42 0.29-0.71A0.97 0.97 0 0 1 19 15q0.42 0 0.71 0.29T20 16v2q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 20z"/>
+  <path
+      android:pathData="M12,16a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 15V7.85L9.125,9.725q-0.3,0.3 -0.7,0.3T7.7,9.7a0.93,0.93 0,0 1,-0.288 -0.713A0.98,0.98 0,0 1,7.7 8.3l3.6,-3.6q0.15,-0.15 0.325,-0.213 0.175,-0.062 0.375,-0.062t0.375,0.062a0.9,0.9 0,0 1,0.325 0.213l3.6,3.6q0.3,0.3 0.287,0.712a0.98,0.98 0,0 1,-0.287 0.688q-0.3,0.3 -0.713,0.313a0.93,0.93 0,0 1,-0.712 -0.288L13,7.85V15q0,0.424 -0.287,0.713A0.97,0.97 0,0 1,12 16m-6,4q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 18v-2q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,5 15q0.424,0 0.713,0.287Q6,15.576 6,16v2h12v-2q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,19 15q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713v2q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 20z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_share_android.xml b/libraries/compound/src/main/res/drawable/ic_compound_share_android.xml
index a92b79a76a..3c82973339 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_share_android.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_share_android.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13 5a4 4 0 1 1 1.4 3.04l-3.65 2.56a4 4 0 0 1 0 2.8l3.65 2.56a4 4 0 1 1-1.15 1.64L9.6 15.04a4 4 0 1 1 0-6.08l3.65-2.56A4 4 0 0 1 13 5m4-2a2 2 0 1 0 0 4 2 2 0 0 0 0-4M7 10a2 2 0 1 0 0 4 2 2 0 0 0 0-4m10 7a2 2 0 1 0 0 4 2 2 0 0 0 0-4"/>
+  <path
+      android:pathData="M13,5a4,4 0,1 1,1.4 3.04l-3.653,2.558a4,4 0,0 1,0 2.804L14.4,15.96a4,4 0,1 1,-1.148 1.638L9.6,15.04a4,4 0,1 1,0 -6.08l3.654,-2.558A4,4 0,0 1,13 5m4,-2a2,2 0,1 0,0 4,2 2,0 0,0 0,-4M7,10a2,2 0,1 0,0 4,2 2,0 0,0 0,-4m10,7a2,2 0,1 0,0 4,2 2,0 0,0 0,-4"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_share_ios.xml b/libraries/compound/src/main/res/drawable/ic_compound_share_ios.xml
index e481978c28..9027271541 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_share_ios.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_share_ios.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.7 2.3a1 1 0 0 0-1.4 0L8.8 4.8a1 1 0 0 0 1.4 1.4L11 5.42V14a1 1 0 1 0 2 0V5.41l0.8 0.8a1 1 0 1 0 1.4-1.42z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 20V10h2a1 1 0 0 0 0-2H6a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V10a2 2 0 0 0-2-2h-2a1 1 0 1 0 0 2h2v10z"/>
+  <path
+      android:pathData="M12.707,2.293a1,1 0,0 0,-1.414 0l-2.5,2.5a1,1 0,0 0,1.414 1.414L11,5.414V14a1,1 0,1 0,2 0V5.414l0.793,0.793a1,1 0,1 0,1.414 -1.414z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M6,20V10h2a1,1 0,0 0,0 -2H6a2,2 0,0 0,-2 2v10a2,2 0,0 0,2 2h12a2,2 0,0 0,2 -2V10a2,2 0,0 0,-2 -2h-2a1,1 0,1 0,0 2h2v10z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_share_screen.xml b/libraries/compound/src/main/res/drawable/ic_compound_share_screen.xml
index 89f63b897c..10ef39193b 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_share_screen.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_share_screen.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M1.29 20.71Q1.57 21 2 21h20q0.42 0 0.71-0.29A0.97 0.97 0 0 0 23 20a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 22 19H2a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 1 20q0 0.42 0.29 0.71M12.7 7.3a1 1 0 0 0-1.42 0L8.8 9.8a1 1 0 0 0 1.42 1.42L11 10.4V13a1 1 0 1 0 2 0v-2.59l0.8 0.8a1 1 0 0 0 1.4-1.42z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.59 17.41Q3.17 18 4 18h16q0.82 0 1.41-0.59T22 16V5q0-0.82-0.59-1.41A1.93 1.93 0 0 0 20 3H4Q3.18 3 2.59 3.59A1.93 1.93 0 0 0 2 5v11q0 0.82 0.59 1.41M20 5v11H4V5z"/>
+  <path
+      android:pathData="M1.288,20.713Q1.575,21 2,21h20q0.424,0 0.712,-0.288A0.97,0.97 0,0 0,23 20a0.97,0.97 0,0 0,-0.288 -0.712A0.97,0.97 0,0 0,22 19H2a0.97,0.97 0,0 0,-0.712 0.288A0.97,0.97 0,0 0,1 20q0,0.424 0.288,0.712M12.707,7.293a1,1 0,0 0,-1.414 0l-2.5,2.5a1,1 0,0 0,1.414 1.414l0.793,-0.793V13a1,1 0,1 0,2 0v-2.586l0.793,0.793a1,1 0,0 0,1.414 -1.414z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M2.588,17.413Q3.175,18 4,18h16q0.824,0 1.413,-0.587Q22,16.825 22,16V5q0,-0.824 -0.587,-1.412A1.93,1.93 0,0 0,20 3H4q-0.824,0 -1.412,0.587A1.93,1.93 0,0 0,2 5v11q0,0.824 0.587,1.413M20,5v11H4V5z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_share_screen_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_share_screen_solid.xml
index ee9a1aa837..255e373765 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_share_screen_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_share_screen_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M1.29 20.71Q1.57 21 2 21h20q0.42 0 0.71-0.29A0.97 0.97 0 0 0 23 20a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 22 19H2a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 1 20q0 0.42 0.29 0.71m1.3-3.3A1.93 1.93 0 0 1 2 16V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 4 3h16q0.82 0 1.41 0.59T22 5v11q0 0.82-0.59 1.41A1.93 1.93 0 0 1 20 18H4q-0.82 0-1.41-0.59M12.7 7.3a1 1 0 0 0-1.42 0L8.8 9.8a1 1 0 0 0 1.42 1.42L11 10.4V13a1 1 0 1 0 2 0v-2.59l0.8 0.8a1 1 0 0 0 1.4-1.42z"/>
+  <path
+      android:pathData="M1.288,20.713Q1.575,21 2,21h20q0.424,0 0.712,-0.288A0.97,0.97 0,0 0,23 20a0.97,0.97 0,0 0,-0.288 -0.712A0.97,0.97 0,0 0,22 19H2a0.97,0.97 0,0 0,-0.712 0.288A0.97,0.97 0,0 0,1 20q0,0.424 0.288,0.712m1.3,-3.299A1.93,1.93 0,0 1,2 16V5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,4 3h16q0.824,0 1.413,0.587Q22,4.176 22,5v11q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,20 18H4q-0.824,0 -1.412,-0.587m10.12,-10.12a1,1 0,0 0,-1.415 0l-2.5,2.5a1,1 0,0 0,1.414 1.414l0.793,-0.793V13a1,1 0,1 0,2 0v-2.586l0.793,0.793a1,1 0,0 0,1.414 -1.414z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_shield.xml b/libraries/compound/src/main/res/drawable/ic_compound_shield.xml
index 7d2ee79157..a75afcb947 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_shield.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_shield.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M11.1 2.45a2 2 0 0 1 1.8 0l6 3A2 2 0 0 1 20 7.24V12c0 6.74-5.77 9.25-7.51 9.85-0.32 0.1-0.66 0.1-0.98 0C9.77 21.25 4 18.75 4 12V7.24a2 2 0 0 1 1.1-1.8z m4.6 6.84a1 1 0 0 0-1.4 0L11 12.6l-1.3-1.3a1 1 0 0 0-1.4 1.42l2 2a1 1 0 0 0 1.4 0l4-4a1 1 0 0 0 0-1.42"/>
+  <path
+      android:pathData="M11.106,2.447a2,2 0,0 1,1.789 0l6,3A2,2 0,0 1,20 7.237L20,12c0,6.742 -5.773,9.246 -7.51,9.846 -0.32,0.111 -0.66,0.111 -0.98,0C9.774,21.246 4,18.743 4,12L4,7.236a2,2 0,0 1,1.105 -1.789zM15.707,9.293a1,1 0,0 0,-1.414 0L11,12.586l-1.293,-1.293a1,1 0,0 0,-1.414 1.414l2,2a1,1 0,0 0,1.414 0l4,-4a1,1 0,0 0,0 -1.414"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_sidebar.xml b/libraries/compound/src/main/res/drawable/ic_compound_sidebar.xml
index 4bd5a0b3e3..1f5b355e49 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_sidebar.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_sidebar.xml
@@ -4,8 +4,8 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M18 3a4 4 0 0 1 4 4v10a4 4 0 0 1-4 4H6a4 4 0 0 1-4-4V7a4 4 0 0 1 4-4z m-8 2h8a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-8zM8 19H6a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h2z"/>
+  <path
+      android:pathData="M18,3a4,4 0,0 1,4 4v10a4,4 0,0 1,-4 4L6,21a4,4 0,0 1,-4 -4L2,7a4,4 0,0 1,4 -4zM10,5h8a2,2 0,0 1,2 2v10a2,2 0,0 1,-2 2h-8zM8,19L6,19a2,2 0,0 1,-2 -2L4,7a2,2 0,0 1,2 -2h2z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_sign_out.xml b/libraries/compound/src/main/res/drawable/ic_compound_sign_out.xml
index a6ded2b7a8..641cac9a0d 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_sign_out.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_sign_out.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9 12.03q0-0.42 0.29-0.71A0.97 0.97 0 0 1 10 11.03h7.15l-1.88-1.88a0.96 0.96 0 0 1-0.3-0.7q0-0.4 0.33-0.72a0.93 0.93 0 0 1 0.71-0.29 0.98 0.98 0 0 1 0.69 0.29l3.6 3.6q0.15 0.15 0.21 0.33 0.06 0.17 0.06 0.37 0 0.2-0.06 0.38a0.9 0.9 0 0 1-0.21 0.32l-3.6 3.6q-0.3 0.3-0.71 0.29a0.98 0.98 0 0 1-0.69-0.29 1.02 1.02 0 0 1-0.31-0.71 0.93 0.93 0 0 1 0.28-0.72l1.88-1.87H10a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 9 12.03m-6-7q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 3.03h6q0.42 0 0.71 0.29Q12 3.6 12 4.03t-0.29 0.71A0.97 0.97 0 0 1 11 5.03H5v14h6q0.42 0 0.71 0.29T12 20.03t-0.29 0.71A0.97 0.97 0 0 1 11 21.03H5q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19.03z"/>
+  <path
+      android:pathData="M9,12.031q0,-0.424 0.288,-0.712A0.97,0.97 0,0 1,10 11.03h7.15l-1.875,-1.875a0.96,0.96 0,0 1,-0.3 -0.7q0,-0.4 0.325,-0.725a0.93,0.93 0,0 1,0.712 -0.287,0.98 0.98,0 0,1 0.688,0.287l3.6,3.6q0.15,0.15 0.212,0.325 0.063,0.175 0.063,0.375 0,0.201 -0.062,0.375a0.9,0.9 0,0 1,-0.213 0.325l-3.6,3.6q-0.3,0.3 -0.712,0.288a0.98,0.98 0,0 1,-0.688 -0.288,1.02 1.02,0 0,1 -0.312,-0.712 0.93,0.93 0,0 1,0.287 -0.713l1.875,-1.875H10a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,9 12.03m-6,-7q0,-0.824 0.588,-1.412A1.93,1.93 0,0 1,5 3.03h6q0.424,0 0.713,0.288 0.287,0.287 0.287,0.712t-0.287,0.713A0.97,0.97 0,0 1,11 5.03H5v14h6q0.424,0 0.713,0.288 0.287,0.287 0.287,0.712t-0.287,0.713a0.97,0.97 0,0 1,-0.713 0.287H5q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19.03z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_space.xml b/libraries/compound/src/main/res/drawable/ic_compound_space.xml
new file mode 100644
index 0000000000..53a069c640
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_space.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="M6,21q-1.65,0 -2.825,-1.175T2,17t1.175,-2.825T6,13t2.825,1.175T10,17t-1.175,2.825T6,21m12,0q-1.65,0 -2.825,-1.175T14,17t1.175,-2.825T18,13t2.825,1.175T22,17t-1.175,2.825T18,21M6,19q0.824,0 1.412,-0.587Q8,17.825 8,17t-0.588,-1.412A1.93,1.93 0,0 0,6 15q-0.824,0 -1.412,0.588A1.93,1.93 0,0 0,4 17q0,0.824 0.588,1.413Q5.175,19 6,19m12,0q0.824,0 1.413,-0.587Q20,17.825 20,17t-0.587,-1.412A1.93,1.93 0,0 0,18 15q-0.824,0 -1.413,0.588A1.93,1.93 0,0 0,16 17q0,0.824 0.587,1.413Q17.176,19 18,19m-6,-8q-1.65,0 -2.825,-1.175T8,7t1.175,-2.825T12,3t2.825,1.175T16,7t-1.175,2.825T12,11m0,-2q0.825,0 1.412,-0.588Q14,7.826 14,7q0,-0.824 -0.588,-1.412A1.93,1.93 0,0 0,12 5q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,10 7q0,0.824 0.588,1.412Q11.175,9 12,9"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_space_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_space_solid.xml
new file mode 100644
index 0000000000..34730e87ff
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_space_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="M3.175,19.825Q4.35,21 6,21t2.825,-1.175T10,17t-1.175,-2.825T6,13t-2.825,1.175T2,17t1.175,2.825m12,0Q16.35,21 18,21t2.825,-1.175T22,17t-1.175,-2.825T18,13t-2.825,1.175T14,17t1.175,2.825m-6,-10Q10.35,11 12,11t2.825,-1.175T16,7t-1.175,-2.825T12,3 9.175,4.175 8,7t1.175,2.825"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_spinner.xml b/libraries/compound/src/main/res/drawable/ic_compound_spinner.xml
index 80721fdce8..d3577cba4c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_spinner.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_spinner.xml
@@ -4,8 +4,8 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M12 4.03a8 8 0 1 0 8 8 1 1 0 0 1 2 0c0 5.52-4.48 10-10 10s-10-4.48-10-10 4.48-10 10-10a1 1 0 1 1 0 2"/>
+  <path
+      android:pathData="M12,4.031a8,8 0,1 0,8 8,1 1,0 0,1 2,0c0,5.523 -4.477,10 -10,10s-10,-4.477 -10,-10 4.477,-10 10,-10a1,1 0,1 1,0 2"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_spotlight.xml b/libraries/compound/src/main/res/drawable/ic_compound_spotlight.xml
index acaad53b3b..df9e43f1fe 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_spotlight.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_spotlight.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 5h14v8h-5a1 1 0 0 0-1 1v5H5z m10 14v-4h4v4zM5 21h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2"/>
+  <path
+      android:pathData="M5,5h14v8h-5a1,1 0,0 0,-1 1v5L5,19zM15,19v-4h4v4zM5,21h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2L5,3a2,2 0,0 0,-2 2v14a2,2 0,0 0,2 2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_spotlight_view.xml b/libraries/compound/src/main/res/drawable/ic_compound_spotlight_view.xml
index 724cdf91cf..5a33b46550 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_spotlight_view.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_spotlight_view.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M20 6H4v12h16zM4 4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2z"/>
+  <path
+      android:pathData="M20,6H4v12h16zM4,4a2,2 0,0 0,-2 2v12a2,2 0,0 0,2 2h16a2,2 0,0 0,2 -2V6a2,2 0,0 0,-2 -2z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_sticker.xml b/libraries/compound/src/main/res/drawable/ic_compound_sticker.xml
new file mode 100644
index 0000000000..c68fd65d7d
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_sticker.xml
@@ -0,0 +1,10 @@
+<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="M17,2a5,5 0,0 1,5 4.999v5.335a5,5 0,0 1,-1.58 3.647l-4.978,4.667A5,5 0,0 1,12.023 22L7,22l-0.258,-0.007A5,5 0,0 1,2 17L2,7a5,5 0,0 1,5 -5zM7,4a3,3 0,0 0,-3 3v10a3,3 0,0 0,2.999 3L12,20v-4a4,4 0,0 1,4 -4h4L20,6.999A3,3 0,0 0,17 4zM16,14a2,2 0,0 0,-2 2v3.251l0.074,-0.062 4.978,-4.666q0.252,-0.238 0.441,-0.523z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_strikethrough.xml b/libraries/compound/src/main/res/drawable/ic_compound_strikethrough.xml
index a472c6c97e..010baa2a4e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_strikethrough.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_strikethrough.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.15 20q-1.9 0-3.38-1.13T6.66 15.8l2.2-0.95q0.35 1.2 1.21 1.98 0.86 0.77 2.14 0.77 1.05 0 1.9-0.5t0.85-1.6q0-0.45-0.17-0.82A2.4 2.4 0 0 0 14.3 14h2.8a4.3 4.3 0 0 1 0.25 1.5q0 2.15-1.54 3.33Q14.28 20 12.15 20M3 12a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 2 11q0-0.42 0.29-0.71A0.97 0.97 0 0 1 3 10h18q0.42 0 0.71 0.29T22 11q0 0.42-0.29 0.71A0.97 0.97 0 0 1 21 12z m9.05-8.15q1.65 0 2.89 0.81t1.91 2.49l-2.2 0.97a3 3 0 0 0-0.84-1.3Q13.2 6.25 12.1 6.25q-1.02 0-1.7 0.46Q9.72 7.17 9.65 8h-2.4Q7.3 6.27 8.61 5.06q1.32-1.21 3.44-1.21"/>
+  <path
+      android:pathData="M12.15,20q-1.9,0 -3.375,-1.125T6.65,15.8l2.2,-0.95q0.35,1.2 1.213,1.975 0.861,0.775 2.137,0.775 1.05,0 1.9,-0.5t0.85,-1.6q0,-0.45 -0.175,-0.825A2.4,2.4 0,0 0,14.3 14h2.8a4.3,4.3 0,0 1,0.25 1.5q0,2.15 -1.538,3.325Q14.277,20 12.15,20M3,12a0.97,0.97 0,0 1,-0.712 -0.287A0.97,0.97 0,0 1,2 11q0,-0.424 0.288,-0.713A0.97,0.97 0,0 1,3 10h18q0.424,0 0.712,0.287 0.288,0.288 0.288,0.713 0,0.424 -0.288,0.713A0.97,0.97 0,0 1,21 12zM12.05,3.85q1.65,0 2.887,0.812T16.85,7.15l-2.2,0.975a3,3 0,0 0,-0.838 -1.3Q13.2,6.25 12.1,6.25q-1.025,0 -1.7,0.462 -0.675,0.463 -0.75,1.288h-2.4q0.05,-1.725 1.363,-2.938Q9.925,3.85 12.05,3.85"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_switch_camera_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_switch_camera_solid.xml
index a7695e40ff..8d275c6ae3 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_switch_camera_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_switch_camera_solid.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.3 2.3a1 1 0 0 1 1.4 0l2 2a1 1 0 0 1 0 1.4l-2 2a1 1 0 1 1-1.4-1.4L16.58 6H6a2 2 0 0 0-2 2v7a1 1 0 1 1-2 0V8a4 4 0 0 1 4-4h10.59l-0.3-0.3a1 1 0 0 1 0-1.4M18 18H7.41l0.3-0.3a1 1 0 1 0-1.42-1.4l-2 2a1 1 0 0 0 0 1.4l2 2a1 1 0 0 0 1.42-1.4L7.4 20H18a4 4 0 0 0 4-4V9a1 1 0 1 0-2 0v7a2 2 0 0 1-2 2"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6"/>
+  <path
+      android:pathData="M16.293,2.293a1,1 0,0 1,1.414 0l2,2a1,1 0,0 1,0 1.414l-2,2a1,1 0,1 1,-1.414 -1.414L16.586,6H6a2,2 0,0 0,-2 2v7a1,1 0,1 1,-2 0V8a4,4 0,0 1,4 -4h10.586l-0.293,-0.293a1,1 0,0 1,0 -1.414M18,18H7.414l0.293,-0.293a1,1 0,1 0,-1.414 -1.414l-2,2a1,1 0,0 0,0 1.414l2,2a1,1 0,0 0,1.414 -1.414L7.414,20H18a4,4 0,0 0,4 -4V9a1,1 0,1 0,-2 0v7a2,2 0,0 1,-2 2"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M12,15a3,3 0,1 0,0 -6,3 3,0 0,0 0,6"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_take_photo.xml b/libraries/compound/src/main/res/drawable/ic_compound_take_photo.xml
index d6dbb4d568..fdd8ebd707 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_take_photo.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_take_photo.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 17.5q1.88 0 3.19-1.31Q16.5 14.87 16.5 13t-1.31-3.19T12 8.5 8.81 9.81Q7.5 11.12 7.5 13t1.31 3.19Q10.12 17.5 12 17.5m0-2q-1.05 0-1.77-0.72T9.5 13t0.72-1.77T12 10.5t1.77 0.72T14.5 13t-0.72 1.77T12 15.5M4 21q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 2 19V7q0-0.82 0.59-1.41A1.93 1.93 0 0 1 4 5h3.15L8.4 3.65q0.28-0.3 0.66-0.47Q9.45 3 9.88 3h4.25q0.42 0 0.8 0.17 0.4 0.18 0.67 0.48L16.85 5H20q0.82 0 1.41 0.59Q22 6.17 22 7v12q0 0.82-0.59 1.41A1.93 1.93 0 0 1 20 21z m0-2h16V7h-4.05l-1.82-2H9.87L8.05 7H4z"/>
+  <path
+      android:pathData="M12,17.5q1.875,0 3.188,-1.312Q16.5,14.875 16.5,13t-1.312,-3.187T12,8.5 8.813,9.813Q7.499,11.125 7.5,13q0,1.875 1.313,3.188Q10.125,17.5 12,17.5m0,-2q-1.05,0 -1.775,-0.725T9.5,13t0.725,-1.775T12,10.5t1.775,0.725T14.5,13t-0.725,1.775T12,15.5M4,21q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,2 19L2,7q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,4 5h3.15L8.4,3.65q0.275,-0.3 0.662,-0.475Q9.45,3 9.876,3h4.25q0.424,0 0.813,0.175 0.387,0.175 0.662,0.475L16.85,5L20,5q0.824,0 1.413,0.588Q22,6.175 22,7v12q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,20 21zM4,19h16L20,7h-4.05l-1.825,-2h-4.25L8.05,7L4,7z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_take_photo_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_take_photo_solid.xml
index 2db8a6cdf0..bc3b0708cd 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_take_photo_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_take_photo_solid.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M2.59 20.41Q3.17 21 4 21h16q0.82 0 1.41-0.59T22 19V7q0-0.82-0.59-1.41A1.93 1.93 0 0 0 20 5h-3.15L15.6 3.65a2 2 0 0 0-0.66-0.47A1.95 1.95 0 0 0 14.13 3H9.87q-0.42 0-0.8 0.17-0.4 0.18-0.67 0.48L7.15 5H4Q3.18 5 2.59 5.59A1.93 1.93 0 0 0 2 7v12q0 0.82 0.59 1.41M12 16.5a3.5 3.5 0 1 0 0-7 3.5 3.5 0 0 0 0 7"/>
+  <path
+      android:pathData="M2.588,20.413Q3.175,21 4,21h16q0.824,0 1.413,-0.587Q22,19.825 22,19V7q0,-0.824 -0.587,-1.412A1.93,1.93 0,0 0,20 5h-3.15L15.6,3.65a2,2 0,0 0,-0.662 -0.475A1.95,1.95 0,0 0,14.125 3h-4.25q-0.425,0 -0.812,0.175 -0.389,0.175 -0.663,0.475L7.15,5H4q-0.824,0 -1.412,0.588A1.93,1.93 0,0 0,2 7v12q0,0.824 0.587,1.413M12,16.5a3.5,3.5 0,1 0,0 -7,3.5 3.5,0 0,0 0,7"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_text_formatting.xml b/libraries/compound/src/main/res/drawable/ic_compound_text_formatting.xml
index 4126080fa9..c87c152b34 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_text_formatting.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_text_formatting.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 19a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 5 18q0-0.42 0.29-0.71A0.97 0.97 0 0 1 6 17h12q0.42 0 0.71 0.29T19 18q0 0.42-0.29 0.71A0.97 0.97 0 0 1 18 19z m1.35-5.2l3.42-9.2a0.9 0.9 0 0 1 0.34-0.44A0.93 0.93 0 0 1 11.65 4h0.7q0.3 0 0.54 0.16 0.23 0.16 0.33 0.44l3.43 9.22q0.15 0.43-0.1 0.8a0.8 0.8 0 0 1-0.7 0.38 0.9 0.9 0 0 1-0.51-0.16A0.9 0.9 0 0 1 15 14.4l-0.75-2.2H9.8L9 14.43a0.84 0.84 0 0 1-0.33 0.42Q8.46 15 8.18 15a0.84 0.84 0 0 1-0.73-0.39 0.82 0.82 0 0 1-0.09-0.81m3-3.2h3.3l-1.6-4.55h-0.1z"/>
+  <path
+      android:pathData="M6,19a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,5 18q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,6 17h12q0.424,0 0.712,0.288 0.288,0.287 0.288,0.712 0,0.424 -0.288,0.712A0.97,0.97 0,0 1,18 19zM7.35,13.8 L10.775,4.6a0.9,0.9 0,0 1,0.338 -0.437A0.93,0.93 0,0 1,11.65 4h0.7q0.3,0 0.537,0.162 0.238,0.163 0.338,0.438l3.425,9.225q0.15,0.425 -0.1,0.8a0.8,0.8 0,0 1,-0.7 0.375,0.9 0.9,0 0,1 -0.512,-0.162A0.9,0.9 0,0 1,15 14.4l-0.75,-2.2L9.8,12.2L9,14.425a0.84,0.84 0,0 1,-0.325 0.425q-0.225,0.15 -0.5,0.15a0.84,0.84 0,0 1,-0.738 -0.387,0.82 0.82,0 0,1 -0.087,-0.813m3,-3.2h3.3l-1.6,-4.55h-0.1z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_threads.xml b/libraries/compound/src/main/res/drawable/ic_compound_threads.xml
index 4fa1e877d1..6d3fd0c853 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_threads.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_threads.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7 10a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 6 9q0-0.42 0.29-0.71A0.97 0.97 0 0 1 7 8h10q0.42 0 0.71 0.29T18 9t-0.29 0.71A0.97 0.97 0 0 1 17 10z m0 4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 6 13q0-0.42 0.29-0.71A0.97 0.97 0 0 1 7 12h6q0.42 0 0.71 0.29T14 13q0 0.42-0.29 0.71A0.97 0.97 0 0 1 13 14z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.7 21.3C3.09 21.91 2 21.47 2 20.58V5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6zM6 17h14V5H4v13.17l0.59-0.58A2 2 0 0 1 6 17"/>
+  <path
+      android:pathData="M7,10a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,6 9q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,7 8h10q0.424,0 0.712,0.287Q18,8.576 18,9t-0.288,0.713A0.97,0.97 0,0 1,17 10zM7,14a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,6 13q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,7 12h6q0.424,0 0.713,0.287 0.287,0.288 0.287,0.713 0,0.424 -0.287,0.713A0.97,0.97 0,0 1,13 14z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M3.707,21.293c-0.63,0.63 -1.707,0.184 -1.707,-0.707V5a2,2 0,0 1,2 -2h16a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2H6zM6,17h14V5H4v13.172l0.586,-0.586A2,2 0,0 1,6 17"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_threads_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_threads_solid.xml
index 4db292231d..b06b67c27e 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_threads_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_threads_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 3h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6l-2.3 2.3C3.09 21.91 2 21.47 2 20.58V5a2 2 0 0 1 2-2m3 7h10q0.42 0 0.71-0.29A0.97 0.97 0 0 0 18 9a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 17 8H7a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 6 9q0 0.42 0.29 0.71T7 10m0 4h6q0.42 0 0.71-0.29A0.97 0.97 0 0 0 14 13a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 13 12H7a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 6 13q0 0.42 0.29 0.71T7 14"/>
+  <path
+      android:pathData="M4,3h16a2,2 0,0 1,2 2v12a2,2 0,0 1,-2 2H6l-2.293,2.293c-0.63,0.63 -1.707,0.184 -1.707,-0.707V5a2,2 0,0 1,2 -2m3,7h10q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,18 9a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,17 8H7a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,6 9q0,0.424 0.287,0.713Q6.576,10 7,10m0,4h6q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,14 13a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,13 12H7a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,6 13q0,0.424 0.287,0.713Q6.576,14 7,14"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_time.xml b/libraries/compound/src/main/res/drawable/ic_compound_time.xml
index b29bb29de7..7fc0404c88 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_time.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_time.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13 8a1 1 0 1 0-2 0v4a1 1 0 0 0 0.3 0.7l2.82 2.84a1 1 0 0 0 1.42-1.42L13 11.6z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M22 11.91c0 5.53-4.48 10-10 10s-10-4.47-10-10 4.48-10 10-10 10 4.48 10 10m-2 0a8 8 0 1 1-16 0 8 8 0 0 1 16 0"/>
+  <path
+      android:pathData="M13,8a1,1 0,1 0,-2 0v4a1,1 0,0 0,0.293 0.707l2.83,2.83a1,1 0,0 0,1.414 -1.414L13,11.586z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M22,11.915c0,5.523 -4.477,10 -10,10s-10,-4.477 -10,-10 4.477,-10 10,-10 10,4.477 10,10m-2,0a8,8 0,1 1,-16 0,8 8,0 0,1 16,0"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_underline.xml b/libraries/compound/src/main/res/drawable/ic_compound_underline.xml
index c90d6bc591..3c8e5b7caa 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_underline.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_underline.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 21a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 5 20q0-0.42 0.29-0.71A0.97 0.97 0 0 1 6 19h12q0.42 0 0.71 0.29T19 20q0 0.42-0.29 0.71A0.97 0.97 0 0 1 18 21z m6-4q-2.52 0-3.92-1.57t-1.4-4.18V4.28q0-0.53 0.38-0.9A1.27 1.27 0 0 1 7.98 3q0.52 0 0.9 0.38t0.37 0.9v7.12q0 1.4 0.7 2.27T12 14.56t2.05-0.88 0.7-2.27V4.27q0-0.52 0.39-0.9A1.27 1.27 0 0 1 16.05 3q0.53 0 0.9 0.38t0.38 0.9v6.97q0 2.6-1.4 4.17T12 17"/>
+  <path
+      android:pathData="M6,21a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,5 20q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,6 19h12q0.424,0 0.712,0.288 0.288,0.287 0.288,0.712 0,0.424 -0.288,0.712A0.97,0.97 0,0 1,18 21zM12,17q-2.525,0 -3.925,-1.575t-1.4,-4.175L6.675,4.275q0,-0.525 0.388,-0.9A1.27,1.27 0,0 1,7.975 3q0.525,0 0.9,0.375t0.375,0.9L9.25,11.4q0,1.4 0.7,2.275t2.05,0.875 2.05,-0.875 0.7,-2.275L14.75,4.275q0,-0.525 0.387,-0.9A1.27,1.27 0,0 1,16.05 3q0.525,0 0.9,0.375t0.375,0.9v6.975q0,2.6 -1.4,4.175T12,17"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_unknown.xml b/libraries/compound/src/main/res/drawable/ic_compound_unknown.xml
index 87afe69e02..606e20b9e9 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_unknown.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_unknown.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 21q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 3 19V5q0-0.82 0.59-1.41A1.93 1.93 0 0 1 5 3h14q0.82 0 1.41 0.59T21 5v14q0 0.82-0.59 1.41A1.93 1.93 0 0 1 19 21z m0-2h14V5H5z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11 10a1 1 0 1 1 1.48 0.88c-0.31 0.17-0.66 0.41-0.94 0.74C11.25 11.95 11 12.42 11 13a1 1 0 0 0 2 0 0.3 0.3 0 0 1 0.06-0.08 1.4 1.4 0 0 1 0.38-0.29A3 3 0 1 0 9 10a1 1 0 1 0 2 0m2 3.01zM12 17a1 1 0 1 0 0-2 1 1 0 0 0 0 2"/>
+  <path
+      android:pathData="M5,21q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 19L3,5q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 3h14q0.824,0 1.413,0.587Q21,4.176 21,5v14q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 21zM5,19h14L19,5L5,5z"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M11,10a1,1 0,1 1,1.479 0.878c-0.31,0.17 -0.659,0.413 -0.94,0.741 -0.286,0.334 -0.539,0.8 -0.539,1.381a1,1 0,0 0,2 0.006,0.3 0.3,0 0,1 0.057,-0.085 1.4,1.4 0,0 1,0.382 -0.288A3,3 0,1 0,9 10a1,1 0,1 0,2 0m1.999,3.012v-0.005zM12,17a1,1 0,1 0,0 -2,1 1,0 0,0 0,2"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_unknown_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_unknown_solid.xml
index 89b6a89056..5aec9fa483 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_unknown_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_unknown_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13 13.01z m-9.41 7.4Q4.17 21 5 21h14q0.82 0 1.41-0.59T21 19V5q0-0.82-0.59-1.41A1.93 1.93 0 0 0 19 3H5Q4.18 3 3.59 3.59A1.93 1.93 0 0 0 3 5v14q0 0.82 0.59 1.41M12 9a1 1 0 0 0-1 1 1 1 0 1 1-2 0 3 3 0 1 1 4.44 2.63 1.4 1.4 0 0 0-0.38 0.3A0.3 0.3 0 0 0 13 13 1 1 0 0 1 11 13c0-0.58 0.25-1.05 0.54-1.38 0.28-0.33 0.63-0.57 0.94-0.74A1 1 0 0 0 12 9m1 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/>
+  <path
+      android:pathData="M12.999,13.012v-0.005zM3.588,20.413Q4.175,21 5,21h14q0.824,0 1.413,-0.587Q21,19.825 21,19L21,5q0,-0.824 -0.587,-1.412A1.93,1.93 0,0 0,19 3L5,3q-0.824,0 -1.412,0.587A1.93,1.93 0,0 0,3 5v14q0,0.824 0.587,1.413M12,9a1,1 0,0 0,-1 1,1 1,0 1,1 -2,0 3,3 0,1 1,4.44 2.633,1.4 1.4,0 0,0 -0.383,0.288 0.3,0.3 0,0 0,-0.057 0.085A1,1 0,0 1,11 13c0,-0.58 0.253,-1.047 0.539,-1.38 0.281,-0.33 0.63,-0.572 0.94,-0.742A1,1 0,0 0,12 9m1,7a1,1 0,1 1,-2 0,1 1,0 0,1 2,0"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_unpin.xml b/libraries/compound/src/main/res/drawable/ic_compound_unpin.xml
index c7aee251f4..361c4be028 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_unpin.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_unpin.xml
@@ -4,11 +4,11 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M5.46 2.08A1 1 0 0 0 4.04 3.5l4 4v2.24a0.5 0.5 0 0 1-0.15 0.36l-3.7 3.64a0.5 0.5 0 0 0-0.15 0.36v1.4a0.5 0.5 0 0 0 0.5 0.5h6.5v6a1 1 0 0 0 2 0v-6h3.5l4.5 4.5a1 1 0 0 0 1.42-1.42zM14.55 14l-4.51-4.5v0.24a2.5 2.5 0 0 1-0.75 1.78L6.78 14z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M14.04 4v3.85l2.02 2.02a0.5 0.5 0 0 1-0.02-0.12v-4.5a0.5 0.5 0 0 1 0.15-0.35l2.08-2.04A0.5 0.5 0 0 0 17.92 2H8.2l2 2z"/>
+  <path
+      android:pathData="M5.457,2.083a1,1 0,0 0,-1.414 1.414L8.04,7.494v2.25a0.5,0.5 0,0 1,-0.15 0.356l-3.7,3.644a0.5,0.5 0,0 0,-0.15 0.356v1.4a0.5,0.5 0,0 0,0.5 0.5h6.5v6a1,1 0,0 0,2 0v-6h3.506l4.497,4.497a1,1 0,0 0,1.414 -1.414zM14.546,14 L10.04,9.494v0.25a2.5,2.5 0,0 1,-0.746 1.781L6.78,14z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.04,4v3.85l2.015,2.015a0.5,0.5 0,0 1,-0.015 -0.12V5.257a0.5,0.5 0,0 1,0.15 -0.357l2.081,-2.043a0.5,0.5 0,0 0,-0.35 -0.857h-9.73l2,2z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_user.xml b/libraries/compound/src/main/res/drawable/ic_compound_user.xml
index 948bda3e4e..b0d51f5cfe 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_user.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_user.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 12q-1.65 0-2.83-1.18T8 8t1.18-2.83T12 4t2.83 1.18T16 8t-1.18 2.83T12 12m-8 6v-0.8q0-0.85 0.44-1.56 0.43-0.72 1.16-1.09a14.8 14.8 0 0 1 3.15-1.16A13.8 13.8 0 0 1 12 13q1.65 0 3.25 0.39 1.6 0.38 3.15 1.16 0.72 0.38 1.16 1.09Q20 16.35 20 17.2V18q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 20H6q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 18m2 0h12v-0.8a0.97 0.97 0 0 0-0.5-0.85q-1.35-0.68-2.73-1.01a11.6 11.6 0 0 0-5.54 0q-1.38 0.34-2.73 1.01A0.97 0.97 0 0 0 6 17.2z m6-8q0.82 0 1.41-0.59Q14 8.83 14 8q0-0.82-0.59-1.41A1.93 1.93 0 0 0 12 6q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 10 8q0 0.82 0.59 1.41T12 10"/>
+  <path
+      android:pathData="M12,12q-1.65,0 -2.825,-1.175T8,8t1.175,-2.825T12,4t2.825,1.175T16,8t-1.175,2.825T12,12m-8,6v-0.8q0,-0.85 0.438,-1.562 0.437,-0.713 1.162,-1.088a14.8,14.8 0,0 1,3.15 -1.163A13.8,13.8 0,0 1,12 13q1.65,0 3.25,0.387 1.6,0.388 3.15,1.163 0.724,0.375 1.163,1.087Q20,16.35 20,17.2v0.8q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 20L6,20q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 18m2,0h12v-0.8a0.97,0.97 0,0 0,-0.5 -0.85q-1.35,-0.675 -2.725,-1.012a11.6,11.6 0,0 0,-5.55 0Q7.85,15.675 6.5,16.35a0.97,0.97 0,0 0,-0.5 0.85zM12,10q0.825,0 1.412,-0.588Q14,8.826 14,8q0,-0.824 -0.588,-1.412A1.93,1.93 0,0 0,12 6q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,10 8q0,0.825 0.588,1.412Q11.175,10 12,10"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_user_add.xml b/libraries/compound/src/main/res/drawable/ic_compound_user_add.xml
index 81d9aaf1bb..9965dadcde 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_user_add.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_user_add.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10 12q-1.65 0-2.83-1.18T6 8t1.18-2.83T10 4t2.83 1.18T14 8t-1.18 2.83T10 12m-8 6v-0.8q0-0.85 0.44-1.56 0.44-0.72 1.16-1.09a14.8 14.8 0 0 1 3.15-1.16A13.8 13.8 0 0 1 10 13q1.65 0 3.25 0.39 1.6 0.38 3.15 1.16 0.72 0.38 1.16 1.09Q18 16.35 18 17.2V18q0 0.82-0.59 1.41A1.93 1.93 0 0 1 16 20H4q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 2 18m2 0h12v-0.8a0.97 0.97 0 0 0-0.5-0.85q-1.35-0.68-2.73-1.01a11.6 11.6 0 0 0-5.54 0q-1.38 0.34-2.73 1.01A0.97 0.97 0 0 0 4 17.2z m6-8q0.82 0 1.41-0.59Q12 8.83 12 8q0-0.82-0.59-1.41A1.93 1.93 0 0 0 10 6Q9.18 6 8.59 6.59A1.93 1.93 0 0 0 8 8q0 0.82 0.59 1.41T10 10m7 1h2v2q0 0.42 0.29 0.71T20 14q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 13v-2h2q0.42 0 0.71-0.29A0.97 0.97 0 0 0 24 10a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 23 9h-2V7a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 6a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 19 7v2h-2a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 16 10q0 0.42 0.29 0.71T17 11"/>
+  <path
+      android:pathData="M10,12q-1.65,0 -2.825,-1.175T6,8t1.175,-2.825T10,4t2.825,1.175T14,8t-1.175,2.825T10,12m-8,6v-0.8q0,-0.85 0.438,-1.562 0.437,-0.713 1.162,-1.088a14.8,14.8 0,0 1,3.15 -1.163A13.8,13.8 0,0 1,10 13q1.65,0 3.25,0.387 1.6,0.388 3.15,1.163 0.724,0.375 1.163,1.087Q18,16.35 18,17.2v0.8q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,16 20L4,20q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,2 18m2,0h12v-0.8a0.97,0.97 0,0 0,-0.5 -0.85q-1.35,-0.675 -2.725,-1.012a11.6,11.6 0,0 0,-5.55 0Q5.85,15.675 4.5,16.35a0.97,0.97 0,0 0,-0.5 0.85zM10,10q0.825,0 1.412,-0.588Q12,8.826 12,8q0,-0.824 -0.588,-1.412A1.93,1.93 0,0 0,10 6q-0.825,0 -1.412,0.588A1.93,1.93 0,0 0,8 8q0,0.825 0.588,1.412Q9.175,10 10,10m7,1h2v2q0,0.424 0.288,0.713 0.287,0.287 0.712,0.287 0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 13v-2h2q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,24 10a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,23 9h-2L21,7a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 6a0.97,0.97 0,0 0,-0.712 0.287A0.97,0.97 0,0 0,19 7v2h-2a0.97,0.97 0,0 0,-0.712 0.287A0.97,0.97 0,0 0,16 10q0,0.424 0.288,0.713 0.287,0.287 0.712,0.287"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_user_add_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_user_add_solid.xml
index 693db72c06..685d751fdb 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_user_add_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_user_add_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10 12q-1.65 0-2.83-1.18T6 8t1.18-2.83T10 4t2.83 1.18T14 8t-1.18 2.83T10 12m-8 6v-0.8q0-0.85 0.44-1.56 0.44-0.72 1.16-1.09a14.8 14.8 0 0 1 3.15-1.16A13.8 13.8 0 0 1 10 13q1.65 0 3.25 0.39 1.6 0.38 3.15 1.16 0.72 0.38 1.16 1.09Q18 16.35 18 17.2V18q0 0.82-0.59 1.41A1.93 1.93 0 0 1 16 20H4q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 2 18m15-7h2v2q0 0.42 0.29 0.71T20 14q0.42 0 0.71-0.29A0.97 0.97 0 0 0 21 13v-2h2q0.42 0 0.71-0.29A0.97 0.97 0 0 0 24 10a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 23 9h-2V7a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 20 6a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 19 7v2h-2a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 16 10q0 0.42 0.29 0.71T17 11"/>
+  <path
+      android:pathData="M10,12q-1.65,0 -2.825,-1.175T6,8t1.175,-2.825T10,4t2.825,1.175T14,8t-1.175,2.825T10,12m-8,6v-0.8q0,-0.85 0.438,-1.562 0.437,-0.713 1.162,-1.088a14.8,14.8 0,0 1,3.15 -1.163A13.8,13.8 0,0 1,10 13q1.65,0 3.25,0.387 1.6,0.388 3.15,1.163 0.724,0.375 1.163,1.087Q18,16.35 18,17.2v0.8q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,16 20H4q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,2 18m15,-7h2v2q0,0.424 0.288,0.713 0.287,0.287 0.712,0.287 0.424,0 0.712,-0.287A0.97,0.97 0,0 0,21 13v-2h2q0.424,0 0.712,-0.287A0.97,0.97 0,0 0,24 10a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,23 9h-2V7a0.97,0.97 0,0 0,-0.288 -0.713A0.97,0.97 0,0 0,20 6a0.97,0.97 0,0 0,-0.712 0.287A0.97,0.97 0,0 0,19 7v2h-2a0.97,0.97 0,0 0,-0.712 0.287A0.97,0.97 0,0 0,16 10q0,0.424 0.288,0.713 0.287,0.287 0.712,0.287"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_user_profile.xml b/libraries/compound/src/main/res/drawable/ic_compound_user_profile.xml
index 222b9510ea..f66ebd04e7 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_user_profile.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_user_profile.xml
@@ -3,13 +3,13 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9.18 13.82Q10.35 15 12 15t2.83-1.18T16 11t-1.18-2.83T12 7 9.18 8.18 8 11t1.18 2.83m4.23-1.42A1.93 1.93 0 0 1 12 13q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 10 11q0-0.82 0.59-1.41A1.93 1.93 0 0 1 12 9q0.82 0 1.41 0.59T14 11t-0.59 1.41"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22 12c0 5.52-4.48 10-10 10S2 17.52 2 12 6.48 2 12 2s10 4.48 10 10m-2 0a8 8 0 1 0-16 0 8 8 0 0 0 16 0"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.23 18.8a13 13 0 0 0-1.46-0.46 11.6 11.6 0 0 0-5.54 0q-0.73 0.18-1.46 0.45a8 8 0 0 1-1.73-1.45q1.34-0.62 2.71-0.95A13.8 13.8 0 0 1 12 16q1.65 0 3.25 0.39 1.37 0.33 2.7 0.95a8 8 0 0 1-1.72 1.45"/>
+  <path
+      android:pathData="M9.175,13.825Q10.35,15 12,15t2.825,-1.175T16,11t-1.175,-2.825T12,7 9.175,8.175 8,11t1.175,2.825m4.237,-1.412A1.93,1.93 0,0 1,12 13q-0.825,0 -1.412,-0.588A1.93,1.93 0,0 1,10 11q0,-0.825 0.588,-1.412A1.93,1.93 0,0 1,12 9q0.825,0 1.412,0.588Q14,10.175 14,11t-0.588,1.412"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M22,12c0,5.523 -4.477,10 -10,10S2,17.523 2,12 6.477,2 12,2s10,4.477 10,10m-2,0a8,8 0,1 0,-16 0,8 8,0 0,0 16,0"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M16.23,18.792a13,13 0,0 0,-1.455 -0.455,11.6 11.6,0 0,0 -5.55,0q-0.73,0.18 -1.455,0.455a8,8 0,0 1,-1.729 -1.454q1.336,-0.618 2.709,-0.95A13.8,13.8 0,0 1,12 16q1.65,0 3.25,0.387 1.373,0.333 2.709,0.95a8,8 0,0 1,-1.73 1.455"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_user_profile_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_user_profile_solid.xml
index 5d268642e0..54ada8e1ce 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_user_profile_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_user_profile_solid.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 15q-1.65 0-2.83-1.18T8 11t1.18-2.83T12 7t2.83 1.18T16 11t-1.18 2.83T12 15"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.53 18.58A9.96 9.96 0 0 0 22 12c0-5.52-4.48-10-10-10S2 6.48 2 12c0 2.52 0.93 4.82 2.47 6.58A9.98 9.98 0 0 0 12 22a9.98 9.98 0 0 0 7.53-3.42m-10.78-2.2q-1.37 0.34-2.7 0.96a8 8 0 1 1 11.9 0 14.7 14.7 0 0 0-2.7-0.95A13.8 13.8 0 0 0 12 16q-1.65 0-3.25 0.39"/>
+  <path
+      android:pathData="M12,15q-1.65,0 -2.825,-1.175T8,11t1.175,-2.825T12,7t2.825,1.175T16,11t-1.175,2.825T12,15"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M19.528,18.583A9.96,9.96 0,0 0,22 12c0,-5.523 -4.477,-10 -10,-10S2,6.477 2,12c0,2.52 0.933,4.824 2.472,6.583A9.98,9.98 0,0 0,12 22a9.98,9.98 0,0 0,7.528 -3.417M8.75,16.388q-1.373,0.332 -2.709,0.95a8,8 0,1 1,11.918 0,14.7 14.7,0 0,0 -2.709,-0.95A13.8,13.8 0,0 0,12 16q-1.65,0 -3.25,0.387"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_user_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_user_solid.xml
index c281d6f009..64409fcf5c 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_user_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_user_solid.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 12q-1.65 0-2.83-1.18T8 8t1.18-2.83T12 4t2.83 1.18T16 8t-1.18 2.83T12 12m-8 6v-0.8q0-0.85 0.44-1.56 0.43-0.72 1.16-1.09a14.8 14.8 0 0 1 3.15-1.16A13.8 13.8 0 0 1 12 13q1.65 0 3.25 0.39 1.6 0.38 3.15 1.16 0.72 0.38 1.16 1.09Q20 16.35 20 17.2V18q0 0.82-0.59 1.41A1.93 1.93 0 0 1 18 20H6q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 4 18"/>
+  <path
+      android:pathData="M12,12q-1.65,0 -2.825,-1.175T8,8t1.175,-2.825T12,4t2.825,1.175T16,8t-1.175,2.825T12,12m-8,6v-0.8q0,-0.85 0.438,-1.562 0.437,-0.713 1.162,-1.088a14.8,14.8 0,0 1,3.15 -1.163A13.8,13.8 0,0 1,12 13q1.65,0 3.25,0.387 1.6,0.388 3.15,1.163 0.724,0.375 1.163,1.087Q20,16.35 20,17.2v0.8q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,18 20H6q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,4 18"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_verified.xml b/libraries/compound/src/main/res/drawable/ic_compound_verified.xml
index f30bec93ff..510e386bb9 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_verified.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_verified.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8.15 21.75L6.7 19.3l-2.75-0.6a0.94 0.94 0 0 1-0.6-0.39 0.93 0.93 0 0 1-0.17-0.68l0.27-2.83-1.88-2.15A0.93 0.93 0 0 1 1.34 12q0-0.38 0.25-0.65L3.45 9.2 3.17 6.37A0.93 0.93 0 0 1 3.36 5.7a0.94 0.94 0 0 1 0.6-0.39L6.7 4.7l1.45-2.45A0.98 0.98 0 0 1 8.7 1.81a0.97 0.97 0 0 1 0.7 0.04l2.6 1.1 2.6-1.1a0.97 0.97 0 0 1 0.7-0.04q0.35 0.11 0.55 0.44L17.3 4.7l2.75 0.6q0.38 0.07 0.6 0.39 0.23 0.31 0.18 0.68L20.55 9.2l1.88 2.15q0.25 0.28 0.25 0.65t-0.25 0.65l-1.88 2.15 0.28 2.83a0.93 0.93 0 0 1-0.18 0.68 0.94 0.94 0 0 1-0.6 0.39l-2.75 0.6-1.45 2.45a0.98 0.98 0 0 1-0.55 0.44 0.97 0.97 0 0 1-0.7-0.04l-2.6-1.1-2.6 1.1a0.97 0.97 0 0 1-0.7 0.04 0.98 0.98 0 0 1-0.55-0.44m2.8-9.05L9.5 11.28A0.93 0.93 0 0 0 8.81 11Q8.4 11 8.1 11.3A0.95 0.95 0 0 0 7.82 12q0 0.42 0.28 0.7l2.15 2.15q0.3 0.3 0.7 0.3t0.7-0.3l4.25-4.25q0.3-0.3 0.29-0.7a1.06 1.06 0 0 0-0.29-0.7 1.02 1.02 0 0 0-0.71-0.31 0.93 0.93 0 0 0-0.72 0.29z"/>
+  <path
+      android:pathData="M8.15,21.75 L6.7,19.3l-2.75,-0.6a0.94,0.94 0,0 1,-0.6 -0.387,0.93 0.93,0 0,1 -0.175,-0.688L3.45,14.8l-1.875,-2.15a0.93,0.93 0,0 1,-0.25 -0.65q0,-0.375 0.25,-0.65L3.45,9.2l-0.275,-2.825a0.93,0.93 0,0 1,0.175 -0.687,0.94 0.94,0 0,1 0.6,-0.388l2.75,-0.6 1.45,-2.45a0.98,0.98 0,0 1,0.55 -0.437,0.97 0.97,0 0,1 0.7,0.037l2.6,1.1 2.6,-1.1a0.97,0.97 0,0 1,0.7 -0.038q0.35,0.112 0.55,0.438L17.3,4.7l2.75,0.6q0.375,0.075 0.6,0.388 0.225,0.312 0.175,0.687L20.55,9.2l1.875,2.15q0.25,0.275 0.25,0.65t-0.25,0.65L20.55,14.8l0.275,2.825a0.93,0.93 0,0 1,-0.175 0.688,0.94 0.94,0 0,1 -0.6,0.387l-2.75,0.6 -1.45,2.45a0.98,0.98 0,0 1,-0.55 0.438,0.97 0.97,0 0,1 -0.7,-0.038l-2.6,-1.1 -2.6,1.1a0.97,0.97 0,0 1,-0.7 0.038,0.98 0.98,0 0,1 -0.55,-0.438m2.8,-9.05L9.5,11.275A0.93,0.93 0,0 0,8.812 11q-0.412,0 -0.712,0.3a0.95,0.95 0,0 0,-0.275 0.7q0,0.425 0.275,0.7l2.15,2.15q0.3,0.3 0.7,0.3t0.7,-0.3l4.25,-4.25q0.3,-0.3 0.287,-0.7a1.06,1.06 0,0 0,-0.287 -0.7,1.02 1.02,0 0,0 -0.713,-0.312 0.93,0.93 0,0 0,-0.712 0.287z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_video_call.xml b/libraries/compound/src/main/res/drawable/ic_compound_video_call.xml
index 4f1c9b1ba7..bee275ab25 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_video_call.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_video_call.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2 8a4 4 0 0 1 4-4h10a2 2 0 0 1 2 2v4.29l3.35-2.87A1 1 0 0 1 23 8.16v7.65a1 1 0 0 1-1.65 0.76L18 13.73V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4z m4-2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h10V6z m15 7.65v-3.3L19.07 12z"/>
+  <path
+      android:pathData="M2,8a4,4 0,0 1,4 -4h10a2,2 0,0 1,2 2v4.286l3.35,-2.871a1,1 0,0 1,1.65 0.76v7.65a1,1 0,0 1,-1.65 0.76L18,13.715L18,18a2,2 0,0 1,-2 2L6,20a4,4 0,0 1,-4 -4zM6,6a2,2 0,0 0,-2 2v8a2,2 0,0 0,2 2h10L16,6zM21,13.652v-3.303L19.073,12z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_video_call_declined_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_video_call_declined_solid.xml
index a6b699c6bd..b9a8090cce 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_video_call_declined_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_video_call_declined_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2 8a4 4 0 0 1 4-4h10a2 2 0 0 1 2 2v4.29l3.35-2.87A1 1 0 0 1 23 8.16v7.65a1 1 0 0 1-1.65 0.76L18 13.73V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4z m10.83 6.83q0.3-0.3 0.3-0.7 0-0.41-0.3-0.72L11.4 12l1.42-1.41q0.3-0.3 0.3-0.71t-0.3-0.7-0.7-0.3q-0.41 0-0.72 0.3L10 10.57l-1.41-1.4q-0.3-0.3-0.71-0.3-0.4 0-0.7 0.3t-0.3 0.7q0 0.4 0.3 0.7L8.57 12l-1.4 1.41q-0.3 0.3-0.3 0.71t0.3 0.7 0.7 0.3q0.4 0 0.7-0.3l1.42-1.4 1.41 1.4q0.3 0.3 0.71 0.3t0.7-0.3"/>
+  <path
+      android:pathData="M2,8a4,4 0,0 1,4 -4h10a2,2 0,0 1,2 2v4.286l3.35,-2.871a1,1 0,0 1,1.65 0.76v7.65a1,1 0,0 1,-1.65 0.76L18,13.715L18,18a2,2 0,0 1,-2 2L6,20a4,4 0,0 1,-4 -4zM12.828,14.828q0.3,-0.3 0.3,-0.707 0,-0.405 -0.3,-0.707L11.414,12l1.414,-1.414q0.3,-0.3 0.3,-0.707t-0.3,-0.707 -0.707,-0.301q-0.405,0 -0.707,0.3L10,10.587 8.586,9.172q-0.3,-0.3 -0.707,-0.301 -0.407,0 -0.707,0.3t-0.3,0.708q0,0.405 0.3,0.707L8.586,12l-1.414,1.414q-0.3,0.3 -0.3,0.707t0.3,0.707 0.707,0.3q0.405,0 0.707,-0.3L10,13.414l1.414,1.414q0.3,0.3 0.707,0.3t0.707,-0.3"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_video_call_missed_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_video_call_missed_solid.xml
index 57c1502560..43133555f7 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_video_call_missed_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_video_call_missed_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2 8a4 4 0 0 1 4-4h10a2 2 0 0 1 2 2v4.29l3.35-2.87A1 1 0 0 1 23 8.16v7.65a1 1 0 0 1-1.65 0.76L18 13.73V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4z m8.7 5.15L8.5 11H9q0.42 0 0.71-0.29A0.97 0.97 0 0 0 10 10a0.97 0.97 0 0 0-0.29-0.71A0.97 0.97 0 0 0 9 9H6a0.97 0.97 0 0 0-0.71 0.29A0.97 0.97 0 0 0 5 10v3q0 0.42 0.29 0.71T6 14t0.71-0.29A0.97 0.97 0 0 0 7 13v-0.7l3 3q0.13 0.13 0.31 0.2a1.03 1.03 0 0 0 0.78 0 0.8 0.8 0 0 0 0.31-0.23l3.13-3.14a0.92 0.92 0 0 0 0.27-0.68q0-0.4-0.3-0.7a0.95 0.95 0 0 0-0.7-0.28 0.95 0.95 0 0 0-0.7 0.28z"/>
+  <path
+      android:pathData="M2,8a4,4 0,0 1,4 -4h10a2,2 0,0 1,2 2v4.286l3.35,-2.871a1,1 0,0 1,1.65 0.76v7.65a1,1 0,0 1,-1.65 0.76L18,13.715L18,18a2,2 0,0 1,-2 2L6,20a4,4 0,0 1,-4 -4zM10.7,13.15L8.5,11L9,11q0.424,0 0.713,-0.287A0.97,0.97 0,0 0,10 10a0.97,0.97 0,0 0,-0.287 -0.713A0.97,0.97 0,0 0,9 9L6,9a0.97,0.97 0,0 0,-0.713 0.287A0.97,0.97 0,0 0,5 10v3q0,0.424 0.287,0.713Q5.576,14 6,14t0.713,-0.287A0.97,0.97 0,0 0,7 13v-0.7l3,3q0.125,0.125 0.313,0.2a1.03,1.03 0,0 0,0.774 0,0.8 0.8,0 0,0 0.313,-0.225l3.125,-3.15a0.92,0.92 0,0 0,0.275 -0.675q0,-0.4 -0.3,-0.7a0.95,0.95 0,0 0,-0.7 -0.275,0.95 0.95,0 0,0 -0.7,0.275z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_video_call_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_video_call_off.xml
index 6466ec2848..ab9cbf55eb 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_video_call_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_video_call_off.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.75 2.75l1.6 1.6L6.02 6H5.99L16 16l2 2 3.25 3.25a1 1 0 0 1-1.42 1.42l-2.9-2.9A2 2 0 0 1 16 20H6a4 4 0 0 1-4-4V8c0-0.9 0.3-1.72 0.79-2.38L1.33 4.17a1 1 0 0 1 1.42-1.42m1.48 4.31A2 2 0 0 0 4 8v8a2 2 0 0 0 2 2h9.17zM16 6H8.83l-2-2H16a2 2 0 0 1 2 2v4.29l3.35-2.87A1 1 0 0 1 23 8.16v7.65a1 1 0 0 1-1.65 0.76L18 13.73v1.44l-2-2z m5 7.65v-3.3L19.07 12z"/>
+  <path
+      android:pathData="m2.747,2.753 l1.602,1.602q0.005,0 0.008,-0.003L6.006,6h-0.012L16,16.006v-0.012l2,2v0.012l3.247,3.247a1,1 0,0 1,-1.414 1.414l-2.899,-2.898A2,2 0,0 1,16 20L6,20a4,4 0,0 1,-4 -4L2,8c0,-0.892 0.292,-1.715 0.785,-2.38L1.333,4.166a1,1 0,0 1,1.414 -1.414m1.484,4.312A2,2 0,0 0,4 8v8a2,2 0,0 0,2 2h9.166zM16,6L8.834,6l-2,-2L16,4a2,2 0,0 1,2 2v4.286l3.35,-2.871a1,1 0,0 1,1.65 0.76v7.65a1,1 0,0 1,-1.65 0.76L18,13.715v1.45l-2,-2zM21,13.652v-3.304L19.073,12z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_video_call_off_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_video_call_off_solid.xml
index 35a5796577..10dd687230 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_video_call_off_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_video_call_off_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.75 2.75l1.6 1.6L18 18v0.02l3.25 3.24a1 1 0 0 1-1.42 1.42l-2.9-2.9A2 2 0 0 1 16 20H6a4 4 0 0 1-4-4V8c0-0.9 0.3-1.72 0.79-2.38L1.33 4.17a1 1 0 0 1 1.42-1.42M18 15.17L6.83 4H16a2 2 0 0 1 2 2v4.29l3.35-2.87A1 1 0 0 1 23 8.16v7.65a1 1 0 0 1-1.65 0.76L18 13.73z"/>
+  <path
+      android:pathData="M2.747,2.753 L4.35,4.355l0.007,-0.003L18,17.994v0.012l3.247,3.247a1,1 0,0 1,-1.414 1.414l-2.898,-2.898A2,2 0,0 1,16 20H6a4,4 0,0 1,-4 -4V8c0,-0.892 0.292,-1.715 0.785,-2.38L1.333,4.166a1,1 0,0 1,1.414 -1.414M18,15.166 L6.834,4H16a2,2 0,0 1,2 2v4.286l3.35,-2.871a1,1 0,0 1,1.65 0.76v7.65a1,1 0,0 1,-1.65 0.76L18,13.715z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_video_call_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_video_call_solid.xml
index ec4cf0902e..dc78198098 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_video_call_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_video_call_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 4h10a2 2 0 0 1 2 2v4.29l3.35-2.87A1 1 0 0 1 23 8.16v7.65a1 1 0 0 1-1.65 0.76L18 13.73V18a2 2 0 0 1-2 2H6a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4"/>
+  <path
+      android:pathData="M6,4h10a2,2 0,0 1,2 2v4.286l3.35,-2.871a1,1 0,0 1,1.65 0.76v7.65a1,1 0,0 1,-1.65 0.76L18,13.715V18a2,2 0,0 1,-2 2H6a4,4 0,0 1,-4 -4V8a4,4 0,0 1,4 -4"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_visibility_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_visibility_off.xml
index c4234584a3..815184858b 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_visibility_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_visibility_off.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.1 13.3l-1.45-1.45q0.23-1.17-0.67-2.2t-2.33-0.8L10.2 7.4q0.42-0.2 0.86-0.3A4.2 4.2 0 0 1 12 7q1.88 0 3.19 1.31t1.31 3.19q0 0.5-0.1 0.94t-0.3 0.86m3.2 3.15l-1.45-1.4a11 11 0 0 0 1.69-1.59 9 9 0 0 0 1.26-1.96q-1.25-2.52-3.59-4.01Q14.87 6 12 6q-0.72 0-1.43 0.1A10 10 0 0 0 9.2 6.4L7.65 4.85A11.1 11.1 0 0 1 12 4q3.58 0 6.42 1.89t4.28 4.91a0.8 0.8 0 0 1 0.1 0.31q0.03 0.2 0.03 0.39a2 2 0 0 1-0.13 0.7 10.9 10.9 0 0 1-3.4 4.25m-0.2 5.45l-3.5-3.45q-0.87 0.27-1.76 0.41Q12.95 19 12 19q-3.58 0-6.42-1.89T1.3 12.2a0.8 0.8 0 0 1-0.1-0.31 3 3 0 0 1 0-0.77 0.8 0.8 0 0 1 0.1-0.3Q1.82 9.7 2.55 8.75A13.3 13.3 0 0 1 4.15 7L2.07 4.9A0.93 0.93 0 0 1 1.8 4.21q0-0.41 0.3-0.71a0.95 0.95 0 0 1 0.7-0.27q0.42 0 0.7 0.27l17 17q0.28 0.28 0.29 0.69a0.93 0.93 0 0 1-0.29 0.71 0.95 0.95 0 0 1-0.7 0.28 0.95 0.95 0 0 1-0.7-0.28M5.55 8.4Q4.83 9.05 4.23 9.83A9 9 0 0 0 3.2 11.5q1.25 2.52 3.59 4.01T12 17q0.5 0 0.97-0.06l0.98-0.14-0.9-0.95q-0.27 0.07-0.53 0.11A3.5 3.5 0 0 1 12 16q-1.88 0-3.19-1.31T7.5 11.5q0-0.27 0.04-0.53 0.04-0.25 0.11-0.52z"/>
+  <path
+      android:pathData="m16.1,13.3 l-1.45,-1.45q0.225,-1.175 -0.675,-2.2t-2.325,-0.8L10.2,7.4q0.424,-0.2 0.863,-0.3A4.2,4.2 0,0 1,12 7q1.875,0 3.188,1.312Q16.5,9.625 16.5,11.5q0,0.5 -0.1,0.938t-0.3,0.862m3.2,3.15 l-1.45,-1.4a11,11 0,0 0,1.688 -1.588A9,9 0,0 0,20.8 11.5q-1.25,-2.524 -3.588,-4.013Q14.875,6 12,6q-0.724,0 -1.425,0.1a10,10 0,0 0,-1.375 0.3L7.65,4.85A11.1,11.1 0,0 1,12 4q3.575,0 6.425,1.887T22.7,10.8a0.8,0.8 0,0 1,0.1 0.313q0.025,0.188 0.025,0.387a2,2 0,0 1,-0.125 0.7,10.9 10.9,0 0,1 -3.4,4.25m-0.2,5.45 l-3.5,-3.45q-0.874,0.274 -1.762,0.413Q12.95,19 12,19q-3.575,0 -6.425,-1.887T1.3,12.2a0.8,0.8 0,0 1,-0.1 -0.312,3 3,0 0,1 0,-0.763 0.8,0.8 0,0 1,0.1 -0.3Q1.825,9.7 2.55,8.75A13.3,13.3 0,0 1,4.15 7L2.075,4.9a0.93,0.93 0,0 1,-0.275 -0.688q0,-0.412 0.3,-0.712a0.95,0.95 0,0 1,0.7 -0.275q0.425,0 0.7,0.275l17,17q0.275,0.275 0.288,0.688a0.93,0.93 0,0 1,-0.288 0.712,0.95 0.95,0 0,1 -0.7,0.275 0.95,0.95 0,0 1,-0.7 -0.275M5.55,8.4q-0.725,0.65 -1.325,1.425A9,9 0,0 0,3.2 11.5q1.25,2.524 3.588,4.012T12,17q0.5,0 0.975,-0.062 0.475,-0.063 0.975,-0.138l-0.9,-0.95q-0.274,0.075 -0.525,0.113A3.5,3.5 0,0 1,12 16q-1.875,0 -3.187,-1.312Q7.5,13.375 7.5,11.5q0,-0.274 0.038,-0.525 0.037,-0.25 0.112,-0.525z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_visibility_on.xml b/libraries/compound/src/main/res/drawable/ic_compound_visibility_on.xml
index a66dcfa429..59b23e3928 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_visibility_on.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_visibility_on.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 16q1.88 0 3.19-1.31t1.31-3.19-1.31-3.19T12 7 8.81 8.31 7.5 11.5t1.31 3.19T12 16m0-1.8q-1.13 0-1.91-0.79A2.6 2.6 0 0 1 9.3 11.5q0-1.13 0.79-1.91A2.6 2.6 0 0 1 12 8.8q1.13 0 1.91 0.79 0.79 0.79 0.79 1.91t-0.79 1.91A2.6 2.6 0 0 1 12 14.2m0 4.8q-3.48 0-6.35-1.84-2.88-1.84-4.35-4.96a0.8 0.8 0 0 1-0.1-0.31 3 3 0 0 1 0-0.78 0.8 0.8 0 0 1 0.1-0.31q1.47-3.13 4.35-4.96Q8.53 4 12 4t6.35 1.84 4.35 4.96a0.8 0.8 0 0 1 0.1 0.31 3 3 0 0 1 0 0.78 0.8 0.8 0 0 1-0.1 0.31q-1.48 3.13-4.35 4.96Q15.47 19 12 19m0-2a9.54 9.54 0 0 0 5.19-1.49 9.77 9.77 0 0 0 3.61-4.01 9.77 9.77 0 0 0-3.61-4.01A9.54 9.54 0 0 0 12 6a9.55 9.55 0 0 0-5.19 1.49A9.77 9.77 0 0 0 3.2 11.5a9.77 9.77 0 0 0 3.61 4.01A9.54 9.54 0 0 0 12 17"/>
+  <path
+      android:pathData="M12,16q1.875,0 3.188,-1.312Q16.5,13.375 16.5,11.5t-1.312,-3.187T12,7 8.813,8.313 7.5,11.5t1.313,3.188T12,16m0,-1.8q-1.125,0 -1.912,-0.787A2.6,2.6 0,0 1,9.3 11.5q0,-1.125 0.787,-1.912A2.6,2.6 0,0 1,12 8.8q1.125,0 1.912,0.787 0.788,0.788 0.788,1.913t-0.787,1.912A2.6,2.6 0,0 1,12 14.2m0,4.8q-3.475,0 -6.35,-1.837Q2.775,15.324 1.3,12.2a0.8,0.8 0,0 1,-0.1 -0.312,3 3,0 0,1 0,-0.775 0.8,0.8 0,0 1,0.1 -0.313q1.475,-3.125 4.35,-4.962Q8.525,4 12,4t6.35,1.838T22.7,10.8a0.8,0.8 0,0 1,0.1 0.313,3 3,0 0,1 0,0.774 0.8,0.8 0,0 1,-0.1 0.313q-1.475,3.125 -4.35,4.963Q15.475,19 12,19m0,-2a9.54,9.54 0,0 0,5.188 -1.488A9.77,9.77 0,0 0,20.8 11.5a9.77,9.77 0,0 0,-3.613 -4.012A9.54,9.54 0,0 0,12 6a9.55,9.55 0,0 0,-5.187 1.487A9.77,9.77 0,0 0,3.2 11.5a9.77,9.77 0,0 0,3.613 4.012A9.54,9.54 0,0 0,12 17"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_voice_call.xml b/libraries/compound/src/main/res/drawable/ic_compound_voice_call.xml
index 579738d57b..258a541751 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_voice_call.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_voice_call.xml
@@ -4,10 +4,12 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group>
-        <path
-            android:fillColor="#FF000000"
-            android:fillType="evenOdd"
-            android:pathData="M8.93 15.1a13.6 13.6 0 0 0 4.65 3.07q2.62 1.03 5.5 0.92l-0.02-3.13-3.52-0.48-1.8 1.79-0.64-0.32a13.5 13.5 0 0 1-3.5-2.52 13.4 13.4 0 0 1-2.52-3.5l-0.32-0.64 1.8-1.8-0.49-3.52-3.12-0.03a13.65 13.65 0 0 0 0.92 5.5 13.4 13.4 0 0 0 3.06 4.66m3.92 4.93a15.6 15.6 0 0 1-5.33-3.52 15.4 15.4 0 0 1-3.5-5.34A15.6 15.6 0 0 1 2.93 4.9a1.93 1.93 0 0 1 0.6-1.37C3.9 3.16 4.36 2.94 4.91 2.94L8.1 2.98a1.96 1.96 0 0 1 1.96 1.69l0.48 3.55c0.05 0.3 0.03 0.6-0.07 0.9A2 2 0 0 1 9.97 9.9l-0.76 0.76a11.4 11.4 0 0 0 3.2 3.54q0.46 0.33 0.96 0.62l0.76-0.76a2 2 0 0 1 0.77-0.49c0.3-0.1 0.61-0.12 0.9-0.07l3.56 0.48a1.96 1.96 0 0 1 1.7 1.96l0.03 3.17c0 0.55-0.22 1.02-0.59 1.39-0.36 0.36-0.83 0.58-1.36 0.59a15.3 15.3 0 0 1-6.3-1.06"/>
-    </group>
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24H0z"/>
+    <path
+        android:pathData="M8.929,15.1a13.6,13.6 0,0 0,4.654 3.066q2.62,1.036 5.492,0.923h0.008l0.003,-0.004 0.003,-0.002 -0.034,-3.124 -3.52,-0.483 -1.791,1.792 -0.645,-0.322a13.5,13.5 0,0 1,-3.496 -2.52,13.4 13.4,0 0,1 -2.52,-3.496l-0.322,-0.644 1.792,-1.792 -0.483,-3.519 -3.123,-0.034 -0.003,0.002 -0.003,0.004v0.002a13.65,13.65 0,0 0,0.932 5.492A13.4,13.4 0,0 0,8.93 15.1m3.92,4.926a15.6,15.6 0,0 1,-5.334 -3.511,15.4 15.4,0 0,1 -3.505,-5.346 15.6,15.6 0,0 1,-1.069 -6.274,1.93 1.93,0 0,1 0.589,-1.366c0.366,-0.366 0.84,-0.589 1.386,-0.589h0.01l3.163,0.035a1.96,1.96 0,0 1,1.958 1.694v0.005l0.487,3.545v0.003c0.043,0.297 0.025,0.605 -0.076,0.907a2,2 0,0 1,-0.485 0.773l-0.762,0.762a11.4,11.4 0,0 0,3.206 3.54q0.457,0.33 0.948,0.614l0.762,-0.761a2,2 0,0 1,0.774 -0.486c0.302,-0.1 0.61,-0.118 0.907,-0.076l3.553,0.487a1.96,1.96 0,0 1,1.694 1.958l0.034,3.174c0,0.546 -0.223,1.02 -0.588,1.386 -0.361,0.36 -0.827,0.582 -1.363,0.588a15.3,15.3 0,0 1,-6.29 -1.062"
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"/>
+  </group>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_voice_call_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_voice_call_solid.xml
index 428e2fa3d1..6aed590ced 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_voice_call_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_voice_call_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20.96 16.37L21 19.9q0 0.43-0.33 0.76t-0.76 0.33a16 16 0 0 1-6.57-1.1 16.2 16.2 0 0 1-5.56-3.67 16.1 16.1 0 0 1-3.65-5.57A16.3 16.3 0 0 1 3 4.09q0-0.43 0.33-0.76T4.09 3l3.53 0.04a1.07 1.07 0 0 1 1.09 0.93l0.54 3.95Q9.3 8.2 9.21 8.42a1.1 1.1 0 0 1-0.27 0.43L7.3 10.5q0.5 1.01 1.15 1.91C8.9 13 9.9 14.1 9.9 14.1s1.1 1 1.7 1.44q0.9 0.65 1.9 1.16l1.64-1.64q0.2-0.2 0.43-0.28t0.5-0.03l3.96 0.54q0.4 0.06 0.67 0.36t0.26 0.72"/>
+  <path
+      android:pathData="m20.958,16.374 l0.039,3.527q0,0.427 -0.33,0.756 -0.33,0.33 -0.756,0.33a16,16 0,0 1,-6.57 -1.105,16.2 16.2,0 0,1 -5.563,-3.663 16.1,16.1 0,0 1,-3.653 -5.573,16.3 16.3,0 0,1 -1.115,-6.56q0,-0.427 0.33,-0.757T4.095,3l3.528,0.039a1.07,1.07 0,0 1,1.085 0.93l0.543,3.954q0.039,0.271 -0.039,0.504a1.1,1.1 0,0 1,-0.271 0.426l-1.64,1.64q0.505,1.008 1.154,1.909c0.433,0.6 1.444,1.696 1.444,1.696s1.095,1.01 1.696,1.444q0.9,0.65 1.909,1.153l1.64,-1.64q0.193,-0.193 0.426,-0.27t0.504,-0.04l3.954,0.543q0.406,0.059 0.668,0.359t0.262,0.727"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_volume_off.xml b/libraries/compound/src/main/res/drawable/ic_compound_volume_off.xml
index e240c01b0b..884d3c3196 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_volume_off.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_volume_off.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.5 3.5l4 4L8.92 8.9 10 10l2 2 2.12 2.12 1.42 1.41 1.41 1.42 1.42 1.41 2.13 2.14a1 1 0 0 1-1.41 1.41L12 14.83v3.76c0 0.89-1.08 1.33-1.7 0.7L7 16H5a2 2 0 0 1-2-2v-4a2 2 0 0 1 2-2h0.17L2.1 4.91A1 1 0 0 1 3.5 3.5M7.17 10H5v4h2.83L10 16.17v-3.34zM15 12.16l1.66 1.66C16.88 13.26 17 12.64 17 12c0-1.38-0.56-2.63-1.46-3.54a1 1 0 1 0-1.42 1.42A3 3 0 0 1 15 12.16m3.16 3.17l1.46 1.46A8.96 8.96 0 0 0 21 12a8.98 8.98 0 0 0-2.64-6.36 1 1 0 0 0-1.41 1.41A6.98 6.98 0 0 1 19 12a7 7 0 0 1-0.84 3.33M8.92 6.08L12 9.17V5.4c0-0.89-1.08-1.33-1.7-0.7z"/>
+  <path
+      android:pathData="m3.5,3.5 l4,4 0.003,-0.003L8.917,8.91l-0.003,0.003L10,10v-0.006l2,2L12,12l2.122,2.121 0.002,-0.003 1.415,1.415 -0.003,0.003 1.414,1.414 0.003,-0.003 1.414,1.414 -0.003,0.003L20.5,20.5a1,1 0,0 1,-1.414 1.414L12,14.828v3.758c0,0.89 -1.077,1.337 -1.707,0.707L7,16L5,16a2,2 0,0 1,-2 -2v-4a2,2 0,0 1,2 -2h0.172L2.086,4.914A1,1 0,0 1,3.5 3.5M7.172,10L5,10v4h2.828L10,16.17v-3.343zM14.996,12.162 L16.657,13.822c0.222,-0.564 0.343,-1.18 0.343,-1.822 0,-1.38 -0.56,-2.632 -1.464,-3.536a1,1 0,1 0,-1.414 1.414,3 3,0 0,1 0.874,2.284m3.164,3.165 l1.462,1.46A8.96,8.96 0,0 0,21 12a8.98,8.98 0,0 0,-2.636 -6.364A1,1 0,0 0,16.95 7.05,6.98 6.98,0 0,1 19,12a7,7 0,0 1,-0.84 3.326M8.917,6.083 L12,9.166L12,5.414c0,-0.89 -1.077,-1.337 -1.707,-0.707z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_volume_off_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_volume_off_solid.xml
index 6c801e7a16..b4d75ae32a 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_volume_off_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_volume_off_solid.xml
@@ -4,7 +4,7 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.5 3.5a1 1 0 1 0-1.41 1.41L5.17 8H5a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h2l3.3 3.3c0.62 0.62 1.7 0.18 1.7-0.71v-3.76l7.09 7.08a1 1 0 0 0 1.41-1.41l-2.14-2.14-1.4-1.41h-0.01l-1.41-1.41-1.42-1.42L12 12 7.5 7.5zM15 12.16l1.66 1.66C16.88 13.26 17 12.64 17 12c0-1.38-0.56-2.63-1.46-3.54a1 1 0 1 0-1.42 1.42A3 3 0 0 1 15 12.16m3.16 3.17l1.46 1.46A8.96 8.96 0 0 0 21 12a8.98 8.98 0 0 0-2.64-6.36 1 1 0 0 0-1.41 1.41A6.98 6.98 0 0 1 19 12a7 7 0 0 1-0.84 3.33M8.92 6.08L12 9.17V5.4c0-0.89-1.08-1.33-1.7-0.7z"/>
+  <path
+      android:pathData="M3.5,3.5a1,1 0,1 0,-1.414 1.414L5.172,8L5,8a2,2 0,0 0,-2 2v4a2,2 0,0 0,2 2h2l3.293,3.293c0.63,0.63 1.707,0.184 1.707,-0.707v-3.758l7.086,7.086A1,1 0,0 0,20.5 20.5l-2.136,-2.136 0.003,-0.003 -1.414,-1.414 -0.003,0.003 -1.414,-1.414 0.003,-0.003 -1.415,-1.415 -0.002,0.003L12,12v-0.006L7.503,7.497 7.5,7.5zM14.996,12.162 L16.657,13.822c0.222,-0.564 0.343,-1.18 0.343,-1.822 0,-1.38 -0.56,-2.632 -1.464,-3.536a1,1 0,1 0,-1.414 1.414,3 3,0 0,1 0.874,2.284m3.164,3.165 l1.462,1.46A8.96,8.96 0,0 0,21 12a8.98,8.98 0,0 0,-2.636 -6.364A1,1 0,0 0,16.95 7.05,6.98 6.98,0 0,1 19,12a7,7 0,0 1,-0.84 3.326M8.917,6.083 L12,9.166L12,5.414c0,-0.89 -1.077,-1.337 -1.707,-0.707z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_volume_on.xml b/libraries/compound/src/main/res/drawable/ic_compound_volume_on.xml
index 453a2578e2..bbc3effd39 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_volume_on.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_volume_on.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3 10a2 2 0 0 1 2-2h2l3.3-3.3C10.91 4.09 12 4.53 12 5.42V18.6c0 0.89-1.08 1.33-1.7 0.7L7 16H5a2 2 0 0 1-2-2z m4.83 4L10 16.17V7.83L7.83 10H5v4z m6.3-5.54a1 1 0 0 1 1.4 0A5 5 0 0 1 17 12c0 1.38-0.56 2.63-1.46 3.54a1 1 0 1 1-1.42-1.42A3 3 0 0 0 15 12c0-0.83-0.33-1.58-0.88-2.12a1 1 0 0 1 0-1.42"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18.36 5.64a1 1 0 1 0-1.41 1.41A6.98 6.98 0 0 1 19 12a6.98 6.98 0 0 1-2.05 4.95 1 1 0 0 0 1.41 1.41A8.98 8.98 0 0 0 21 12a8.98 8.98 0 0 0-2.64-6.36"/>
+  <path
+      android:pathData="M3,10a2,2 0,0 1,2 -2h2l3.293,-3.293c0.63,-0.63 1.707,-0.184 1.707,0.707v13.172c0,0.89 -1.077,1.337 -1.707,0.707L7,16L5,16a2,2 0,0 1,-2 -2zM7.828,14L10,16.172L10,7.828L7.828,10L5,10v4zM14.122,8.464a1,1 0,0 1,1.414 0A5,5 0,0 1,17 12c0,1.38 -0.56,2.632 -1.464,3.535a1,1 0,1 1,-1.415 -1.414,3 3,0 0,0 0.88,-2.121c0,-0.829 -0.335,-1.578 -0.88,-2.122a1,1 0,0 1,0 -1.414"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M18.364,5.636A1,1 0,1 0,16.95 7.05,6.98 6.98,0 0,1 19,12a6.98,6.98 0,0 1,-2.05 4.95,1 1,0 0,0 1.414,1.414A8.98,8.98 0,0 0,21 12a8.98,8.98 0,0 0,-2.636 -6.364"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_volume_on_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_volume_on_solid.xml
index 232571342f..2041eaba02 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_volume_on_solid.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_volume_on_solid.xml
@@ -4,10 +4,10 @@
     android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3 14v-4a2 2 0 0 1 2-2h2l3.3-3.3C10.91 4.09 12 4.53 12 5.42V18.6c0 0.89-1.08 1.33-1.7 0.7L7 16H5a2 2 0 0 1-2-2m11.12-5.54a1 1 0 0 1 1.42 0A5 5 0 0 1 17 12c0 1.38-0.56 2.63-1.46 3.54a1 1 0 0 1-1.42-1.42A3 3 0 0 0 15 12c0-0.83-0.33-1.58-0.88-2.12a1 1 0 0 1 0-1.42"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.95 5.64a1 1 0 0 1 1.41 0A8.98 8.98 0 0 1 21 12a8.98 8.98 0 0 1-2.64 6.36 1 1 0 0 1-1.41-1.41A6.98 6.98 0 0 0 19 12a6.98 6.98 0 0 0-2.05-4.95 1 1 0 0 1 0-1.41"/>
+  <path
+      android:pathData="M3,14v-4a2,2 0,0 1,2 -2h2l3.293,-3.293c0.63,-0.63 1.707,-0.184 1.707,0.707v13.172c0,0.89 -1.077,1.337 -1.707,0.707L7,16H5a2,2 0,0 1,-2 -2m11.122,-5.536a1,1 0,0 1,1.414 0A5,5 0,0 1,17 12c0,1.38 -0.56,2.632 -1.464,3.536a1,1 0,0 1,-1.415 -1.415,3 3,0 0,0 0.88,-2.121c0,-0.829 -0.335,-1.577 -0.88,-2.121a1,1 0,0 1,0 -1.415"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M16.95,5.636a1,1 0,0 1,1.414 0A8.98,8.98 0,0 1,21 12a8.98,8.98 0,0 1,-2.636 6.364,1 1,0 0,1 -1.414,-1.414A6.98,6.98 0,0 0,19 12a6.98,6.98 0,0 0,-2.05 -4.95,1 1,0 0,1 0,-1.414"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_warning.xml b/libraries/compound/src/main/res/drawable/ic_compound_warning.xml
index 53b838ca56..3b196aa863 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_warning.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_warning.xml
@@ -3,11 +3,11 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.71 17.71A0.97 0.97 0 0 1 12 18a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 17q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 16q0.42 0 0.71 0.29T13 17q0 0.42-0.29 0.71m0-4A0.97 0.97 0 0 1 12 14a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 13V9q0-0.42 0.29-0.71A0.97 0.97 0 0 1 12 8q0.42 0 0.71 0.29T13 9v4q0 0.42-0.29 0.71"/>
-    <path
-        android:fillColor="#FF000000"
-        android:fillType="evenOdd"
-        android:pathData="M10.26 3.04c0.77-1.34 2.7-1.34 3.48 0L22.29 18c0.76 1.33-0.2 2.99-1.74 2.99H3.45c-1.54 0-2.5-1.66-1.74-3zM3.45 19L12 4.03 20.55 19z"/>
+  <path
+      android:pathData="M12.713,17.713A0.97,0.97 0,0 1,12 18a0.97,0.97 0,0 1,-0.713 -0.288A0.97,0.97 0,0 1,11 17q0,-0.424 0.287,-0.712A0.97,0.97 0,0 1,12 16q0.424,0 0.713,0.288 0.287,0.287 0.287,0.712 0,0.424 -0.287,0.712m0,-3.999A0.97,0.97 0,0 1,12 14a0.97,0.97 0,0 1,-0.713 -0.287A0.97,0.97 0,0 1,11 13V9q0,-0.424 0.287,-0.713A0.97,0.97 0,0 1,12 8q0.424,0 0.713,0.287Q13,8.576 13,9v4q0,0.424 -0.287,0.713"
+      android:fillColor="#FF000000"/>
+  <path
+      android:pathData="M10.264,3.039c0.767,-1.344 2.705,-1.344 3.472,0l8.554,14.969c0.762,1.333 -0.2,2.992 -1.736,2.992H3.446c-1.535,0 -2.498,-1.659 -1.736,-2.992zM3.446,19 L12,4.031 20.554,19z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_web_browser.xml b/libraries/compound/src/main/res/drawable/ic_compound_web_browser.xml
index baaf15c059..173b24addd 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_web_browser.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_web_browser.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4 20q-0.82 0-1.41-0.59A1.93 1.93 0 0 1 2 18V6q0-0.82 0.59-1.41A1.93 1.93 0 0 1 4 4h16q0.82 0 1.41 0.59Q22 5.17 22 6v12q0 0.82-0.59 1.41A1.93 1.93 0 0 1 20 20z m0-2h16V8H4z"/>
+  <path
+      android:pathData="M4,20q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,2 18L2,6q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,4 4h16q0.824,0 1.413,0.588Q22,5.175 22,6v12q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,20 20zM4,18h16L20,8L4,8z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_windows.xml b/libraries/compound/src/main/res/drawable/ic_compound_windows.xml
index 37a3915dc8..0aa8b49e32 100644
--- a/libraries/compound/src/main/res/drawable/ic_compound_windows.xml
+++ b/libraries/compound/src/main/res/drawable/ic_compound_windows.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.59 2.4h9.01v9.01h-9.01zM2.4 12.59h9.01v9H2.4z m0-10.19h9.01v9.01H2.4z m10.19 10.19h9.01v9h-9.01z"/>
+  <path
+      android:pathData="M12.589,2.4L21.6,2.4v9.011h-9.011zM2.4,12.588h9.011v9.011L2.4,21.599zM2.4,2.4h9.011v9.011L2.4,11.411zM12.589,12.588L21.6,12.588v9.011h-9.011z"
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_workspace.xml b/libraries/compound/src/main/res/drawable/ic_compound_workspace.xml
deleted file mode 100644
index 3871fde4b4..0000000000
--- a/libraries/compound/src/main/res/drawable/ic_compound_workspace.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6 21q-1.65 0-2.83-1.18T2 17t1.18-2.83T6 13t2.83 1.18T10 17t-1.18 2.83T6 21m12 0q-1.65 0-2.83-1.18T14 17t1.18-2.83T18 13t2.83 1.18T22 17t-1.18 2.83T18 21M6 19q0.82 0 1.41-0.59T8 17t-0.59-1.41A1.93 1.93 0 0 0 6 15q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 4 17q0 0.82 0.59 1.41Q5.17 19 6 19m12 0q0.82 0 1.41-0.59T20 17t-0.59-1.41A1.93 1.93 0 0 0 18 15q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 16 17q0 0.82 0.59 1.41T18 19m-6-8q-1.65 0-2.83-1.18T8 7t1.18-2.83T12 3t2.83 1.18T16 7t-1.18 2.83T12 11m0-2q0.82 0 1.41-0.59Q14 7.83 14 7q0-0.82-0.59-1.41A1.93 1.93 0 0 0 12 5q-0.82 0-1.41 0.59A1.93 1.93 0 0 0 10 7q0 0.82 0.59 1.41T12 9"/>
-</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_workspace_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_workspace_solid.xml
deleted file mode 100644
index 51c5c9f9cb..0000000000
--- a/libraries/compound/src/main/res/drawable/ic_compound_workspace_solid.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.17 19.82Q4.35 21 6 21t2.83-1.18T10 17t-1.18-2.83T6 13t-2.83 1.18T2 17t1.18 2.83m12 0Q16.34 21 18 21t2.83-1.18T22 17t-1.18-2.83T18 13t-2.83 1.18T14 17t1.18 2.83m-6-10Q10.35 11 12 11t2.83-1.18T16 7t-1.18-2.83T12 3 9.18 4.17 8 7t1.18 2.83"/>
-</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 015cd5341c..01c3e787cf 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9ae73a6205..6e15233013 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2d50e6287d..c4822f680e 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
@@ -1,24 +1,17 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package io.element.android.compound.screenshot
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.TextStyle
-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.CompoundTypographyPreview
 import io.element.android.compound.screenshot.utils.screenshotFile
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.compound.tokens.generated.TypographyTokens
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
@@ -31,35 +24,7 @@ class CompoundTypographyTest {
     @Config(sdk = [35], qualifiers = "h2048dp-xxhdpi")
     fun screenshots() {
         captureRoboImage(file = screenshotFile("Compound Typography.png")) {
-            ElementTheme {
-                Surface {
-                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                        with(TypographyTokens) {
-                            TypographyTokenPreview(fontHeadingXlBold, "Heading XL Bold")
-                            TypographyTokenPreview(fontHeadingXlRegular, "Heading XL Regular")
-                            TypographyTokenPreview(fontHeadingLgBold, "Heading LG Bold")
-                            TypographyTokenPreview(fontHeadingLgRegular, "Heading LG Regular")
-                            TypographyTokenPreview(fontHeadingMdBold, "Heading MD Bold")
-                            TypographyTokenPreview(fontHeadingMdRegular, "Heading MD Regular")
-                            TypographyTokenPreview(fontHeadingSmMedium, "Heading SM Medium")
-                            TypographyTokenPreview(fontHeadingSmRegular, "Heading SM Regular")
-                            TypographyTokenPreview(fontBodyLgMedium, "Body LG Medium")
-                            TypographyTokenPreview(fontBodyLgRegular, "Body LG Regular")
-                            TypographyTokenPreview(fontBodyMdMedium, "Body MD Medium")
-                            TypographyTokenPreview(fontBodyMdRegular, "Body MD Regular")
-                            TypographyTokenPreview(fontBodySmMedium, "Body SM Medium")
-                            TypographyTokenPreview(fontBodySmRegular, "Body SM Regular")
-                            TypographyTokenPreview(fontBodyXsMedium, "Body XS Medium")
-                            TypographyTokenPreview(fontBodyXsRegular, "Body XS Regular")
-                        }
-                    }
-                }
-            }
+            CompoundTypographyPreview()
         }
     }
-
-    @Composable
-    private fun TypographyTokenPreview(style: TextStyle, text: String) {
-        Text(text = text, style = style)
-    }
 }
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 341b7cb650..74e6f3010d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,6 +20,7 @@ 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
@@ -42,7 +44,9 @@ class ForcedDarkElementThemeTest {
                         verticalArrangement = Arrangement.spacedBy(10.dp)
                     ) {
                         Text(text = "Outside")
-                        ForcedDarkElementTheme {
+                        ForcedDarkElementTheme(
+                            colors = SemanticColorsLightDark.default,
+                        ) {
                             Surface {
                                 Box(modifier = Modifier.fillMaxSize()) {
                                     Text(text = "Inside ForcedDarkElementTheme", modifier = Modifier.align(Alignment.Center))
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 ecfbbe81cd..deb27c6519 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7542eaa4fc..282ca0e69a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 764d4de77c..2aaeed43a5 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4f77a070ed..3d8256e2af 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 694d2c9fc6..2fe3167199 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7e5fabd96a..f36d0d2ee5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/utils/ScreenshotUtils.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/utils/ScreenshotUtils.kt
index 3d4c9b3824..082a9b248a 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/utils/ScreenshotUtils.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/utils/ScreenshotUtils.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2025 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 17cb2425dc..8fd7c5f041 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/build.gradle.kts b/libraries/core/build.gradle.kts
index 25e7cd9ba8..d04efaa40e 100644
--- a/libraries/core/build.gradle.kts
+++ b/libraries/core/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -23,6 +24,7 @@ kotlin {
 
 dependencies {
     implementation(libs.coroutines.core)
+    implementation(libs.coroutines.test)
     testImplementation(libs.test.junit)
     testImplementation(libs.test.truth)
 }
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt
index 477e3590cd..703bc924b0 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/bool/Booleans.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt
index 88e7934245..57edd84ab1 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ChildScopeOf.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ChildScopeOf.kt
index db4afe727c..46831a2698 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ChildScopeOf.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ChildScopeOf.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.job
 import kotlinx.coroutines.plus
+import kotlinx.coroutines.test.TestScope
 
 /**
  * Create a child scope of the current scope.
@@ -27,6 +29,11 @@ fun CoroutineScope.childScope(
     dispatcher: CoroutineDispatcher,
     name: String,
 ): CoroutineScope = run {
-    val supervisorJob = SupervisorJob(parent = coroutineContext.job)
-    this + dispatcher + supervisorJob + CoroutineName(name)
+    if (this is TestScope) {
+        // Special case for tests: we can't start a coroutine with a different SupervisorJob
+        this
+    } else {
+        val supervisorJob = SupervisorJob(parent = coroutineContext.job)
+        this + dispatcher + supervisorJob + CoroutineName(name)
+    }
 }
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt
index 606fe20158..6b0ceb2293 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt
index 7f88212a59..b186e6f2c2 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/DerivedStateFlow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ErrorFlow.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ErrorFlow.kt
index b0cd57ca28..5498d52f9d 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ErrorFlow.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ErrorFlow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Flow.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Flow.kt
index bb168d8eb7..64dbe7f20a 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Flow.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Flow.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt
index eadcbdb564..109d492ad6 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/ParallelMap.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Suspend.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Suspend.kt
index 62c75916fd..a2113c6d8c 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Suspend.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/Suspend.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/SuspendLazy.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/SuspendLazy.kt
index e5442c4940..f6068d27f3 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/SuspendLazy.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/SuspendLazy.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/ByteSize.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/ByteSize.kt
new file mode 100644
index 0000000000..f4daf85011
--- /dev/null
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/ByteSize.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.core.data
+
+enum class ByteUnit(val bitShift: Int) {
+    BYTES(0),
+    KB(10),
+    MB(20),
+    GB(30)
+}
+
+class ByteSize internal constructor(val value: Long, val unit: ByteUnit) {
+    fun into(dest: ByteUnit): Long {
+        if (unit == dest) return value
+        return value shl unit.bitShift shr dest.bitShift
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is ByteSize) return false
+
+        return value == other.value && unit == other.unit
+    }
+
+    override fun hashCode(): Int {
+        var result = value.hashCode()
+        result = 31 * result + unit.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        return "$value $unit"
+    }
+}
+
+val Number.gigaBytes get() = ByteSize(toLong(), ByteUnit.GB)
+val Number.megaBytes get() = ByteSize(toLong(), ByteUnit.MB)
+val Number.kiloBytes get() = ByteSize(toLong(), ByteUnit.KB)
+val Number.bytes get() = ByteSize(toLong(), ByteUnit.BYTES)
+
+// For the SDK values
+val ULong.gigaBytes get() = ByteSize(toLong(), ByteUnit.GB)
+val ULong.megaBytes get() = ByteSize(toLong(), ByteUnit.MB)
+val ULong.kiloBytes get() = ByteSize(toLong(), ByteUnit.KB)
+val ULong.bytes get() = ByteSize(toLong(), ByteUnit.BYTES)
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/FilterUpTo.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/FilterUpTo.kt
index 6cf8351935..a691c06f3f 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/FilterUpTo.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/FilterUpTo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt
index 0610fa04e4..34c5eb68d9 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt
index abd6e10d1f..d3a2805df1 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt
index d616c634bf..1130702c7f 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/Result.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/Result.kt
index e46f37cffb..614dc6d565 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/Result.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/Result.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/hash/Hash.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/hash/Hash.kt
index 107525a9ee..4a9af95bd1 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/hash/Hash.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/hash/Hash.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,7 +21,7 @@ fun String.md5() = try {
     digest.digest()
         .joinToString("") { String.format(locale, "%02X", it) }
         .lowercase(locale)
-} catch (exc: Exception) {
+} catch (_: Exception) {
     // Should not happen, but just in case
     hashCode().toString()
 }
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt
index 3954da9a66..1c1d5cdfab 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
index cc53ffea1b..8781c718f6 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildType.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildType.kt
index f16cd81321..04b6f7d9fb 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildType.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt
index 357fce2feb..e7962f8bd6 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/mimetype/MimeTypes.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import io.element.android.libraries.core.bool.orFalse
 @Suppress("ktlint:standard:property-naming")
 object MimeTypes {
     const val Any: String = "*/*"
+    const val Json = "application/json"
     const val OctetStream = "application/octet-stream"
     const val Apk = "application/vnd.android.package-archive"
     const val Pdf = "application/pdf"
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/preview/PreviewUtil.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/preview/PreviewUtil.kt
index aa9f5b5bcb..0bb76179fb 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/preview/PreviewUtil.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/preview/PreviewUtil.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt
index d3230ec69b..666ee1d7ab 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/uri/UrlUtils.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ fun String.isValidUrl(): Boolean {
     return try {
         URI(this).toURL()
         true
-    } catch (t: Throwable) {
+    } catch (_: Throwable) {
         false
     }
 }
diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/cache/CircularCacheTest.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/cache/CircularCacheTest.kt
index 8489f464a6..367acd9c1c 100644
--- a/libraries/core/src/test/kotlin/io/element/android/libraries/core/cache/CircularCacheTest.kt
+++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/cache/CircularCacheTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/data/ByteSizeTest.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/data/ByteSizeTest.kt
new file mode 100644
index 0000000000..ad0191da0c
--- /dev/null
+++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/data/ByteSizeTest.kt
@@ -0,0 +1,49 @@
+/*
+ * 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.core.data
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class ByteSizeTest {
+    @Test
+    fun testSizeConversions() {
+        // Check bytes to other units
+        val bytes = 10_000_000.bytes
+        assertThat(bytes.into(ByteUnit.BYTES)).isEqualTo(bytes.value)
+        assertThat(bytes.into(ByteUnit.KB)).isEqualTo(bytes.value / 1024L)
+        assertThat(bytes.into(ByteUnit.MB)).isEqualTo(bytes.value / 1024L / 1024L)
+        assertThat(bytes.into(ByteUnit.GB)).isEqualTo(bytes.value / 1024L / 1024L / 1024L)
+
+        // Now check for values too small to be converted
+        assertThat(100.bytes.into(ByteUnit.KB)).isEqualTo(0)
+        assertThat(100.bytes.into(ByteUnit.MB)).isEqualTo(0)
+        assertThat(100.bytes.into(ByteUnit.GB)).isEqualTo(0)
+
+        // Check for KBs
+        val kiloBytes = 10_000.kiloBytes
+        assertThat(kiloBytes.into(ByteUnit.BYTES)).isEqualTo(kiloBytes.value * 1024L)
+        assertThat(kiloBytes.into(ByteUnit.KB)).isEqualTo(kiloBytes.value)
+        assertThat(kiloBytes.into(ByteUnit.MB)).isEqualTo(kiloBytes.value / 1024L)
+        assertThat(kiloBytes.into(ByteUnit.GB)).isEqualTo(kiloBytes.value / 1024L / 1024L)
+
+        // Check for MBs
+        val megaBytes = 10_000.megaBytes
+        assertThat(megaBytes.into(ByteUnit.BYTES)).isEqualTo(megaBytes.value * 1024L * 1024L)
+        assertThat(megaBytes.into(ByteUnit.KB)).isEqualTo(megaBytes.value * 1024L)
+        assertThat(megaBytes.into(ByteUnit.MB)).isEqualTo(megaBytes.value)
+        assertThat(megaBytes.into(ByteUnit.GB)).isEqualTo(megaBytes.value / 1024L)
+
+        // Check for GBs
+        val gigaBytes = 10.gigaBytes
+        assertThat(gigaBytes.into(ByteUnit.BYTES)).isEqualTo(gigaBytes.value * 1024L * 1024L * 1024L)
+        assertThat(gigaBytes.into(ByteUnit.KB)).isEqualTo(gigaBytes.value * 1024L * 1024L)
+        assertThat(gigaBytes.into(ByteUnit.MB)).isEqualTo(gigaBytes.value * 1024L)
+        assertThat(gigaBytes.into(ByteUnit.GB)).isEqualTo(gigaBytes.value)
+    }
+}
diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt
index b454412fb7..0099a67a79 100644
--- a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt
+++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt
index 2db3fc9385..6c6340e1c5 100644
--- a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt
+++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/api/build.gradle.kts b/libraries/cryptography/api/build.gradle.kts
index 64e7024bc8..9ce26419d8 100644
--- a/libraries/cryptography/api/build.gradle.kts
+++ b/libraries/cryptography/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/AESEncryptionSpecs.kt b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/AESEncryptionSpecs.kt
index d349fbe824..ea1309fa3d 100644
--- a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/AESEncryptionSpecs.kt
+++ b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/AESEncryptionSpecs.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionDecryptionService.kt b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionDecryptionService.kt
index 2d217eef05..fc882bc54b 100644
--- a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionDecryptionService.kt
+++ b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionDecryptionService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionResult.kt b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionResult.kt
index ae5e89993e..776cd2ddea 100644
--- a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionResult.kt
+++ b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/EncryptionResult.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a2312c5236..ba6c10dbe0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/impl/build.gradle.kts b/libraries/cryptography/impl/build.gradle.kts
index 5e130b64e2..454432de6f 100644
--- a/libraries/cryptography/impl/build.gradle.kts
+++ b/libraries/cryptography/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionService.kt b/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionService.kt
index 7b3d57259d..cf5c2c6335 100644
--- a/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionService.kt
+++ b/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.cryptography.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.cryptography.api.AESEncryptionSpecs
 import io.element.android.libraries.cryptography.api.EncryptionDecryptionService
 import io.element.android.libraries.cryptography.api.EncryptionResult
@@ -21,7 +21,6 @@ import javax.crypto.spec.GCMParameterSpec
  * Default implementation of [EncryptionDecryptionService] using AES encryption.
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class AESEncryptionDecryptionService : EncryptionDecryptionService {
     override fun createEncryptionCipher(key: SecretKey): Cipher {
         return Cipher.getInstance(AESEncryptionSpecs.CIPHER_TRANSFORMATION).apply {
diff --git a/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/CryptographyModule.kt b/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/CryptographyModule.kt
index 6990796ef3..e9a9eb7b34 100644
--- a/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/CryptographyModule.kt
+++ b/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/CryptographyModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9e394f9db2..46572ef047 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.cryptography.api.AESEncryptionSpecs
 import io.element.android.libraries.cryptography.api.SecretKeyRepository
 import timber.log.Timber
@@ -26,7 +26,6 @@ import javax.crypto.SecretKey
  * The generated key uses AES algorithm, with a key size of 128 bits, and the GCM block mode.
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class KeyStoreSecretKeyRepository(
     private val keyStore: KeyStore,
 ) : SecretKeyRepository {
diff --git a/libraries/cryptography/impl/src/test/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionServiceTest.kt b/libraries/cryptography/impl/src/test/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionServiceTest.kt
index 0d0553da17..d449409777 100644
--- a/libraries/cryptography/impl/src/test/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionServiceTest.kt
+++ b/libraries/cryptography/impl/src/test/kotlin/io/element/android/libraries/cryptography/impl/AESEncryptionDecryptionServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/cryptography/test/build.gradle.kts b/libraries/cryptography/test/build.gradle.kts
index 5564c972f9..eaa621d53a 100644
--- a/libraries/cryptography/test/build.gradle.kts
+++ b/libraries/cryptography/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,8 +12,8 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.cryptography.test"
-
-    dependencies {
-        api(projects.libraries.cryptography.api)
-    }
+}
+
+dependencies {
+    api(projects.libraries.cryptography.api)
 }
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 f1e53edea9..0e301553ea 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/api/build.gradle.kts b/libraries/dateformatter/api/build.gradle.kts
index cebb9d4049..33194e769b 100644
--- a/libraries/dateformatter/api/build.gradle.kts
+++ b/libraries/dateformatter/api/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,8 +14,8 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.dateformatter.api"
-
-    dependencies {
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    testCommonDependencies(libs)
 }
diff --git a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt
index 19efe03822..1f5c88f008 100644
--- a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt
+++ b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DateFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt
index 04c6df1d02..8ecf01c343 100644
--- a/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt
+++ b/libraries/dateformatter/api/src/main/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/api/src/test/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatterTest.kt b/libraries/dateformatter/api/src/test/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatterTest.kt
index 200422db6c..e3a5f2bde4 100644
--- a/libraries/dateformatter/api/src/test/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatterTest.kt
+++ b/libraries/dateformatter/api/src/test/kotlin/io/element/android/libraries/dateformatter/api/DurationFormatterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/build.gradle.kts b/libraries/dateformatter/impl/build.gradle.kts
index 72da2f81f6..c9ddf459d6 100644
--- a/libraries/dateformatter/impl/build.gradle.kts
+++ b/libraries/dateformatter/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -30,19 +31,19 @@ android {
             )
         }
     }
-
-    dependencies {
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.designsystem)
-        implementation(projects.libraries.di)
-        implementation(projects.libraries.uiStrings)
-        implementation(projects.services.toolbox.api)
-
-        api(projects.libraries.dateformatter.api)
-        api(libs.datetime)
-
-        testCommonDependencies(libs, true)
-        testImplementation(projects.libraries.dateformatter.test)
-        testImplementation(projects.services.toolbox.test)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.services.toolbox.api)
+
+    api(projects.libraries.dateformatter.api)
+    api(libs.datetime)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.libraries.dateformatter.test)
+    testImplementation(projects.services.toolbox.test)
 }
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt
index 8a9ce96463..39d2ba84c6 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterDay.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.dateformatter.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.safeCapitalize
 
 interface DateFormatterDay {
@@ -20,7 +20,6 @@ interface DateFormatterDay {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultDateFormatterDay(
     private val localDateTimeProvider: LocalDateTimeProvider,
     private val dateFormatters: DateFormatters,
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt
index 38ff91fdc7..11a1532468 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterFull.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt
index a6002744c4..f39164860c 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterMonth.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt
index de46c1f5c9..eadf0e0e14 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTime.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt
index b9e3091a32..2889235fec 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatterTimeOnly.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt
index ceac6777ba..cf6b302164 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateFormatters.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt
index 60a4e7da8f..0a7e683502 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DateTimeFormatters.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt
index cd1180caa1..8b2bcc5629 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.libraries.dateformatter.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultDateFormatter(
     private val dateFormatterFull: DateFormatterFull,
     private val dateFormatterMonth: DateFormatterMonth,
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocalDateTimeProvider.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocalDateTimeProvider.kt
index a246ce2293..a205c844fb 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocalDateTimeProvider.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocalDateTimeProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt
index 773871d153..bb2b1e016e 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/LocaleChangeObserver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import android.content.IntentFilter
 import android.os.Build
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 
@@ -28,7 +28,6 @@ interface LocaleChangeListener {
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLocaleChangeObserver(
     @ApplicationContext private val context: Context,
 ) : LocaleChangeObserver {
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/TimezoneProvider.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/TimezoneProvider.kt
index 9397710580..77eba1a2d7 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/TimezoneProvider.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/TimezoneProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/di/DateFormatterModule.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/di/DateFormatterModule.kt
index ac36cd3caf..c80324c149 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/di/DateFormatterModule.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/di/DateFormatterModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt
index 5098f8175f..79fe3acc4a 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateForPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt
index eebe7da5b6..48856cad7b 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt
index 79b1022c14..e3cd9563a8 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/DateFormatterModeViewPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt
index d0c25f8b60..6028a04794 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/Factory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt
index 8151e07262..feecf105ca 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewClock.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f2bb2ff518..3cd004f8a8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/main/res/values-hr/translations.xml b/libraries/dateformatter/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..f70800fcd0
--- /dev/null
+++ b/libraries/dateformatter/impl/src/main/res/values-hr/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 u %2$s"</string>
+  <string name="common_date_this_month">"Ovaj mjesec"</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 0e52e1de37..b4800729d5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 136bbc1293..94b6fe983e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt
index 20f36a0dd6..0ec6377c40 100644
--- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt
+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/Factory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt
index c3d1f01d4f..d2305e6f1f 100644
--- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt
+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/FakeClock.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/dateformatter/test/build.gradle.kts b/libraries/dateformatter/test/build.gradle.kts
index 6f3877ea80..0367030ae1 100644
--- a/libraries/dateformatter/test/build.gradle.kts
+++ b/libraries/dateformatter/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,9 +12,9 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.dateformatter.test"
-
-    dependencies {
-        api(projects.libraries.dateformatter.api)
-        api(libs.datetime)
-    }
+}
+
+dependencies {
+    api(projects.libraries.dateformatter.api)
+    api(libs.datetime)
 }
diff --git a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt b/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt
index 1a918222dd..617fa76dd0 100644
--- a/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt
+++ b/libraries/dateformatter/test/src/main/kotlin/io/element/android/libraries/dateformatter/test/FakeDateFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/deeplink/api/build.gradle.kts b/libraries/deeplink/api/build.gradle.kts
index 01d568df52..dded8dc8b8 100644
--- a/libraries/deeplink/api/build.gradle.kts
+++ b/libraries/deeplink/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeepLinkCreator.kt b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeepLinkCreator.kt
index 2a29d70bd4..2b46b15e46 100644
--- a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeepLinkCreator.kt
+++ b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeepLinkCreator.kt
@@ -1,16 +1,18 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.deeplink.api
 
+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.core.ThreadId
 
 fun interface DeepLinkCreator {
-    fun create(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): String
+    fun create(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?, eventId: EventId?): String
 }
diff --git a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkData.kt b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkData.kt
index d15652b3ee..aac1a7ded1 100644
--- a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkData.kt
+++ b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkData.kt
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.deeplink.api
 
+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.core.ThreadId
@@ -18,6 +20,6 @@ sealed interface DeeplinkData {
     /** The target is the root of the app, with the given [sessionId]. */
     data class Root(override val sessionId: SessionId) : DeeplinkData
 
-    /** The target is a room, with the given [sessionId], [roomId] and optionally a [threadId]. */
-    data class Room(override val sessionId: SessionId, val roomId: RoomId, val threadId: ThreadId?) : DeeplinkData
+    /** The target is a room, with the given [sessionId], [roomId] and optionally a [threadId] and [eventId]. */
+    data class Room(override val sessionId: SessionId, val roomId: RoomId, val threadId: ThreadId?, val eventId: EventId?) : DeeplinkData
 }
diff --git a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkParser.kt b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkParser.kt
index d101bbc2ec..f0f8640a2d 100644
--- a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkParser.kt
+++ b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/DeeplinkParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/usecase/InviteFriendsUseCase.kt b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/usecase/InviteFriendsUseCase.kt
index 7c8910e156..64287f918c 100644
--- a/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/usecase/InviteFriendsUseCase.kt
+++ b/libraries/deeplink/api/src/main/kotlin/io/element/android/libraries/deeplink/api/usecase/InviteFriendsUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/deeplink/impl/build.gradle.kts b/libraries/deeplink/impl/build.gradle.kts
index 074e144b3a..e07df72d4e 100644
--- a/libraries/deeplink/impl/build.gradle.kts
+++ b/libraries/deeplink/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/Constants.kt b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/Constants.kt
index 1cd98a70d3..5bea982f43 100644
--- a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/Constants.kt
+++ b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/Constants.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreator.kt b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreator.kt
index 7c36ecd0b1..95b7ccf116 100644
--- a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreator.kt
+++ b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreator.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,27 +10,32 @@ package io.element.android.libraries.deeplink.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.text.urlEncoded
 import io.element.android.libraries.deeplink.api.DeepLinkCreator
+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.core.ThreadId
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultDeepLinkCreator : DeepLinkCreator {
-    override fun create(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): String {
+    override fun create(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?, eventId: EventId?): String {
         return buildString {
             append("$SCHEME://$HOST/")
-            append(sessionId.value)
-            if (roomId != null) {
-                append("/")
-                append(roomId.value)
-                if (threadId != null) {
-                    append("/")
-                    append(threadId.value)
-                }
-            }
+            append(sessionId.value.urlEncoded())
+            append("/")
+            append(roomId?.value?.urlEncoded().orEmpty())
+            append("/")
+            append(threadId?.value?.urlEncoded().orEmpty())
+            append("/")
+            append(eventId?.value?.urlEncoded().orEmpty())
         }
+            // Remove all possible trailing '/' characters:
+            // No event id
+            .removeSuffix("/")
+            // No thread id
+            .removeSuffix("/")
+            // No room id
+            .removeSuffix("/")
     }
 }
diff --git a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParser.kt b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParser.kt
index e6ab87b2b3..8c865b6557 100644
--- a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParser.kt
+++ b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParser.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,15 +12,15 @@ import android.content.Intent
 import android.net.Uri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.text.urlDecoded
 import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.deeplink.api.DeeplinkParser
+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.core.ThreadId
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultDeeplinkParser : DeeplinkParser {
     override fun getFromIntent(intent: Intent): DeeplinkData? {
         return intent
@@ -31,15 +32,16 @@ class DefaultDeeplinkParser : DeeplinkParser {
     private fun Uri.toDeeplinkData(): DeeplinkData? {
         if (scheme != SCHEME) return null
         if (host != HOST) return null
-        val pathBits = path.orEmpty().split("/").drop(1)
+        val pathBits = encodedPath.orEmpty().split("/").drop(1).map { it.urlDecoded() }
         val sessionId = pathBits.elementAtOrNull(0)?.let(::SessionId) ?: return null
 
         return when (val screenPathComponent = pathBits.elementAtOrNull(1)) {
             null -> DeeplinkData.Root(sessionId)
             else -> {
                 val roomId = screenPathComponent.let(::RoomId)
-                val threadId = pathBits.elementAtOrNull(2)?.let(::ThreadId)
-                DeeplinkData.Room(sessionId, roomId, threadId)
+                val threadId = pathBits.elementAtOrNull(2)?.takeIf { it.isNotBlank() }?.let(::ThreadId)
+                val eventId = pathBits.elementAtOrNull(3)?.takeIf { it.isNotBlank() }?.let(::EventId)
+                DeeplinkData.Room(sessionId, roomId, threadId, eventId)
             }
         }
     }
diff --git a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/usecase/DefaultInviteFriendsUseCase.kt b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/usecase/DefaultInviteFriendsUseCase.kt
index 045b199237..d3ba7e75fe 100644
--- a/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/usecase/DefaultInviteFriendsUseCase.kt
+++ b/libraries/deeplink/impl/src/main/kotlin/io/element/android/libraries/deeplink/impl/usecase/DefaultInviteFriendsUseCase.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.deeplink.impl.usecase
 
 import android.app.Activity
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.deeplink.api.usecase.InviteFriendsUseCase
@@ -22,7 +22,6 @@ import timber.log.Timber
 import io.element.android.libraries.androidutils.R as AndroidUtilsR
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultInviteFriendsUseCase(
     private val stringProvider: StringProvider,
     private val matrixClient: MatrixClient,
diff --git a/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt b/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt
index a5c943c525..b27a645802 100644
--- a/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt
+++ b/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeepLinkCreatorTest.kt
@@ -1,13 +1,19 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.deeplink.impl
 
 import com.google.common.truth.Truth.assertThat
+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.core.ThreadId
+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_THREAD_ID
@@ -17,11 +23,36 @@ class DefaultDeepLinkCreatorTest {
     @Test
     fun create() {
         val sut = DefaultDeepLinkCreator()
-        assertThat(sut.create(A_SESSION_ID, null, null))
-            .isEqualTo("elementx://open/@alice:server.org")
-        assertThat(sut.create(A_SESSION_ID, A_ROOM_ID, null))
-            .isEqualTo("elementx://open/@alice:server.org/!aRoomId:domain")
-        assertThat(sut.create(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID))
-            .isEqualTo("elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId")
+        val sessionId = A_SESSION_ID
+        val roomId = A_ROOM_ID
+        val threadId = A_THREAD_ID
+        val eventId = AN_EVENT_ID
+        assertThat(sut.create(sessionId, null, null, null))
+            .isEqualTo("elementx://open/%40alice%3Aserver.org")
+        assertThat(sut.create(sessionId, roomId, null, null))
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain")
+        assertThat(sut.create(sessionId, roomId, threadId, null))
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain/%24aThreadId")
+        assertThat(sut.create(sessionId, roomId, threadId, eventId))
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain/%24aThreadId/%24anEventId")
+        assertThat(sut.create(sessionId, roomId, null, eventId))
+            .isEqualTo("elementx://open/%40alice%3Aserver.org/%21aRoomId%3Adomain//%24anEventId")
+    }
+
+    @Test
+    fun `create - with escaped invalid characters`() {
+        val sut = DefaultDeepLinkCreator()
+        val sessionId = SessionId("@a/:domain")
+        val roomId = RoomId("!a/RoomId:domain")
+        val threadId = ThreadId("\$a/ThreadId")
+        val eventId = EventId("\$an/EventId")
+        assertThat(sut.create(sessionId, roomId, null, null))
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain")
+        assertThat(sut.create(sessionId, roomId, threadId, null))
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain/%24a%2FThreadId")
+        assertThat(sut.create(sessionId, roomId, threadId, eventId))
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain/%24a%2FThreadId/%24an%2FEventId")
+        assertThat(sut.create(sessionId, roomId, null, eventId))
+            .isEqualTo("elementx://open/%40a%2F%3Adomain/%21a%2FRoomId%3Adomain//%24an%2FEventId")
     }
 }
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 787c721092..7f563ddd7f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,11 @@ import android.content.Intent
 import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.deeplink.api.DeeplinkData
+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.core.ThreadId
+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_THREAD_ID
@@ -28,6 +34,12 @@ class DefaultDeeplinkParserTest {
             "elementx://open/@alice:server.org/!aRoomId:domain"
         const val A_URI_WITH_ROOM_WITH_THREAD =
             "elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId"
+        const val A_URI_WITH_ROOM_WITH_THREAD_AND_EVENT =
+            "elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId/\$anEventId"
+        const val A_URI_WITH_ROOM_WITH_EVENT_AND_NO_THREAD =
+            "elementx://open/@alice:server.org/!aRoomId:domain//\$anEventId"
+        const val A_URI_WITH_ROOM_WITH_THREAD_AND_EVENT_AND_INVALID_CHARACTERS =
+            "elementx://open/@a%2Flice:server.org/!a%2FRoomId:domain/\$a%2FThreadId/\$an%2FEventId"
     }
 
     @Test
@@ -36,9 +48,22 @@ class DefaultDeeplinkParserTest {
         assertThat(sut.getFromIntent(createIntent(A_URI)))
             .isEqualTo(DeeplinkData.Root(A_SESSION_ID))
         assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM)))
-            .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, null))
+            .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, null, null))
         assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM_WITH_THREAD)))
-            .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID))
+            .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID, null))
+        assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM_WITH_THREAD_AND_EVENT)))
+            .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID, AN_EVENT_ID))
+        assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM_WITH_EVENT_AND_NO_THREAD)))
+            .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, null, AN_EVENT_ID))
+        assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM_WITH_THREAD_AND_EVENT_AND_INVALID_CHARACTERS)))
+            .isEqualTo(
+                DeeplinkData.Room(
+                    sessionId = SessionId("@a/lice:server.org"),
+                    roomId = RoomId("!a/RoomId:domain"),
+                    threadId = ThreadId("\$a/ThreadId"),
+                    eventId = EventId("\$an/EventId"),
+                )
+            )
     }
 
     @Test
diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts
index 3983317055..bdb9a32e89 100644
--- a/libraries/designsystem/build.gradle.kts
+++ b/libraries/designsystem/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,25 +26,24 @@ android {
             consumerProguardFiles("consumer-rules.pro")
         }
     }
-
-    dependencies {
-        api(projects.libraries.compound)
-
-        implementation(libs.androidx.compose.material3.windowsizeclass)
-        implementation(libs.androidx.compose.material3.adaptive)
-        implementation(libs.coil.compose)
-        implementation(libs.vanniktech.blurhash)
-        implementation(projects.features.enterprise.api)
-        implementation(projects.libraries.androidutils)
-        implementation(projects.libraries.architecture)
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.preferences.api)
-        implementation(projects.libraries.testtags)
-        implementation(projects.libraries.uiStrings)
-
-        ksp(libs.showkase.processor)
-        implementation(libs.showkase)
-
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    api(projects.libraries.compound)
+
+    implementation(libs.androidx.compose.material3.windowsizeclass)
+    implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.coil.compose)
+    implementation(libs.vanniktech.blurhash)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.testtags)
+    implementation(projects.libraries.uiStrings)
+
+    ksp(libs.showkase.processor)
+    implementation(libs.showkase)
+
+    testCommonDependencies(libs)
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt
index debcd57c67..925d66eef2 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ColorUtil.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/animation/AlphaAnimation.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/animation/AlphaAnimation.kt
index 7b02d48eb3..1da74b30ae 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/animation/AlphaAnimation.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/animation/AlphaAnimation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/BetaLabel.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/BetaLabel.kt
index 2600b83561..9663c18991 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/BetaLabel.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/BetaLabel.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 483c9aa346..a051fd4c80 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
index 5eb099bcd4..85cf642d8f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/LoadingButtonAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/LoadingButtonAtom.kt
new file mode 100644
index 0000000000..666d48d457
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/LoadingButtonAtom.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.designsystem.atomic.atoms
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun LoadingButtonAtom(
+    modifier: Modifier = Modifier,
+) = Button(
+    modifier = modifier.fillMaxWidth(),
+    enabled = false,
+    showProgress = true,
+    text = stringResource(CommonStrings.common_loading),
+    onClick = {},
+)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
index 227e2f27cc..c96fb630e9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/PlaceholderAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/PlaceholderAtom.kt
index d083943469..4d5a9b8cae 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/PlaceholderAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/PlaceholderAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RedIndicatorAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RedIndicatorAtom.kt
index 354eada12a..99100fd298 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RedIndicatorAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RedIndicatorAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewDescriptionAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewDescriptionAtom.kt
index 3aece9889e..e4e250f9a6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewDescriptionAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewDescriptionAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewSubtitleAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewSubtitleAtom.kt
index 4fe52f5443..b076bb0e24 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewSubtitleAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewSubtitleAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewTitleAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewTitleAtom.kt
index 2c77dc8461..740605fe88 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewTitleAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoomPreviewTitleAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
index 71dbd93ec5..739300220f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/RoundedIconAtom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt
index 4f30ac6d9b..b2e25af0fb 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/SelectedIndicatorAtom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c9aa5901ec..d2db3aec8e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonColumnMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonColumnMolecule.kt
index 2b9a34fadb..eb03eff17b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonColumnMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonColumnMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonRowMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonRowMolecule.kt
index af45356088..502f921365 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonRowMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ButtonRowMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMolecule.kt
index 07e2454dbc..72994fec44 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,18 +25,17 @@ 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.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.anAvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toAnnotatedString
 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.designsystem.utils.BooleanProvider
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -44,20 +44,37 @@ fun ComposerAlertMolecule(
     content: AnnotatedString,
     onSubmitClick: () -> Unit,
     modifier: Modifier = Modifier,
-    isCritical: Boolean = false,
+    level: ComposerAlertLevel = ComposerAlertLevel.Default,
+    showIcon: Boolean = false,
     submitText: String = stringResource(CommonStrings.action_ok),
 ) {
     Column(
         modifier.fillMaxWidth()
     ) {
-        val lineColor = if (isCritical) ElementTheme.colors.borderCriticalSubtle else ElementTheme.colors.borderInfoSubtle
+        val lineColor = when (level) {
+            ComposerAlertLevel.Default -> ElementTheme.colors.borderInfoSubtle
+            ComposerAlertLevel.Info -> ElementTheme.colors.borderInfoSubtle
+            ComposerAlertLevel.Critical -> ElementTheme.colors.borderCriticalSubtle
+        }
+
+        val startColor = when (level) {
+            ComposerAlertLevel.Default -> ElementTheme.colors.bgInfoSubtle
+            ComposerAlertLevel.Info -> ElementTheme.colors.bgInfoSubtle
+            ComposerAlertLevel.Critical -> ElementTheme.colors.bgCriticalSubtle
+        }
+
+        val textColor = when (level) {
+            ComposerAlertLevel.Default -> ElementTheme.colors.textPrimary
+            ComposerAlertLevel.Info -> ElementTheme.colors.textInfoPrimary
+            ComposerAlertLevel.Critical -> ElementTheme.colors.textCriticalPrimary
+        }
+
         Box(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(1.dp)
                 .background(lineColor)
         )
-        val startColor = if (isCritical) ElementTheme.colors.bgCriticalSubtle else ElementTheme.colors.bgInfoSubtle
         val brush = Brush.verticalGradient(
             listOf(startColor, ElementTheme.colors.bgCanvasDefault),
         )
@@ -77,16 +94,28 @@ fun ComposerAlertMolecule(
                             avatarData = avatar,
                             avatarType = AvatarType.User,
                         )
+                    } else if (showIcon) {
+                        val icon = when (level) {
+                            ComposerAlertLevel.Default -> CompoundIcons.Info()
+                            ComposerAlertLevel.Info -> CompoundIcons.Info()
+                            ComposerAlertLevel.Critical -> CompoundIcons.Error()
+                        }
+                        val iconTint = when (level) {
+                            ComposerAlertLevel.Default -> ElementTheme.colors.iconPrimary
+                            ComposerAlertLevel.Info -> ElementTheme.colors.iconInfoPrimary
+                            ComposerAlertLevel.Critical -> ElementTheme.colors.iconCriticalPrimary
+                        }
+                        Icon(
+                            imageVector = icon,
+                            tint = iconTint,
+                            contentDescription = null,
+                        )
                     }
                     Text(
                         text = content,
                         modifier = Modifier.weight(1f),
                         style = ElementTheme.typography.fontBodyMdRegular,
-                        color = if (isCritical) {
-                            ElementTheme.colors.textCriticalPrimary
-                        } else {
-                            ElementTheme.colors.textPrimary
-                        },
+                        color = textColor,
                         textAlign = TextAlign.Start,
                     )
                 }
@@ -101,13 +130,22 @@ fun ComposerAlertMolecule(
     }
 }
 
+enum class ComposerAlertLevel {
+    Default,
+    Info,
+    Critical
+}
+
 @PreviewsDayNight
 @Composable
-internal fun ComposerAlertMoleculePreview(@PreviewParameter(BooleanProvider::class) isCritical: Boolean) = ElementPreview {
+internal fun ComposerAlertMoleculePreview(
+    @PreviewParameter(ComposerAlertMoleculeParamsProvider::class) params: ComposerAlertMoleculeParams,
+) = ElementPreview {
     ComposerAlertMolecule(
-        avatar = anAvatarData(size = AvatarSize.ComposerAlert),
+        avatar = params.avatar,
         content = "Alice’s verified identity has changed. Learn more".toAnnotatedString(),
-        isCritical = isCritical,
+        level = params.level,
+        showIcon = params.showIcon,
         onSubmitClick = {},
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMoleculeParamsProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMoleculeParamsProvider.kt
new file mode 100644
index 0000000000..09027e0c91
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/ComposerAlertMoleculeParamsProvider.kt
@@ -0,0 +1,37 @@
+/*
+ * 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.atomic.molecules
+
+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.components.avatar.anAvatarData
+
+internal data class ComposerAlertMoleculeParams(
+    val level: ComposerAlertLevel,
+    val avatar: AvatarData? = null,
+    val showIcon: Boolean = false,
+)
+
+internal class ComposerAlertMoleculeParamsProvider : PreviewParameterProvider<ComposerAlertMoleculeParams> {
+    private val allLevels = sequenceOf(
+        ComposerAlertLevel.Default,
+        ComposerAlertLevel.Info,
+        ComposerAlertLevel.Critical
+    )
+
+    override val values: Sequence<ComposerAlertMoleculeParams>
+        get() = allLevels.flatMap { level ->
+            sequenceOf(
+                ComposerAlertMoleculeParams(level = level),
+                ComposerAlertMoleculeParams(level = level, avatar = anAvatarData(size = AvatarSize.ComposerAlert)),
+                ComposerAlertMoleculeParams(level = level, showIcon = true),
+            )
+        }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt
index a71962fad9..1d2e8ae3fc 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitlePlaceholdersRowMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
index e38070e09f..56255d7623 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/atomic/molecules/InfoListItemMolecule.kt
index 0b3ca7fd8b..46d8029c89 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/atomic/molecules/InfoListItemMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InviteButtonsRowMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InviteButtonsRowMolecule.kt
index 85d938d3be..96075dd1f9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InviteButtonsRowMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InviteButtonsRowMolecule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1cadcf98b3..48f8d798fe 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MembersCountMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MembersCountMolecule.kt
index fa22b8a50a..4df1a5ad6a 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MembersCountMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MembersCountMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/NumberedListMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/NumberedListMolecule.kt
index 1531598022..70ad04a373 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/NumberedListMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/NumberedListMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/TextWithLabelMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/TextWithLabelMolecule.kt
index cc195ca686..fdc7ae56a5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/TextWithLabelMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/TextWithLabelMolecule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/atomic/organisms/InfoListOrganism.kt
index aeb8b5ba65..f52ee2512f 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/atomic/organisms/InfoListOrganism.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2c1ac7479c..df841dad9b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/RoomPreviewOrganism.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/RoomPreviewOrganism.kt
index dac9f00a7c..c8b064a18b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/RoomPreviewOrganism.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/RoomPreviewOrganism.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a6af316399..b62f634ece 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5100abad64..f09dc895e9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt
index 810ff7b493..db0bb69cc7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/OnBoardingPage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 84c51b8ec8..c2ee9800db 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/LightGradientBackground.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/LightGradientBackground.kt
index d33fa9f211..776c52f985 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/LightGradientBackground.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/LightGradientBackground.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt
index 73bc7ca841..2a3b790559 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsProvider.kt
index 6d77bd8523..d12bfe3b82 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsProvider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/Gradient.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/Gradient.kt
index 342377d0b8..1faed13425 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/Gradient.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/colors/Gradient.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ae88faa205..dcd3f8fa21 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Badge.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Badge.kt
index 5e2160a01f..315e75e655 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Badge.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Badge.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt
index 78a4d32e44..40e84b34c3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
index 6c6d6d398e..a70aafff36 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 74dff31060..14fd284067 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1caf5c50b7..85307823f6 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -76,28 +77,9 @@ fun ExpandableBottomSheetLayout(
     var calculatedMaxBottomContentHeightPx by remember(maxBottomContentHeightPx) { mutableIntStateOf(maxBottomContentHeightPx) }
     val animatable = remember { Animatable(0f) }
 
-    fun calculatePercentage(currentPos: Int, minPos: Int, maxPos: Int): Float {
-        val currentProgress = currentPos - minPos
-        if (currentProgress < 0) {
-            Timber.e("Invalid current progress: $currentProgress, minPos: $minPos, maxPos: $maxPos")
-            return 0f
-        }
-        val total = (maxPos - minPos).toFloat()
-        if (total <= 0) {
-            Timber.e("Invalid total space: $total, minPos: $minPos, maxPos: $maxPos")
-            return 0f
-        }
-        return currentProgress / total
-    }
-
     LaunchedEffect(animatable.value) {
         if (animatable.isRunning && animatable.value != animatable.targetValue) {
             currentBottomContentHeightPx = animatable.value.roundToInt()
-            state.internalDraggingPercentage = calculatePercentage(
-                currentPos = currentBottomContentHeightPx,
-                minPos = minBottomContentHeightPx,
-                maxPos = calculatedMaxBottomContentHeightPx,
-            )
         }
     }
 
@@ -121,11 +103,6 @@ fun ExpandableBottomSheetLayout(
                                         minBottomContentHeightPx -> ExpandableBottomSheetLayoutState.Position.COLLAPSED
                                         else -> ExpandableBottomSheetLayoutState.Position.DRAGGING
                                     }
-                                    state.internalDraggingPercentage = calculatePercentage(
-                                        currentPos = newHeight,
-                                        minPos = minBottomContentHeightPx,
-                                        maxPos = calculatedMaxBottomContentHeightPx,
-                                    )
                                     currentBottomContentHeightPx = newHeight
                                 },
                                 onDragEnd = {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayoutState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayoutState.kt
index 71fb2d06be..ae9f9e4cf2 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayoutState.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayoutState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.designsystem.components
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -31,21 +31,12 @@ fun rememberExpandableBottomSheetLayoutState(): ExpandableBottomSheetLayoutState
 @Stable
 class ExpandableBottomSheetLayoutState {
     internal var internalPosition: Position by mutableStateOf(Position.COLLAPSED)
-    internal var internalDraggingPercentage: Float by mutableFloatStateOf(
-        if (internalPosition == Position.EXPANDED) 1f else 0f
-    )
 
     /**
      * The current position of the bottom sheet layout.
      */
     val position get() = internalPosition
 
-    /**
-     * The percentage of the bottom sheet layout that is currently being dragged.
-     * This value ranges from `0f` for [Position.COLLAPSED] to `1f` for [Position.EXPANDED].
-     */
-    val draggingPercentage = internalDraggingPercentage
-
     /**
      * The position of the bottom sheet layout.
      */
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt
index 3f25a69eb0..5e23306b41 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LabelledCheckbox.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt
index 7bcc216d2f..88287ef44b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/PinIcon.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
index fe18daaaea..571a0b9bc2 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5b87b1171b..34d119508a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/TopAppBarScrollBehaviorLayout.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/TopAppBarScrollBehaviorLayout.kt
new file mode 100644
index 0000000000..36e9547575
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/TopAppBarScrollBehaviorLayout.kt
@@ -0,0 +1,55 @@
+/*
+ * 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.components
+
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Surface
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.UiComposable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.Layout
+import io.element.android.compound.theme.ElementTheme
+
+/**
+ * A layout that measures its content to set the height offset limit of a [TopAppBarScrollBehavior].
+ * It places the content according to the current height offset of the scroll behavior.
+ *
+ */
+@ExperimentalMaterial3Api
+@Composable
+fun TopAppBarScrollBehaviorLayout(
+    scrollBehavior: TopAppBarScrollBehavior,
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = ElementTheme.colors.bgCanvasDefault,
+    contentColor: Color = contentColorFor(backgroundColor),
+    content: @Composable @UiComposable () -> Unit,
+) {
+    Surface(
+        modifier = modifier,
+        color = backgroundColor,
+        contentColor = contentColor
+    ) {
+        Layout(
+            content = content,
+            measurePolicy = { measurables, constraints ->
+                val placeable = measurables.first().measure(constraints)
+                val contentHeight = placeable.height.toFloat()
+                scrollBehavior.state.heightOffsetLimit = -contentHeight
+                val heightOffset = scrollBehavior.state.heightOffset
+                val layoutHeight = (contentHeight + heightOffset).toInt()
+                layout(placeable.width, layoutHeight) {
+                    placeable.place(0, heightOffset.toInt())
+                }
+            }
+        )
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionProvider.kt
index a1062b697f..2f7439e1c8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionProvider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt
index 296e7aa543..da1b0fc796 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncFailure.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncFailure.kt
index b2050a6d7e..6b303a4782 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncFailure.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncFailure.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicator.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicator.kt
index 173980f515..b4880520e5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicator.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorHost.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorHost.kt
index 1b4c23c0e7..abfbe77789 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorHost.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorHost.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorView.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorView.kt
index 7193feb213..521ed68794 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorView.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncIndicatorView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncLoading.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncLoading.kt
index 4345cd35dd..9a2faa4bd8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncLoading.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncLoading.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
index d3a9ed3107..57dcb60325 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/Avatar.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
index 2e711ee6eb..ac7e426e65 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt
@@ -1,17 +1,16 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.runtime.Immutable
 import io.element.android.libraries.core.data.tryOrNull
 import java.text.BreakIterator
 
-@Immutable
 data class AvatarData(
     val id: String,
     val name: String?,
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 2bc497f10d..870ffe44a9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarRow.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarRow.kt
index 8c3ae3aac9..25784aa501 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarRow.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarRow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt
index c4c2c77766..fc9f31da46 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 31c569c870..0f99349494 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -46,7 +47,7 @@ enum class AvatarSize(val dp: Dp) {
     InviteSender(16.dp),
 
     EditRoomDetails(70.dp),
-    RoomListManageUser(70.dp),
+    RoomListManageUser(96.dp),
 
     NotificationsOptIn(32.dp),
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt
index 6d99574a55..f7a8fee888 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index f4d05d3fcd..1cd024542c 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/AvatarCluster.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/AvatarCluster.kt
index 1c8ac81e64..bb696c2405 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/AvatarCluster.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/AvatarCluster.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt
index db30a94830..ebd81f61b1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/ImageAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -45,7 +46,7 @@ internal fun ImageAvatar(
             is AsyncImagePainter.State.Success -> SubcomposeAsyncImageContent()
             is AsyncImagePainter.State.Error -> {
                 SideEffect {
-                    Timber.Forest.e(
+                    Timber.e(
                         state.result.throwable,
                         "Error loading avatar $state\n${state.result}"
                     )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialLetterAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialLetterAvatar.kt
index 6503917b23..05508b8af6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialLetterAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialLetterAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialOrImageAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialOrImageAvatar.kt
index 3111048d3b..4e5a4f0e36 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialOrImageAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/InitialOrImageAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/OverlapRatioProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/OverlapRatioProvider.kt
index 9a1abcee58..26a76c2fac 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/OverlapRatioProvider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/OverlapRatioProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/RoomAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/RoomAvatar.kt
index a9d1e5a95e..e5dc24f5f6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/RoomAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/RoomAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
index b8880744c9..c301a490eb 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/SpaceAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TextAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TextAvatar.kt
index f44319fece..8867735259 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TextAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TextAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TombstonedRoomAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TombstonedRoomAvatar.kt
index b712ff9fb1..413ca3b3f1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TombstonedRoomAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/TombstonedRoomAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatar.kt
index ad0275593d..c6aa75be0e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatarPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatarPreview.kt
index d4a629a052..a9c1f95ac6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatarPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/internal/UserAvatarPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashAsyncImage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashAsyncImage.kt
index c22197f22f..f3da71b000 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashAsyncImage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashAsyncImage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashBackgroundModifier.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashBackgroundModifier.kt
index ef1f1573cb..a6f04a20d3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashBackgroundModifier.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashBackgroundModifier.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashImage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashImage.kt
index a6c1f9f9b8..7285322026 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashImage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/blurhash/BlurHashImage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt
index 83e3891a75..52a97baf57 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/BackButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt
index 4444ff7f1e..9d7a0fec19 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt
index d58e181353..ff82f3f4b8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/GradientFloatingActionButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,12 +38,10 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.graphicsLayer
 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.tokens.generated.CompoundIcons
-import io.element.android.compound.tokens.generated.internal.LightColorTokens
+import io.element.android.libraries.designsystem.colors.gradientActionColors
 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.Icon
 
 @OptIn(CoreColorToken::class)
@@ -53,26 +52,14 @@ fun GradientFloatingActionButton(
     shape: Shape = RoundedCornerShape(25),
     content: @Composable () -> Unit,
 ) {
-    val color1 = if (LocalBuildMeta.current.isEnterpriseBuild) {
-        ElementTheme.colors.textActionAccent
-    } else {
-        LightColorTokens.colorGreen700
-    }
-    val color2 = if (LocalBuildMeta.current.isEnterpriseBuild) {
-        ElementTheme.colors.textActionAccent
-    } else {
-        LightColorTokens.colorBlue900
-    }
+    val colors = gradientActionColors()
     val linearShaderBrush = remember {
         object : ShaderBrush() {
             override fun createShader(size: Size): Shader {
                 return LinearGradientShader(
                     from = Offset(size.width, size.height),
                     to = Offset(size.width, 0f),
-                    colors = listOf(
-                        color2,
-                        color1,
-                    ),
+                    colors = colors,
                 )
             }
         }
@@ -83,10 +70,7 @@ fun GradientFloatingActionButton(
                 return RadialGradientShader(
                     center = size.center,
                     radius = size.width / 2,
-                    colors = listOf(
-                        color1,
-                        color2,
-                    )
+                    colors = colors,
                 )
             }
         }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/MainActionButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/MainActionButton.kt
index 56a0a756c9..9893620bbd 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/MainActionButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/MainActionButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt
index 90dd64d59d..694e739f25 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -40,7 +41,6 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.colors.gradientActionColors
 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.ButtonSize
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.lowHorizontalPaddingValue
@@ -63,15 +63,7 @@ fun SuperButton(
             ButtonSize.Small -> PaddingValues(horizontal = 16.dp, vertical = 5.dp)
         }
     }
-    val colors = if (LocalBuildMeta.current.isEnterpriseBuild) {
-        listOf(
-            ElementTheme.colors.textActionAccent,
-            ElementTheme.colors.textActionAccent,
-        )
-    } else {
-        gradientActionColors()
-    }
-
+    val colors = gradientActionColors()
     val shaderBrush = remember(colors) {
         object : ShaderBrush() {
             override fun createShader(size: Size): Shader {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/AlertDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/AlertDialog.kt
index 1c87ab0924..3c9204ac3e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/AlertDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/AlertDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
index b15bafa338..9d217da059 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
index f1a645079a..3c79dd7714 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialogWithDoNotShowAgain.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialogWithDoNotShowAgain.kt
index e4a35c1647..e85725cfc0 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialogWithDoNotShowAgain.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialogWithDoNotShowAgain.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,14 +57,14 @@ fun ErrorDialogWithDoNotShowAgain(
             Column {
                 Text(
                     text = content,
-                    style = ElementTheme.materialTypography.bodyMedium,
+                    style = ElementTheme.typography.fontBodyMdRegular,
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Checkbox(checked = doNotShowAgain, onCheckedChange = { doNotShowAgain = it })
                     Text(
                         text = stringResource(id = CommonStrings.common_do_not_show_this_again),
-                        style = ElementTheme.materialTypography.bodyMedium,
+                        style = ElementTheme.typography.fontBodyMdRegular,
                     )
                 }
             }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt
index 944fca1cf4..ce1afae93d 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -40,6 +41,7 @@ fun ListDialog(
     submitText: String = stringResource(CommonStrings.action_ok),
     enabled: Boolean = true,
     applyPaddingToContents: Boolean = true,
+    destructiveSubmit: Boolean = false,
     listItems: LazyListScope.() -> Unit,
 ) {
     val decoratedSubtitle: @Composable (() -> Unit)? = subtitle?.let {
@@ -64,6 +66,7 @@ fun ListDialog(
             enabled = enabled,
             listItems = listItems,
             applyPaddingToContents = applyPaddingToContents,
+            destructiveSubmit = destructiveSubmit,
         )
     }
 }
@@ -78,6 +81,7 @@ private fun ListDialogContent(
     title: String?,
     enabled: Boolean,
     applyPaddingToContents: Boolean,
+    destructiveSubmit: Boolean,
     subtitle: @Composable (() -> Unit)? = null,
 ) {
     SimpleAlertDialogContent(
@@ -89,6 +93,7 @@ private fun ListDialogContent(
         onSubmitClick = onSubmitClick,
         enabled = enabled,
         applyPaddingToContents = applyPaddingToContents,
+        destructiveSubmit = destructiveSubmit,
     ) {
         // No start padding if padding is already applied to the content
         val horizontalPadding = if (applyPaddingToContents) 0.dp else 8.dp
@@ -119,6 +124,7 @@ internal fun ListDialogContentPreview() {
                 cancelText = "Cancel",
                 submitText = "Save",
                 enabled = true,
+                destructiveSubmit = false,
                 applyPaddingToContents = true,
             )
         }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListOption.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListOption.kt
index d21a57325f..5b84b609d9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListOption.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListOption.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt
index 81646f9459..6fe899287b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt
index c496b83286..0b313e1180 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SaveChangesDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SaveChangesDialog.kt
new file mode 100644
index 0000000000..dc30b191a0
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SaveChangesDialog.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.components.dialogs
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+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 SaveChangesDialog(
+    onSaveClick: () -> Unit,
+    onDiscardClick: () -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+    title: String = stringResource(CommonStrings.dialog_unsaved_changes_title),
+    content: String = stringResource(CommonStrings.dialog_unsaved_changes_description),
+    submitText: String = stringResource(CommonStrings.action_save),
+    cancelText: String = stringResource(CommonStrings.action_discard),
+) = ConfirmationDialog(
+    modifier = modifier,
+    title = title,
+    content = content,
+    submitText = submitText,
+    cancelText = cancelText,
+    onSubmitClick = onSaveClick,
+    onCancelClick = onDiscardClick,
+    onDismiss = onDismiss,
+)
+
+@PreviewsDayNight
+@Composable
+internal fun SaveChangesDialogPreview() = ElementPreview {
+    SaveChangesDialog(
+        onSaveClick = {},
+        onDiscardClick = {},
+        onDismiss = {}
+    )
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt
index 23e7b22d85..8a64fce510 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/TextFieldDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/TextFieldDialog.kt
index bb31edd313..1ce241d5d9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/TextFieldDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/TextFieldDialog.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,11 +43,13 @@ fun TextFieldDialog(
     validation: (String?) -> Boolean = { true },
     onValidationErrorMessage: String? = null,
     autoSelectOnDisplay: Boolean = true,
-    maxLines: Int = 1,
+    minLines: Int = 1,
+    maxLines: Int = minLines,
     content: String? = null,
     label: String? = null,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
     submitText: String = stringResource(CommonStrings.action_ok),
+    destructiveSubmit: Boolean = false,
 ) {
     val focusRequester = remember { FocusRequester() }
     var textFieldContents by rememberSaveable(stateSaver = TextFieldValue.Saver) {
@@ -66,13 +69,14 @@ fun TextFieldDialog(
         onDismissRequest = onDismissRequest,
         enabled = canSubmit,
         submitText = submitText,
+        destructiveSubmit = destructiveSubmit,
         modifier = modifier,
     ) {
         if (content != null) {
             item {
                 Text(
                     text = content,
-                    style = ElementTheme.materialTypography.bodyMedium,
+                    style = ElementTheme.typography.fontBodyMdRegular,
                 )
             }
         }
@@ -92,6 +96,7 @@ fun TextFieldDialog(
                         onSubmit(textFieldContents.text)
                     }
                 }),
+                minLines = minLines,
                 maxLines = maxLines,
                 modifier = Modifier
                     .fillMaxWidth()
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt
index ab37ddb277..3911f0e947 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 41cef050ff..4775b91720 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt
index 5b9efc51c8..e8add0369f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -84,7 +85,7 @@ sealed interface ListItemContent {
     data class Text(val text: String) : ListItemContent
 
     /** Displays any custom content. */
-    data class Custom(val content: @Composable () -> Unit) : ListItemContent
+    data class Custom(val content: @Composable (enabled: Boolean) -> Unit) : ListItemContent
 
     /** Displays a badge. */
     data object Badge : ListItemContent
@@ -130,7 +131,7 @@ sealed interface ListItemContent {
             is Counter -> {
                 CounterAtom(count = count)
             }
-            is Custom -> content()
+            is Custom -> content(isItemEnabled)
         }
     }
 }
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 69a41c4ff3..f314f17008 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9cbfe2edda..70fb91e2e6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2db45def82..e07cda5e77 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 070e112736..c5016bc5bc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt
index f9d61b6593..e149af5890 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,7 +26,8 @@ fun TextFieldListItem(
     onTextChange: (String) -> Unit,
     modifier: Modifier = Modifier,
     error: String? = null,
-    maxLines: Int = 1,
+    minLines: Int = 1,
+    maxLines: Int = minLines,
     label: String? = null,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
     keyboardActions: KeyboardActions = KeyboardActions.Default,
@@ -52,7 +54,8 @@ fun TextFieldListItem(
     onTextChange: (TextFieldValue) -> Unit,
     modifier: Modifier = Modifier,
     error: String? = null,
-    maxLines: Int = 1,
+    minLines: Int = 1,
+    maxLines: Int = minLines,
     label: String? = null,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
     keyboardActions: KeyboardActions = KeyboardActions.Default,
@@ -67,6 +70,7 @@ fun TextFieldListItem(
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,
         maxLines = maxLines,
+        minLines = minLines,
         singleLine = maxLines == 1,
         modifier = modifier,
     )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/DrawScopeWaveformExtensions.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/DrawScopeWaveformExtensions.kt
index 4c17c10835..14c95640bc 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/DrawScopeWaveformExtensions.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/DrawScopeWaveformExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/FakeWaveformFactory.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/FakeWaveformFactory.kt
deleted file mode 100644
index 3264f55754..0000000000
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/FakeWaveformFactory.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.designsystem.components.media
-
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-import kotlin.random.Random
-
-/**
- * Generate a waveform for testing purposes.
- *
- * The waveform is a list of floats between 0 and 1.
- *
- * @param length The length of the waveform.
- */
-fun createFakeWaveform(length: Int = 1000): ImmutableList<Float> {
-    val random = Random(seed = 2)
-    return List(length) { random.nextFloat() }
-        .toImmutableList()
-}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveFormSamples.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveFormSamples.kt
new file mode 100644
index 0000000000..ddbbb9d10d
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveFormSamples.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.libraries.designsystem.components.media
+
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+
+object WaveFormSamples {
+    val allRangeWaveForm = List(100) { it.toFloat() / 100 }.toImmutableList()
+
+    @Suppress("ktlint:standard:argument-list-wrapping")
+    val realisticWaveForm = persistentListOf(
+        0.000f, 0.000f, 0.000f, 0.003f, 0.354f,
+        0.353f, 0.365f, 0.790f, 0.787f, 0.167f,
+        0.333f, 0.975f, 0.000f, 0.102f, 0.003f,
+        0.531f, 0.584f, 0.317f, 0.140f, 0.475f,
+        0.496f, 0.561f, 0.042f, 0.263f, 0.169f,
+        0.829f, 0.349f, 0.010f, 0.000f, 0.000f,
+        1.000f, 0.334f, 0.321f, 0.011f, 0.000f,
+        0.000f, 0.003f,
+    )
+
+    val longRealisticWaveForm = List(4) { realisticWaveForm }.flatten().toImmutableList()
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveformPlaybackView.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveformPlaybackView.kt
index 5fe722d447..f91cf96a95 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveformPlaybackView.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/media/WaveformPlaybackView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -49,7 +50,7 @@ private const val DEFAULT_GRAPHICS_LAYER_ALPHA: Float = 0.99F
  *
  * @param playbackProgress The current playback progress, between 0 and 1.
  * @param showCursor Whether to show the cursor or not.
- * @param waveform The waveform to display. Use [createFakeWaveform] to generate a fake waveform.
+ * @param waveform The waveform to display.
  * @param onSeek Callback when the user seeks the waveform. Called with a value between 0 and 1.
  * @param modifier The modifier to be applied to the view.
  * @param seekEnabled Whether the user can seek the waveform or not.
@@ -187,14 +188,14 @@ internal fun WaveformPlaybackViewPreview() = ElementPreview {
             showCursor = false,
             playbackProgress = 0.5f,
             onSeek = {},
-            waveform = aWaveForm().toImmutableList(),
+            waveform = WaveFormSamples.realisticWaveForm,
         )
         WaveformPlaybackView(
             modifier = Modifier.height(34.dp),
             showCursor = true,
             playbackProgress = 0.5f,
             onSeek = {},
-            waveform = List(1024) { it / 1024f }.toImmutableList(),
+            waveform = WaveFormSamples.allRangeWaveForm,
         )
     }
 }
@@ -217,45 +218,3 @@ private fun ImmutableList<Float>.normalisedData(maxSamplesCount: Int): Immutable
 
     return result.toImmutableList()
 }
-
-fun aWaveForm(): List<Float> {
-    return listOf(
-        0.000f,
-        0.000f,
-        0.000f,
-        0.003f,
-        0.354f,
-        0.353f,
-        0.365f,
-        0.790f,
-        0.787f,
-        0.167f,
-        0.333f,
-        0.975f,
-        0.000f,
-        0.102f,
-        0.003f,
-        0.531f,
-        0.584f,
-        0.317f,
-        0.140f,
-        0.475f,
-        0.496f,
-        0.561f,
-        0.042f,
-        0.263f,
-        0.169f,
-        0.829f,
-        0.349f,
-        0.010f,
-        0.000f,
-        0.000f,
-        1.000f,
-        0.334f,
-        0.321f,
-        0.011f,
-        0.000f,
-        0.000f,
-        0.003f,
-    )
-}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt
index 1a993899e8..452c9d8d3c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCategory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f70b87e812..6b4a8e1e0c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,7 +43,6 @@ fun PreferenceCheckbox(
         leadingContent = preferenceIcon(
             icon = icon,
             iconResourceId = iconResourceId,
-            enabled = enabled,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
         headlineContent = {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDivider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDivider.kt
index a401d02d2e..139aea33e1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDivider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDivider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7be47338ca..5fcbcab475 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,13 +11,12 @@
 package io.element.android.libraries.designsystem.components.preferences
 
 import androidx.annotation.DrawableRes
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExposedDropdownMenuBox
-import androidx.compose.material3.ExposedDropdownMenuDefaults
-import androidx.compose.material3.MenuAnchorType
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -25,17 +25,22 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.components.preferences.components.preferenceIcon
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
+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.Icon
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.designsystem.toEnabledColor
+import io.element.android.libraries.designsystem.toIconSecondaryEnabledColor
 import io.element.android.libraries.designsystem.toSecondaryEnabledColor
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -59,7 +64,6 @@ fun <T : DropdownOption> PreferenceDropdown(
         leadingContent = preferenceIcon(
             icon = icon,
             iconResourceId = iconResourceId,
-            enabled = enabled,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
         headlineContent = {
@@ -67,7 +71,6 @@ fun <T : DropdownOption> PreferenceDropdown(
                 style = ElementTheme.typography.fontBodyLgRegular,
                 modifier = Modifier.fillMaxWidth(),
                 text = title,
-                color = enabled.toEnabledColor(),
             )
         },
         supportingContent = supportingText?.let {
@@ -75,21 +78,23 @@ fun <T : DropdownOption> PreferenceDropdown(
                 Text(
                     style = ElementTheme.typography.fontBodyMdRegular,
                     text = it,
-                    color = enabled.toSecondaryEnabledColor(),
                 )
             }
         },
         trailingContent = ListItemContent.Custom(
-            content = {
+            content = { enabled ->
                 DropdownTrailingContent(
                     selectedOption = selectedOption,
                     options = options,
                     onSelectOption = onSelectOption,
                     expanded = isDropdownExpanded,
                     onExpandedChange = { isDropdownExpanded = it },
+                    enabled = enabled,
+                    modifier = Modifier.fillMaxSize(0.3f)
                 )
             }
         ),
+        enabled = enabled,
         onClick = { isDropdownExpanded = true }.takeIf { !isDropdownExpanded },
     )
 }
@@ -112,38 +117,51 @@ private fun <T : DropdownOption> DropdownTrailingContent(
     expanded: Boolean,
     onExpandedChange: (Boolean) -> Unit,
     onSelectOption: (T) -> Unit,
+    enabled: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    ExposedDropdownMenuBox(
-        expanded = expanded,
-        onExpandedChange = onExpandedChange,
+    Row(
         modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.End,
     ) {
-        Row(
-            modifier = Modifier.menuAnchor(MenuAnchorType.PrimaryNotEditable),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = selectedOption?.getText().orEmpty(),
-                maxLines = 1,
-                style = ElementTheme.typography.fontBodyMdRegular,
-                color = ElementTheme.colors.textSecondary,
-            )
-            ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
-        }
-        ExposedDropdownMenu(
+        Text(
+            text = selectedOption?.getText().orEmpty(),
+            maxLines = 1,
+            style = ElementTheme.typography.fontBodyMdRegular,
+            color = enabled.toSecondaryEnabledColor(),
+            overflow = TextOverflow.Ellipsis,
+            textAlign = TextAlign.End,
+            modifier = Modifier.weight(1f),
+        )
+        Icon(
+            imageVector = CompoundIcons.ChevronDown(),
+            contentDescription = null,
+            tint = enabled.toIconSecondaryEnabledColor(),
+        )
+        DropdownMenu(
             expanded = expanded,
+            minWidth = 0.dp,
             onDismissRequest = { onExpandedChange(false) },
-            matchTextFieldWidth = false,
         ) {
             options.forEach { option ->
                 DropdownMenuItem(
+                    enabled = enabled,
                     text = {
                         Text(
                             text = option.getText(),
                             style = ElementTheme.typography.fontBodyMdRegular
                         )
                     },
+                    trailingIcon = {
+                        if (option == selectedOption) {
+                            Icon(
+                                imageVector = CompoundIcons.Check(),
+                                contentDescription = null,
+                                tint = ElementTheme.colors.iconAccentPrimary,
+                            )
+                        }
+                    },
                     onClick = {
                         onSelectOption(option)
                         onExpandedChange(false)
@@ -189,5 +207,14 @@ internal fun PreferenceDropdownPreview() = ElementThemedPreview {
             options = options,
             onSelectOption = {},
         )
+        PreferenceDropdown(
+            title = "Dropdown",
+            supportingText = "Options for dropdown",
+            icon = CompoundIcons.Threads(),
+            selectedOption = options.first(),
+            options = options,
+            onSelectOption = {},
+            enabled = false
+        )
     }
 }
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 b81c3e6b86..24477b4339 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d52f1c3a5a..efc36544b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3513221cb9..671eb5bf3f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -43,7 +44,6 @@ fun PreferenceSlide(
         leadingContent = preferenceIcon(
             icon = icon,
             iconResourceId = iconResourceId,
-            enabled = enabled,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
         headlineContent = {
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 ed71fa5389..4545dbdf3e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -41,7 +42,6 @@ fun PreferenceSwitch(
         leadingContent = preferenceIcon(
             icon = icon,
             iconResourceId = iconResourceId,
-            enabled = enabled,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
         headlineContent = {
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 98f324f88a..c67b4c857f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/ImageVectorProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/ImageVectorProvider.kt
index 7e3052ca16..c1bf2b9112 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/ImageVectorProvider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/ImageVectorProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
index 2e4fff1e92..59e818c18a 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/components/PreferenceIcon.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,11 +34,10 @@ fun preferenceIcon(
     @DrawableRes iconResourceId: Int? = null,
     showIconBadge: Boolean = false,
     tintColor: Color? = null,
-    enabled: Boolean = true,
     showIconAreaIfNoIcon: Boolean = false,
 ): ListItemContent.Custom? {
     return if (icon != null || iconResourceId != null || showIconAreaIfNoIcon) {
-        ListItemContent.Custom {
+        ListItemContent.Custom { enabled ->
             PreferenceIcon(
                 icon = icon,
                 iconResourceId = iconResourceId,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt
index 0182a4b108..c6c244b2d6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.tooltip
 
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.TooltipAnchorPosition
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -40,8 +42,9 @@ object ElementTooltipDefaults {
         windowPadding: Dp = 12.dp,
     ): PopupPositionProvider {
         val windowPaddingPx = with(LocalDensity.current) { windowPadding.roundToPx() }
-        val plainTooltipPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(
-            spacingBetweenTooltipAndAnchor = spacingBetweenTooltipAndAnchor,
+        val plainTooltipPositionProvider = TooltipDefaults.rememberTooltipPositionProvider(
+            positioning = TooltipAnchorPosition.Above,
+            spacingBetweenTooltipAndAnchor = spacingBetweenTooltipAndAnchor
         )
         return remember(windowPaddingPx, plainTooltipPositionProvider) {
             object : PopupPositionProvider {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/PlainTooltip.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/PlainTooltip.kt
index e497f5eb37..f0fb57fc49 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/PlainTooltip.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/PlainTooltip.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt
index e623f79186..3bca8b8b8b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/CompoundDrawables.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/CompoundDrawables.kt
index d10eed1312..4aeba02ee4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/CompoundDrawables.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/CompoundDrawables.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
index ff98ab5b1e..f0a6fc847b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,4 +16,5 @@ internal val iconsOther = listOf(
     R.drawable.ic_notification,
     R.drawable.ic_stop,
     R.drawable.pin,
+    R.drawable.ic_winner,
 )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsPreview.kt
index e2da9bdcc0..f40c4ea024 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,11 +19,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 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.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
@@ -30,53 +28,12 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
-internal class CompoundIconChunkProvider : PreviewParameterProvider<IconChunk> {
-    override val values: Sequence<IconChunk>
-        get() {
-            val chunks = CompoundIcons.allResIds.chunked(36)
-            return chunks.mapIndexed { index, chunk ->
-                IconChunk(index = index + 1, total = chunks.size, icons = chunk.toImmutableList())
-            }
-                .asSequence()
-        }
-}
-
-internal class OtherIconChunkProvider : PreviewParameterProvider<IconChunk> {
-    override val values: Sequence<IconChunk>
-        get() {
-            val chunks = iconsOther.chunked(36)
-            return chunks.mapIndexed { index, chunk ->
-                IconChunk(index = index + 1, total = chunks.size, icons = chunk.toImmutableList())
-            }
-                .asSequence()
-        }
-}
-
-internal data class IconChunk(
-    val index: Int,
-    val total: Int,
-    val icons: ImmutableList<Int>,
-)
-
 @PreviewsDayNight
 @Composable
-internal fun IconsCompoundPreview(@PreviewParameter(CompoundIconChunkProvider::class) chunk: IconChunk) = ElementPreview {
+internal fun IconsOtherPreview() = ElementPreview {
     IconsPreview(
-        title = "R.drawable.ic_compound_* ${chunk.index}/${chunk.total}",
-        iconsList = chunk.icons,
-        iconNameTransform = { name ->
-            name.removePrefix("ic_compound_")
-                .replace("_", " ")
-        }
-    )
-}
-
-@PreviewsDayNight
-@Composable
-internal fun IconsOtherPreview(@PreviewParameter(OtherIconChunkProvider::class) iconChunk: IconChunk) = ElementPreview {
-    IconsPreview(
-        title = "R.drawable.ic_*  ${iconChunk.index}/${iconChunk.total}",
-        iconsList = iconChunk.icons,
+        title = "Other icons",
+        iconsList = iconsOther.toImmutableList(),
         iconNameTransform = { name ->
             name.removePrefix("ic_")
                 .replace("_", " ")
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
index abd1de9f90..0d1bece173 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt
index 9c7145e33b..43c07ad79e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ClearFocusOnTap.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ClearFocusOnTap.kt
index c338b36d26..c9ab328f02 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ClearFocusOnTap.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ClearFocusOnTap.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt
index 5789a4525d..7350c54de1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/CornerBorder.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/CornerBorder.kt
index eb4e6a8050..ad42616411 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/CornerBorder.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/CornerBorder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/FadingEdge.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/FadingEdge.kt
index b5ba35c807..72167a13da 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/FadingEdge.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/FadingEdge.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Gradient.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Gradient.kt
index 5d6f91e4b4..115c567391 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Gradient.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Gradient.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,13 +16,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.colors.gradientSubtleColors
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.LocalBuildMeta
 
 /**
  * Ref: https://www.figma.com/design/kcnHxunG1LDWXsJhaNuiHz/ER-145--Workspaces-V1?node-id=1141-24692
@@ -30,35 +28,15 @@ import io.element.android.libraries.designsystem.theme.LocalBuildMeta
 @Composable
 fun Modifier.backgroundVerticalGradient(
     isVisible: Boolean = true,
-    isEnterpriseBuild: Boolean = LocalBuildMeta.current.isEnterpriseBuild,
 ): Modifier {
     if (!isVisible) return this
     return background(
         brush = Brush.verticalGradient(
-            colorStops = subtleColorStops(isEnterpriseBuild),
+            colors = gradientSubtleColors(),
         ),
     )
 }
 
-@Composable
-fun subtleColorStops(
-    isEnterpriseBuild: Boolean = LocalBuildMeta.current.isEnterpriseBuild,
-): Array<Pair<Float, Color>> {
-    return buildList {
-        if (isEnterpriseBuild) {
-            // For enterprise builds, ensure that we are theming the gradient
-            add(0f to ElementTheme.colors.textActionAccent.copy(alpha = 0.5f))
-            add(0.75f to ElementTheme.colors.bgCanvasDefault)
-            add(1f to Color.Transparent)
-        } else {
-            val colors = gradientSubtleColors()
-            colors.forEachIndexed { index, color ->
-                add(index.toFloat() / (colors.size - 1) to color)
-            }
-        }
-    }.toTypedArray()
-}
-
 @PreviewsDayNight
 @Composable
 internal fun BackgroundVerticalGradientPreview() = ElementPreview {
@@ -70,19 +48,6 @@ internal fun BackgroundVerticalGradientPreview() = ElementPreview {
     )
 }
 
-@PreviewsDayNight
-@Composable
-internal fun BackgroundVerticalGradientEnterprisePreview() = ElementPreview {
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(height = 100.dp)
-            .backgroundVerticalGradient(
-                isEnterpriseBuild = true,
-            )
-    )
-}
-
 @PreviewsDayNight
 @Composable
 internal fun BackgroundVerticalGradientDisabledPreview() = ElementPreview {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Keyboard.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Keyboard.kt
index c8c8b8769e..8d961ecb82 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Keyboard.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Keyboard.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/OnTabOrEnterKeyFocusNext.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/OnTabOrEnterKeyFocusNext.kt
index dfe23c85d7..08cf1a052e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/OnTabOrEnterKeyFocusNext.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/OnTabOrEnterKeyFocusNext.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/RoundedBackground.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/RoundedBackground.kt
index ac444257bf..e315f69fa3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/RoundedBackground.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/RoundedBackground.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/SquareSizeModifier.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/SquareSizeModifier.kt
index 6c2e3884d6..a7dae1eaf6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/SquareSizeModifier.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/SquareSizeModifier.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 788b8fee55..b0ef41e154 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b1142c0174..c054b318f3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 266fca534a..1c2bdf3cef 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7ab7d323e3..7b29757843 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewGroup.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewGroup.kt
index aa2b4dd761..0f40021bb3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewGroup.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewGroup.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fed605792c..163ee21590 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewsDayNight.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewsDayNight.kt
index 28964ebbae..4b084b1e21 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewsDayNight.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewsDayNight.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b605283c2c..7e687e9b89 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,12 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.SheetValue
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalDensity
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun sheetStateForPreview() = SheetState(
     skipPartiallyExpanded = true,
+    positionalThreshold = { 0.5f },
+    velocityThreshold = { 400f },
     initialValue = SheetValue.Expanded,
-    density = LocalDensity.current,
 )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/WithFontScale.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/WithFontScale.kt
index 4c333f2f8a..5967b660dd 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/WithFontScale.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/WithFontScale.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/HorizontalRuler.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/HorizontalRuler.kt
index 82469b8f23..f88a5a643f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/HorizontalRuler.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/HorizontalRuler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/VerticalRuler.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/VerticalRuler.kt
index 8c922ba8c8..171a2901e5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/VerticalRuler.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/VerticalRuler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt
index 234d07cb25..1248c761e7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/showkase/DesignSystemShowkaseRootModule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/showkase/DesignSystemShowkaseRootModule.kt
index 0475bd417f..abb420a0a0 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/showkase/DesignSystemShowkaseRootModule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/showkase/DesignSystemShowkaseRootModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/swipe/SwipeableActionsState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/swipe/SwipeableActionsState.kt
index 35ac426005..418c1d1b63 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/swipe/SwipeableActionsState.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/swipe/SwipeableActionsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/AnnotatedStrings.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/AnnotatedStrings.kt
index 79f70cc2f5..43fd80ab43 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/AnnotatedStrings.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/AnnotatedStrings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
index 856160d7bf..3fe720e3c7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/StringWithLink.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/StringWithLink.kt
new file mode 100644
index 0000000000..d82ea9e817
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/StringWithLink.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.designsystem.text
+
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun stringWithLink(
+    @StringRes textRes: Int,
+    url: String,
+    onLinkClick: (String) -> Unit,
+    @StringRes linkTextRes: Int = CommonStrings.action_learn_more,
+) = buildAnnotatedString {
+    val learnMoreStr = stringResource(linkTextRes)
+    val fullText = stringResource(textRes, learnMoreStr)
+    append(fullText)
+    val learnMoreStartIndex = fullText.lastIndexOf(learnMoreStr)
+    addStyle(
+        style = SpanStyle(
+            textDecoration = TextDecoration.Underline,
+            fontWeight = FontWeight.Bold,
+            color = ElementTheme.colors.textPrimary
+        ),
+        start = learnMoreStartIndex,
+        end = learnMoreStartIndex + learnMoreStr.length,
+    )
+    addLink(
+        url = LinkAnnotation.Url(
+            url = url,
+            linkInteractionListener = {
+                onLinkClick(url)
+            }
+        ),
+        start = learnMoreStartIndex,
+        end = learnMoreStartIndex + learnMoreStr.length,
+    )
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/TextSyleToTypeface.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/TextSyleToTypeface.kt
index 6608103909..6261c88e66 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/TextSyleToTypeface.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/TextSyleToTypeface.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/UnitConverters.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/UnitConverters.kt
index eaf6712830..d0c7074402 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/UnitConverters.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/UnitConverters.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8f6224eca9..06827fb218 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bb0fcd971b..7aa0ab79b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,7 +20,7 @@ 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.features.enterprise.api.EnterpriseService
+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.preferences.api.store.AppPreferencesStore
@@ -53,7 +54,8 @@ val LocalBuildMeta = staticCompositionLocalOf {
 @Composable
 fun ElementThemeApp(
     appPreferencesStore: AppPreferencesStore,
-    enterpriseService: EnterpriseService,
+    compoundLight: SemanticColors,
+    compoundDark: SemanticColors,
     buildMeta: BuildMeta,
     content: @Composable () -> Unit,
 ) {
@@ -70,8 +72,6 @@ fun ElementThemeApp(
             }
         )
     }
-    val compoundLight = remember { enterpriseService.semanticColorsLight() }
-    val compoundDark = remember { enterpriseService.semanticColorsDark() }
     CompositionLocalProvider(
         LocalBuildMeta provides buildMeta,
     ) {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt
index 3e32b09fc0..6c3296d194 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/TypographyAliases.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/TypographyAliases.kt
index e83a701acd..750e4d0d05 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/TypographyAliases.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/TypographyAliases.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
index 7811c26c4a..c9c553b7b9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -64,7 +65,7 @@ internal fun SimpleAlertDialogContent(
         content = {
             Text(
                 text = content,
-                style = ElementTheme.materialTypography.bodyMedium,
+                style = ElementTheme.typography.fontBodyMdRegular,
             )
         },
         submitText = submitText,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetDragHandle.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetDragHandle.kt
index 596c2480b2..3f8ca0144b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetDragHandle.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetDragHandle.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetScaffold.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetScaffold.kt
index d4db8923a0..721350e883 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetScaffold.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/BottomSheetScaffold.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8b1ca52515..676d34ee3e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
index c76afdbfed..a825738518 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt
index f9e238e432..9bca6e5699 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt
index 6dc681b0e1..9a3e359a95 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenu.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,8 +11,10 @@ package io.element.android.libraries.designsystem.theme.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.PopupProperties
@@ -24,22 +27,24 @@ fun DropdownMenu(
     expanded: Boolean,
     onDismissRequest: () -> Unit,
     modifier: Modifier = Modifier,
-    // By default add a 16.dp offset to the menu
-    offset: DpOffset = DpOffset(x = 16.dp, y = 0.dp),
+    offset: DpOffset = DpOffset(x = 0.dp, y = 0.dp),
     properties: PopupProperties = PopupProperties(focusable = true),
+    minWidth: Dp = DropdownMenuDefaults.minWidth,
     content: @Composable ColumnScope.() -> Unit
 ) {
-    // Note: the internal shape corner radius should be 8dp, but there is a 4p value hardcoded in the internal Surface component
     androidx.compose.material3.DropdownMenu(
         expanded = expanded,
         onDismissRequest = onDismissRequest,
         modifier = modifier
-            .background(color = ElementTheme.colors.bgCanvasDefault)
-            .widthIn(min = minMenuWidth),
+            .background(color = ElementTheme.colors.bgCanvasDefaultLevel1)
+            .widthIn(min = minWidth),
+        shape = RoundedCornerShape(8.dp),
         offset = offset,
         properties = properties,
         content = content
     )
 }
 
-private val minMenuWidth = 200.dp
+object DropdownMenuDefaults {
+    val minWidth = 200.dp
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt
index 41990c4cf4..31c3f3c49b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FilledTextField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FilledTextField.kt
index d2aa0bbac2..cbd25c1aeb 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FilledTextField.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FilledTextField.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
index aa32c27dd9..38eada2370 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2e1ec4dc51..b4c7eddf31 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
index f4487b34fa..f409761247 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Icon.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
index 51797086fa..023d798fd3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconColorButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconColorButton.kt
index cc863bcf8d..1425d59bc3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconColorButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconColorButton.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt
index 2c9a030439..af14f3511c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/IconToggleButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt
index 6336ff73ca..04f08166b7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 78195d4f98..0da086725d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -113,7 +114,7 @@ fun ListItem(
 
     val decoratedHeadlineContent: @Composable () -> Unit = {
         CompositionLocalProvider(
-            LocalTextStyle provides ElementTheme.materialTypography.bodyLarge,
+            LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular,
             LocalContentColor provides headlineColor,
         ) {
             headlineContent()
@@ -122,7 +123,7 @@ fun ListItem(
     val decoratedSupportingContent: (@Composable () -> Unit)? = supportingContent?.let { content ->
         {
             CompositionLocalProvider(
-                LocalTextStyle provides ElementTheme.materialTypography.bodyMedium,
+                LocalTextStyle provides ElementTheme.typography.fontBodyMdRegular,
                 LocalContentColor provides supportingColor,
             ) {
                 content()
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 d03cc4fe27..403ed6da97 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 558cbea653..4be53ddb39 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt
index 3b52158a37..a49a3595f7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -32,7 +33,7 @@ fun MediumTopAppBar(
     navigationIcon: @Composable () -> Unit = {},
     actions: @Composable RowScope.() -> Unit = {},
     windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
-    colors: TopAppBarColors = TopAppBarDefaults.mediumTopAppBarColors(),
+    colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors(),
     scrollBehavior: TopAppBarScrollBehavior? = null
 ) {
     androidx.compose.material3.MediumTopAppBar(
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 b362c729dc..3f70aab727 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBar.kt
index 9d67f4ec05..b983d107ef 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarIcon.kt
index 2c2890f854..7c6332bd51 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarIcon.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarIcon.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt
index 8c42b932dd..40407602a8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarItem.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarText.kt
index 826c99f743..d84fddd0b4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/NavigationBarText.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
index eb4f428622..dfb4758f65 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/RadioButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt
index 64d5672b38..16d5f624cf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bfceb2263e..c1fd7bc6f0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,13 +14,13 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SearchBar
 import androidx.compose.material3.SearchBarColors
 import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.material3.TextFieldColors
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
@@ -44,6 +45,9 @@ import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 import io.element.android.libraries.ui.strings.CommonStrings
 
+/**
+ * Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1992-8350
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun <T> SearchBar(
@@ -62,14 +66,12 @@ fun <T> SearchBar(
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     inactiveBarColors: SearchBarColors = ElementSearchBarDefaults.inactiveColors(),
     activeBarColors: SearchBarColors = ElementSearchBarDefaults.activeColors(),
-    inactiveTextInputColors: TextFieldColors = ElementSearchBarDefaults.inactiveInputFieldColors(),
-    activeTextInputColors: TextFieldColors = ElementSearchBarDefaults.activeInputFieldColors(),
     contentPrefix: @Composable ColumnScope.() -> Unit = {},
     contentSuffix: @Composable ColumnScope.() -> Unit = {},
     resultHandler: @Composable ColumnScope.(T) -> Unit = {},
 ) {
     val focusManager = LocalFocusManager.current
-
+    val colors = if (active) activeBarColors else inactiveBarColors
     val updatedOnQueryChange by rememberUpdatedState(onQueryChange)
     LaunchedEffect(active) {
         if (!active) {
@@ -106,28 +108,25 @@ fun <T> SearchBar(
                             }
                         }
                     }
-
                     !active -> {
                         {
                             Icon(
                                 imageVector = CompoundIcons.Search(),
                                 contentDescription = stringResource(CommonStrings.action_search),
-                                tint = ElementTheme.colors.iconTertiary,
                             )
                         }
                     }
-
                     else -> null
                 },
                 interactionSource = interactionSource,
-                colors = if (active) activeTextInputColors else inactiveTextInputColors,
+                colors = colors.inputFieldColors,
             )
         },
         expanded = active,
         onExpandedChange = onActiveChange,
         modifier = modifier.padding(horizontal = if (!active) 16.dp else 0.dp),
         shape = shape,
-        colors = if (active) activeBarColors else inactiveBarColors,
+        colors = colors,
         tonalElevation = tonalElevation,
         windowInsets = windowInsets,
         content = {
@@ -162,35 +161,43 @@ object ElementSearchBarDefaults {
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     fun inactiveColors() = SearchBarDefaults.colors(
-        containerColor = ElementTheme.materialColors.surfaceVariant,
-        dividerColor = ElementTheme.materialColors.outline,
+        containerColor = Color.Transparent,
+        dividerColor = ElementTheme.colors.borderInteractivePrimary,
+        inputFieldColors = inactiveInputFieldColors(),
     )
 
     @Composable
     fun inactiveInputFieldColors() = TextFieldDefaults.colors(
         unfocusedPlaceholderColor = ElementTheme.colors.textDisabled,
         focusedPlaceholderColor = ElementTheme.colors.textDisabled,
-        unfocusedLeadingIconColor = ElementTheme.materialColors.primary,
-        focusedLeadingIconColor = ElementTheme.materialColors.primary,
-        unfocusedTrailingIconColor = ElementTheme.materialColors.primary,
-        focusedTrailingIconColor = ElementTheme.materialColors.primary,
+        unfocusedTrailingIconColor = ElementTheme.colors.iconDisabled,
+        focusedTrailingIconColor = ElementTheme.colors.iconDisabled,
+        focusedContainerColor = ElementTheme.colors.bgSubtleSecondary,
+        unfocusedContainerColor = ElementTheme.colors.bgSubtleSecondary,
+        disabledContainerColor = ElementTheme.colors.bgSubtleSecondary,
+        errorContainerColor = ElementTheme.colors.bgSubtleSecondary,
     )
 
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     fun activeColors() = SearchBarDefaults.colors(
         containerColor = Color.Transparent,
-        dividerColor = ElementTheme.materialColors.outline,
+        dividerColor = ElementTheme.colors.borderInteractivePrimary,
+        inputFieldColors = activeInputFieldColors(),
     )
 
     @Composable
     fun activeInputFieldColors() = TextFieldDefaults.colors(
-        unfocusedPlaceholderColor = ElementTheme.colors.textDisabled,
-        focusedPlaceholderColor = ElementTheme.colors.textDisabled,
-        unfocusedLeadingIconColor = ElementTheme.materialColors.primary,
-        focusedLeadingIconColor = ElementTheme.materialColors.primary,
-        unfocusedTrailingIconColor = ElementTheme.materialColors.primary,
-        focusedTrailingIconColor = ElementTheme.materialColors.primary,
+        unfocusedPlaceholderColor = ElementTheme.colors.textSecondary,
+        focusedPlaceholderColor = ElementTheme.colors.textSecondary,
+        unfocusedLeadingIconColor = ElementTheme.colors.iconPrimary,
+        focusedLeadingIconColor = ElementTheme.colors.iconPrimary,
+        unfocusedTrailingIconColor = ElementTheme.colors.iconTertiary,
+        focusedTrailingIconColor = ElementTheme.colors.iconTertiary,
+        focusedContainerColor = Color.Transparent,
+        unfocusedContainerColor = Color.Transparent,
+        disabledContainerColor = Color.Transparent,
+        errorContainerColor = Color.Transparent,
     )
 }
 
@@ -294,6 +301,7 @@ private fun ContentToPreview(
     resultHandler: @Composable ColumnScope.(String) -> Unit = {},
 ) {
     SearchBar(
+        modifier = Modifier.heightIn(max = 200.dp),
         query = query,
         active = active,
         resultState = resultState,
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
new file mode 100644
index 0000000000..fc84abe827
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt
@@ -0,0 +1,224 @@
+/*
+ * 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.theme.components
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+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.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+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.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.graphics.SolidColor
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+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.tokens.generated.CompoundIcons
+import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.preview.PreviewGroup
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1985-3223
+ */
+@Composable
+fun SearchField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    placeholder: String? = null,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    val focusManager = LocalFocusManager.current
+    val isFocused by interactionSource.collectIsFocusedAsState()
+    BasicTextField(
+        value = value,
+        onValueChange = onValueChange,
+        modifier = modifier,
+        textStyle = textFieldStyle(),
+        singleLine = true,
+        interactionSource = interactionSource,
+        keyboardOptions = KeyboardOptions(
+            imeAction = ImeAction.Search,
+        ),
+        keyboardActions = KeyboardActions(
+            onSearch = {
+                focusManager.clearFocus()
+            }
+        ),
+        cursorBrush = SolidColor(ElementTheme.colors.textActionAccent),
+    ) { innerTextField ->
+        DecorationBox(
+            isFocused = isFocused,
+            placeholder = placeholder,
+            isTextEmpty = value.isEmpty(),
+            innerTextField = innerTextField,
+            onClear = { onValueChange("") },
+        )
+    }
+}
+
+@Composable
+fun SearchField(
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    modifier: Modifier = Modifier,
+    placeholder: String? = null,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    val focusManager = LocalFocusManager.current
+    val isFocused by interactionSource.collectIsFocusedAsState()
+    BasicTextField(
+        value = value,
+        onValueChange = onValueChange,
+        modifier = modifier,
+        textStyle = textFieldStyle(),
+        singleLine = true,
+        interactionSource = interactionSource,
+        keyboardOptions = KeyboardOptions(
+            imeAction = ImeAction.Search,
+        ),
+        keyboardActions = KeyboardActions(
+            onSearch = {
+                focusManager.clearFocus()
+            }
+        ),
+        cursorBrush = SolidColor(ElementTheme.colors.textActionAccent),
+    ) { innerTextField ->
+        DecorationBox(
+            isFocused = isFocused,
+            placeholder = placeholder,
+            isTextEmpty = value.text.isEmpty(),
+            innerTextField = innerTextField,
+            onClear = { TextFieldValue() }
+        )
+    }
+}
+
+@Composable
+private fun DecorationBox(
+    isFocused: Boolean,
+    placeholder: String?,
+    isTextEmpty: Boolean,
+    onClear: () -> Unit,
+    innerTextField: @Composable () -> Unit,
+) {
+    SearchFieldContainer(
+        isFocused = isFocused,
+    ) {
+        Row(modifier = Modifier.padding(start = 16.dp), verticalAlignment = Alignment.CenterVertically) {
+            Box(modifier = Modifier.weight(1f)) {
+                if (placeholder != null && isTextEmpty) {
+                    Text(
+                        text = placeholder,
+                        color = ElementTheme.colors.textSecondary,
+                        style = ElementTheme.typography.fontBodyLgRegular,
+                    )
+                }
+                innerTextField()
+            }
+            Spacer(modifier = Modifier.width(16.dp))
+            val showClearIcon = isFocused && !isTextEmpty
+            IconButton(onClick = onClear, enabled = showClearIcon) {
+                if (showClearIcon) {
+                    Icon(
+                        modifier = Modifier.background(ElementTheme.colors.iconSecondary, CircleShape),
+                        imageVector = CompoundIcons.Close(),
+                        contentDescription = stringResource(CommonStrings.action_clear),
+                        tint = ElementTheme.colors.iconOnSolidPrimary,
+                    )
+                } else {
+                    Icon(
+                        imageVector = CompoundIcons.Search(),
+                        contentDescription = null,
+                        tint = ElementTheme.colors.iconTertiary,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun SearchFieldContainer(
+    isFocused: Boolean,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+    Surface(
+        modifier = modifier,
+        shape = RoundedCornerShape(99.dp),
+        border = BorderStroke(
+            width = 1.dp,
+            color = if (isFocused) {
+                ElementTheme.colors.borderInteractiveHovered
+            } else {
+                ElementTheme.colors.borderInteractiveSecondary
+            }
+        ),
+        color = ElementTheme.colors.bgSubtleSecondary,
+        content = content
+    )
+}
+
+@Composable
+private fun textFieldStyle(): TextStyle {
+    return ElementTheme.typography.fontBodyLgRegular.copy(
+        color = ElementTheme.colors.textPrimary
+    )
+}
+
+@Preview(group = PreviewGroup.Search, heightDp = 1000)
+@Composable
+internal fun SearchFieldsLightPreview() = ElementPreviewLight { ContentToPreview() }
+
+@Preview(group = PreviewGroup.Search, heightDp = 1000)
+@Composable
+internal fun SearchFieldsDarkPreview() = ElementPreviewDark { ContentToPreview() }
+
+@Composable
+@ExcludeFromCoverage
+private fun ContentToPreview() {
+    Column(
+        modifier = Modifier.padding(8.dp),
+        verticalArrangement = spacedBy(8.dp)
+    ) {
+        SearchField(
+            onValueChange = {},
+            placeholder = "Search",
+            value = "",
+        )
+        SearchField(
+            onValueChange = {},
+            placeholder = "Search",
+            value = "Search term",
+        )
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SegmentedButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SegmentedButton.kt
index 914c29a905..7fd195bd49 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SegmentedButton.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SegmentedButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt
index 91a4870f37..7b6e6f3062 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Snackbar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Snackbar.kt
index 7a6e8f2b91..8c246a6593 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Snackbar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Snackbar.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Surface.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Surface.kt
index 86a92eca99..134435f76c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Surface.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Surface.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Switch.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Switch.kt
index 2694634878..f4bbdcec72 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Switch.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Switch.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
index 1270e62e5d..e7f2a666f4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Text.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d51e9745c2..5e0a81ba03 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TopAppBar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TopAppBar.kt
index 3087f8f5f0..d6c876d243 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TopAppBar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TopAppBar.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/DatePickerPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/DatePickerPreview.kt
index dbfb0b29a6..b5dfe42587 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/DatePickerPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/DatePickerPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt
index 6ae35532ea..f0bc0efbbf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/MenuPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/TimePickerPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/TimePickerPreview.kt
index 57ecb9c967..f4562f1058 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/TimePickerPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/previews/TimePickerPreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/AnnotatedString.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/AnnotatedString.kt
index 5002ab3c70..977262e341 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/AnnotatedString.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/AnnotatedString.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/BooleanProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/BooleanProvider.kt
index b64dbd4667..c50e20dd66 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/BooleanProvider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/BooleanProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/CommonDrawables.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/CommonDrawables.kt
index 5e533d3631..5a95f91378 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/CommonDrawables.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/CommonDrawables.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt
new file mode 100644
index 0000000000..ce5a43a7a3
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.utils
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.runtime.Composable
+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.setValue
+import androidx.compose.ui.platform.LocalInspectionMode
+import kotlinx.coroutines.delay
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Displays the content of [block] after a delay of [duration].
+ */
+@Composable
+fun DelayedVisibility(
+    duration: Duration = 300.milliseconds,
+    block: @Composable () -> Unit,
+) {
+    // Technically this shouldn't be needed because `LocalInspectionMode` won't change, but let's make the linter happy
+    val movableBlock = remember { movableContentOf { block() } }
+    if (LocalInspectionMode.current) {
+        // Just allow the contents to be displayed in the previews/screenshot tests
+        movableBlock()
+    } else {
+        var shouldDisplay by remember { mutableStateOf(false) }
+        LaunchedEffect(Unit) {
+            delay(duration)
+            shouldDisplay = true
+        }
+        AnimatedVisibility(shouldDisplay) {
+            movableBlock()
+        }
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DrawScope.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DrawScope.kt
index 4db7082720..ea6d6539da 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DrawScope.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DrawScope.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Extensions.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Extensions.kt
index 27defe4bcd..b6b84f4190 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Extensions.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Extensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceMaxBrightness.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceMaxBrightness.kt
new file mode 100644
index 0000000000..b0c9e8cea7
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceMaxBrightness.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.designsystem.utils
+
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import io.element.android.libraries.androidutils.system.setFullBrightness
+
+@Composable
+fun ForceMaxBrightness() {
+    val activity = LocalActivity.current ?: return
+    DisposableEffect(Unit) {
+        activity.setFullBrightness(true)
+        onDispose {
+            activity.setFullBrightness(false)
+        }
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientation.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientation.kt
index 37e6e1c93e..fb07ee1219 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientation.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientationInMobileDevices.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientationInMobileDevices.kt
index 72de702a66..1445c38d4c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientationInMobileDevices.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/ForceOrientationInMobileDevices.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/HideKeyboardWhenDisposed.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/HideKeyboardWhenDisposed.kt
index 1ac7906914..1c9213e71c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/HideKeyboardWhenDisposed.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/HideKeyboardWhenDisposed.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/KeepScreenOn.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/KeepScreenOn.kt
index bd49bb696b..689154eab0 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/KeepScreenOn.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/KeepScreenOn.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LazyListState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LazyListState.kt
index c20cb5077f..f252c69b8f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LazyListState.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LazyListState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LocalUiTestMode.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LocalUiTestMode.kt
index 5c1288f0e7..6ea781dc03 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LocalUiTestMode.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LocalUiTestMode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt
index 2e4d0018c8..1ad235d068 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OpenUrlInTabView.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OpenUrlInTabView.kt
index 9770c6849d..5ea182d0d6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OpenUrlInTabView.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OpenUrlInTabView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowInsetsExtension.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowInsetsExtension.kt
index a3a471875b..f7d2635cb3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowInsetsExtension.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowInsetsExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 52fe5979e6..56bb070228 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt
index ea41d3f4d7..a4cab70ccd 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt
index fb9be76f98..18b1fb650c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarMessage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/main/res/drawable/ic_winner.xml b/libraries/designsystem/src/main/res/drawable/ic_winner.xml
index 33587d1849..6393f878ff 100644
--- a/libraries/designsystem/src/main/res/drawable/ic_winner.xml
+++ b/libraries/designsystem/src/main/res/drawable/ic_winner.xml
@@ -1,7 +1,8 @@
 <!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2024 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt
index 4c2ca668b7..cbfe74b752 100644
--- a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt
+++ b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/component/async/AsyncIndicatorTest.kt b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/component/async/AsyncIndicatorTest.kt
index 993ece6d1c..d53b28d85e 100644
--- a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/component/async/AsyncIndicatorTest.kt
+++ b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/component/async/AsyncIndicatorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataTest.kt b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataTest.kt
index 01395eb9f1..8b76b29bad 100644
--- a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataTest.kt
+++ b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 90b25b751a..91c32b1da0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/build.gradle.kts b/libraries/di/build.gradle.kts
index 1b2b04d880..2444392064 100644
--- a/libraries/di/build.gradle.kts
+++ b/libraries/di/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/BaseDirectory.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/BaseDirectory.kt
index bc07597456..37c4bbcb70 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/BaseDirectory.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/BaseDirectory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/CacheDirectory.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/CacheDirectory.kt
index e17f38562a..9664a40227 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/CacheDirectory.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/CacheDirectory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/DependencyInjectionGraphOwner.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DependencyInjectionGraphOwner.kt
index f1466d924f..21482bd54d 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/DependencyInjectionGraphOwner.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/DependencyInjectionGraphOwner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt
index 7bdf55a344..8ca1f4ba83 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/RoomScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt
index 714b829270..5952b18bb6 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/SessionScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/AppCoroutineScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/AppCoroutineScope.kt
index 9ebf83583e..5838bba331 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/AppCoroutineScope.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/AppCoroutineScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/ApplicationContext.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/ApplicationContext.kt
index ad70c53bce..d823ac7ba9 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/ApplicationContext.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/ApplicationContext.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/RoomCoroutineScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/RoomCoroutineScope.kt
new file mode 100644
index 0000000000..96ef331bde
--- /dev/null
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/RoomCoroutineScope.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.di.annotations
+
+import dev.zacsweers.metro.Qualifier
+
+/**
+ * Qualifies a [CoroutineScope] object which represents the base coroutine scope to use for an active room.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+@Qualifier
+annotation class RoomCoroutineScope
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/SessionCoroutineScope.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/SessionCoroutineScope.kt
index 473eaaf90c..e93b238977 100644
--- a/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/SessionCoroutineScope.kt
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/annotations/SessionCoroutineScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/identifiers/SentryDsn.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/identifiers/SentryDsn.kt
new file mode 100644
index 0000000000..264af2e6e1
--- /dev/null
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/identifiers/SentryDsn.kt
@@ -0,0 +1,11 @@
+/*
+ * 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.di.identifiers
+
+@JvmInline
+value class SentryDsn(val value: String)
diff --git a/libraries/di/src/main/kotlin/io/element/android/libraries/di/identifiers/SentrySdkDsn.kt b/libraries/di/src/main/kotlin/io/element/android/libraries/di/identifiers/SentrySdkDsn.kt
new file mode 100644
index 0000000000..f1ebe2e5c2
--- /dev/null
+++ b/libraries/di/src/main/kotlin/io/element/android/libraries/di/identifiers/SentrySdkDsn.kt
@@ -0,0 +1,11 @@
+/*
+ * 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.di.identifiers
+
+@JvmInline
+value class SentrySdkDsn(val value: String)
diff --git a/libraries/encrypted-db/build.gradle.kts b/libraries/encrypted-db/build.gradle.kts
index ea53646cfc..a2150945a5 100644
--- a/libraries/encrypted-db/build.gradle.kts
+++ b/libraries/encrypted-db/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 172e4b5285..e4ac1a949f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt
index 9e9f6e1b2f..ee6b381e08 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileInputStream.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileInputStream.kt
index 8ef15f3be5..391440293f 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileInputStream.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileInputStream.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileOutputStream.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileOutputStream.kt
index 539ca0f490..6d0d19a631 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileOutputStream.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFileOutputStream.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/PassphraseProvider.kt
index ffa58552b8..a72dc73596 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/PassphraseProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/RandomSecretPassphraseProvider.kt
index 601dce508a..fe78a4a8da 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/RandomSecretPassphraseProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/api/build.gradle.kts b/libraries/eventformatter/api/build.gradle.kts
index 2a58bcd1ec..6e97cf5054 100644
--- a/libraries/eventformatter/api/build.gradle.kts
+++ b/libraries/eventformatter/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/PinnedMessagesBannerFormatter.kt b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/PinnedMessagesBannerFormatter.kt
index 02060feaef..67994f18b9 100644
--- a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/PinnedMessagesBannerFormatter.kt
+++ b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/PinnedMessagesBannerFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLastMessageFormatter.kt b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLastMessageFormatter.kt
deleted file mode 100644
index 7fd6d8c2f3..0000000000
--- a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLastMessageFormatter.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.eventformatter.api
-
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
-
-fun interface RoomLastMessageFormatter {
-    fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence?
-}
diff --git a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
new file mode 100644
index 0000000000..abb5cc929d
--- /dev/null
+++ b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/RoomLatestEventFormatter.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.eventformatter.api
+
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
+
+interface RoomLatestEventFormatter {
+    fun format(latestEvent: LatestEventValue.Local, isDmRoom: Boolean): CharSequence?
+    fun format(latestEvent: LatestEventValue.Remote, isDmRoom: Boolean): CharSequence?
+}
diff --git a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/TimelineEventFormatter.kt b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/TimelineEventFormatter.kt
index 71920f3c4e..be601fb82a 100644
--- a/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/TimelineEventFormatter.kt
+++ b/libraries/eventformatter/api/src/main/kotlin/io/element/android/libraries/eventformatter/api/TimelineEventFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/impl/build.gradle.kts b/libraries/eventformatter/impl/build.gradle.kts
index 3b726da654..939344d4f8 100644
--- a/libraries/eventformatter/impl/build.gradle.kts
+++ b/libraries/eventformatter/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c172377ff5..7878245aca 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.eventformatter.impl
 import androidx.annotation.StringRes
 import androidx.compose.ui.text.AnnotatedString
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.eventformatter.api.PinnedMessagesBannerFormatter
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
@@ -38,7 +38,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultPinnedMessagesBannerFormatter(
     private val sp: StringProvider,
     private val permalinkParser: PermalinkParser,
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
similarity index 82%
rename from libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
rename to libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
index 8354052a24..7e1ffc3ee6 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
@@ -1,22 +1,24 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.eventformatter.impl.mode.RenderingMode
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 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.EmoteMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
+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
@@ -45,23 +47,48 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 @ContributesBinding(SessionScope::class)
-@Inject
-class DefaultRoomLastMessageFormatter(
+class DefaultRoomLatestEventFormatter(
     private val sp: StringProvider,
     private val roomMembershipContentFormatter: RoomMembershipContentFormatter,
     private val profileChangeContentFormatter: ProfileChangeContentFormatter,
     private val stateContentFormatter: StateContentFormatter,
-    private val permalinkParser: PermalinkParser
-) : RoomLastMessageFormatter {
+    private val permalinkParser: PermalinkParser,
+) : RoomLatestEventFormatter {
     companion object {
         // Max characters to display in the last message. This works around https://github.com/element-hq/element-x-android/issues/2105
         private const val MAX_SAFE_LENGTH = 500
     }
 
-    override fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence? {
-        val isOutgoing = event.isOwn
-        val senderDisambiguatedDisplayName = event.senderProfile.getDisambiguatedDisplayName(event.sender)
-        return when (val content = event.content) {
+    override fun format(
+        latestEvent: LatestEventValue.Local,
+        isDmRoom: Boolean,
+    ): CharSequence? = formatContent(
+        content = latestEvent.content,
+        isDmRoom = isDmRoom,
+        isOutgoing = true,
+        senderId = latestEvent.senderId,
+        senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
+    )
+
+    override fun format(
+        latestEvent: LatestEventValue.Remote,
+        isDmRoom: Boolean,
+    ): CharSequence? = formatContent(
+        content = latestEvent.content,
+        isDmRoom = isDmRoom,
+        isOutgoing = latestEvent.isOwn,
+        senderId = latestEvent.senderId,
+        senderDisambiguatedDisplayName = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId)
+    )
+
+    private fun formatContent(
+        content: EventContent,
+        isDmRoom: Boolean,
+        isOutgoing: Boolean,
+        senderId: UserId,
+        senderDisambiguatedDisplayName: String
+    ): CharSequence? {
+        return when (content) {
             is MessageContent -> content.process(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             RedactedContent -> {
                 val message = sp.getString(CommonStrings.common_message_removed)
@@ -79,7 +106,7 @@ class DefaultRoomLastMessageFormatter(
                 roomMembershipContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing)
             }
             is ProfileChangeContent -> {
-                profileChangeContentFormatter.format(content, event.sender, senderDisambiguatedDisplayName, isOutgoing)
+                profileChangeContentFormatter.format(content, senderId, senderDisambiguatedDisplayName, isOutgoing)
             }
             is StateContent -> {
                 stateContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing, RenderingMode.RoomList)
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultTimelineEventFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultTimelineEventFormatter.kt
index 6cbe734733..9657f87bd0 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultTimelineEventFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultTimelineEventFormatter.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.eventformatter.api.TimelineEventFormatter
@@ -34,7 +34,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultTimelineEventFormatter(
     private val sp: StringProvider,
     private val buildMeta: BuildMeta,
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 c3ccd98d84..51fdccf256 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/ProfileChangeContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/ProfileChangeContentFormatter.kt
index 4bf73325af..aa08fb9d8c 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/ProfileChangeContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/ProfileChangeContentFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
index 7fb68ac167..9434d7e4d0 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6c6302f38b..f9d38fd8a7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -153,7 +154,7 @@ class StateContentFormatter(
                     "RoomHistoryVisibility"
                 }
             }
-            OtherState.RoomJoinRules -> when (renderingMode) {
+            is OtherState.RoomJoinRules -> when (renderingMode) {
                 RenderingMode.RoomList -> {
                     Timber.v("Filtering timeline item for room state change: $content")
                     null
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/mode/RenderingMode.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/mode/RenderingMode.kt
index 22c2ce5d96..22bde7db1c 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/mode/RenderingMode.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/mode/RenderingMode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/impl/src/main/res/values-hr/translations.xml b/libraries/eventformatter/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..50ca735d50
--- /dev/null
+++ b/libraries/eventformatter/impl/src/main/res/values-hr/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">"(promijenjen je i avatar)"</string>
+  <string name="state_event_avatar_url_changed">"%1$s promijenio/la je svoj avatar"</string>
+  <string name="state_event_avatar_url_changed_by_you">"Promijenili ste svoj avatar"</string>
+  <string name="state_event_demoted_to_member">"%1$s degradiran/a je u člana"</string>
+  <string name="state_event_demoted_to_moderator">"%1$s degradiran/a je u moderatora"</string>
+  <string name="state_event_display_name_changed_from">"%1$s promijenio/la je svoje ime za prikaz s %2$s na %3$s"</string>
+  <string name="state_event_display_name_changed_from_by_you">"Promijenili ste svoje ime za prikaz s %1$s na %2$s"</string>
+  <string name="state_event_display_name_removed">"%1$s uklonio/la je svoje ime za prikaz (bilo je %2$s)"</string>
+  <string name="state_event_display_name_removed_by_you">"Uklonili ste svoje ime za prikaz (bilo je %1$s)"</string>
+  <string name="state_event_display_name_set">"%1$s postavio/la je svoje ime za prikaz na %2$s"</string>
+  <string name="state_event_display_name_set_by_you">"Postavili ste svoje ime za prikaz na %1$s"</string>
+  <string name="state_event_promoted_to_administrator">"%1$s promaknut/a je u administratora"</string>
+  <string name="state_event_promoted_to_moderator">"%1$s promaknut/a je u moderatora"</string>
+  <string name="state_event_room_avatar_changed">"%1$s promijenio/la je avatar sobe"</string>
+  <string name="state_event_room_avatar_changed_by_you">"Promijenili ste avatar sobe"</string>
+  <string name="state_event_room_avatar_removed">"%1$s uklonio/la je avatar sobe"</string>
+  <string name="state_event_room_avatar_removed_by_you">"Uklonili ste avatar sobe"</string>
+  <string name="state_event_room_ban">"%1$s zabranio/la je pristup za %2$s"</string>
+  <string name="state_event_room_ban_by_you">"Zabranili ste pristup korisniku %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Zabranili ste pristup korisniku %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s zabranio/la je pristup korisniku %2$s: %3$s"</string>
+  <string name="state_event_room_created">"%1$s stvorio/la je sobu"</string>
+  <string name="state_event_room_created_by_you">"Stvorili ste sobu"</string>
+  <string name="state_event_room_invite">"%1$s je pozvao/la %2$s"</string>
+  <string name="state_event_room_invite_accepted">"%1$s prihvatio/la je poziv"</string>
+  <string name="state_event_room_invite_accepted_by_you">"Prihvatili ste poziv"</string>
+  <string name="state_event_room_invite_by_you">"Pozvali ste %1$s"</string>
+  <string name="state_event_room_invite_you">"%1$s vas je pozvao/la"</string>
+  <string name="state_event_room_join">"%1$s pridružio/la se sobi"</string>
+  <string name="state_event_room_join_by_you">"Pridružili ste se sobi"</string>
+  <string name="state_event_room_knock">"%1$s zatražio/la je pridruživanje sobi"</string>
+  <string name="state_event_room_knock_accepted">"Korisniku %1$s odobren je pristup sobi %2$s"</string>
+  <string name="state_event_room_knock_accepted_by_you">"Dopustili ste korisniku %1$s da se pridruži"</string>
+  <string name="state_event_room_knock_by_you">"Zatražili ste pridruživanje sobi"</string>
+  <string name="state_event_room_knock_denied">"%1$s odbio/la je zahtjev za pridruživanje korisnika %2$s"</string>
+  <string name="state_event_room_knock_denied_by_you">"Odbili ste zahtjev za pridruživanje korisnika %1$s"</string>
+  <string name="state_event_room_knock_denied_you">"%1$s odbio/la je vaš zahtjev za pridruživanje"</string>
+  <string name="state_event_room_knock_retracted">"Korisnik %1$s više nije zainteresiran za pridruživanje"</string>
+  <string name="state_event_room_knock_retracted_by_you">"Otkazali ste zahtjev za pridruživanje"</string>
+  <string name="state_event_room_leave">"%1$s napustio/la je sobu"</string>
+  <string name="state_event_room_leave_by_you">"Napustili ste sobu"</string>
+  <string name="state_event_room_name_changed">"%1$s promijenio/la je naziv sobe u: %2$s"</string>
+  <string name="state_event_room_name_changed_by_you">"Promijenili ste naziv sobe u: %1$s"</string>
+  <string name="state_event_room_name_removed">"%1$s uklonio/la je naziv sobe"</string>
+  <string name="state_event_room_name_removed_by_you">"Uklonili ste naziv sobe"</string>
+  <string name="state_event_room_none">"%1$s nije izvršio/la nikakve promjene"</string>
+  <string name="state_event_room_none_by_you">"Niste izvršili nikakve promjene"</string>
+  <string name="state_event_room_pinned_events_changed">"%1$s promijenio/la je prikvačene poruke"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"Promijenili ste prikvačene poruke"</string>
+  <string name="state_event_room_pinned_events_pinned">"%1$s prikvačio/la je poruku"</string>
+  <string name="state_event_room_pinned_events_pinned_by_you">"Prikvačili ste poruku"</string>
+  <string name="state_event_room_pinned_events_unpinned">"%1$s otkvačio/la je poruku"</string>
+  <string name="state_event_room_pinned_events_unpinned_by_you">"Otkvačili ste poruku"</string>
+  <string name="state_event_room_reject">"%1$s odbio/la je poziv"</string>
+  <string name="state_event_room_reject_by_you">"Odbili ste poziv"</string>
+  <string name="state_event_room_remove">"%1$s uklonio/la je %2$s"</string>
+  <string name="state_event_room_remove_by_you">"Uklonili ste %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Uklonili ste korisnika %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s uklonio/la je korisnika %2$s: %3$s"</string>
+  <string name="state_event_room_third_party_invite">"%1$s poslao/la je pozivnicu za pridruživanje sobi korisniku %2$s"</string>
+  <string name="state_event_room_third_party_invite_by_you">"Poslali ste pozivnicu za pridruživanje sobi korisniku %1$s"</string>
+  <string name="state_event_room_third_party_revoked_invite">"%1$s povukao/la je poziv za pridruživanje sobi korisniku %2$s"</string>
+  <string name="state_event_room_third_party_revoked_invite_by_you">"Povukli ste poziv za pridruživanje sobi korisniku %1$s"</string>
+  <string name="state_event_room_topic_changed">"%1$s promijenio/la je temu na: %2$s"</string>
+  <string name="state_event_room_topic_changed_by_you">"Promijenili ste temu na: %1$s"</string>
+  <string name="state_event_room_topic_removed">"%1$s uklonio/la je temu sobe"</string>
+  <string name="state_event_room_topic_removed_by_you">"Uklonili ste temu sobe"</string>
+  <string name="state_event_room_unban">"%1$s uklonio/la je zabranu pristupa za %2$sban"</string>
+  <string name="state_event_room_unban_by_you">"Uklonili ste zabranu pristupa za %1$s"</string>
+  <string name="state_event_room_unknown_membership_change">"%1$s napravio/la je nepoznatu promjenu u svom članstvu"</string>
+</resources>
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 d0f4a39773..b551539feb 100644
--- a/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
@@ -30,7 +30,7 @@
   <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">"%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>
diff --git a/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml b/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml
index 88a8186fec..11835dc605 100644
--- a/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-uz/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Siz xonani avatarini o\'chirib tashladingiz"</string>
   <string name="state_event_room_ban">"%1$staqiqlangan%2$s"</string>
   <string name="state_event_room_ban_by_you">"Siz taqiqlangansiz%1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Siz %1$s: %2$sni blokladingiz"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s %2$s:%3$sni blokladi"</string>
   <string name="state_event_room_created">"%1$sxonani yaratdi"</string>
   <string name="state_event_room_created_by_you">"Siz xonani yaratdingiz"</string>
   <string name="state_event_room_invite">"%1$staklif qilingan%2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Siz taklifni rad etdingiz"</string>
   <string name="state_event_room_remove">"%1$s o\'chirildi %2$s"</string>
   <string name="state_event_room_remove_by_you">"Siz o\'chirildingiz %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Siz olib tashladingiz %1$s :%2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s %2$s:%3$sni olib tashladi"</string>
   <string name="state_event_room_third_party_invite">"%1$s taklifnoma yubordi %2$sga xonaga qo\'shilish uchun"</string>
   <string name="state_event_room_third_party_invite_by_you">"Siz taklifnoma yubordingiz %1$s ga xonaga qo\'shilishi uchun"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s taklifni %2$s ga xonaga qo\'shilish uchun bekor qildi"</string>
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 442357f386..b58bbb4b25 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -43,7 +44,7 @@ import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.matrix.test.timeline.aPollContent
 import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageContent
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+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.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
@@ -102,7 +103,11 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Unable to decrypt content`() {
         val expected = "Waiting for this message"
         val senderName = "Someone"
-        val message = createRoomEvent(false, senderName, UnableToDecryptContent(UnableToDecryptContent.Data.Unknown))
+        val message = createRoomEvent(
+            sentByYou = false,
+            senderDisplayName = senderName,
+            content = UnableToDecryptContent(data = UnableToDecryptContent.Data.Unknown, threadInfo = null)
+        )
         val result = formatter.format(message)
         assertThat(result).isEqualTo(expected)
     }
@@ -600,7 +605,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
             OtherState.RoomCanonicalAlias,
             OtherState.RoomGuestAccess,
             OtherState.RoomHistoryVisibility,
-            OtherState.RoomJoinRules,
+            OtherState.RoomJoinRules(null),
             OtherState.RoomPinnedEvents(OtherState.RoomPinnedEvents.Change.CHANGED),
             OtherState.RoomUserPowerLevels(emptyMap()),
             OtherState.RoomServerAcl,
@@ -777,7 +782,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
         content: EventContent,
     ): EventTimelineItem {
         val sender = if (sentByYou) A_USER_ID else someoneElseId
-        val profile = aProfileTimelineDetails(senderDisplayName)
+        val profile = aProfileDetails(senderDisplayName)
         return anEventTimelineItem(
             content = content,
             senderProfile = profile,
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
similarity index 79%
rename from libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
rename to libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
index 8fb4ac0bf4..0da3134098 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,10 +15,10 @@ import com.google.common.truth.Truth.assertWithMessage
 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.roomlist.LatestEventValue
 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.EventContent
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 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
@@ -42,11 +43,11 @@ 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.media.aMediaSource
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
+import io.element.android.libraries.matrix.test.room.aRemoteLatestEvent
 import io.element.android.libraries.matrix.test.timeline.aPollContent
 import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageContent
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+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.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import org.junit.Before
@@ -58,17 +59,17 @@ import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
 @RunWith(RobolectricTestRunner::class)
-class DefaultBaseRoomLastMessageFormatterTest {
+class DefaultRoomLatestEventFormatterTest {
     private lateinit var context: Context
     private lateinit var fakeMatrixClient: FakeMatrixClient
-    private lateinit var formatter: DefaultRoomLastMessageFormatter
+    private lateinit var formatter: DefaultRoomLatestEventFormatter
 
     @Before
     fun setup() {
         context = RuntimeEnvironment.getApplication() as Context
         fakeMatrixClient = FakeMatrixClient()
         val stringProvider = AndroidStringProvider(context.resources)
-        formatter = DefaultRoomLastMessageFormatter(
+        formatter = DefaultRoomLatestEventFormatter(
             sp = AndroidStringProvider(context.resources),
             roomMembershipContentFormatter = RoomMembershipContentFormatter(fakeMatrixClient, stringProvider),
             profileChangeContentFormatter = ProfileChangeContentFormatter(stringProvider),
@@ -83,7 +84,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val expected = "Message removed"
         val senderName = "Someone"
         sequenceOf(false, true).forEach { isDm ->
-            val message = createRoomEvent(false, senderName, RedactedContent)
+            val message = createLatestEvent(false, senderName, RedactedContent)
             val result = formatter.format(message, isDm)
             if (isDm) {
                 assertThat(result).isEqualTo(expected)
@@ -99,7 +100,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
     fun `Sticker content`() {
         val body = "a sticker body"
         val info = ImageInfo(null, null, null, null, null, null, null)
-        val message = createRoomEvent(false, null, aStickerContent(body, info, aMediaSource(url = "url")))
+        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)"
         assertThat(result.toString()).isEqualTo(expectedBody)
@@ -111,7 +112,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val expected = "Waiting for this message"
         val senderName = "Someone"
         sequenceOf(false, true).forEach { isDm ->
-            val message = createRoomEvent(false, senderName, UnableToDecryptContent(UnableToDecryptContent.Data.Unknown))
+            val message = createLatestEvent(
+                sentByYou = false,
+                senderDisplayName = senderName,
+                content = UnableToDecryptContent(data = UnableToDecryptContent.Data.Unknown, threadInfo = null),
+            )
             val result = formatter.format(message, isDm)
             if (isDm) {
                 assertThat(result).isEqualTo(expected)
@@ -133,7 +138,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
                 FailedToParseStateContent("", "", ""),
                 UnknownContent,
             ).forEach { type ->
-                val message = createRoomEvent(false, senderName, type)
+                val message = createLatestEvent(false, senderName, type)
                 val result = formatter.format(message, isDm)
                 if (isDm) {
                     assertWithMessage("$type was not properly handled").that(result).isEqualTo(expected)
@@ -197,7 +202,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
         sequenceOf(false, true).forEach { isDm ->
             sharedContentMessagesTypes.forEach { type ->
                 val content = createMessageContent(type)
-                val message = createRoomEvent(sentByYou = sentByYou, senderDisplayName = senderName, content = content)
+                val message = createLatestEvent(sentByYou = sentByYou, senderDisplayName = senderName, content = content)
                 val result = formatter.format(message, isDmRoom = isDm)
                 if (isDm) {
                     resultsInDm.add(type to result)
@@ -293,11 +298,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.JOINED)
 
-        val youJoinedRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youJoinedRoomEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youJoinedRoom = formatter.format(youJoinedRoomEvent, false)
         assertThat(youJoinedRoom).isEqualTo("You joined the room")
 
-        val someoneJoinedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneJoinedRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneJoinedRoom = formatter.format(someoneJoinedRoomEvent, false)
         assertThat(someoneJoinedRoom).isEqualTo("$otherName joined the room")
     }
@@ -309,11 +314,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.LEFT)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.LEFT)
 
-        val youLeftRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youLeftRoomEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youLeftRoom = formatter.format(youLeftRoomEvent, false)
         assertThat(youLeftRoom).isEqualTo("You left the room")
 
-        val someoneLeftRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneLeftRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneLeftRoom = formatter.format(someoneLeftRoomEvent, false)
         assertThat(someoneLeftRoom).isEqualTo("$otherName left the room")
     }
@@ -328,19 +333,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
         val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
 
-        val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youBanned = formatter.format(youBannedEvent, false)
         assertThat(youBanned).isEqualTo("You banned $third")
 
-        val youKickBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
+        val youKickBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
         val youKickedBanned = formatter.format(youKickBannedEvent, false)
         assertThat(youKickedBanned).isEqualTo("You banned $third")
 
-        val someoneBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneBanned = formatter.format(someoneBannedEvent, false)
         assertThat(someoneBanned).isEqualTo("$otherName banned $third")
 
-        val someoneKickBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
+        val someoneKickBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
         val someoneKickBanned = formatter.format(someoneKickBannedEvent, false)
         assertThat(someoneKickBanned).isEqualTo("$otherName banned $third")
     }
@@ -355,19 +360,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED, A_REASON)
         val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED, A_REASON)
 
-        val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youBanned = formatter.format(youBannedEvent, false)
         assertThat(youBanned).isEqualTo("You banned $third: $A_REASON")
 
-        val youKickBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
+        val youKickBannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
         val youKickedBanned = formatter.format(youKickBannedEvent, false)
         assertThat(youKickedBanned).isEqualTo("You banned $third: $A_REASON")
 
-        val someoneBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneBanned = formatter.format(someoneBannedEvent, false)
         assertThat(someoneBanned).isEqualTo("$otherName banned $third: $A_REASON")
 
-        val someoneKickBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
+        val someoneKickBannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
         val someoneKickBanned = formatter.format(someoneKickBannedEvent, false)
         assertThat(someoneKickBanned).isEqualTo("$otherName banned $third: $A_REASON")
     }
@@ -380,11 +385,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
 
-        val youUnbannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youUnbannedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youUnbanned = formatter.format(youUnbannedEvent, false)
         assertThat(youUnbanned).isEqualTo("You unbanned $third")
 
-        val someoneUnbannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneUnbannedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneUnbanned = formatter.format(someoneUnbannedEvent, false)
         assertThat(someoneUnbanned).isEqualTo("$otherName unbanned $third")
     }
@@ -397,11 +402,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
 
-        val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKickedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKicked = formatter.format(youKickedEvent, false)
         assertThat(youKicked).isEqualTo("You removed $third")
 
-        val someoneKickedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKickedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneKicked = formatter.format(someoneKickedEvent, false)
         assertThat(someoneKicked).isEqualTo("$otherName removed $third")
     }
@@ -414,11 +419,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED, A_REASON)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED, A_REASON)
 
-        val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKickedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKicked = formatter.format(youKickedEvent, false)
         assertThat(youKicked).isEqualTo("You removed $third: $A_REASON")
 
-        val someoneKickedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKickedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneKicked = formatter.format(someoneKickedEvent, false)
         assertThat(someoneKicked).isEqualTo("$otherName removed $third: $A_REASON")
     }
@@ -431,15 +436,15 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITED)
 
-        val youWereInvitedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
+        val youWereInvitedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
         val youWereInvited = formatter.format(youWereInvitedEvent, false)
         assertThat(youWereInvited).isEqualTo("$otherName invited you")
 
-        val youInvitedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youInvitedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youInvited = formatter.format(youInvitedEvent, false)
         assertThat(youInvited).isEqualTo("You invited $third")
 
-        val someoneInvitedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneInvitedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneInvited = formatter.format(someoneInvitedEvent, false)
         assertThat(someoneInvited).isEqualTo("$otherName invited $third")
     }
@@ -451,11 +456,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_ACCEPTED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_ACCEPTED)
 
-        val youAcceptedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youAcceptedInviteEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youAcceptedInvite = formatter.format(youAcceptedInviteEvent, false)
         assertThat(youAcceptedInvite).isEqualTo("You accepted the invite")
 
-        val someoneAcceptedInviteEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneAcceptedInviteEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneAcceptedInvite = formatter.format(someoneAcceptedInviteEvent, false)
         assertThat(someoneAcceptedInvite).isEqualTo("$otherName accepted the invite")
     }
@@ -467,11 +472,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_REJECTED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_REJECTED)
 
-        val youRejectedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youRejectedInviteEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRejectedInvite = formatter.format(youRejectedInviteEvent, false)
         assertThat(youRejectedInvite).isEqualTo("You rejected the invitation")
 
-        val someoneRejectedInviteEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneRejectedInviteEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneRejectedInvite = formatter.format(someoneRejectedInviteEvent, false)
         assertThat(someoneRejectedInvite).isEqualTo("$otherName rejected the invitation")
     }
@@ -483,11 +488,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val third = "Someone"
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITATION_REVOKED)
 
-        val youRevokedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youRevokedInviteEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youRevokedInvite = formatter.format(youRevokedInviteEvent, false)
         assertThat(youRevokedInvite).isEqualTo("You revoked the invitation for $third to join the room")
 
-        val someoneRevokedInviteEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneRevokedInviteEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneRevokedInvite = formatter.format(someoneRevokedInviteEvent, false)
         assertThat(someoneRevokedInvite).isEqualTo("$otherName revoked the invitation for $third to join the room")
     }
@@ -499,11 +504,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCKED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.KNOCKED)
 
-        val youKnockedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKnockedEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKnocked = formatter.format(youKnockedEvent, false)
         assertThat(youKnocked).isEqualTo("You requested to join")
 
-        val someoneKnockedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKnockedEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneKnocked = formatter.format(someoneKnockedEvent, false)
         assertThat(someoneKnocked).isEqualTo("$otherName is requesting to join")
     }
@@ -515,11 +520,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val third = "Someone"
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_ACCEPTED)
 
-        val youAcceptedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youAcceptedKnockEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youAcceptedKnock = formatter.format(youAcceptedKnockEvent, false)
         assertThat(youAcceptedKnock).isEqualTo("You allowed $third to join")
 
-        val someoneAcceptedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneAcceptedKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneAcceptedKnock = formatter.format(someoneAcceptedKnockEvent, false)
         assertThat(someoneAcceptedKnock).isEqualTo("$otherName granted access to $third")
     }
@@ -531,11 +536,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCK_RETRACTED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), null, MembershipChange.KNOCK_RETRACTED)
 
-        val youRetractedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youRetractedKnockEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRetractedKnock = formatter.format(youRetractedKnockEvent, false)
         assertThat(youRetractedKnock).isEqualTo("You cancelled your request to join")
 
-        val someoneRetractedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneRetractedKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneRetractedKnock = formatter.format(someoneRetractedKnockEvent, false)
         assertThat(someoneRetractedKnock).isEqualTo("$otherName is no longer interested in joining")
     }
@@ -548,15 +553,15 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, third, MembershipChange.KNOCK_DENIED)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_DENIED)
 
-        val youDeniedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
+        val youDeniedKnockEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youDeniedKnock = formatter.format(youDeniedKnockEvent, false)
         assertThat(youDeniedKnock).isEqualTo("You rejected $third's request to join")
 
-        val someoneDeniedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneDeniedKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneDeniedKnock = formatter.format(someoneDeniedKnockEvent, false)
         assertThat(someoneDeniedKnock).isEqualTo("$otherName rejected $third's request to join")
 
-        val someoneDeniedYourKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
+        val someoneDeniedYourKnockEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
         val someoneDeniedYourKnock = formatter.format(someoneDeniedYourKnockEvent, false)
         assertThat(someoneDeniedYourKnock).isEqualTo("$otherName rejected your request to join")
     }
@@ -568,11 +573,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.NONE)
         val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.NONE)
 
-        val youNoneRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youNoneRoomEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youNoneRoom = formatter.format(youNoneRoomEvent, false)
         assertThat(youNoneRoom).isEqualTo("You made no changes")
 
-        val someoneNoneRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneNoneRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
         val someoneNoneRoom = formatter.format(someoneNoneRoomEvent, false)
         assertThat(someoneNoneRoom).isEqualTo("$otherName made no changes")
     }
@@ -584,7 +589,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
 
         val results = otherChanges.map { change ->
             val content = aRoomMembershipContent(A_USER_ID, null, change)
-            val event = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
+            val event = createLatestEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
             val result = formatter.format(event, false)
             change to result
         }
@@ -603,19 +608,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val changedContent = StateContent("", OtherState.RoomAvatar("new_avatar"))
         val removedContent = StateContent("", OtherState.RoomAvatar(null))
 
-        val youChangedRoomAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedRoomAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedRoomAvatar = formatter.format(youChangedRoomAvatarEvent, false)
         assertThat(youChangedRoomAvatar).isEqualTo("You changed the room avatar")
 
-        val someoneChangedRoomAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedRoomAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedRoomAvatar = formatter.format(someoneChangedRoomAvatarEvent, false)
         assertThat(someoneChangedRoomAvatar).isEqualTo("$otherName changed the room avatar")
 
-        val youRemovedRoomAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedRoomAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedRoomAvatar = formatter.format(youRemovedRoomAvatarEvent, false)
         assertThat(youRemovedRoomAvatar).isEqualTo("You removed the room avatar")
 
-        val someoneRemovedRoomAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedRoomAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedRoomAvatar = formatter.format(someoneRemovedRoomAvatarEvent, false)
         assertThat(someoneRemovedRoomAvatar).isEqualTo("$otherName removed the room avatar")
     }
@@ -626,11 +631,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val otherName = "Other"
         val content = StateContent("", OtherState.RoomCreate)
 
-        val youCreatedRoomMessage = createRoomEvent(sentByYou = true, senderDisplayName = null, content = content)
+        val youCreatedRoomMessage = createLatestEvent(sentByYou = true, senderDisplayName = null, content = content)
         val youCreatedRoom = formatter.format(youCreatedRoomMessage, false)
         assertThat(youCreatedRoom).isEqualTo("You created the room")
 
-        val someoneCreatedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = content)
+        val someoneCreatedRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = content)
         val someoneCreatedRoom = formatter.format(someoneCreatedRoomEvent, false)
         assertThat(someoneCreatedRoom).isEqualTo("$otherName created the room")
     }
@@ -641,11 +646,11 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val otherName = "Other"
         val content = StateContent("", OtherState.RoomEncryption)
 
-        val youCreatedRoomMessage = createRoomEvent(sentByYou = true, senderDisplayName = null, content = content)
+        val youCreatedRoomMessage = createLatestEvent(sentByYou = true, senderDisplayName = null, content = content)
         val youCreatedRoom = formatter.format(youCreatedRoomMessage, false)
         assertThat(youCreatedRoom).isEqualTo("Encryption enabled")
 
-        val someoneCreatedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = content)
+        val someoneCreatedRoomEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = content)
         val someoneCreatedRoom = formatter.format(someoneCreatedRoomEvent, false)
         assertThat(someoneCreatedRoom).isEqualTo("Encryption enabled")
     }
@@ -658,19 +663,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val changedContent = StateContent("", OtherState.RoomName(newName))
         val removedContent = StateContent("", OtherState.RoomName(null))
 
-        val youChangedRoomNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedRoomNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedRoomName = formatter.format(youChangedRoomNameEvent, false)
         assertThat(youChangedRoomName).isEqualTo("You changed the room name to: $newName")
 
-        val someoneChangedRoomNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedRoomNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedRoomName = formatter.format(someoneChangedRoomNameEvent, false)
         assertThat(someoneChangedRoomName).isEqualTo("$otherName changed the room name to: $newName")
 
-        val youRemovedRoomNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedRoomNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedRoomName = formatter.format(youRemovedRoomNameEvent, false)
         assertThat(youRemovedRoomName).isEqualTo("You removed the room name")
 
-        val someoneRemovedRoomNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedRoomNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedRoomName = formatter.format(someoneRemovedRoomNameEvent, false)
         assertThat(someoneRemovedRoomName).isEqualTo("$otherName removed the room name")
     }
@@ -683,19 +688,19 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val changedContent = StateContent("", OtherState.RoomThirdPartyInvite(inviteeName))
         val removedContent = StateContent("", OtherState.RoomThirdPartyInvite(null))
 
-        val youInvitedSomeoneEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youInvitedSomeoneEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youInvitedSomeone = formatter.format(youInvitedSomeoneEvent, false)
         assertThat(youInvitedSomeone).isEqualTo("You sent an invitation to $inviteeName to join the room")
 
-        val someoneInvitedSomeoneEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneInvitedSomeoneEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneInvitedSomeone = formatter.format(someoneInvitedSomeoneEvent, false)
         assertThat(someoneInvitedSomeone).isEqualTo("$otherName sent an invitation to $inviteeName to join the room")
 
-        val youInvitedNoOneEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youInvitedNoOneEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youInvitedNoOne = formatter.format(youInvitedNoOneEvent, false)
         assertThat(youInvitedNoOne).isNull()
 
-        val someoneInvitedNoOneEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneInvitedNoOneEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneInvitedNoOne = formatter.format(someoneInvitedNoOneEvent, false)
         assertThat(someoneInvitedNoOne).isNull()
     }
@@ -709,27 +714,27 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val removedContent = StateContent("", OtherState.RoomTopic(null))
         val blankContent = StateContent("", OtherState.RoomTopic(""))
 
-        val youChangedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedRoomTopicEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedRoomTopic = formatter.format(youChangedRoomTopicEvent, false)
         assertThat(youChangedRoomTopic).isEqualTo("You changed the topic to: $roomTopic")
 
-        val someoneChangedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedRoomTopicEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedRoomTopic = formatter.format(someoneChangedRoomTopicEvent, false)
         assertThat(someoneChangedRoomTopic).isEqualTo("$otherName changed the topic to: $roomTopic")
 
-        val youRemovedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedRoomTopicEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedRoomTopic = formatter.format(youRemovedRoomTopicEvent, false)
         assertThat(youRemovedRoomTopic).isEqualTo("You removed the room topic")
 
-        val someoneRemovedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedRoomTopicEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedRoomTopic = formatter.format(someoneRemovedRoomTopicEvent, false)
         assertThat(someoneRemovedRoomTopic).isEqualTo("$otherName removed the room topic")
 
-        val youSetBlankRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = blankContent)
+        val youSetBlankRoomTopicEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = blankContent)
         val youSetBlankRoomTopic = formatter.format(youSetBlankRoomTopicEvent, false)
         assertThat(youSetBlankRoomTopic).isEqualTo("You removed the room topic")
 
-        val someoneSetBlankRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = blankContent)
+        val someoneSetBlankRoomTopicEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = blankContent)
         val someoneSetBlankRoomTopic = formatter.format(someoneSetBlankRoomTopicEvent, false)
         assertThat(someoneSetBlankRoomTopic).isEqualTo("$otherName removed the room topic")
     }
@@ -745,7 +750,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
             OtherState.RoomCanonicalAlias,
             OtherState.RoomGuestAccess,
             OtherState.RoomHistoryVisibility,
-            OtherState.RoomJoinRules,
+            OtherState.RoomJoinRules(null),
             OtherState.RoomPinnedEvents(OtherState.RoomPinnedEvents.Change.CHANGED),
             OtherState.RoomUserPowerLevels(emptyMap()),
             OtherState.RoomServerAcl,
@@ -757,7 +762,7 @@ class DefaultBaseRoomLastMessageFormatterTest {
 
         val results = otherStates.map { state ->
             val content = StateContent("", state)
-            val event = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
+            val event = createLatestEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
             val result = formatter.format(event, false)
             state to result
         }
@@ -779,35 +784,35 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val invalidContent = aProfileChangeMessageContent(avatarUrl = null, prevAvatarUrl = null)
         val sameContent = aProfileChangeMessageContent(avatarUrl = "same_avatar_url", prevAvatarUrl = "same_avatar_url")
 
-        val youChangedAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedAvatar = formatter.format(youChangedAvatarEvent, false)
         assertThat(youChangedAvatar).isEqualTo("You changed your avatar")
 
-        val someoneChangeAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangeAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangeAvatar = formatter.format(someoneChangeAvatarEvent, false)
         assertThat(someoneChangeAvatar).isEqualTo("$otherName changed their avatar")
 
-        val youSetAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = setContent)
+        val youSetAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = setContent)
         val youSetAvatar = formatter.format(youSetAvatarEvent, false)
         assertThat(youSetAvatar).isEqualTo("You changed your avatar")
 
-        val someoneSetAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
+        val someoneSetAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
         val someoneSetAvatar = formatter.format(someoneSetAvatarEvent, false)
         assertThat(someoneSetAvatar).isEqualTo("$otherName changed their avatar")
 
-        val youRemovedAvatarEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedAvatarEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedAvatar = formatter.format(youRemovedAvatarEvent, false)
         assertThat(youRemovedAvatar).isEqualTo("You changed your avatar")
 
-        val someoneRemovedAvatarEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedAvatarEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedAvatar = formatter.format(someoneRemovedAvatarEvent, false)
         assertThat(someoneRemovedAvatar).isEqualTo("$otherName changed their avatar")
 
-        val unchangedEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
+        val unchangedEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
         val unchangedResult = formatter.format(unchangedEvent, false)
         assertThat(unchangedResult).isNull()
 
-        val invalidEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
+        val invalidEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
         val invalidResult = formatter.format(invalidEvent, false)
         assertThat(invalidResult).isNull()
     }
@@ -824,35 +829,35 @@ class DefaultBaseRoomLastMessageFormatterTest {
         val sameContent = aProfileChangeMessageContent(displayName = newDisplayName, prevDisplayName = newDisplayName)
         val invalidContent = aProfileChangeMessageContent(displayName = null, prevDisplayName = null)
 
-        val youChangedDisplayNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedDisplayNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedDisplayName = formatter.format(youChangedDisplayNameEvent, false)
         assertThat(youChangedDisplayName).isEqualTo("You changed your display name from $oldDisplayName to $newDisplayName")
 
-        val someoneChangedDisplayNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
+        val someoneChangedDisplayNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = changedContent)
         val someoneChangedDisplayName = formatter.format(someoneChangedDisplayNameEvent, false)
         assertThat(someoneChangedDisplayName).isEqualTo("$someoneElseId changed their display name from $oldDisplayName to $newDisplayName")
 
-        val youSetDisplayNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = setContent)
+        val youSetDisplayNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = setContent)
         val youSetDisplayName = formatter.format(youSetDisplayNameEvent, false)
         assertThat(youSetDisplayName).isEqualTo("You set your display name to $newDisplayName")
 
-        val someoneSetDisplayNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
+        val someoneSetDisplayNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = setContent)
         val someoneSetDisplayName = formatter.format(someoneSetDisplayNameEvent, false)
         assertThat(someoneSetDisplayName).isEqualTo("$someoneElseId set their display name to $newDisplayName")
 
-        val youRemovedDisplayNameEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
+        val youRemovedDisplayNameEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = removedContent)
         val youRemovedDisplayName = formatter.format(youRemovedDisplayNameEvent, false)
         assertThat(youRemovedDisplayName).isEqualTo("You removed your display name (it was $oldDisplayName)")
 
-        val someoneRemovedDisplayNameEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
+        val someoneRemovedDisplayNameEvent = createLatestEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
         val someoneRemovedDisplayName = formatter.format(someoneRemovedDisplayNameEvent, false)
         assertThat(someoneRemovedDisplayName).isEqualTo("$someoneElseId removed their display name (it was $oldDisplayName)")
 
-        val unchangedEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
+        val unchangedEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = sameContent)
         val unchangedResult = formatter.format(unchangedEvent, false)
         assertThat(unchangedResult).isNull()
 
-        val invalidEvent = createRoomEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
+        val invalidEvent = createLatestEvent(sentByYou = true, senderDisplayName = otherName, content = invalidContent)
         val invalidResult = formatter.format(invalidEvent, false)
         assertThat(invalidResult).isNull()
     }
@@ -881,15 +886,15 @@ class DefaultBaseRoomLastMessageFormatterTest {
             prevAvatarUrl = "same_avatar_url",
         )
 
-        val youChangedBothEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
+        val youChangedBothEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
         val youChangedBoth = formatter.format(youChangedBothEvent, false)
         assertThat(youChangedBoth).isEqualTo("You changed your display name from $oldDisplayName to $newDisplayName\n(avatar was changed too)")
 
-        val invalidContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = invalidContent)
+        val invalidContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = invalidContent)
         val invalidMessage = formatter.format(invalidContentEvent, false)
         assertThat(invalidMessage).isNull()
 
-        val sameContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = sameContent)
+        val sameContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = null, content = sameContent)
         val sameMessage = formatter.format(sameContentEvent, false)
         assertThat(sameMessage).isNull()
     }
@@ -903,10 +908,10 @@ class DefaultBaseRoomLastMessageFormatterTest {
     fun `Computes last message for poll in DM`() {
         val pollContent = aPollContent()
 
-        val mineContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
+        val mineContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
         assertThat(formatter.format(mineContentEvent, true)).isEqualTo("Poll: Do you like polls?")
 
-        val contentEvent = createRoomEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
+        val contentEvent = createLatestEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
         assertThat(formatter.format(contentEvent, true)).isEqualTo("Poll: Do you like polls?")
     }
 
@@ -915,26 +920,26 @@ class DefaultBaseRoomLastMessageFormatterTest {
     fun `Computes last message for poll in room`() {
         val pollContent = aPollContent()
 
-        val mineContentEvent = createRoomEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
+        val mineContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
         assertThat(formatter.format(mineContentEvent, false).toString()).isEqualTo("You: Poll: Do you like polls?")
 
-        val contentEvent = createRoomEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
+        val contentEvent = createLatestEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
         assertThat(formatter.format(contentEvent, false).toString()).isEqualTo("Bob: Poll: Do you like polls?")
     }
 
     // endregion
 
-    private fun createRoomEvent(
+    private fun createLatestEvent(
         sentByYou: Boolean,
         senderDisplayName: String?,
         content: EventContent,
-    ): EventTimelineItem {
+    ): LatestEventValue.Remote {
         val sender = if (sentByYou) A_USER_ID else someoneElseId
-        val profile = aProfileTimelineDetails(senderDisplayName)
-        return anEventTimelineItem(
-            content = content,
+        val profile = aProfileDetails(senderDisplayName)
+        return aRemoteLatestEvent(
+            senderId = sender,
             senderProfile = profile,
-            sender = sender,
+            content = content,
             isOwn = sentByYou,
         )
     }
diff --git a/libraries/eventformatter/test/build.gradle.kts b/libraries/eventformatter/test/build.gradle.kts
index 1d0df1e245..7a72cf0575 100644
--- a/libraries/eventformatter/test/build.gradle.kts
+++ b/libraries/eventformatter/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakePinnedMessagesBannerFormatter.kt b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakePinnedMessagesBannerFormatter.kt
index 3313976d25..19698a7630 100644
--- a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakePinnedMessagesBannerFormatter.kt
+++ b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakePinnedMessagesBannerFormatter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLastMessageFormatter.kt b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLastMessageFormatter.kt
deleted file mode 100644
index 9739b55526..0000000000
--- a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLastMessageFormatter.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.eventformatter.test
-
-import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
-
-class FakeRoomLastMessageFormatter : RoomLastMessageFormatter {
-    private var result: CharSequence? = null
-
-    override fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence? {
-        return result
-    }
-
-    fun givenFormatResult(result: CharSequence?) {
-        this.result = result
-    }
-}
diff --git a/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
new file mode 100644
index 0000000000..5e1a056a6c
--- /dev/null
+++ b/libraries/eventformatter/test/src/main/kotlin/io/element/android/libraries/eventformatter/test/FakeRoomLatestEventFormatter.kt
@@ -0,0 +1,28 @@
+/*
+ * 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.eventformatter.test
+
+import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
+
+class FakeRoomLatestEventFormatter : RoomLatestEventFormatter {
+    private var result: CharSequence? = null
+
+    override fun format(latestEvent: LatestEventValue.Local, isDmRoom: Boolean): CharSequence? {
+        return result
+    }
+
+    override fun format(latestEvent: LatestEventValue.Remote, isDmRoom: Boolean): CharSequence? {
+        return result
+    }
+
+    fun givenFormatResult(result: CharSequence?) {
+        this.result = result
+    }
+}
diff --git a/libraries/featureflag/api/build.gradle.kts b/libraries/featureflag/api/build.gradle.kts
index 9664ac9f09..b34e082cd3 100644
--- a/libraries/featureflag/api/build.gradle.kts
+++ b/libraries/featureflag/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/Feature.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/Feature.kt
index 18a9ea1bc3..395fd04c6c 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/Feature.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/Feature.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlagService.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlagService.kt
index 1358909771..6a8cb2fd9d 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlagService.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlagService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -35,7 +36,12 @@ interface FeatureFlagService {
     suspend fun setFeatureEnabled(feature: Feature, enabled: Boolean): Boolean
 
     /**
-     * @return the list of available (not finished) features that can be toggled.
+     * @return the list of available features that can be toggled.
+     * @param includeFinishedFeatures whether to include finished features, default is false
+     * @param isInLabs whether the user is in labs (to include lab features), default is false
      */
-    fun getAvailableFeatures(): List<Feature>
+    fun getAvailableFeatures(
+        includeFinishedFeatures: Boolean = false,
+        isInLabs: Boolean = false,
+    ): List<Feature>
 }
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 cb908dbe5e..f7227a9ac9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -73,6 +74,13 @@ enum class FeatureFlags(
         key = "feature.space",
         title = "Spaces",
         defaultValue = { true },
+        isFinished = true,
+    ),
+    SpaceSettings(
+        key = "feature.spaceSettings",
+        title = "Space settings",
+        description = "Allow managing space settings such as details, permissions and privacy.",
+        defaultValue = { false },
         isFinished = false,
     ),
     PrintLogsToLogcat(
@@ -109,4 +117,19 @@ 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",
+        description = "Allow logging in on other devices using a QR code.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
 }
diff --git a/libraries/featureflag/impl/build.gradle.kts b/libraries/featureflag/impl/build.gradle.kts
index c54f95a293..63d968467a 100644
--- a/libraries/featureflag/impl/build.gradle.kts
+++ b/libraries/featureflag/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,4 +32,5 @@ dependencies {
 
     testCommonDependencies(libs)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.featureflag.test)
 }
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagService.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagService.kt
index 01c1e8a258..f7361b69b1 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagService.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,40 +10,42 @@ package io.element.android.libraries.featureflag.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.featureflag.api.Feature
 import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultFeatureFlagService(
     private val providers: Set<@JvmSuppressWildcards FeatureFlagProvider>,
     private val buildMeta: BuildMeta,
+    private val featuresProvider: FeaturesProvider,
 ) : FeatureFlagService {
     override fun isFeatureEnabledFlow(feature: Feature): Flow<Boolean> {
         return providers.filter { it.hasFeature(feature) }
-            .sortedByDescending(FeatureFlagProvider::priority)
-            .firstOrNull()
+            .maxByOrNull(FeatureFlagProvider::priority)
             ?.isFeatureEnabledFlow(feature)
             ?: flowOf(feature.defaultValue(buildMeta))
     }
 
     override suspend fun setFeatureEnabled(feature: Feature, enabled: Boolean): Boolean {
         return providers.filterIsInstance<MutableFeatureFlagProvider>()
-            .sortedBy(FeatureFlagProvider::priority)
-            .firstOrNull()
+            .maxByOrNull(FeatureFlagProvider::priority)
             ?.setFeatureEnabled(feature, enabled)
             ?.let { true }
             ?: false
     }
 
-    override fun getAvailableFeatures(): List<Feature> {
-        return FeatureFlags.entries.filter { !it.isFinished }
+    override fun getAvailableFeatures(
+        includeFinishedFeatures: Boolean,
+        isInLabs: Boolean,
+    ): List<Feature> {
+        return featuresProvider.provide().filter { flag ->
+            (includeFinishedFeatures || !flag.isFinished) &&
+                flag.isInLabs == isInLabs
+        }
     }
 }
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeatureFlagProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeatureFlagProvider.kt
index e0ddbb52cb..e3172fc8a0 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeatureFlagProvider.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeatureFlagProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeaturesProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeaturesProvider.kt
new file mode 100644
index 0000000000..e24ae66783
--- /dev/null
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/FeaturesProvider.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.libraries.featureflag.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.featureflag.api.Feature
+import io.element.android.libraries.featureflag.api.FeatureFlags
+
+fun interface FeaturesProvider {
+    fun provide(): List<Feature>
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultFeaturesProvider : FeaturesProvider {
+    override fun provide(): List<Feature> = FeatureFlags.entries
+}
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/MutableFeatureFlagProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/MutableFeatureFlagProvider.kt
index 0eede7ac4a..48ed2c3701 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/MutableFeatureFlagProvider.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/MutableFeatureFlagProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
index f477d2ea0d..679bd9ce6f 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/PreferencesFeatureFlagProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/di/FeatureFlagModule.kt b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/di/FeatureFlagModule.kt
index 137d2d3ab1..de3f8aa519 100644
--- a/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/di/FeatureFlagModule.kt
+++ b/libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/di/FeatureFlagModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt
index 097e318609..00bc687bb9 100644
--- a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt
+++ b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeatureFlagServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,26 +10,47 @@ package io.element.android.libraries.featureflag.impl
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.featureflag.api.Feature
+import io.element.android.libraries.featureflag.test.FakeFeature
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class DefaultFeatureFlagServiceTest {
+    private val aFeature = FakeFeature(
+        key = "test_feature",
+        title = "Test Feature",
+    )
+
     @Test
     fun `given service without provider when feature is checked then it returns the default value`() = runTest {
+        val featureWithDefaultToFalse = FakeFeature(
+            key = "test_feature",
+            title = "Test Feature",
+            defaultValue = { false }
+        )
+        val featureWithDefaultToTrue = FakeFeature(
+            key = "test_feature_2",
+            title = "Test Feature 2",
+            defaultValue = { true }
+        )
         val buildMeta = aBuildMeta()
-        val featureFlagService = DefaultFeatureFlagService(emptySet(), buildMeta)
-        featureFlagService.isFeatureEnabledFlow(FeatureFlags.Space).test {
-            assertThat(awaitItem()).isEqualTo(FeatureFlags.Space.defaultValue(buildMeta))
+        val featureFlagService = createDefaultFeatureFlagService(buildMeta = buildMeta)
+        featureFlagService.isFeatureEnabledFlow(featureWithDefaultToFalse).test {
+            assertThat(awaitItem()).isFalse()
+            cancelAndIgnoreRemainingEvents()
+        }
+        featureFlagService.isFeatureEnabledFlow(featureWithDefaultToTrue).test {
+            assertThat(awaitItem()).isTrue()
             cancelAndIgnoreRemainingEvents()
         }
     }
 
     @Test
     fun `given service without provider when set enabled feature is called then it returns false`() = runTest {
-        val featureFlagService = DefaultFeatureFlagService(emptySet(), aBuildMeta())
-        val result = featureFlagService.setFeatureEnabled(FeatureFlags.Space, true)
+        val featureFlagService = createDefaultFeatureFlagService()
+        val result = featureFlagService.setFeatureEnabled(aFeature, true)
         assertThat(result).isFalse()
     }
 
@@ -36,8 +58,11 @@ class DefaultFeatureFlagServiceTest {
     fun `given service with a runtime provider when set enabled feature is called then it returns true`() = runTest {
         val buildMeta = aBuildMeta()
         val featureFlagProvider = FakeMutableFeatureFlagProvider(0, buildMeta)
-        val featureFlagService = DefaultFeatureFlagService(setOf(featureFlagProvider), buildMeta)
-        val result = featureFlagService.setFeatureEnabled(FeatureFlags.Space, true)
+        val featureFlagService = createDefaultFeatureFlagService(
+            providers = setOf(featureFlagProvider),
+            buildMeta = buildMeta,
+        )
+        val result = featureFlagService.setFeatureEnabled(aFeature, true)
         assertThat(result).isTrue()
     }
 
@@ -45,11 +70,14 @@ class DefaultFeatureFlagServiceTest {
     fun `given service with a runtime provider and feature enabled when feature is checked then it returns the correct value`() = runTest {
         val buildMeta = aBuildMeta()
         val featureFlagProvider = FakeMutableFeatureFlagProvider(0, buildMeta)
-        val featureFlagService = DefaultFeatureFlagService(setOf(featureFlagProvider), buildMeta)
-        featureFlagService.setFeatureEnabled(FeatureFlags.Space, true)
-        featureFlagService.isFeatureEnabledFlow(FeatureFlags.Space).test {
+        val featureFlagService = createDefaultFeatureFlagService(
+            providers = setOf(featureFlagProvider),
+            buildMeta = buildMeta
+        )
+        featureFlagService.setFeatureEnabled(aFeature, true)
+        featureFlagService.isFeatureEnabledFlow(aFeature).test {
             assertThat(awaitItem()).isTrue()
-            featureFlagService.setFeatureEnabled(FeatureFlags.Space, false)
+            featureFlagService.setFeatureEnabled(aFeature, false)
             assertThat(awaitItem()).isFalse()
         }
     }
@@ -59,11 +87,84 @@ class DefaultFeatureFlagServiceTest {
         val buildMeta = aBuildMeta()
         val lowPriorityFeatureFlagProvider = FakeMutableFeatureFlagProvider(LOW_PRIORITY, buildMeta)
         val highPriorityFeatureFlagProvider = FakeMutableFeatureFlagProvider(HIGH_PRIORITY, buildMeta)
-        val featureFlagService = DefaultFeatureFlagService(setOf(lowPriorityFeatureFlagProvider, highPriorityFeatureFlagProvider), buildMeta)
-        lowPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.Space, false)
-        highPriorityFeatureFlagProvider.setFeatureEnabled(FeatureFlags.Space, true)
-        featureFlagService.isFeatureEnabledFlow(FeatureFlags.Space).test {
+        val featureFlagService = createDefaultFeatureFlagService(
+            providers = setOf(lowPriorityFeatureFlagProvider, highPriorityFeatureFlagProvider),
+            buildMeta = buildMeta
+        )
+        lowPriorityFeatureFlagProvider.setFeatureEnabled(aFeature, false)
+        highPriorityFeatureFlagProvider.setFeatureEnabled(aFeature, true)
+        featureFlagService.isFeatureEnabledFlow(aFeature).test {
             assertThat(awaitItem()).isTrue()
         }
     }
+
+    @Test
+    fun `getAvailableFeatures should return expected features`() {
+        val aFinishedLabFeature = FakeFeature(
+            key = "finished_lab_feature",
+            title = "Finished Lab Feature",
+            isFinished = true,
+            isInLabs = true,
+        )
+        val aFinishedDevFeature = FakeFeature(
+            key = "finished_dev_feature",
+            title = "Finished Dev Feature",
+            isFinished = true,
+            isInLabs = false,
+        )
+        val anUnfinishedLabFeature = FakeFeature(
+            key = "unfinished_lab_feature",
+            title = "Unfinished Lab Feature",
+            isFinished = false,
+            isInLabs = true,
+        )
+        val anUnfinishedDevFeature = FakeFeature(
+            key = "unfinished_dev_feature",
+            title = "Unfinished Dev Feature",
+            isFinished = false,
+            isInLabs = false,
+        )
+        val featureFlagService = createDefaultFeatureFlagService(
+            features = listOf(
+                aFinishedLabFeature,
+                aFinishedDevFeature,
+                anUnfinishedLabFeature,
+                anUnfinishedDevFeature,
+            ),
+        )
+        assertThat(
+            featureFlagService.getAvailableFeatures(
+                includeFinishedFeatures = false,
+                isInLabs = true,
+            )
+        ).containsExactly(anUnfinishedLabFeature)
+        assertThat(
+            featureFlagService.getAvailableFeatures(
+                includeFinishedFeatures = true,
+                isInLabs = true,
+            )
+        ).containsExactly(aFinishedLabFeature, anUnfinishedLabFeature)
+        assertThat(
+            featureFlagService.getAvailableFeatures(
+                includeFinishedFeatures = false,
+                isInLabs = false,
+            )
+        ).containsExactly(anUnfinishedDevFeature)
+        assertThat(
+            featureFlagService.getAvailableFeatures(
+                includeFinishedFeatures = true,
+                isInLabs = false,
+            )
+        ).containsExactly(aFinishedDevFeature, anUnfinishedDevFeature)
+    }
 }
+
+private fun createDefaultFeatureFlagService(
+    providers: Set<FeatureFlagProvider> = emptySet(),
+    buildMeta: BuildMeta = aBuildMeta(),
+    features: List<Feature> = emptyList(),
+) = DefaultFeatureFlagService(
+    providers = providers,
+    buildMeta = buildMeta,
+    featuresProvider = { features }
+)
diff --git a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeaturesProviderTest.kt b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeaturesProviderTest.kt
new file mode 100644
index 0000000000..66d772920a
--- /dev/null
+++ b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/DefaultFeaturesProviderTest.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.featureflag.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import org.junit.Test
+
+class DefaultFeaturesProviderTest {
+    @Test
+    fun `provide should return all features`() {
+        val provider = DefaultFeaturesProvider()
+        val features = provider.provide()
+        assertThat(features.size).isEqualTo(FeatureFlags.entries.size)
+        FeatureFlags.entries.forEach {
+            assertThat(features.contains(it)).isTrue()
+        }
+    }
+}
diff --git a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/FakeMutableFeatureFlagProvider.kt b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/FakeMutableFeatureFlagProvider.kt
index 1018c2ea19..13f1f30d43 100644
--- a/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/FakeMutableFeatureFlagProvider.kt
+++ b/libraries/featureflag/impl/src/test/kotlin/io/element/android/libraries/featureflag/impl/FakeMutableFeatureFlagProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/test/build.gradle.kts b/libraries/featureflag/test/build.gradle.kts
index e2920a07b7..2572131b22 100644
--- a/libraries/featureflag/test/build.gradle.kts
+++ b/libraries/featureflag/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,11 +12,11 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.featureflag.test"
-
-    dependencies {
-        api(projects.libraries.featureflag.api)
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.matrix.test)
-        implementation(libs.coroutines.core)
-    }
+}
+
+dependencies {
+    api(projects.libraries.featureflag.api)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.matrix.test)
+    implementation(libs.coroutines.core)
 }
diff --git a/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeature.kt b/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeature.kt
index a141fbdd75..c8ba9f4b25 100644
--- a/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeature.kt
+++ b/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeature.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeatureFlagService.kt b/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeatureFlagService.kt
index 49fc095ed4..eee8ee4559 100644
--- a/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeatureFlagService.kt
+++ b/libraries/featureflag/test/src/main/java/io/element/android/libraries/featureflag/test/FakeFeatureFlagService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 class FakeFeatureFlagService(
     initialState: Map<String, Boolean> = emptyMap(),
     private val buildMeta: BuildMeta = aBuildMeta(),
-    var providedAvailableFeatures: List<Feature> = emptyList(),
+    private val getAvailableFeaturesResult: (Boolean, Boolean) -> List<Feature> = { _, _ -> emptyList() },
 ) : FeatureFlagService {
     private val enabledFeatures = initialState
         .mapValues { MutableStateFlow(it.value) }
@@ -33,7 +34,10 @@ class FakeFeatureFlagService(
         return enabledFeatures.getOrPut(feature.key) { MutableStateFlow(feature.defaultValue(buildMeta)) }
     }
 
-    override fun getAvailableFeatures(): List<Feature> {
-        return providedAvailableFeatures
+    override fun getAvailableFeatures(
+        includeFinishedFeatures: Boolean,
+        isInLabs: Boolean,
+    ): List<Feature> {
+        return getAvailableFeaturesResult(includeFinishedFeatures, isInLabs)
     }
 }
diff --git a/libraries/featureflag/ui/build.gradle.kts b/libraries/featureflag/ui/build.gradle.kts
index 32fd4f6eab..085c6193ec 100644
--- a/libraries/featureflag/ui/build.gradle.kts
+++ b/libraries/featureflag/ui/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt
index fb9e85b4f9..bd6d883440 100644
--- a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt
+++ b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModel.kt b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModel.kt
index f37e096c5b..d3ec3151ae 100644
--- a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModel.kt
+++ b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModelProvider.kt b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModelProvider.kt
index 66697b447f..63bc118f7c 100644
--- a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModelProvider.kt
+++ b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/model/FeatureUiModelProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/fullscreenintent/api/build.gradle.kts b/libraries/fullscreenintent/api/build.gradle.kts
index 4bd0a50cb7..8d6be454ea 100644
--- a/libraries/fullscreenintent/api/build.gradle.kts
+++ b/libraries/fullscreenintent/api/build.gradle.kts
@@ -1,12 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
diff --git a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt
index e0b8433749..1c5bc4b6a0 100644
--- a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt
+++ b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt
index 5b3f84f977..5b1ddb91ed 100644
--- a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt
+++ b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt
index 25ab2ab522..7248a24414 100644
--- a/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt
+++ b/libraries/fullscreenintent/api/src/main/kotlin/io/element/android/libraries/fullscreenintent/api/FullScreenIntentPermissionsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/fullscreenintent/impl/build.gradle.kts b/libraries/fullscreenintent/impl/build.gradle.kts
index 2ccb7f80b8..57c4f5b836 100644
--- a/libraries/fullscreenintent/impl/build.gradle.kts
+++ b/libraries/fullscreenintent/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt b/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt
index b05aad303c..d4a3e75d1a 100644
--- a/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt
+++ b/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/FullScreenIntentPermissionsPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -63,7 +64,7 @@ class FullScreenIntentPermissionsPresenter(
         val isGranted = notificationManagerCompat.canUseFullScreenIntent()
         val isBannerDismissed by isFullScreenIntentBannerDismissed.collectAsState(initial = true)
 
-        fun handleEvents(event: FullScreenIntentPermissionsEvents) {
+        fun handleEvent(event: FullScreenIntentPermissionsEvents) {
             when (event) {
                 FullScreenIntentPermissionsEvents.Dismiss -> coroutineScope.launch {
                     dismissFullScreenIntentBanner()
@@ -75,7 +76,7 @@ class FullScreenIntentPermissionsPresenter(
         return FullScreenIntentPermissionsState(
             permissionGranted = isGranted,
             shouldDisplayBanner = !isBannerDismissed && !isGranted,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 
@@ -87,7 +88,7 @@ class FullScreenIntentPermissionsPresenter(
                     "package:${buildMeta.applicationId}".toUri()
                 )
                 externalIntentLauncher.launch(intent)
-            } catch (e: ActivityNotFoundException) {
+            } catch (_: ActivityNotFoundException) {
                 val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
                     .putExtra(Settings.EXTRA_APP_PACKAGE, buildMeta.applicationId)
                 externalIntentLauncher.launch(intent)
diff --git a/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/di/FullScreenIntentModule.kt b/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/di/FullScreenIntentModule.kt
index f1c6f1efe4..249485b15c 100644
--- a/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/di/FullScreenIntentModule.kt
+++ b/libraries/fullscreenintent/impl/src/main/kotlin/io/element/android/libraries/fullscreenintent/impl/di/FullScreenIntentModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt b/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt
index 0d10032da0..44a5579e86 100644
--- a/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt
+++ b/libraries/fullscreenintent/impl/src/test/kotlin/io/element/android/libraries/fullscreenintent/test/FullScreenIntentPermissionsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/indicator/api/build.gradle.kts b/libraries/indicator/api/build.gradle.kts
index 5bc1ac42d9..c6f33ec83f 100644
--- a/libraries/indicator/api/build.gradle.kts
+++ b/libraries/indicator/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/indicator/api/src/main/kotlin/io/element/android/libraries/indicator/api/IndicatorService.kt b/libraries/indicator/api/src/main/kotlin/io/element/android/libraries/indicator/api/IndicatorService.kt
index b2f8b5eff8..0409a0f846 100644
--- a/libraries/indicator/api/src/main/kotlin/io/element/android/libraries/indicator/api/IndicatorService.kt
+++ b/libraries/indicator/api/src/main/kotlin/io/element/android/libraries/indicator/api/IndicatorService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/indicator/impl/build.gradle.kts b/libraries/indicator/impl/build.gradle.kts
index 2596b9fe67..8f1e9ea56d 100644
--- a/libraries/indicator/impl/build.gradle.kts
+++ b/libraries/indicator/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/indicator/impl/src/main/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorService.kt b/libraries/indicator/impl/src/main/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorService.kt
index 5cd17418b3..0629799c74 100644
--- a/libraries/indicator/impl/src/main/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorService.kt
+++ b/libraries/indicator/impl/src/main/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.indicator.api.IndicatorService
 import io.element.android.libraries.matrix.api.encryption.BackupState
@@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.api.encryption.RecoveryState
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultIndicatorService(
     private val sessionVerificationService: SessionVerificationService,
     private val encryptionService: EncryptionService,
diff --git a/libraries/indicator/impl/src/test/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorServiceTest.kt b/libraries/indicator/impl/src/test/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorServiceTest.kt
index 9e325a6573..cd861ef530 100644
--- a/libraries/indicator/impl/src/test/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorServiceTest.kt
+++ b/libraries/indicator/impl/src/test/kotlin/io/element/android/libraries/indicator/impl/DefaultIndicatorServiceTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/indicator/test/build.gradle.kts b/libraries/indicator/test/build.gradle.kts
index 5d61dde8be..a5ce0c57c2 100644
--- a/libraries/indicator/test/build.gradle.kts
+++ b/libraries/indicator/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/indicator/test/src/main/kotlin/io/element/android/libraries/indicator/test/FakeIndicatorService.kt b/libraries/indicator/test/src/main/kotlin/io/element/android/libraries/indicator/test/FakeIndicatorService.kt
index 26f8547b66..76cca70736 100644
--- a/libraries/indicator/test/src/main/kotlin/io/element/android/libraries/indicator/test/FakeIndicatorService.kt
+++ b/libraries/indicator/test/src/main/kotlin/io/element/android/libraries/indicator/test/FakeIndicatorService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/build.gradle.kts b/libraries/maplibre-compose/build.gradle.kts
index 756a09c32c..5552aae37f 100644
--- a/libraries/maplibre-compose/build.gradle.kts
+++ b/libraries/maplibre-compose/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMode.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMode.kt
index 533ff777a5..8ef02f5bbc 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMode.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMode.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMoveStartedReason.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMoveStartedReason.kt
index b2237ee35d..2683de1655 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMoveStartedReason.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraMoveStartedReason.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraPositionState.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraPositionState.kt
index b5b46ca847..1999526718 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraPositionState.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/CameraPositionState.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -156,8 +157,8 @@ public class CameraPositionState(
         /**
          * The default saver implementation for [CameraPositionState].
          */
-        public val Saver: Saver<CameraPositionState, SaveableCameraPositionState> = Saver(
-            save = { SaveableCameraPositionState(it.position, it.cameraMode.toInternal()) },
+        public val Saver: Saver<CameraPositionState, SaveableCameraPositionData> = Saver(
+            save = { SaveableCameraPositionData(it.position, it.cameraMode.toInternal()) },
             restore = { CameraPositionState(it.position, CameraMode.fromInternal(it.cameraMode)) }
         )
     }
@@ -172,7 +173,7 @@ public val currentCameraPositionState: CameraPositionState
     get() = LocalCameraPositionState.current
 
 @Parcelize
-public data class SaveableCameraPositionState(
+public data class SaveableCameraPositionData(
     val position: CameraPosition,
     val cameraMode: Int
 ) : Parcelable
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/IconAnchor.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/IconAnchor.kt
index ccb423f32f..e46dcdcf65 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/IconAnchor.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/IconAnchor.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt
index df79e7e1c5..f8fd64c537 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt
index f1ef0f0459..62c29fbd04 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMap.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -71,10 +72,7 @@ public fun MapLibreMap(
     uiSettings: MapUiSettings = DefaultMapUiSettings,
     symbolManagerSettings: MapSymbolManagerSettings = DefaultMapSymbolManagerSettings,
     locationSettings: MapLocationSettings = DefaultMapLocationSettings,
-    content: (
-        @Composable @MapLibreMapComposable
-        () -> Unit
-    )? = null,
+    content: (@Composable @MapLibreMapComposable () -> Unit)? = null,
 ) {
     // When in preview, early return a Box with the received modifier preserving layout
     if (LocalInspectionMode.current) {
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMapComposable.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMapComposable.kt
index cf88191580..c819dee711 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMapComposable.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLibreMapComposable.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLocationSettings.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLocationSettings.kt
index 0cf7147530..7fb777aeba 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLocationSettings.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapLocationSettings.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapSymbolManagerSettings.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapSymbolManagerSettings.kt
index a073aed720..93c7b2118b 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapSymbolManagerSettings.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapSymbolManagerSettings.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUiSettings.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUiSettings.kt
index 5e5c763f44..edee9b4dc5 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUiSettings.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUiSettings.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt
index 396d59df51..a07a596fe3 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 @file:Suppress("MatchingDeclarationName")
diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/Symbol.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/Symbol.kt
index 2ebb5b10d3..e6a5c3f632 100644
--- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/Symbol.kt
+++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/Symbol.kt
@@ -1,8 +1,9 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  * Copyright 2021 Google LLC
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/build.gradle.kts b/libraries/matrix/api/build.gradle.kts
index 04a45654b2..1c70006cc8 100644
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -1,12 +1,12 @@
 import config.BuildTimeConfig
 import extension.buildConfigFieldStr
-import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,8 +16,6 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
-setupDependencyInjection()
-
 android {
     namespace = "io.element.android.libraries.matrix.api"
 
diff --git a/libraries/matrix/api/src/main/AndroidManifest.xml b/libraries/matrix/api/src/main/AndroidManifest.xml
index 5c0a832239..608f16cc36 100644
--- a/libraries/matrix/api/src/main/AndroidManifest.xml
+++ b/libraries/matrix/api/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
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 5f116612b1..dca269453a 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
@@ -1,14 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
 import io.element.android.libraries.core.data.tryOrNull
+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.EventId
 import io.element.android.libraries.matrix.api.core.MatrixPatterns
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -17,6 +20,8 @@ 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.createroom.CreateRoomParameters
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
+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.media.MediaPreviewService
 import io.element.android.libraries.matrix.api.notification.NotificationService
@@ -34,6 +39,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomListService
 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.verification.SessionVerificationService
@@ -78,6 +84,7 @@ interface MatrixClient {
     suspend fun joinRoomByIdOrAlias(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomInfo?>
     suspend fun knockRoom(roomIdOrAlias: RoomIdOrAlias, message: String, serverNames: List<String>): Result<RoomInfo?>
     suspend fun getCacheSize(): Long
+    suspend fun getDatabaseSizes(): Result<SdkStoreSizes>
 
     /**
      * Will close the client and delete the cache data.
@@ -183,6 +190,31 @@ interface MatrixClient {
      * Adds an emoji to the list of recent emoji reactions for this account.
      */
     suspend fun addRecentEmoji(emoji: String): Result<Unit>
+
+    /**
+     * Marks the room with the provided [roomId] as read, sending a fully read receipt for [eventId].
+     *
+     * This method should be used with caution as providing the [eventId] ourselves can result in incorrect read receipts.
+     * Use [Timeline.markAsRead] instead when possible.
+     */
+    suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result<Unit>
+
+    /**
+     * Check if linking a new device using QrCode is supported by the server.
+     */
+    suspend fun canLinkNewDevice(): Result<Boolean>
+
+    /**
+     * Create a handler to link a new mobile device, i.e. a device capable of scanning QrCodes.
+     */
+    fun createLinkMobileHandler(): Result<LinkMobileHandler>
+
+    /**
+     * Create a handler to link a new desktop device, i.e. a device not capable of scanning QrCodes.
+     */
+    fun createLinkDesktopHandler(): Result<LinkDesktopHandler>
+
+    suspend fun performDatabaseVacuum(): Result<Unit>
 }
 
 /**
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClientProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClientProvider.kt
index fb8b2f4d5f..54f70845fa 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClientProvider.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClientProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/SdkMetadata.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/SdkMetadata.kt
index 34cf895366..16f34807fc 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/SdkMetadata.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/SdkMetadata.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..ab11374116
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/GetDatabaseSizesUseCase.kt
@@ -0,0 +1,14 @@
+/*
+ * 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.api.analytics
+
+import io.element.android.libraries.matrix.api.core.SessionId
+
+fun interface GetDatabaseSizesUseCase {
+    suspend operator fun invoke(sessionId: SessionId): Result<SdkStoreSizes>
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/SdkStoreSizes.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/SdkStoreSizes.kt
new file mode 100644
index 0000000000..62b68b8fdb
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/SdkStoreSizes.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.api.analytics
+
+import io.element.android.libraries.core.data.ByteSize
+
+/**
+ * The sizes of the different stores (DBs) in the SDK.
+ */
+data class SdkStoreSizes(
+    val stateStore: ByteSize?,
+    val eventCacheStore: ByteSize?,
+    val mediaStore: ByteSize?,
+    val cryptoStore: ByteSize?,
+)
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 ec5a3d8431..ac3b0c8e3a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCode.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCode.kt
index 0e58e41872..b6053cce4a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCode.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 03e8d57150..c50ec09609 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
@@ -1,16 +1,21 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.auth
 
-sealed class AuthenticationException(message: String) : Exception(message) {
-    class AccountAlreadyLoggedIn(userId: String) : AuthenticationException(userId)
-    class InvalidServerName(message: String) : AuthenticationException(message)
-    class SlidingSyncVersion(message: String) : AuthenticationException(message)
-    class Oidc(message: String) : AuthenticationException(message)
-    class Generic(message: String) : AuthenticationException(message)
+sealed class AuthenticationException(message: String?) : Exception(message) {
+    data class AccountAlreadyLoggedIn(
+        val userId: String,
+    ) : AuthenticationException(null)
+
+    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 Generic(message: String?) : AuthenticationException(message)
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/HomeServerLoginCompatibilityChecker.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/HomeServerLoginCompatibilityChecker.kt
new file mode 100644
index 0000000000..dcf43a80a4
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/HomeServerLoginCompatibilityChecker.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.matrix.api.auth
+
+/**
+ * Checks the homeserver's compatibility with Element X.
+ */
+interface HomeServerLoginCompatibilityChecker {
+    /**
+     * Performs the compatibility check given the homeserver's [url].
+     * @return a `true` value if the homeserver is compatible, `false` if not, or a failure result if the check unexpectedly failed.
+     */
+    suspend fun check(url: String): Result<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 38777944ee..1c574ad467 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ 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 kotlinx.coroutines.flow.StateFlow
 
 interface MatrixAuthenticationService {
     /**
@@ -22,8 +22,12 @@ interface MatrixAuthenticationService {
      * Generally this method should not be used directly, prefer using [MatrixClientProvider.getOrRestore] instead.
      */
     suspend fun restoreSession(sessionId: SessionId): Result<MatrixClient>
-    fun getHomeserverDetails(): StateFlow<MatrixHomeServerDetails?>
-    suspend fun setHomeserver(homeserver: String): Result<Unit>
+
+    /**
+     * Set the homeserver to use for authentication, and return its details.
+     */
+    suspend fun setHomeserver(homeserver: String): Result<MatrixHomeServerDetails>
+
     suspend fun login(username: String, password: String): 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 c2f0741571..aa5ed9a41d 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
@@ -1,18 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.auth
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
 data class MatrixHomeServerDetails(
     val url: String,
     val supportsPasswordLogin: Boolean,
     val supportsOidcLogin: Boolean,
-) : Parcelable
+) {
+    val isSupported = supportsPasswordLogin || supportsOidcLogin
+}
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/OidcConfig.kt
index f8434a9d4a..ee8b7ec50e 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/OidcConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/OidcDetails.kt
index 61f418dd0a..c4fb87e3c2 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/OidcDetails.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/OidcPrompt.kt
index 79576e0adb..8ddad9f52e 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/OidcPrompt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/OidcRedirectUrlProvider.kt
index 1dba996ea9..ad4d862474 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/OidcRedirectUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/SessionRestorationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/SessionRestorationException.kt
new file mode 100644
index 0000000000..bf6f50cab5
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/SessionRestorationException.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.api.auth
+
+import io.element.android.libraries.matrix.api.core.SessionId
+
+sealed class SessionRestorationException(message: String, cause: Throwable? = null) : Exception(message, cause) {
+    data class MissingSession(val sessionId: SessionId) : SessionRestorationException("Session with id $sessionId not found")
+    class InvalidToken : SessionRestorationException("Access token is invalid or expired")
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/external/ExternalSession.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/external/ExternalSession.kt
index a144a33559..1241f5fb15 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/external/ExternalSession.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/external/ExternalSession.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,5 +17,4 @@ data class ExternalSession(
     val accessToken: String,
     val refreshToken: String?,
     val homeserverUrl: String,
-    val slidingSyncProxy: String?
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginData.kt
index 48532e44b9..413f17af63 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginData.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginDataFactory.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginDataFactory.kt
index 41f4374c12..b0e3089501 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginDataFactory.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/MatrixQrCodeLoginDataFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeDecodeException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeDecodeException.kt
index 514a8d521d..438ee4e765 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeDecodeException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeDecodeException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeLoginStep.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeLoginStep.kt
index 20b57d2c71..56b3dc6ca5 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeLoginStep.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrCodeLoginStep.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ sealed interface QrCodeLoginStep {
     data class EstablishingSecureChannel(val checkCode: String) : QrCodeLoginStep
     data object Starting : QrCodeLoginStep
     data class WaitingForToken(val userCode: String) : QrCodeLoginStep
+    data object SyncingSecrets : QrCodeLoginStep
     data class Failed(val error: QrLoginException) : QrCodeLoginStep
     data object Finished : QrCodeLoginStep
 }
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 ab278abd56..c81437eff0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,5 +17,8 @@ sealed class QrLoginException : Exception() {
     data object OidcMetadataInvalid : QrLoginException()
     data object SlidingSyncNotAvailable : QrLoginException()
     data object OtherDeviceNotSignedIn : QrLoginException()
+    data object CheckCodeAlreadySent : QrLoginException()
+    data object CheckCodeCannotBeSent : QrLoginException()
     data object Unknown : QrLoginException()
+    data object NotFound : QrLoginException()
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/DeviceId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/DeviceId.kt
index 7f615a77d2..1fd8485cfb 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/DeviceId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/DeviceId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/EventId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/EventId.kt
index 08a9c2eeaa..0a2fe6ec08 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/EventId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/EventId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/FlowId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/FlowId.kt
index f9253bbb98..70564be0b2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/FlowId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/FlowId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
index c833d46718..a933e50529 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatterns.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ProgressCallback.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ProgressCallback.kt
index dc515f09f2..a7abc0f797 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ProgressCallback.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ProgressCallback.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomAlias.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomAlias.kt
index 3a02d0a9a3..c4a5c40aac 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomAlias.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomAlias.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
index 8d339ae704..1758563f55 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 cfccf6f6cb..4ac480e064 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SendHandle.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SendHandle.kt
index ca169fc402..f3b8904fff 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SendHandle.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SendHandle.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SessionId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SessionId.kt
index 5a95e84825..7fcfcd94a3 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SessionId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SessionId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt
index 6db907bacd..6acf2e43d8 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/SpaceId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ThreadId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ThreadId.kt
index da0594f023..5b4221381c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ThreadId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/ThreadId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/TransactionId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/TransactionId.kt
index 89d39e94d9..b548dcca9c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/TransactionId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/TransactionId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UniqueId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UniqueId.kt
index 5222934dca..e2c84cce22 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UniqueId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UniqueId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UserId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UserId.kt
index ece3a9a296..b00fdde2ca 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UserId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UserId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt
index 3a4aaeea4f..a0a0bde1ed 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/CreateRoomParameters.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/RoomPreset.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/RoomPreset.kt
index 296c4ae99a..83fa25cd59 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/RoomPreset.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/createroom/RoomPreset.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.createroom
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupState.kt
index 855f3ef0a9..9c21ce044b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt
index 5d93163445..2a90cdbb7c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/BackupUploadState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EnableRecoveryProgress.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EnableRecoveryProgress.kt
index 69394bc159..3fc27692f2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EnableRecoveryProgress.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EnableRecoveryProgress.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 961178ee3e..aefad517dc 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import kotlinx.coroutines.flow.Flow
@@ -17,7 +19,7 @@ interface EncryptionService {
     val recoveryStateStateFlow: StateFlow<RecoveryState>
     val enableRecoveryProgressStateFlow: StateFlow<EnableRecoveryProgress>
     val isLastDevice: StateFlow<Boolean>
-    val hasDevicesToVerifyAgainst: StateFlow<Boolean>
+    val hasDevicesToVerifyAgainst: StateFlow<AsyncData<Boolean>>
 
     suspend fun enableBackups(): Result<Unit>
 
@@ -62,8 +64,6 @@ interface EncryptionService {
      */
     suspend fun startIdentityReset(): Result<IdentityResetHandle?>
 
-    suspend fun isUserVerified(userId: UserId): Result<Boolean>
-
     /**
      * Remember this identity, ensuring it does not result in a pin violation.
      */
@@ -80,8 +80,10 @@ interface EncryptionService {
 
     /**
      * Get the identity state of a user, if known.
+     * @param userId the user id to get the identity for.
+     * @param fallbackToServer whether to fallback to fetching the identity from the server if not known locally. Defaults to true.
      */
-    suspend fun getUserIdentity(userId: UserId): Result<IdentityState?>
+    suspend fun getUserIdentity(userId: UserId, fallbackToServer: Boolean = true): Result<IdentityState?>
 }
 
 /**
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryException.kt
index 7dffbf3653..4b580f2e8b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryState.kt
index 367aba5e00..eee547cbe9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/SteadyStateException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/SteadyStateException.kt
index a9d4e5b7d1..6410633cc1 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/SteadyStateException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/SteadyStateException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
index d565c47336..f6f35d8ab2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityStateChange.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityStateChange.kt
index 0a377df401..f269e5fd84 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityStateChange.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityStateChange.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 56497e8fa6..52b1577bf0 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
@@ -1,16 +1,21 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-sealed class ClientException(message: String, val details: String?) : Exception(message) {
-    class Generic(message: String, details: String?) : ClientException(message, details)
-    class MatrixApi(val kind: ErrorKind, val code: String, message: String, details: String?) : ClientException(message, details)
-    class Other(message: String) : ClientException(message, null)
+sealed class ClientException(message: String, val details: String?, cause: Throwable? = null) : Exception(message, cause) {
+    class Generic(message: String, details: String?, cause: Throwable? = null) : ClientException(message, details, cause)
+    class MatrixApi(val kind: ErrorKind, val code: String, message: String, details: String?, cause: Throwable? = null) : ClientException(
+        message = message,
+        details = details,
+        cause = cause
+    )
+    class Other(message: String, cause: Throwable? = null) : ClientException(message, null, cause)
 }
 
 fun ClientException.isNetworkError(): Boolean {
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ErrorKind.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ErrorKind.kt
index 8ca7ce5579..9d37dde164 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ErrorKind.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ErrorKind.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/NotificationResolverException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/NotificationResolverException.kt
index ab251f19d8..fd3adf2592 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/NotificationResolverException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/NotificationResolverException.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/CheckCodeSender.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/CheckCodeSender.kt
new file mode 100644
index 0000000000..ecb440de83
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/CheckCodeSender.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.api.linknewdevice
+
+interface CheckCodeSender {
+    /**
+     * Validates the given [code]. Returns true if the code is valid, false otherwise.
+     * This method can be called multiple times to validate different codes.
+     */
+    suspend fun validate(code: UByte): Boolean
+
+    /**
+     * Sends the given [code].
+     * This method can be called only once.
+     */
+    suspend fun send(code: UByte): Result<Unit>
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/ErrorType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/ErrorType.kt
new file mode 100644
index 0000000000..0f61007d47
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/ErrorType.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.api.linknewdevice
+
+sealed class ErrorType(message: String) : Exception(message) {
+    /**
+     * The requested device ID is already in use.
+     */
+    class DeviceIdAlreadyInUse(message: String) : ErrorType(message)
+
+    /**
+     * The check code was incorrect.
+     */
+    class InvalidCheckCode(message: String) : ErrorType(message)
+
+    /**
+     * The other client proposed an unsupported protocol.
+     */
+    class UnsupportedProtocol(message: String) : ErrorType(message)
+
+    /**
+     * Secrets backup not set up properly.
+     */
+    class MissingSecretsBackup(message: String) : ErrorType(message)
+
+    /**
+     * The rendezvous session was not found and might have expired.
+     */
+    class NotFound(message: String) : ErrorType(message)
+
+    /**
+     * The device could not be created.
+     */
+    class UnableToCreateDevice(message: String) : ErrorType(message)
+
+    /**
+     * An unknown error has happened.
+     */
+    class Unknown(message: String) : ErrorType(message)
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkDesktopHandler.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkDesktopHandler.kt
new file mode 100644
index 0000000000..d600c1a8bf
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkDesktopHandler.kt
@@ -0,0 +1,41 @@
+/*
+ * 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.api.linknewdevice
+
+import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeDecodeException
+import kotlinx.coroutines.flow.StateFlow
+
+interface LinkDesktopHandler {
+    val linkDesktopStep: StateFlow<LinkDesktopStep>
+    suspend fun handleScannedQrCode(data: ByteArray)
+}
+
+sealed interface LinkDesktopStep {
+    data object Uninitialized : LinkDesktopStep
+    data object Starting : LinkDesktopStep
+    data class WaitingForAuth(
+        val verificationUri: String,
+    ) : LinkDesktopStep
+
+    data class EstablishingSecureChannel(
+        val checkCode: UByte,
+        val checkCodeString: String,
+    ) : LinkDesktopStep
+
+    data class InvalidQrCode(
+        val error: QrCodeDecodeException,
+    ) : LinkDesktopStep
+
+    data class Error(
+        val errorType: ErrorType,
+    ) : LinkDesktopStep
+
+    data object SyncingSecrets : LinkDesktopStep
+
+    data object Done : LinkDesktopStep
+}
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
new file mode 100644
index 0000000000..0c261cdd1a
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkMobileHandler.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.api.linknewdevice
+
+import kotlinx.coroutines.flow.Flow
+
+interface LinkMobileHandler {
+    val linkMobileStep: Flow<LinkMobileStep>
+    suspend fun start()
+}
+
+sealed interface LinkMobileStep {
+    data object Uninitialized : LinkMobileStep
+    data object Starting : LinkMobileStep
+    data class QrReady(val data: String) : LinkMobileStep
+    data class WaitingForAuth(val verificationUri: String) : LinkMobileStep
+    data class QrScanned(val checkCodeSender: CheckCodeSender) : LinkMobileStep
+    data class Error(val errorType: ErrorType) : LinkMobileStep
+    data object SyncingSecrets : LinkMobileStep
+    data object Done : LinkMobileStep
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/logs/LoggerTags.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/logs/LoggerTags.kt
new file mode 100644
index 0000000000..7f19b2d3db
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/logs/LoggerTags.kt
@@ -0,0 +1,14 @@
+/*
+ * 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.api.logs
+
+import io.element.android.libraries.core.log.logger.LoggerTag
+
+object LoggerTags {
+    val linkNewDevice = LoggerTag("LinkNewDevice")
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioDetails.kt
index c2cd4c2988..b93386850e 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioDetails.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioInfo.kt
index a3dadf8a16..a91a3c03f6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/FileInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/FileInfo.kt
index f2a6e7522c..794807cd79 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/FileInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/FileInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ImageInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ImageInfo.kt
index e4ec33fe39..946e523b5f 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ImageInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ImageInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MatrixMediaLoader.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MatrixMediaLoader.kt
index a507aed391..a36849b812 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MatrixMediaLoader.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MatrixMediaLoader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaFile.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaFile.kt
index 793f5acd7f..b5cefe897b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaFile.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaFile.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewConfig.kt
index f1adec8e89..c91fea7e88 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewConfig.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewService.kt
index dffa2d25e4..39718ddfd2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewValue.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewValue.kt
index 60f7552fd9..b77b01b692 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewValue.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaPreviewValue.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaSource.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaSource.kt
index 25e6a47be4..56e32ba2fc 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaSource.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaUploadHandler.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaUploadHandler.kt
index fdf14c4cca..c07949441b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaUploadHandler.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/MediaUploadHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ThumbnailInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ThumbnailInfo.kt
index 04203bf283..368abd4389 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ThumbnailInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/ThumbnailInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/VideoInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/VideoInfo.kt
index 0ae6e9f55d..e5f3915d55 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/VideoInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/VideoInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8525425e1b..306ab8354b 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
@@ -1,34 +1,19 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.mxc
 
-import dev.zacsweers.metro.Inject
-
-@Inject
-class MxcTools {
-    /**
-     * Regex to match a Matrix Content (mxc://) URI.
-     *
-     * See: https://spec.matrix.org/v1.8/client-server-api/#matrix-content-mxc-uris
-     */
-    private val mxcRegex = Regex("""^mxc://([^/]+)/([^/]+)$""")
-
+interface MxcTools {
     /**
      * Sanitizes an mxcUri to be used as a relative file path.
      *
      * @param mxcUri the Matrix Content (mxc://) URI of the file.
      * @return the relative file path as "<server-name>/<media-id>" or null if the mxcUri is invalid.
      */
-    fun mxcUri2FilePath(mxcUri: String): String? = mxcRegex.matchEntire(mxcUri)?.let { match ->
-        buildString {
-            append(match.groupValues[1])
-            append("/")
-            append(match.groupValues[2])
-        }
-    }
+    fun mxcUri2FilePath(mxcUri: String): String?
 }
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 1a58ced0fd..aff3092549 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,6 +30,7 @@ data class NotificationData(
     val roomDisplayName: String?,
     val isDirect: Boolean,
     val isDm: Boolean,
+    val isSpace: Boolean,
     val isEncrypted: Boolean,
     val isNoisy: Boolean,
     val timestamp: Long,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt
index ddec326cef..369587cd10 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 703ec1205e..4d8ce8afb4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,6 +32,7 @@ interface NotificationSettingsService {
     suspend fun setCallEnabled(enabled: Boolean): Result<Unit>
     suspend fun isInviteForMeEnabled(): Result<Boolean>
     suspend fun setInviteForMeEnabled(enabled: Boolean): Result<Unit>
-    suspend fun getRoomsWithUserDefinedRules(): Result<List<String>>
+    suspend fun getRoomsWithUserDefinedRules(): Result<List<RoomId>>
     suspend fun canHomeServerPushEncryptedEventsToDevice(): Result<Boolean>
+    suspend fun getRawPushRules(): Result<String?>
 }
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/oidc/AccountManagementAction.kt
index 506d1d9f3f..77e8854417 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/oidc/AccountManagementAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt
index 7f7d685326..cc3e2b5cf6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt
index c66dc89693..878b0e7a69 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkData.kt
index 1f5f39dee7..a554ce2b20 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkData.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import androidx.compose.runtime.Immutable
 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.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -28,6 +30,7 @@ sealed interface PermalinkData : Parcelable {
     data class RoomLink(
         val roomIdOrAlias: RoomIdOrAlias,
         val eventId: EventId? = null,
+        val threadId: ThreadId? = null,
         val viaParameters: ImmutableList<String> = persistentListOf()
     ) : PermalinkData
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParser.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParser.kt
index f51856db33..5365b8776a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParser.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/platform/InitPlatformService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/platform/InitPlatformService.kt
index 6199d1704d..a08946bbac 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/platform/InitPlatformService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/platform/InitPlatformService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollAnswer.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollAnswer.kt
index d55a902b03..043d2881c3 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollAnswer.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollAnswer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollKind.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollKind.kt
index 81c55569be..e79d716f82 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollKind.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/poll/PollKind.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.poll
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/PushersService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/PushersService.kt
index 14c2d50694..6764598235 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/PushersService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/PushersService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3525594c08..8a557f4b70 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/UnsetHttpPusherData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/UnsetHttpPusherData.kt
index ad833a6a78..dc9cf12ffe 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/UnsetHttpPusherData.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/UnsetHttpPusherData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/recentemojis/AddRecentEmoji.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/recentemojis/AddRecentEmoji.kt
deleted file mode 100644
index da657ea78a..0000000000
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/recentemojis/AddRecentEmoji.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.matrix.api.recentemojis
-
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.matrix.api.MatrixClient
-import kotlinx.coroutines.withContext
-
-@Inject
-class AddRecentEmoji(
-    private val client: MatrixClient,
-    private val dispatchers: CoroutineDispatchers,
-) {
-    suspend operator fun invoke(emoji: String): Result<Unit> = withContext(dispatchers.io) {
-        client.addRecentEmoji(emoji)
-    }
-}
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 2694191f89..481171ace0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,10 +14,12 @@ 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.core.UserId
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+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
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import io.element.android.libraries.matrix.api.timeline.Timeline
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
@@ -97,6 +100,11 @@ interface BaseRoom : Closeable {
      */
     suspend fun userRole(userId: UserId): Result<RoomMember.Role>
 
+    /**
+     * Gets the permissions of the room.
+     */
+    suspend fun roomPermissions(): Result<RoomPermissions>
+
     /**
      * Gets the display name of the user with the provided [userId] in the room.
      */
@@ -122,57 +130,6 @@ interface BaseRoom : Closeable {
      */
     suspend fun forget(): Result<Unit>
 
-    /**
-     * Returns `true` if the user with the provided [userId] can invite other users to the room.
-     */
-    suspend fun canUserInvite(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can kick other users from the room.
-     */
-    suspend fun canUserKick(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can ban other users from the room.
-     */
-    suspend fun canUserBan(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can redact their own messages.
-     */
-    suspend fun canUserRedactOwn(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can redact messages from other users.
-     */
-    suspend fun canUserRedactOther(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can send state events.
-     */
-    suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can send messages.
-     */
-    suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can trigger an `@room` notification.
-     */
-    suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can pin or unpin messages.
-     */
-    suspend fun canUserPinUnpin(userId: UserId): Result<Boolean>
-
-    /**
-     * Returns `true` if the user with the provided [userId] can join or starts calls.
-     */
-    suspend fun canUserJoinCall(userId: UserId): Result<Boolean> =
-        canUserSendState(userId, StateEventType.CALL_MEMBER)
-
     /**
      * Sets the room as favorite or not, based on the [isFavorite] parameter.
      */
@@ -180,6 +137,10 @@ interface BaseRoom : Closeable {
 
     /**
      * Mark the room as read by trying to attach an unthreaded read receipt to the latest room event.
+     *
+     * Note this will instantiate a new timeline, which is an expensive operation.
+     * Prefer using [Timeline.markAsRead] instead when possible.
+     *
      * @param receiptType The type of receipt to send.
      */
     suspend fun markAsRead(receiptType: ReceiptType): Result<Unit>
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CreateTimelineParams.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CreateTimelineParams.kt
index 7d7b3a379a..b5374c8be8 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CreateTimelineParams.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CreateTimelineParams.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CurrentUserMembership.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CurrentUserMembership.kt
index 9b1b86703b..ecf43e90f3 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CurrentUserMembership.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CurrentUserMembership.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/FilterRoomMembers.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/FilterRoomMembers.kt
index a1c4f0bf01..80cefc41e1 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/FilterRoomMembers.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/FilterRoomMembers.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/ForwardEventException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/ForwardEventException.kt
index 21ccb16278..f73b756810 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/ForwardEventException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/ForwardEventException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/IntentionalMention.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/IntentionalMention.kt
index deee0490a7..25d5fa6f7d 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/IntentionalMention.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/IntentionalMention.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fae6b04a93..1cfcfc46f2 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt
index 0f2a61da6e..1341378b90 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,10 +12,21 @@ import androidx.compose.runtime.Immutable
 
 @Immutable
 sealed interface MessageEventType {
+    data object Audio : MessageEventType
+    data object Beacon : MessageEventType
     data object CallAnswer : MessageEventType
+    data object CallCandidates : MessageEventType
     data object CallInvite : MessageEventType
     data object CallHangup : MessageEventType
-    data object CallCandidates : MessageEventType
+    data object CallNegotiate : MessageEventType
+    data object CallNotify : MessageEventType
+    data object CallReject : MessageEventType
+    data object CallSdpStreamMetadataChanged : MessageEventType
+    data object CallSelectAnswer : MessageEventType
+    data object Emote : MessageEventType
+    data object Encrypted : MessageEventType
+    data object File : MessageEventType
+    data object Image : MessageEventType
     data object RtcNotification : MessageEventType
     data object KeyVerificationReady : MessageEventType
     data object KeyVerificationStart : MessageEventType
@@ -23,10 +35,13 @@ sealed interface MessageEventType {
     data object KeyVerificationKey : MessageEventType
     data object KeyVerificationMac : MessageEventType
     data object KeyVerificationDone : MessageEventType
+    data object Location : MessageEventType
+    data object Message : MessageEventType
     data object Reaction : MessageEventType
     data object RoomEncrypted : MessageEventType
     data object RoomMessage : MessageEventType
     data object RoomRedaction : MessageEventType
+    data object RtcDecline : MessageEventType
     data object Sticker : MessageEventType
     data object PollEnd : MessageEventType
     data object PollResponse : MessageEventType
@@ -34,5 +49,7 @@ sealed interface MessageEventType {
     data object UnstablePollEnd : MessageEventType
     data object UnstablePollResponse : MessageEventType
     data object UnstablePollStart : MessageEventType
+    data object Video : MessageEventType
+    data object Voice : MessageEventType
     data class Other(val type: String) : MessageEventType
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt
index b83292e0f2..fd5e71ff9d 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 48e549ab3f..9a789187ca 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
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -19,7 +19,6 @@ import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
-@Immutable
 data class RoomInfo(
     val id: RoomId,
     /** The room's name from the room state event if received from sync, or one that's been computed otherwise. */
@@ -80,15 +79,4 @@ data class RoomInfo(
 ) {
     val aliases: List<RoomAlias>
         get() = listOfNotNull(canonicalAlias) + alternativeAliases
-
-    /**
-     * Returns the list of users with the given [role] in this room.
-     */
-    fun usersWithRole(role: RoomMember.Role): List<UserId> {
-        return if (role is RoomMember.Role.Owner && role.isCreator) {
-            this.creators
-        } else {
-            this.roomPowerLevels?.usersWithRole(role).orEmpty().toList()
-        }
-    }
 }
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
index 4f0bf2dcae..f33319e2ee 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f1b1104a27..0b3d7071c8 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
@@ -24,6 +26,7 @@ data class RoomMember(
     /**
      * Role of the RoomMember, based on its [powerLevel].
      */
+    @Immutable
     sealed interface Role {
         data class Owner(val isCreator: Boolean) : Role
         data object Admin : Role
@@ -96,6 +99,6 @@ fun RoomMember.getBestName(): String {
 
 fun RoomMember.toMatrixUser() = MatrixUser(
     userId = userId,
-    displayName = displayName,
-    avatarUrl = avatarUrl,
+    displayName = displayName.takeUnless { membership == RoomMembershipState.BAN },
+    avatarUrl = avatarUrl.takeUnless { membership == RoomMembershipState.BAN },
 )
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 c83b74ac70..1c35fab7d0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipDetails.kt
index 20d7b0e2ad..df99d1be67 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipDetails.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt
index a4a718b219..852a997ee9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembershipObserver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettings.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettings.kt
index b86bd51c0d..4505c99e0a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettings.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt
index 15c1003317..243f6c02af 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomType.kt
index d788257dd0..49cc345c24 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f9b0de2449..057c5838e5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 832fb0414f..41d64afff1 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
@@ -1,33 +1,40 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-enum class StateEventType {
-    POLICY_RULE_ROOM,
-    POLICY_RULE_SERVER,
-    POLICY_RULE_USER,
-    CALL_MEMBER,
-    ROOM_ALIASES,
-    ROOM_AVATAR,
-    ROOM_CANONICAL_ALIAS,
-    ROOM_CREATE,
-    ROOM_ENCRYPTION,
-    ROOM_GUEST_ACCESS,
-    ROOM_HISTORY_VISIBILITY,
-    ROOM_JOIN_RULES,
-    ROOM_MEMBER_EVENT,
-    ROOM_NAME,
-    ROOM_PINNED_EVENTS,
-    ROOM_POWER_LEVELS,
-    ROOM_SERVER_ACL,
-    ROOM_THIRD_PARTY_INVITE,
-    ROOM_TOMBSTONE,
-    ROOM_TOPIC,
-    SPACE_CHILD,
-    SPACE_PARENT
+sealed interface StateEventType {
+    data object PolicyRuleRoom : 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
+    data object RoomEncryption : StateEventType
+    data object RoomGuestAccess : StateEventType
+    data object RoomHistoryVisibility : StateEventType
+    data object RoomJoinRules : StateEventType
+    data object RoomMemberEvent : StateEventType
+    data object RoomName : StateEventType
+    data object RoomPinnedEvents : StateEventType
+    data object RoomPowerLevels : StateEventType
+    data object RoomServerAcl : StateEventType
+    data object RoomThirdPartyInvite : StateEventType
+    data object RoomTombstone : StateEventType
+    data object RoomTopic : StateEventType
+    data object SpaceChild : StateEventType
+    data object SpaceParent : StateEventType
+    data object BeaconInfo : StateEventType
+    data object MemberHints : StateEventType
+    data object RoomImagePack : StateEventType
+    data object RoomLanguage : StateEventType
+
+    data class Custom(val type: String) : StateEventType
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
index 0b3bcdbc1c..1b26e8c92f 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/ResolvedRoomAlias.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/ResolvedRoomAlias.kt
index 81f7205140..65a3f2a265 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/ResolvedRoomAlias.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/ResolvedRoomAlias.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/RoomAliasHelper.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/RoomAliasHelper.kt
index c42bcb6982..c23252961f 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/RoomAliasHelper.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/RoomAliasHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraft.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraft.kt
index 24a76d273a..bd1bdacdc9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraft.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraft.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraftType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraftType.kt
index fc828af33d..79e9bd24df 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraftType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/draft/ComposerDraftType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/errors/FocusEventException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/errors/FocusEventException.kt
index 5e787ce4f7..a966394833 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/errors/FocusEventException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/errors/FocusEventException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt
index 09faa9fb00..9f3826fe06 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/history/RoomHistoryVisibility.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/AllowRule.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/AllowRule.kt
index 4dfc3ac565..247fba860b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/AllowRule.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/AllowRule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRoom.kt
index 731512b2e9..4220b68f0d 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRule.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRule.kt
index 0eada82e29..dad2492233 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRule.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/knock/KnockRequest.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/knock/KnockRequest.kt
index cf085a2297..317157793e 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/knock/KnockRequest.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/knock/KnockRequest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/AssetType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/AssetType.kt
index 828b661551..42d384fd74 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/AssetType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/AssetType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt
deleted file mode 100644
index acba06dce8..0000000000
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/message/RoomMessage.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.matrix.api.room.message
-
-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.EventTimelineItem
-
-data class RoomMessage(
-    val eventId: EventId,
-    val event: EventTimelineItem,
-    val sender: UserId,
-    val originServerTs: Long,
-)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomMembersWithRole.kt
similarity index 56%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomMembersWithRole.kt
index 689157f215..4981de3b1a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomMembersWithRole.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,17 +15,16 @@ import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 
 /**
- * Return a flow of the list of active room members who have the given role.
+ * Return a flow of the list of active room members who match the predicate.
  */
-fun BaseRoom.usersWithRole(role: RoomMember.Role): Flow<ImmutableList<RoomMember>> {
-    // Ensure the room members flow is ready
+fun BaseRoom.usersWithRole(predicate: (RoomMember.Role) -> Boolean): Flow<ImmutableList<RoomMember>> {
+    // Wait until members are ready to avoid returning empty lists initially
     val readyMembersFlow = membersStateFlow
         .onStart {
             if (membersStateFlow.value is RoomMembersState.Unknown) {
@@ -33,12 +33,17 @@ fun BaseRoom.usersWithRole(role: RoomMember.Role): Flow<ImmutableList<RoomMember
         }
         .filter { it is RoomMembersState.Ready }
 
-    return roomInfoFlow
-        .map { roomInfo -> roomInfo.usersWithRole(role) }
-        .combine(readyMembersFlow) { powerLevels, membersState ->
-            membersState.activeRoomMembers()
-                .filter { powerLevels.contains(it.userId) }
-                .toImmutableList()
-        }
-        .distinctUntilChanged()
+    return readyMembersFlow.map { membersState ->
+        membersState
+            .activeRoomMembers()
+            .filter { predicate(it.role) }
+            .toImmutableList()
+    }.distinctUntilChanged()
+}
+
+/**
+ * Return the number of active room members who match the predicate.
+ */
+fun BaseRoom.userCountWithRole(predicate: (RoomMember.Role) -> Boolean): Flow<Int> {
+    return usersWithRole(predicate).map { it.size }
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPermissions.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPermissions.kt
new file mode 100644
index 0000000000..a12f7d9606
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPermissions.kt
@@ -0,0 +1,183 @@
+/*
+ * 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.api.room.powerlevels
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.StateEventType
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+
+/**
+ * Provides information about the permissions of users in a room.
+ */
+interface RoomPermissions : AutoCloseable {
+    /**
+     * Returns true if the current user is able to ban from the room.
+     */
+    fun canOwnUserBan(): Boolean
+
+    /**
+     * Returns true if the current user is able to invite in the room.
+     */
+    fun canOwnUserInvite(): Boolean
+
+    /**
+     * Returns true if the current user is able to kick from the room.
+     */
+    fun canOwnUserKick(): Boolean
+
+    /**
+     * Returns true if the current user is able to pin or unpin events in the
+     * room.
+     */
+    fun canOwnUserPinUnpin(): Boolean
+
+    /**
+     * Returns true if the current user user is able to redact messages of
+     * other users in the room.
+     */
+    fun canOwnUserRedactOther(): Boolean
+
+    /**
+     * Returns true if the current user is able to redact their own messages in
+     * the room.
+     */
+    fun canOwnUserRedactOwn(): Boolean
+
+    /**
+     * Returns true if the current user is able to send a specific message type
+     * in the room.
+     */
+    fun canOwnUserSendMessage(message: MessageEventType): Boolean
+
+    /**
+     * Returns true if the current user is able to send a specific state event
+     * type in the room.
+     */
+    fun canOwnUserSendState(stateEvent: StateEventType): Boolean
+
+    /**
+     * Returns true if the current user is able to trigger a notification in
+     * the room.
+     */
+    fun canOwnUserTriggerRoomNotification(): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to ban in the
+     * room.
+     */
+    fun canUserBan(userId: UserId): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to invite in the
+     * room.
+     */
+    fun canUserInvite(userId: UserId): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to kick in the
+     * room.
+     */
+    fun canUserKick(userId: UserId): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to pin or unpin
+     * events in the room.
+     */
+    fun canUserPinUnpin(userId: UserId): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to redact
+     * messages of other users in the room.
+     */
+    fun canUserRedactOther(userId: UserId): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to redact
+     * their own messages in the room.
+     */
+    fun canUserRedactOwn(userId: UserId): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to send a
+     * specific message type in the room.
+     */
+    fun canUserSendMessage(userId: UserId, message: MessageEventType): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to send a
+     * specific state event type in the room.
+     */
+    fun canUserSendState(userId: UserId, stateEvent: StateEventType): Boolean
+
+    /**
+     * Returns true if the user with the given userId is able to trigger a
+     * notification in the room.
+     *
+     * The call may fail if there is an error in getting the power levels.
+     */
+    fun canUserTriggerRoomNotification(userId: UserId): Boolean
+}
+
+/**
+ * Returns true if the current user can edit roles and permissions in the room ie. can send
+ * a power levels state event.
+ */
+fun RoomPermissions.canEditRolesAndPermissions(): Boolean {
+    return canOwnUserSendState(StateEventType.RoomPowerLevels)
+}
+
+/**
+ * Returns true if the current user can start a call in the room ie. can send
+ * a call member state event.
+ */
+fun RoomPermissions.canCall(): Boolean {
+    return canOwnUserSendState(StateEventType.CallMember)
+}
+
+fun <T> Result<RoomPermissions>.use(default: T, block: (RoomPermissions) -> T): T {
+    return fold(
+        onSuccess = { perms ->
+            perms.use(block)
+        },
+        onFailure = {
+            default
+        }
+    )
+}
+
+fun <T> BaseRoom.permissionsFlow(default: T, block: (RoomPermissions) -> T): Flow<T> {
+    return roomInfoFlow
+        .map { info ->
+            // If the user is a privileged creator, we return a constant hashcode to avoid recomputing permissions
+            // each time the power levels change (as they have all permissions).
+            if (info.privilegedCreatorRole && info.creators.contains(sessionId)) {
+                Long.MAX_VALUE
+            } else {
+                info.roomPowerLevels?.hashCode() ?: 0L
+            }
+        }
+        .distinctUntilChanged()
+        .map {
+            roomPermissions().use(default, block)
+        }
+}
+
+@Composable
+fun <T> BaseRoom.permissionsAsState(default: T, block: (RoomPermissions) -> T): State<T> {
+    return remember(this, default, block) {
+        permissionsFlow(default, block)
+    }.collectAsState(default)
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt
index 635a6cc1f4..31019878d9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,19 +35,6 @@ data class RoomPowerLevels(
         return users[userId] ?: 0L
     }
 
-    /**
-     * Returns the set of [UserId]s that have the given role in the room.
-     *
-     * **WARNING**: This method must not be used with a creator role. It'll result in a runtime error.
-     */
-    fun usersWithRole(role: RoomMember.Role): Set<UserId> {
-        return if (role is RoomMember.Role.Owner && role.isCreator) {
-            error("RoomPowerLevels.usersWithRole should not be used with a creator role, use roomInfo.creators instead")
-        } else {
-            users.filterValues { RoomMember.Role.forPowerLevel(it) == role }.keys
-        }
-    }
-
     /**
      * Returns the role of the user in the room based on their power level.
      * If the user is not found, returns null.
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 0acafc2a43..e8f88ed86d 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
@@ -1,71 +1,22 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.powerlevels
 
-import io.element.android.libraries.core.extensions.runCatchingExceptions
-import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
-import io.element.android.libraries.matrix.api.room.StateEventType
-
 data class RoomPowerLevelsValues(
     val ban: Long,
     val invite: Long,
     val kick: Long,
-    val sendEvents: Long,
+    val eventsDefault: Long,
+    val stateDefault: Long,
     val redactEvents: Long,
     val roomName: Long,
     val roomAvatar: Long,
     val roomTopic: Long,
+    val spaceChild: Long,
 )
-
-/**
- * Shortcut for calling [BaseRoom.canUserInvite] with our own user.
- */
-suspend fun BaseRoom.canInvite(): Result<Boolean> = canUserInvite(sessionId)
-
-/**
- * Shortcut for calling [BaseRoom.canUserKick] with our own user.
- */
-suspend fun BaseRoom.canKick(): Result<Boolean> = canUserKick(sessionId)
-
-/**
- * Shortcut for calling [BaseRoom.canUserBan] with our own user.
- */
-suspend fun BaseRoom.canBan(): Result<Boolean> = canUserBan(sessionId)
-
-/**
- * Shortcut for calling [BaseRoom.canUserSendState] with our own user.
- */
-suspend fun BaseRoom.canSendState(type: StateEventType): Result<Boolean> = canUserSendState(sessionId, type)
-
-/**
- * Shortcut for calling [BaseRoom.canUserSendMessage] with our own user.
- */
-suspend fun BaseRoom.canSendMessage(type: MessageEventType): Result<Boolean> = canUserSendMessage(sessionId, type)
-
-/**
- * Shortcut for calling [BaseRoom.canUserRedactOwn] with our own user.
- */
-suspend fun BaseRoom.canRedactOwn(): Result<Boolean> = canUserRedactOwn(sessionId)
-
-/**
- * Shortcut for calling [BaseRoom.canRedactOther] with our own user.
- */
-suspend fun BaseRoom.canRedactOther(): Result<Boolean> = canUserRedactOther(sessionId)
-
-/**
- * Shortcut for checking if current user can handle knock requests.
- */
-suspend fun BaseRoom.canHandleKnockRequests(): Result<Boolean> = runCatchingExceptions {
-    canInvite().getOrThrow() || canBan().getOrThrow() || canKick().getOrThrow()
-}
-
-/**
- * Shortcut for calling [BaseRoom.canUserPinUnpin] with our own user.
- */
-suspend fun BaseRoom.canPinUnpin(): Result<Boolean> = canUserPinUnpin(sessionId)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/UserRoleChange.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/UserRoleChange.kt
index 9ab472e6b4..43d6b8ad70 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/UserRoleChange.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/UserRoleChange.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreviewInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreviewInfo.kt
index 61de6f7d15..ee422d6f9f 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreviewInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/preview/RoomPreviewInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e0a51ef005..8221674439 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/PredecessorRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/PredecessorRoom.kt
index 4e6e8a7157..d66d149c48 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/PredecessorRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/PredecessorRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/SuccessorRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/SuccessorRoom.kt
index 957585a464..c8179d8bcc 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/SuccessorRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/tombstone/SuccessorRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
index 16aa58de28..b6280080f5 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDescription.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryList.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryList.kt
index 402a60f639..c48bf54e9c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryList.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,9 +27,9 @@ interface RoomDirectoryList {
     /**
      * The current search results as a state flow.
      */
-    val state: Flow<State>
+    val state: Flow<SearchResult>
 
-    data class State(
+    data class SearchResult(
         val hasMoreToLoad: Boolean,
         val items: List<RoomDescription>,
     )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryService.kt
index d91b49363b..8f71cfb18c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomVisibility.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomVisibility.kt
index f29c2aac59..1d4cd18009 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomVisibility.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomVisibility.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/DynamicRoomList.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/DynamicRoomList.kt
index b55a57d9dd..acba1e3cf6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/DynamicRoomList.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/DynamicRoomList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt
new file mode 100644
index 0000000000..5482a67875
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/LatestEventValue.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.api.roomlist
+
+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
+
+sealed interface LatestEventValue {
+    data object None : LatestEventValue
+    data class Remote(
+        val timestamp: Long,
+        val content: EventContent,
+        val senderId: UserId,
+        val senderProfile: ProfileDetails,
+        val isOwn: Boolean,
+    ) : LatestEventValue
+
+    data class Local(
+        val timestamp: Long,
+        val content: EventContent,
+        val senderId: UserId,
+        val senderProfile: ProfileDetails,
+        val isSending: Boolean,
+    ) : LatestEventValue
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomList.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomList.kt
index c367f1b675..a0d092596a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomList.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -64,7 +65,7 @@ suspend fun RoomList.awaitLoaded(timeout: Duration = Duration.INFINITE) {
                 it is RoomList.LoadingState.Loaded
             }
         }
-    } catch (timeoutException: TimeoutCancellationException) {
+    } catch (_: TimeoutCancellationException) {
         Timber.d("awaitAllRoomsAreLoaded: no response after $timeout")
     }
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListFilter.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListFilter.kt
index 405906a185..33d233d589 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListFilter.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListFilter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListService.kt
index 261a37defb..4a531792df 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c4f1851089..89a4acfec1 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
@@ -1,20 +1,24 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.roomlist
 
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
 
 data class RoomSummary(
     val info: RoomInfo,
-    val lastMessage: RoomMessage?,
+    val latestEvent: LatestEventValue,
 ) {
     val roomId = info.id
-    val lastMessageTimestamp = lastMessage?.originServerTs
+    val latestEventTimestamp = when (latestEvent) {
+        is LatestEventValue.None -> null
+        is LatestEventValue.Local -> latestEvent.timestamp
+        is LatestEventValue.Remote -> latestEvent.timestamp
+    }
     val isOneToOne get() = info.activeMembersCount == 2L
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/server/UserServerResolver.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/server/UserServerResolver.kt
index 7342272769..3529b17d85 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/server/UserServerResolver.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/server/UserServerResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceHandle.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceHandle.kt
index 292a973dda..174ec20dc9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceHandle.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceHandle.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceRoom.kt
index fb90896e05..071d5693b8 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/LeaveSpaceRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3e72632e6c..d21c3764f3 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt
index 1dddfadc5b..e2528bf117 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomList.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt
index 98afa1d508..47a74461db 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt
index f1fea6b62a..6f5ba674ec 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SlidingSyncVersion.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SlidingSyncVersion.kt
index fd4de06d35..8a60626ed4 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SlidingSyncVersion.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SlidingSyncVersion.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncService.kt
index 13cb54b500..ce0019d8dc 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt
index 6d253c8126..e4210c8ab4 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MatrixTimelineItem.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MatrixTimelineItem.kt
index 96aa9afeaf..b9e9608ef1 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MatrixTimelineItem.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MatrixTimelineItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/ReceiptType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/ReceiptType.kt
index 2b45a27053..f0c9bbaeca 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/ReceiptType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/ReceiptType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f8f5793368..500d9f3191 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
@@ -1,13 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
 import android.os.Parcelable
+import androidx.compose.runtime.Immutable
 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
@@ -42,6 +44,7 @@ interface Timeline : AutoCloseable {
     }
 
     @Parcelize
+    @Immutable
     sealed interface Mode : Parcelable {
         data object Live : Mode
         data class FocusedOnEvent(val eventId: EventId) : Mode
@@ -52,7 +55,9 @@ interface Timeline : AutoCloseable {
 
     val mode: Mode
     val membershipChangeEventReceived: Flow<Unit>
+    val onSyncedEventReceived: Flow<Unit>
     suspend fun sendReadReceipt(eventId: EventId, receiptType: ReceiptType): Result<Unit>
+    suspend fun markAsRead(receiptType: ReceiptType): Result<Unit>
     suspend fun paginate(direction: PaginationDirection): Result<Boolean>
 
     val backwardPaginationStatus: StateFlow<PaginationStatus>
@@ -225,4 +230,9 @@ interface Timeline : AutoCloseable {
      * pinned
      */
     suspend fun unpinEvent(eventId: EventId): Result<Boolean>
+
+    /**
+     * Get the latest event id of the timeline.
+     */
+    suspend fun getLatestEventId(): Result<EventId?>
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineException.kt
index 7fffc94fe3..0e05257a17 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt
index acc18ee1a0..28e487f527 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/TimelineProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,7 @@ import kotlinx.coroutines.flow.first
  * It could be the live timeline, a pinned timeline or a detached timeline.
  * By default, the active timeline is the live timeline.
  */
-interface TimelineProvider {
+fun interface TimelineProvider {
     fun activeTimelineFlow(): StateFlow<Timeline?>
 }
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt
index c34e4c9ac3..97923995a0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/ThreadSummary.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,7 @@ 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.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 
 sealed interface EventThreadInfo {
     data class ThreadRoot(val summary: ThreadSummary) : EventThreadInfo
@@ -28,6 +29,6 @@ data class EmbeddedEventInfo(
     val eventOrTransactionId: EventOrTransactionId,
     val content: EventContent,
     val senderId: UserId,
-    val senderProfile: ProfileTimelineDetails,
+    val senderProfile: ProfileDetails,
     val timestamp: Long,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/TimelineItemDebugInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/TimelineItemDebugInfo.kt
index 1ea8a34590..f34e4181ef 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/TimelineItemDebugInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/TimelineItemDebugInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5fefe8ae31..b6ed7dc602 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,7 +26,7 @@ data class MessageContent(
     val inReplyTo: InReplyTo?,
     val isEdited: Boolean,
     val threadInfo: EventThreadInfo?,
-    val type: MessageType
+    val type: MessageType,
 ) : EventContent
 
 data object RedactedContent : EventContent
@@ -35,6 +36,7 @@ data class StickerContent(
     val body: String?,
     val info: ImageInfo,
     val source: MediaSource,
+    val threadInfo: EventThreadInfo?,
 ) : EventContent {
     val bestDescription: String
         get() = body ?: filename
@@ -48,10 +50,12 @@ data class PollContent(
     val votes: ImmutableMap<String, ImmutableList<UserId>>,
     val endTime: ULong?,
     val isEdited: Boolean,
+    val threadInfo: EventThreadInfo?,
 ) : EventContent
 
 data class UnableToDecryptContent(
-    val data: Data
+    val data: Data,
+    val threadInfo: EventThreadInfo?,
 ) : EventContent {
     @Immutable
     sealed interface Data {
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventOrTransactionId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventOrTransactionId.kt
index f0abd0a6f1..a900326831 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventOrTransactionId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventOrTransactionId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventReaction.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventReaction.kt
index ee304957b2..c9dd22e75c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventReaction.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventReaction.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.item.event
 
-import androidx.compose.runtime.Immutable
 import kotlinx.collections.immutable.ImmutableList
 
-@Immutable
 data class EventReaction(
     val key: String,
     val senders: ImmutableList<ReactionSender>
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt
index fc08c1cee1..401240f927 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventTimelineItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,7 +27,7 @@ data class EventTimelineItem(
     val reactions: ImmutableList<EventReaction>,
     val receipts: ImmutableList<Receipt>,
     val sender: UserId,
-    val senderProfile: ProfileTimelineDetails,
+    val senderProfile: ProfileDetails,
     val timestamp: Long,
     val content: EventContent,
     val origin: TimelineItemEventOrigin?,
@@ -38,7 +39,13 @@ data class EventTimelineItem(
         return (content as? MessageContent)?.inReplyTo
     }
 
-    fun threadInfo(): EventThreadInfo? = (content as? MessageContent)?.threadInfo
+    fun threadInfo(): EventThreadInfo? = when (content) {
+        is MessageContent -> content.threadInfo
+        is PollContent -> content.threadInfo
+        is StickerContent -> content.threadInfo
+        is UnableToDecryptContent -> content.threadInfo
+        else -> null
+    }
 
     fun hasNotLoadedInReplyTo(): Boolean {
         val details = inReplyTo()
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventType.kt
index d6b354376c..8978d28e5b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/FormattedBody.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/FormattedBody.kt
index d5deac22be..88dda6ca5b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/FormattedBody.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/FormattedBody.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt
index 52b1cb9504..43a54602ca 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/InReplyTo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,7 +25,7 @@ sealed interface InReplyTo {
         val eventId: EventId,
         val content: EventContent,
         val senderId: UserId,
-        val senderProfile: ProfileTimelineDetails,
+        val senderProfile: ProfileDetails,
     ) : InReplyTo
 
     /**
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt
index f28ef46c66..05a510bafa 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/LocalEventSendState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MembershipChange.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MembershipChange.kt
index 7d825c541d..e8cd52ec12 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MembershipChange.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MembershipChange.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageFormat.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageFormat.kt
index 436e064ffc..8ef6b1debf 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageFormat.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageFormat.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageShield.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageShield.kt
index 2fd9ec699a..a422e0bcc0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageShield.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageShield.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d2d4f3997c..6de2876f61 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3e03515c7c..ed3f53169f 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
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.item.event
 
 import androidx.compose.runtime.Immutable
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 
 @Immutable
 sealed interface OtherState {
@@ -21,7 +23,7 @@ sealed interface OtherState {
     data object RoomEncryption : OtherState
     data object RoomGuestAccess : OtherState
     data object RoomHistoryVisibility : OtherState
-    data object RoomJoinRules : OtherState
+    data class RoomJoinRules(val joinRule: JoinRule?) : OtherState
     data class RoomName(val name: String?) : OtherState
     data class RoomPinnedEvents(val change: Change) : OtherState {
         enum class Change {
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
similarity index 64%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetails.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
index 46ab482ad5..6393a27bb2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,20 +12,20 @@ import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 
 @Immutable
-sealed interface ProfileTimelineDetails {
-    data object Unavailable : ProfileTimelineDetails
+sealed interface ProfileDetails {
+    data object Unavailable : ProfileDetails
 
-    data object Pending : ProfileTimelineDetails
+    data object Pending : ProfileDetails
 
     data class Ready(
         val displayName: String?,
         val displayNameAmbiguous: Boolean,
         val avatarUrl: String?
-    ) : ProfileTimelineDetails
+    ) : ProfileDetails
 
     data class Error(
         val message: String
-    ) : ProfileTimelineDetails
+    ) : ProfileDetails
 }
 
 /**
@@ -33,9 +34,9 @@ sealed interface ProfileTimelineDetails {
  * If the display name is ambiguous, the user ID is appended in parentheses.
  * Otherwise, the display name is returned.
  */
-fun ProfileTimelineDetails.getDisambiguatedDisplayName(userId: UserId): String {
+fun ProfileDetails.getDisambiguatedDisplayName(userId: UserId): String {
     return when (this) {
-        is ProfileTimelineDetails.Ready -> when {
+        is ProfileDetails.Ready -> when {
             displayName == null -> userId.value
             displayNameAmbiguous -> "$displayName ($userId)"
             else -> displayName
@@ -44,16 +45,16 @@ fun ProfileTimelineDetails.getDisambiguatedDisplayName(userId: UserId): String {
     }
 }
 
-fun ProfileTimelineDetails.getDisplayName(): String? {
+fun ProfileDetails.getDisplayName(): String? {
     return when (this) {
-        is ProfileTimelineDetails.Ready -> displayName
+        is ProfileDetails.Ready -> displayName
         else -> null
     }
 }
 
-fun ProfileTimelineDetails.getAvatarUrl(): String? {
+fun ProfileDetails.getAvatarUrl(): String? {
     return when (this) {
-        is ProfileTimelineDetails.Ready -> avatarUrl
+        is ProfileDetails.Ready -> avatarUrl
         else -> null
     }
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ReactionSender.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ReactionSender.kt
index af4fb3ca98..92eb0b5512 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ReactionSender.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ReactionSender.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/Receipt.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/Receipt.kt
index 8249260f1a..9a371ba7ee 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/Receipt.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/Receipt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/TimelineItemEventOrigin.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/TimelineItemEventOrigin.kt
index 528e28d5cf..f867a03cf9 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/TimelineItemEventOrigin.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/TimelineItemEventOrigin.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/UtdCause.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/UtdCause.kt
index 24d3a4079b..6203d345e4 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/UtdCause.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/UtdCause.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/virtual/VirtualTimelineItem.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/virtual/VirtualTimelineItem.kt
index 1a32bde270..8e32c2e9ed 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/virtual/VirtualTimelineItem.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/virtual/VirtualTimelineItem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/LogLevel.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/LogLevel.kt
index 9485f14e1e..9cd40f4929 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/LogLevel.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/LogLevel.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TraceLogPack.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TraceLogPack.kt
index cdb9c07996..a0e5050a23 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TraceLogPack.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TraceLogPack.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,6 +20,12 @@ enum class TraceLogPack(val key: String) {
     },
     NOTIFICATION_CLIENT("notification_client") {
         override val title: String = "Notification Client"
+    },
+    SYNC_PROFILING("sync_profiling") {
+        override val title: String = "Sync Profiling"
+    },
+    LATEST_EVENTS("latest_events") {
+        override val title = "Latest Events"
     };
 
     abstract val title: String
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingConfiguration.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingConfiguration.kt
index f559176fa6..569683d3f7 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingConfiguration.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingConfiguration.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,4 +14,5 @@ data class TracingConfiguration(
     val traceLogPacks: Set<TraceLogPack>,
     val writesToLogcat: Boolean,
     val writesToFilesConfiguration: WriteToFilesConfiguration,
+    val sdkSentryDsn: String?,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingService.kt
index 8c183c80b4..d4ef27fd0d 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/TracingService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt
index a60ba27490..64822845e7 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixSearchUserResults.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixSearchUserResults.kt
index 2c0462e8e8..5f49ae6d76 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixSearchUserResults.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixSearchUserResults.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c089004af3..53cefa3694 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationData.kt
index 7d460dc042..e96681a31b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationData.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationRequestDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationRequestDetails.kt
index edf8c6ff78..175c9fbf2a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationRequestDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationRequestDetails.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6e34c3de32..4d2e786038 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/VerificationRequest.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/VerificationRequest.kt
index f26afe50f6..303ab284be 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/VerificationRequest.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/VerificationRequest.kt
@@ -1,17 +1,21 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.verification
 
 import android.os.Parcelable
+import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 import kotlinx.parcelize.Parcelize
 
+@Immutable
 sealed interface VerificationRequest : Parcelable {
+    @Immutable
     sealed interface Outgoing : VerificationRequest {
         @Parcelize
         data object CurrentSession : Outgoing
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallAnalyticCredentialsProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallAnalyticCredentialsProvider.kt
index ee57c6edbc..5b2a691afc 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallAnalyticCredentialsProvider.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallAnalyticCredentialsProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt
index 8334fb5fde..6c91a90928 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/CallWidgetSettingsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetDriver.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetDriver.kt
index ac8460785b..d8cca95842 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetDriver.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetDriver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetSettings.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetSettings.kt
index bf534c44f8..00b0eb6f25 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetSettings.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/widget/MatrixWidgetSettings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt
index 9fe44332ce..c8dfe2d1f8 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..d4b360ef53
--- /dev/null
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetailsTest.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.matrix.api.auth
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.auth.aMatrixHomeServerDetails
+import org.junit.Test
+
+class MatrixHomeServerDetailsTest {
+    @Test
+    fun `if homeserver supports oidc, then it is supported`() {
+        val sut = aMatrixHomeServerDetails(
+            supportsOidcLogin = true,
+            supportsPasswordLogin = false,
+        )
+        assertThat(sut.isSupported).isTrue()
+    }
+
+    @Test
+    fun `if homeserver supports password, then it is supported`() {
+        val sut = aMatrixHomeServerDetails(
+            supportsOidcLogin = false,
+            supportsPasswordLogin = true,
+        )
+        assertThat(sut.isSupported).isTrue()
+    }
+
+    @Test
+    fun `if homeserver supports both, then it is supported`() {
+        val sut = aMatrixHomeServerDetails(
+            supportsOidcLogin = true,
+            supportsPasswordLogin = true,
+        )
+        assertThat(sut.isSupported).isTrue()
+    }
+
+    @Test
+    fun `if homeserver supports none, then it is not supported`() {
+        val sut = aMatrixHomeServerDetails(
+            supportsOidcLogin = false,
+            supportsPasswordLogin = false,
+        )
+        assertThat(sut.isSupported).isFalse()
+    }
+}
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatternsTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatternsTest.kt
index 96a40d04ba..4d1f905ba5 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatternsTest.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/MatrixPatternsTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/notification/NotificationDataTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/notification/NotificationDataTest.kt
index 956ea94fdc..26dc241147 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/notification/NotificationDataTest.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/notification/NotificationDataTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 8f9b236c88..1461d28fd9 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c173fa25b4..ffb59ba7d1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,23 +18,23 @@ private val aUserId = UserId(A_USER_ID)
 class ProfileTimelineDetailsTest {
     @Test
     fun `getDisambiguatedDisplayName of Unavailable should be equal to userId`() {
-        assertThat(ProfileTimelineDetails.Unavailable.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
+        assertThat(ProfileDetails.Unavailable.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
     }
 
     @Test
     fun `getDisambiguatedDisplayName of Error should be equal to userId`() {
-        assertThat(ProfileTimelineDetails.Error("An error").getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
+        assertThat(ProfileDetails.Error("An error").getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
     }
 
     @Test
     fun `getDisambiguatedDisplayName of Pending should be equal to userId`() {
-        assertThat(ProfileTimelineDetails.Pending.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
+        assertThat(ProfileDetails.Pending.getDisambiguatedDisplayName(aUserId)).isEqualTo(A_USER_ID)
     }
 
     @Test
     fun `getDisambiguatedDisplayName of Ready without display name should be equal to userId`() {
         assertThat(
-            ProfileTimelineDetails.Ready(
+            ProfileDetails.Ready(
                 displayName = null,
                 displayNameAmbiguous = false,
                 avatarUrl = null,
@@ -44,7 +45,7 @@ class ProfileTimelineDetailsTest {
     @Test
     fun `getDisambiguatedDisplayName of Ready with display name should be equal to display name`() {
         assertThat(
-            ProfileTimelineDetails.Ready(
+            ProfileDetails.Ready(
                 displayName = "Alice",
                 displayNameAmbiguous = false,
                 avatarUrl = null,
@@ -55,7 +56,7 @@ class ProfileTimelineDetailsTest {
     @Test
     fun `getDisambiguatedDisplayName of Ready with display name and ambiguous should be equal to display name with user id`() {
         assertThat(
-            ProfileTimelineDetails.Ready(
+            ProfileDetails.Ready(
                 displayName = "Alice",
                 displayNameAmbiguous = true,
                 avatarUrl = null,
diff --git a/libraries/matrix/impl/build.gradle.kts b/libraries/matrix/impl/build.gradle.kts
index 14ba9df71f..6edf26008a 100644
--- a/libraries/matrix/impl/build.gradle.kts
+++ b/libraries/matrix/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,6 +34,7 @@ dependencies {
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.network)
     implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.workmanager.api)
     implementation(projects.services.analytics.api)
     implementation(projects.services.toolbox.api)
     api(projects.libraries.matrix.api)
@@ -48,6 +50,7 @@ dependencies {
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.previewutils)
     testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.libraries.workmanager.test)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.toolbox.test)
 }
diff --git a/libraries/matrix/impl/src/main/AndroidManifest.xml b/libraries/matrix/impl/src/main/AndroidManifest.xml
index 5c0a832239..608f16cc36 100644
--- a/libraries/matrix/impl/src/main/AndroidManifest.xml
+++ b/libraries/matrix/impl/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/ClientBuilderProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/ClientBuilderProvider.kt
index 57486da3e8..f3cf4ffaf2 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/ClientBuilderProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/ClientBuilderProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.matrix.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import org.matrix.rustcomponents.sdk.ClientBuilder
 
 interface ClientBuilderProvider {
@@ -17,7 +17,6 @@ interface ClientBuilderProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class RustClientBuilderProvider : ClientBuilderProvider {
     override fun provide(): ClientBuilder {
         return ClientBuilder()
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 7a3bfb3e6b..ee9f1d3eac 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c646e2ee18..4cb84abc03 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,18 +12,23 @@ import io.element.android.libraries.androidutils.file.getSizeOfFiles
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScope
+import io.element.android.libraries.core.data.bytes
 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.MatrixClient
+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.EventId
 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
 import io.element.android.libraries.matrix.api.core.UserId
 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.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.room.BaseRoom
@@ -43,6 +49,9 @@ import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
 import io.element.android.libraries.matrix.api.user.MatrixUser
 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
+import io.element.android.libraries.matrix.impl.linknewdevice.RustLinkMobileHandler
+import io.element.android.libraries.matrix.impl.linknewdevice.RustQrCodeDataParser
 import io.element.android.libraries.matrix.impl.mapper.map
 import io.element.android.libraries.matrix.impl.media.RustMediaLoader
 import io.element.android.libraries.matrix.impl.media.RustMediaPreviewService
@@ -73,7 +82,11 @@ 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
+import io.element.android.libraries.matrix.impl.workmanager.PerformDatabaseVacuumWorkManagerRequest
 import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
+import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -129,6 +142,8 @@ class RustMatrixClient(
     clock: SystemClock,
     timelineEventTypeFilterFactory: TimelineEventTypeFilterFactory,
     private val featureFlagService: FeatureFlagService,
+    private val analyticsService: AnalyticsService,
+    private val workManagerScheduler: WorkManagerScheduler,
 ) : MatrixClient {
     override val sessionId: UserId = UserId(innerClient.userId())
     override val deviceId: DeviceId = DeviceId(innerClient.deviceId())
@@ -136,7 +151,9 @@ class RustMatrixClient(
     private val sessionDispatcher = dispatchers.io.limitedParallelism(64)
 
     private val innerRoomListService = innerSyncService.roomListService()
-    private val innerSpaceService = innerClient.spaceService()
+
+    // TODO refactor this and `innerNotificationClient` to be behind a suspend function instead
+    private val innerSpaceService = runBlocking { innerClient.spaceService() }
 
     override val roomMembershipObserver = RoomMembershipObserver()
 
@@ -176,6 +193,7 @@ class RustMatrixClient(
         roomListFactory = RoomListFactory(
             innerRoomListService = innerRoomListService,
             sessionCoroutineScope = sessionCoroutineScope,
+            analyticsService = analyticsService,
         ),
         roomSyncSubscriber = roomSyncSubscriber,
     )
@@ -210,6 +228,7 @@ class RustMatrixClient(
         roomMembershipObserver = roomMembershipObserver,
         roomInfoMapper = roomInfoMapper,
         featureFlagService = featureFlagService,
+        analyticsService = analyticsService,
     )
 
     override val matrixMediaLoader: MatrixMediaLoader = RustMediaLoader(
@@ -270,6 +289,9 @@ class RustMatrixClient(
             // Force a refresh of the profile
             getUserProfile()
         }
+
+        // Schedule regular database vacuuming to ensure DB performance remains optimal
+        scheduleDatabaseVacuum()
     }
 
     override fun userIdServerName(): String {
@@ -286,7 +308,7 @@ class RustMatrixClient(
     override suspend fun getUrl(url: String): Result<ByteArray> = withContext(sessionDispatcher) {
         runCatchingExceptions {
             innerClient.getUrl(url)
-        }
+        }.mapFailure { it.mapClientException() }
     }
 
     override suspend fun getRoom(roomId: RoomId): BaseRoom? = withContext(sessionDispatcher) {
@@ -553,6 +575,17 @@ class RustMatrixClient(
         return getCacheSize(includeCryptoDb = false)
     }
 
+    override suspend fun getDatabaseSizes(): Result<SdkStoreSizes> = runCatchingExceptions {
+        innerClient.getStoreSizes().run {
+            SdkStoreSizes(
+                stateStore = stateStore?.bytes,
+                eventCacheStore = eventCacheStore?.bytes,
+                mediaStore = mediaStore?.bytes,
+                cryptoStore = cryptoStore?.bytes,
+            )
+        }
+    }
+
     override suspend fun clearCache() {
         innerClient.clearCaches(innerSyncService)
         destroy()
@@ -713,6 +746,49 @@ class RustMatrixClient(
         }
     }
 
+    override suspend fun canLinkNewDevice(): Result<Boolean> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            innerClient.isLoginWithQrCodeSupported()
+        }
+    }
+
+    override fun createLinkMobileHandler(): Result<LinkMobileHandler> {
+        return runCatchingExceptions {
+            val handler = innerClient.newGrantLoginWithQrCodeHandler()
+            RustLinkMobileHandler(
+                inner = handler,
+                sessionCoroutineScope = sessionCoroutineScope,
+                sessionDispatcher = sessionDispatcher,
+            )
+        }
+    }
+
+    override fun createLinkDesktopHandler(): Result<LinkDesktopHandler> {
+        return runCatchingExceptions {
+            val handler = innerClient.newGrantLoginWithQrCodeHandler()
+            RustLinkDesktopHandler(
+                inner = handler,
+                sessionCoroutineScope = sessionCoroutineScope,
+                sessionDispatcher = sessionDispatcher,
+                qrCodeDataParser = RustQrCodeDataParser(),
+            )
+        }
+    }
+
+    override suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result<Unit> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            val room = innerClient.getRoom(roomId.value) ?: error("Could not fetch associated room")
+            room.markAsFullyReadUnchecked(eventId.value)
+        }
+    }
+
+    override suspend fun performDatabaseVacuum(): Result<Unit> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            Timber.d("Performing database vacuuming for session $sessionId...")
+            innerClient.optimizeStores()
+        }
+    }
+
     private suspend fun getCacheSize(
         includeCryptoDb: Boolean = false,
     ): Long = withContext(sessionDispatcher) {
@@ -737,6 +813,15 @@ class RustMatrixClient(
         // Delete all the files for this session
         sessionPathsProvider.provides(sessionId)?.deleteRecursively()
     }
+
+    private fun scheduleDatabaseVacuum() {
+        // If there's already a periodic work request, do not schedule another one
+        if (workManagerScheduler.hasPendingWork(sessionId, WorkManagerRequestType.DB_VACUUM)) return
+
+        Timber.i("Scheduling periodic database vacuuming for session $sessionId")
+        val request = PerformDatabaseVacuumWorkManagerRequest(sessionId)
+        workManagerScheduler.submit(request)
+    }
 }
 
 private val defaultRoomCreationPowerLevels = 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 35b5bcf2b9..5932acec20 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,8 @@ package io.element.android.libraries.matrix.impl
 
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.data.ByteUnit
+import io.element.android.libraries.core.data.megaBytes
 import io.element.android.libraries.di.CacheDirectory
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
@@ -19,10 +22,12 @@ 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.TimelineEventTypeFilterFactory
+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
 import io.element.android.libraries.sessionstorage.api.SessionData
 import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
@@ -35,10 +40,13 @@ 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.MediaRetentionPolicy
 import uniffi.matrix_sdk_crypto.CollectStrategy
 import uniffi.matrix_sdk_crypto.DecryptionSettings
 import uniffi.matrix_sdk_crypto.TrustRequirement
 import java.io.File
+import kotlin.time.Duration.Companion.days
+import kotlin.time.toJavaDuration
 
 @Inject
 class RustMatrixClientFactory(
@@ -55,6 +63,8 @@ class RustMatrixClientFactory(
     private val featureFlagService: FeatureFlagService,
     private val timelineEventTypeFilterFactory: TimelineEventTypeFilterFactory,
     private val clientBuilderProvider: ClientBuilderProvider,
+    private val sqliteStoreBuilderProvider: SqliteStoreBuilderProvider,
+    private val workManagerScheduler: WorkManagerScheduler,
 ) {
     private val sessionDelegate = RustClientSessionDelegate(sessionStore, appCoroutineScope, coroutineDispatchers)
 
@@ -68,6 +78,19 @@ class RustMatrixClientFactory(
             .username(sessionData.userId)
             .use { it.build() }
 
+        client.setMediaRetentionPolicy(
+            MediaRetentionPolicy(
+                // Make this 500MB instead of 400MB
+                maxCacheSize = 500.megaBytes.into(ByteUnit.BYTES).toULong(),
+                // This is the default value, but let's make it explicit
+                maxFileSize = 20.megaBytes.into(ByteUnit.BYTES).toULong(),
+                // Use 30 days instead of 60
+                lastAccessExpiry = 30.days.toJavaDuration(),
+                // This is the default value, but let's make it explicit
+                cleanupFrequency = 1.days.toJavaDuration(),
+            )
+        )
+
         client.restoreSession(sessionData.toSession())
 
         create(client)
@@ -94,6 +117,8 @@ class RustMatrixClientFactory(
             clock = clock,
             timelineEventTypeFilterFactory = timelineEventTypeFilterFactory,
             featureFlagService = featureFlagService,
+            analyticsService = analyticsService,
+            workManagerScheduler = workManagerScheduler,
         ).also {
             Timber.tag(it.toString()).d("Creating Client with access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'")
         }
@@ -105,12 +130,12 @@ class RustMatrixClientFactory(
         slidingSyncType: ClientBuilderSlidingSync,
     ): ClientBuilder {
         return clientBuilderProvider.provide()
-            .sessionPaths(
-                dataPath = sessionPaths.fileDirectory.absolutePath,
-                cachePath = sessionPaths.cacheDirectory.absolutePath,
-            )
+            .run {
+                sqliteStoreBuilderProvider.provide(sessionPaths)
+                    .passphrase(passphrase)
+                    .setupClientBuilder(this)
+            }
             .setSessionDelegate(sessionDelegate)
-            .sessionPassphrase(passphrase)
             .userAgent(userAgentProvider.provide())
             .addRootCertificates(userCertificatesProvider.provides())
             .autoEnableBackups(true)
@@ -168,7 +193,7 @@ sealed interface ClientBuilderSlidingSync {
     data object Native : ClientBuilderSlidingSync
 }
 
-private fun SessionData.toSession() = Session(
+fun SessionData.toSession() = Session(
     accessToken = accessToken,
     refreshToken = refreshToken,
     userId = userId,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustSdkMetadata.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustSdkMetadata.kt
index 88ff69459f..65bf81e181 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustSdkMetadata.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustSdkMetadata.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.libraries.matrix.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.SdkMetadata
 import org.matrix.rustcomponents.sdk.sdkGitSha
 
 @ContributesBinding(AppScope::class)
-@Inject
 class RustSdkMetadata : SdkMetadata {
     override val sdkGitSha: String
         get() = sdkGitSha()
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
new file mode 100644
index 0000000000..8973483132
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/DefaultGetDatabaseSizesUseCase.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.analytics
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+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
+
+@ContributesBinding(AppScope::class)
+class DefaultGetDatabaseSizesUseCase(
+    private val clientProvider: Lazy<MatrixClientProvider>,
+) : GetDatabaseSizesUseCase {
+    override suspend fun invoke(sessionId: SessionId): Result<SdkStoreSizes> {
+        val client = clientProvider.value.getOrNull(sessionId)
+            ?: return Result.failure(IllegalArgumentException("No MatrixClient for session $sessionId"))
+
+        return client.getDatabaseSizes()
+    }
+}
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 66fcee1e48..263ce15bd3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/RustAnalyticsSdkManager.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/RustAnalyticsSdkManager.kt
new file mode 100644
index 0000000000..a74acab683
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/RustAnalyticsSdkManager.kt
@@ -0,0 +1,30 @@
+/*
+ * 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.analytics
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.services.analytics.api.AnalyticsSdkManager
+import io.element.android.services.analytics.api.AnalyticsSdkSpan
+import org.matrix.rustcomponents.sdk.enableSentryLogging
+
+@ContributesBinding(AppScope::class)
+class RustAnalyticsSdkManager : AnalyticsSdkManager {
+    override fun enableSdkAnalytics(enabled: Boolean) {
+        enableSentryLogging(enabled)
+    }
+
+    override fun startSpan(name: String, parentTraceId: String?): AnalyticsSdkSpan {
+        return RustAnalyticsSdkSpan(name = name, parentTraceId = parentTraceId)
+    }
+
+    override fun bridge(parentTraceId: String?): AnalyticsSdkSpan {
+        // A bridge span has no name
+        return RustAnalyticsSdkSpan(name = null, parentTraceId = parentTraceId)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/RustAnalyticsSdkSpan.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/RustAnalyticsSdkSpan.kt
new file mode 100644
index 0000000000..9ed8763ec4
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/RustAnalyticsSdkSpan.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.analytics
+
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.services.analytics.api.AnalyticsSdkSpan
+import kotlinx.coroutines.DelicateCoroutinesApi
+import org.matrix.rustcomponents.sdk.LogLevel
+import org.matrix.rustcomponents.sdk.Span
+import timber.log.Timber
+
+class RustAnalyticsSdkSpan(
+    name: String? = null,
+    private val parentTraceId: String?,
+) : AnalyticsSdkSpan {
+    private val inner = if (name != null) {
+        Span(
+            target = "elementx",
+            name = name,
+            file = "-",
+            line = null,
+            level = LogLevel.WARN,
+            bridgeTraceId = parentTraceId,
+        )
+    } else {
+        Span.newBridgeSpan(
+            target = "elementx",
+            parentTraceId = parentTraceId,
+        )
+    }
+
+    override fun enter() {
+        if (Span.current().isNone()) {
+            inner.enter()
+        } else {
+            Timber.w("Not entering span sentry.trace='$parentTraceId' because another span is already active")
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun exit() {
+        inner.exit()
+        runCatchingExceptions { inner.destroy() }
+        Timber.d("Exited span sentry.trace='$parentTraceId'")
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
index c9a71a17d2..8d71ad3ce8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 05eb4c4d5f..36af4113d2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import org.matrix.rustcomponents.sdk.ClientBuildException
 import org.matrix.rustcomponents.sdk.OidcException
 
 fun Throwable.mapAuthenticationException(): AuthenticationException {
-    val message = this.message ?: "Unknown error"
     return when (this) {
         is AuthenticationException -> this
         is ClientBuildException -> when (this) {
@@ -20,7 +20,7 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
             is ClientBuildException.InvalidServerName -> AuthenticationException.InvalidServerName(message)
             is ClientBuildException.SlidingSyncVersion -> AuthenticationException.SlidingSyncVersion(message)
             is ClientBuildException.Sdk -> AuthenticationException.Generic(message)
-            is ClientBuildException.ServerUnreachable -> AuthenticationException.Generic(message)
+            is ClientBuildException.ServerUnreachable -> AuthenticationException.ServerUnreachable(message)
             is ClientBuildException.SlidingSync -> AuthenticationException.Generic(message)
             is ClientBuildException.WellKnownDeserializationException -> AuthenticationException.Generic(message)
             is ClientBuildException.WellKnownLookupFailed -> 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 379222f457..acf96d69d4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index a614c97680..6f9dd67b12 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0ba9eb4c49..e21d8d94c6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..bab803f9b2
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeServerLoginCompatibilityChecker.kt
@@ -0,0 +1,38 @@
+/*
+ * 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.matrix.impl.auth
+
+import dev.zacsweers.metro.AppScope
+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()
+            }
+    }
+}
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 88c86a43d6..7cd9fbedf5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.matrix.impl.auth
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.mapFailure
@@ -20,10 +20,12 @@ 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.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.verification.SessionVerifiedStatus
 import io.element.android.libraries.matrix.impl.ClientBuilderSlidingSync
 import io.element.android.libraries.matrix.impl.RustMatrixClientFactory
 import io.element.android.libraries.matrix.impl.auth.qrlogin.QrErrorMapper
@@ -34,12 +36,13 @@ import io.element.android.libraries.matrix.impl.keys.PassphraseGenerator
 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
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientBuilder
 import org.matrix.rustcomponents.sdk.HumanQrLoginException
@@ -49,10 +52,10 @@ import org.matrix.rustcomponents.sdk.QrLoginProgress
 import org.matrix.rustcomponents.sdk.QrLoginProgressListener
 import timber.log.Timber
 import uniffi.matrix_sdk.OAuthAuthorizationData
+import kotlin.time.Duration.Companion.seconds
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class RustMatrixAuthenticationService(
     private val sessionPathsFactory: SessionPathsFactory,
     private val coroutineDispatchers: CoroutineDispatchers,
@@ -69,7 +72,6 @@ class RustMatrixAuthenticationService(
     // Ideally it would be possible to get the sessionPath from the Client to avoid doing this.
     private var sessionPaths: SessionPaths? = null
     private var currentClient: Client? = null
-    private var currentHomeserver = MutableStateFlow<MatrixHomeServerDetails?>(null)
 
     private val newMatrixClientObservers = mutableListOf<(MatrixClient) -> Unit>()
     override fun listenToNewMatrixClients(lambda: (MatrixClient) -> Unit) {
@@ -95,10 +97,10 @@ class RustMatrixAuthenticationService(
                     }
                     rustMatrixClientFactory.create(sessionData)
                 } else {
-                    error("Token is not valid")
+                    throw SessionRestorationException.InvalidToken()
                 }
             } else {
-                error("No session to restore with id $sessionId")
+                throw SessionRestorationException.MissingSession(sessionId)
             }
         }.mapFailure { failure ->
             failure.mapClientException()
@@ -113,9 +115,7 @@ class RustMatrixAuthenticationService(
         return passphrase
     }
 
-    override fun getHomeserverDetails(): StateFlow<MatrixHomeServerDetails?> = currentHomeserver
-
-    override suspend fun setHomeserver(homeserver: String): Result<Unit> =
+    override suspend fun setHomeserver(homeserver: String): Result<MatrixHomeServerDetails> =
         withContext(coroutineDispatchers.io) {
             val emptySessionPath = rotateSessionPath()
             runCatchingExceptions {
@@ -124,8 +124,7 @@ class RustMatrixAuthenticationService(
                 }
 
                 currentClient = client
-                val homeServerDetails = client.homeserverLoginDetails().map()
-                currentHomeserver.value = homeServerDetails.copy(url = homeserver)
+                client.homeserverLoginDetails().map()
             }.onFailure {
                 clear()
             }.mapFailure { failure ->
@@ -166,7 +165,7 @@ class RustMatrixAuthenticationService(
     override suspend fun importCreatedSession(externalSession: ExternalSession): Result<SessionId> =
         withContext(coroutineDispatchers.io) {
             runCatchingExceptions {
-                currentClient ?: error("You need to call `setHomeserver()` first")
+                val client = currentClient ?: error("You need to call `setHomeserver()` first")
                 val currentSessionPaths = sessionPaths ?: error("You need to call `setHomeserver()` first")
                 val sessionData = externalSession.toSessionData(
                     isTokenValid = true,
@@ -174,8 +173,21 @@ class RustMatrixAuthenticationService(
                     passphrase = pendingPassphrase,
                     sessionPaths = currentSessionPaths,
                 )
-                clear()
+
+                // We restore the client using the just retrieved session data
+                client.restoreSession(sessionData.toSession())
+                val matrixClient = rustMatrixClientFactory.create(client)
+
+                // We wait for the verification state to be known
+                matrixClient.waitForKnownVerificationState()
+
+                // And once it's ready we share it and save the actual session data
+                newMatrixClientObservers.forEach { it.invoke(matrixClient) }
                 sessionStore.addSession(sessionData)
+
+                // Clean up the strong reference held here since it's no longer necessary
+                currentClient = null
+
                 SessionId(sessionData.userId)
             }
         }
@@ -244,6 +256,8 @@ class RustMatrixAuthenticationService(
                     sessionPaths = currentSessionPaths,
                 )
                 val matrixClient = rustMatrixClientFactory.create(client)
+                matrixClient.waitForKnownVerificationState()
+
                 newMatrixClientObservers.forEach { it.invoke(matrixClient) }
                 sessionStore.addSession(sessionData)
 
@@ -287,14 +301,16 @@ class RustMatrixAuthenticationService(
             runCatchingExceptions {
                 val client = makeQrCodeLoginClient(
                     sessionPaths = emptySessionPaths,
-                    passphrase = pendingPassphrase,
                     qrCodeData = sdkQrCodeLoginData,
                 )
-                client.loginWithQrCode(
-                    qrCodeData = qrCodeData.rustQrCodeData,
+                client.newLoginWithQrCodeHandler(
                     oidcConfiguration = oidcConfiguration,
-                    progressListener = progressListener,
-                )
+                ).use {
+                    it.scan(
+                        qrCodeData = qrCodeData.rustQrCodeData,
+                        progressListener = progressListener,
+                    )
+                }
                 // Ensure that the user is not already logged in with the same account
                 ensureNotAlreadyLoggedIn(client)
                 val sessionData = client.session()
@@ -343,7 +359,6 @@ class RustMatrixAuthenticationService(
 
     private suspend fun makeQrCodeLoginClient(
         sessionPaths: SessionPaths,
-        passphrase: String?,
         qrCodeData: QrCodeData,
     ): Client {
         Timber.d("Creating client for QR Code login with simplified sliding sync")
@@ -353,7 +368,6 @@ class RustMatrixAuthenticationService(
                 passphrase = pendingPassphrase,
                 slidingSyncType = ClientBuilderSlidingSync.Discovered,
             )
-            .sessionPassphrase(passphrase)
             .serverNameOrHomeserverUrl(qrCodeData.serverName()!!)
             .build()
     }
@@ -362,4 +376,12 @@ class RustMatrixAuthenticationService(
         currentClient?.close()
         currentClient = null
     }
+
+    private suspend fun MatrixClient.waitForKnownVerificationState() {
+        withTimeoutOrNull(10.seconds) {
+            Timber.d("Waiting for a known verification status...")
+            val status = sessionVerificationService.sessionVerifiedStatus.first { it != SessionVerifiedStatus.Unknown }
+            Timber.d("Finished waiting for a known verification status: $status")
+        } ?: Timber.w("Timed out 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 7b1c614bec..65e15b5f2b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,5 +43,8 @@ object QrErrorMapper {
         is RustHumanQrLoginException.Unknown -> QrLoginException.Unknown
         is RustHumanQrLoginException.OidcMetadataInvalid -> QrLoginException.OidcMetadataInvalid
         is RustHumanQrLoginException.SlidingSyncNotAvailable -> QrLoginException.SlidingSyncNotAvailable
+        is RustHumanQrLoginException.CheckCodeAlreadySent -> QrLoginException.CheckCodeAlreadySent
+        is RustHumanQrLoginException.CheckCodeCannotBeSent -> QrLoginException.CheckCodeCannotBeSent
+        is RustHumanQrLoginException.NotFound -> QrLoginException.NotFound
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensions.kt
index 6c95f31a9f..96ae276b0f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensions.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,7 @@ fun QrLoginProgress.toStep(): QrCodeLoginStep {
         is QrLoginProgress.EstablishingSecureChannel -> QrCodeLoginStep.EstablishingSecureChannel(checkCodeString)
         is QrLoginProgress.Starting -> QrCodeLoginStep.Starting
         is QrLoginProgress.WaitingForToken -> QrCodeLoginStep.WaitingForToken(userCode)
+        is QrLoginProgress.SyncingSecrets -> QrCodeLoginStep.SyncingSecrets
         is QrLoginProgress.Done -> QrCodeLoginStep.Finished
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/RustQrCodeLoginDataFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/RustQrCodeLoginDataFactory.kt
index 17cff41bc1..0e2c206805 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/RustQrCodeLoginDataFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/RustQrCodeLoginDataFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,12 @@ package io.element.android.libraries.matrix.impl.auth.qrlogin
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginDataFactory
 import org.matrix.rustcomponents.sdk.QrCodeData
 
 @ContributesBinding(AppScope::class)
-@Inject
 class RustQrCodeLoginDataFactory : MatrixQrCodeLoginDataFactory {
     override fun parseQrCodeData(data: ByteArray): Result<MatrixQrCodeLoginData> {
         return runCatchingExceptions { SdkQrCodeLoginData(QrCodeData.fromBytes(data)) }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginData.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginData.kt
index 485e9bfaec..b269804091 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginData.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index d5d637f54b..902fe5beb2 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,13 +10,11 @@ package io.element.android.libraries.matrix.impl.certificates
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import timber.log.Timber
 import java.security.KeyStore
 import java.security.KeyStoreException
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUserCertificatesProvider : UserCertificatesProvider {
     /**
      * Get additional user-installed certificates from the `AndroidCAStore` `Keystore`.
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt
index c1936bd348..90d1584f2c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapper.kt
index b79dba27b9..058243a482 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/RustSendHandle.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/RustSendHandle.kt
index 9d5e113703..bb472f7c5f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/RustSendHandle.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/core/RustSendHandle.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/RoomModule.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/RoomModule.kt
new file mode 100644
index 0000000000..af6f0325d3
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/RoomModule.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.di
+
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.di.annotations.RoomCoroutineScope
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import kotlinx.coroutines.CoroutineScope
+
+@BindingContainer
+@ContributesTo(RoomScope::class)
+object RoomModule {
+    @RoomCoroutineScope
+    @Provides
+    fun providesSessionCoroutineScope(room: BaseRoom): CoroutineScope {
+        return room.roomCoroutineScope
+    }
+}
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 37cf406f5f..6ca7d27a8f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapper.kt
index 3c5ce8a090..a3728bb157 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt
index b3fa0d7605..393813ab7a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapper.kt
index 90a3cf5c44..4d0de46060 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EncryptionExtension.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EncryptionExtension.kt
index 8b051b916d..1fd670ea36 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EncryptionExtension.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/EncryptionExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryExceptionMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryExceptionMapper.kt
index 5568d008ec..f5d1a4253b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryExceptionMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryExceptionMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,7 +30,7 @@ fun Throwable.mapRecoveryException(): RecoveryException {
             }
         }
         else -> RecoveryException.Client(
-            ClientException.Other("Unknown error")
+            ClientException.Other("Unknown error", this)
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapper.kt
index 94f3c5d953..dbb2fd9cc5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 91cafd1df0..e081d1c9f1 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.extensions.mapFailure
@@ -42,6 +44,7 @@ import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.EnableRecoveryProgressListener
 import org.matrix.rustcomponents.sdk.Encryption
 import org.matrix.rustcomponents.sdk.UserIdentity
+import timber.log.Timber
 import org.matrix.rustcomponents.sdk.BackupUploadState as RustBackupUploadState
 import org.matrix.rustcomponents.sdk.EnableRecoveryProgress as RustEnableRecoveryProgress
 import org.matrix.rustcomponents.sdk.RecoveryException as RustRecoveryException
@@ -103,14 +106,20 @@ class RustEncryptionService(
      * TODO This is a temporary workaround, when we will have a way to observe
      * the sessions, this code will have to be updated.
      */
-    override val hasDevicesToVerifyAgainst: StateFlow<Boolean> = flow {
+    override val hasDevicesToVerifyAgainst: StateFlow<AsyncData<Boolean>> = flow {
         while (currentCoroutineContext().isActive) {
-            val result = hasDevicesToVerifyAgainst().getOrDefault(false)
-            emit(result)
+            val result = hasDevicesToVerifyAgainst()
+            result
+                .onSuccess {
+                    emit(AsyncData.Success(it))
+                }
+                .onFailure {
+                    Timber.e(it, "Failed to get hasDevicesToVerifyAgainst, retrying in 5s...")
+                }
             delay(5_000)
         }
     }
-        .stateIn(sessionCoroutineScope, SharingStarted.Eagerly, false)
+        .stateIn(sessionCoroutineScope, SharingStarted.Eagerly, AsyncData.Uninitialized)
 
     override suspend fun enableBackups(): Result<Unit> = withContext(dispatchers.io) {
         runCatchingExceptions {
@@ -231,10 +240,6 @@ class RustEncryptionService(
         }
     }
 
-    override suspend fun isUserVerified(userId: UserId): Result<Boolean> = runCatchingExceptions {
-        getUserIdentityInternal(userId).isVerified()
-    }
-
     override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatchingExceptions {
         getUserIdentityInternal(userId).pin()
     }
@@ -243,8 +248,8 @@ class RustEncryptionService(
         getUserIdentityInternal(userId).withdrawVerification()
     }
 
-    override suspend fun getUserIdentity(userId: UserId): Result<IdentityState?> = runCatchingExceptions {
-        val identity = getUserIdentityInternal(userId)
+    override suspend fun getUserIdentity(userId: UserId, fallbackToServer: Boolean): Result<IdentityState?> = runCatchingExceptions {
+        val identity = getUserIdentityInternal(userId, fallbackToServer)
         val isVerified = identity.isVerified()
         when {
             identity.hasVerificationViolation() -> IdentityState.VerificationViolation
@@ -254,10 +259,10 @@ class RustEncryptionService(
         }
     }
 
-    suspend fun getUserIdentityInternal(userId: UserId): UserIdentity {
+    private suspend fun getUserIdentityInternal(userId: UserId, fallbackToServer: Boolean = true): UserIdentity {
         return service.userIdentity(
             userId = userId.value,
-            // requestFromHomeserverIfNeeded = true,
+            fallbackToServer = fallbackToServer,
         ) ?: error("User identity not found")
     }
 
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 3651cc52ac..4813ec1cc3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt
index 5755eff49e..08b6b2a032 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/SteadyStateExceptionMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 21b7f393a1..eefa6d4986 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,15 +15,16 @@ fun Throwable.mapClientException(): ClientException {
     return when (this) {
         is RustClientException -> {
             when (this) {
-                is RustClientException.Generic -> ClientException.Generic(msg, details)
+                is RustClientException.Generic -> ClientException.Generic(message = msg, details = details, cause = this)
                 is RustClientException.MatrixApi -> ClientException.MatrixApi(
                     kind = kind.map(),
                     code = code,
                     message = msg,
                     details = details,
+                    cause = this,
                 )
             }
         }
-        else -> ClientException.Other(message ?: "Unknown error")
+        else -> ClientException.Other(message ?: "Unknown error", this)
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ErrorKind.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ErrorKind.kt
index 12b15b6465..cb82c92f32 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ErrorKind.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ErrorKind.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index b6d9aa2b89..d13ff7779e 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,13 +11,11 @@ package io.element.android.libraries.matrix.impl.keys
 import android.util.Base64
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import java.security.SecureRandom
 
 private const val SECRET_SIZE = 256
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPassphraseGenerator : PassphraseGenerator {
     override fun generatePassphrase(): String? {
         val key = ByteArray(size = SECRET_SIZE)
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
index f6725a5dfb..e0f925fa28 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/HumanQrGrantLoginExceptionExtension.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/HumanQrGrantLoginExceptionExtension.kt
new file mode 100644
index 0000000000..2d47b60def
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/HumanQrGrantLoginExceptionExtension.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.linknewdevice
+
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
+import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
+
+internal fun HumanQrGrantLoginException.map() = when (this) {
+    is HumanQrGrantLoginException.DeviceIdAlreadyInUse -> ErrorType.DeviceIdAlreadyInUse(message.orEmpty())
+    is HumanQrGrantLoginException.InvalidCheckCode -> ErrorType.InvalidCheckCode(message.orEmpty())
+    is HumanQrGrantLoginException.MissingSecretsBackup -> ErrorType.MissingSecretsBackup(message.orEmpty())
+    is HumanQrGrantLoginException.NotFound -> ErrorType.NotFound(message.orEmpty())
+    is HumanQrGrantLoginException.UnableToCreateDevice -> ErrorType.UnableToCreateDevice(message.orEmpty())
+    is HumanQrGrantLoginException.Unknown -> ErrorType.Unknown(message.orEmpty())
+    is HumanQrGrantLoginException.UnsupportedProtocol -> ErrorType.UnsupportedProtocol(message.orEmpty())
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/QrCodeDataParser.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/QrCodeDataParser.kt
new file mode 100644
index 0000000000..6472850a8c
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/QrCodeDataParser.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.linknewdevice
+
+import org.matrix.rustcomponents.sdk.QrCodeData
+
+interface QrCodeDataParser {
+    fun parse(data: ByteArray): QrCodeData
+}
+
+class RustQrCodeDataParser : QrCodeDataParser {
+    override fun parse(data: ByteArray): QrCodeData {
+        return QrCodeData.fromBytes(data)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustCheckCodeSender.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustCheckCodeSender.kt
new file mode 100644
index 0000000000..9919d1fafc
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustCheckCodeSender.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.linknewdevice
+
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.linknewdevice.CheckCodeSender
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.CheckCodeSender as FfiCheckCodeSender
+
+class RustCheckCodeSender(
+    private val inner: FfiCheckCodeSender,
+    private val sessionDispatcher: CoroutineDispatcher,
+) : CheckCodeSender {
+    override suspend fun validate(code: UByte): Boolean = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            // TODO https://github.com/matrix-org/matrix-rust-sdk/pull/5957
+            // inner.validate(code)
+            true
+        }.getOrNull() ?: true
+    }
+
+    override suspend fun send(code: UByte): Result<Unit> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            inner.send(code)
+        }
+    }
+}
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
new file mode 100644
index 0000000000..211bdc3d4e
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandler.kt
@@ -0,0 +1,82 @@
+/*
+ * 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.linknewdevice
+
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import io.element.android.libraries.matrix.api.logs.LoggerTags
+import io.element.android.libraries.matrix.impl.auth.qrlogin.QrErrorMapper
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.GrantLoginWithQrCodeHandler
+import org.matrix.rustcomponents.sdk.GrantQrLoginProgress
+import org.matrix.rustcomponents.sdk.GrantQrLoginProgressListener
+import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
+import org.matrix.rustcomponents.sdk.QrCodeDecodeException
+import timber.log.Timber
+
+private val tag = LoggerTag("RustLinkDesktopHandler", LoggerTags.linkNewDevice)
+
+class RustLinkDesktopHandler(
+    private val inner: GrantLoginWithQrCodeHandler,
+    private val sessionCoroutineScope: CoroutineScope,
+    private val sessionDispatcher: CoroutineDispatcher,
+    private val qrCodeDataParser: QrCodeDataParser,
+) : LinkDesktopHandler {
+    private val _linkDesktopStep = MutableStateFlow<LinkDesktopStep>(LinkDesktopStep.Uninitialized)
+    override val linkDesktopStep: StateFlow<LinkDesktopStep> = _linkDesktopStep.asStateFlow()
+
+    override suspend fun handleScannedQrCode(data: ByteArray) = withContext(sessionDispatcher) {
+        Timber.tag(tag.value).d("Emit Uninitialized")
+        _linkDesktopStep.emit(LinkDesktopStep.Uninitialized)
+        try {
+            val qrCodeData = qrCodeDataParser.parse(data)
+            inner.scan(
+                qrCodeData = qrCodeData,
+                progressListener = object : GrantQrLoginProgressListener {
+                    override fun onUpdate(state: GrantQrLoginProgress) {
+                        sessionCoroutineScope.launch {
+                            val mappedState = state.map()
+                            Timber.tag(tag.value).d("Emit ${mappedState::class.java.simpleName}")
+                            _linkDesktopStep.emit(mappedState)
+                        }
+                    }
+                }
+            )
+        } catch (e: QrCodeDecodeException) {
+            Timber.tag(tag.value).w(e, "Invalid QR code scanned")
+            _linkDesktopStep.emit(
+                LinkDesktopStep.InvalidQrCode(
+                    error = QrErrorMapper.map(e)
+                )
+            )
+        } catch (e: HumanQrGrantLoginException) {
+            Timber.tag(tag.value).w(e, "Error during QR login grant")
+            _linkDesktopStep.emit(LinkDesktopStep.Error(e.map()))
+        }
+    }
+
+    private fun GrantQrLoginProgress.map() = when (this) {
+        GrantQrLoginProgress.Done -> LinkDesktopStep.Done
+        GrantQrLoginProgress.Starting -> LinkDesktopStep.Starting
+        GrantQrLoginProgress.SyncingSecrets -> LinkDesktopStep.SyncingSecrets
+        is GrantQrLoginProgress.WaitingForAuth -> LinkDesktopStep.WaitingForAuth(
+            verificationUri = verificationUri,
+        )
+        is GrantQrLoginProgress.EstablishingSecureChannel -> LinkDesktopStep.EstablishingSecureChannel(
+            checkCode = checkCode,
+            checkCodeString = checkCodeString,
+        )
+    }
+}
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
new file mode 100644
index 0000000000..0189987d96
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
@@ -0,0 +1,75 @@
+/*
+ * 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.linknewdevice
+
+import io.element.android.libraries.core.log.logger.LoggerTag
+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
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.GrantGeneratedQrLoginProgress
+import org.matrix.rustcomponents.sdk.GrantGeneratedQrLoginProgressListener
+import org.matrix.rustcomponents.sdk.GrantLoginWithQrCodeHandler
+import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
+import timber.log.Timber
+
+private val tag = LoggerTag("RustLinkMobileHandler", LoggerTags.linkNewDevice)
+
+class RustLinkMobileHandler(
+    private val inner: GrantLoginWithQrCodeHandler,
+    private val sessionCoroutineScope: CoroutineScope,
+    private val sessionDispatcher: CoroutineDispatcher,
+) : LinkMobileHandler {
+    private val _linkMobileStep = MutableStateFlow<LinkMobileStep>(LinkMobileStep.Uninitialized)
+    override val linkMobileStep: Flow<LinkMobileStep> = _linkMobileStep.asStateFlow()
+
+    override suspend fun start() = withContext(sessionDispatcher) {
+        Timber.tag(tag.value).d("Emit Uninitialized")
+        _linkMobileStep.emit(LinkMobileStep.Uninitialized)
+        try {
+            inner.generate(
+                progressListener = object : GrantGeneratedQrLoginProgressListener {
+                    override fun onUpdate(state: GrantGeneratedQrLoginProgress) {
+                        sessionCoroutineScope.launch {
+                            val mappedState = state.map()
+                            Timber.tag(tag.value).d("Emit ${mappedState::class.java.simpleName}")
+                            _linkMobileStep.emit(mappedState)
+                        }
+                    }
+                }
+            )
+        } catch (e: HumanQrGrantLoginException) {
+            Timber.tag(tag.value).w(e, "Error during QR login grant")
+            _linkMobileStep.emit(LinkMobileStep.Error(e.map()))
+        }
+    }
+
+    private fun GrantGeneratedQrLoginProgress.map(): LinkMobileStep {
+        return when (this) {
+            GrantGeneratedQrLoginProgress.Done -> LinkMobileStep.Done
+            is GrantGeneratedQrLoginProgress.QrReady -> {
+                LinkMobileStep.QrReady(String(qrCode.toBytes(), Charsets.ISO_8859_1))
+            }
+            is GrantGeneratedQrLoginProgress.QrScanned -> LinkMobileStep.QrScanned(
+                RustCheckCodeSender(
+                    inner = checkCodeSender,
+                    sessionDispatcher = sessionDispatcher,
+                )
+            )
+            GrantGeneratedQrLoginProgress.Starting -> LinkMobileStep.Starting
+            GrantGeneratedQrLoginProgress.SyncingSecrets -> LinkMobileStep.SyncingSecrets
+            is GrantGeneratedQrLoginProgress.WaitingForAuth -> LinkMobileStep.WaitingForAuth(verificationUri)
+        }
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/IdentityState.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/IdentityState.kt
index 4a2b2e5ab5..5bb95fc6ff 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/IdentityState.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/IdentityState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2b5cac67ea..3199ebf71a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,6 @@ internal fun Session.toSessionData(
     refreshToken = refreshToken,
     homeserverUrl = homeserverUrl ?: this.homeserverUrl,
     oidcData = oidcData,
-    slidingSyncProxy = null,
     loginTimestamp = Date(),
     isTokenValid = isTokenValid,
     loginType = loginType,
@@ -53,7 +53,6 @@ internal fun ExternalSession.toSessionData(
     refreshToken = refreshToken,
     homeserverUrl = homeserverUrl,
     oidcData = null,
-    slidingSyncProxy = slidingSyncProxy,
     loginTimestamp = Date(),
     isTokenValid = isTokenValid,
     loginType = loginType,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapper.kt
index 6cc338610b..14c813548a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioDetails.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioDetails.kt
index 639660a989..73eb408fdd 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioDetails.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioDetails.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioInfo.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioInfo.kt
index f00392aa42..9c20ad7c3f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioInfo.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/FileInfo.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/FileInfo.kt
index 7a0d93972f..9059e79be2 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/FileInfo.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/FileInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ImageInfo.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ImageInfo.kt
index e43ded8be1..83ab5ebb77 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ImageInfo.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ImageInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaSource.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaSource.kt
index 0d61c690cf..08bef24722 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaSource.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaUploadHandlerImpl.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaUploadHandlerImpl.kt
index dbfa67f374..c3f5d97567 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaUploadHandlerImpl.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/MediaUploadHandlerImpl.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaFile.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaFile.kt
index f6e944ae55..4ecb33d6d5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaFile.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaFile.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d7cd9c4092..892c99f64a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
index 15e86ab983..454c600ea4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaPreviewService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ThumbnailInfo.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ThumbnailInfo.kt
index ca56ea4e10..0303f8700b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ThumbnailInfo.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/ThumbnailInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/VideoInfo.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/VideoInfo.kt
index c6143b8918..33f622fb3d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/VideoInfo.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/VideoInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcTools.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcTools.kt
new file mode 100644
index 0000000000..b9ff2f5505
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcTools.kt
@@ -0,0 +1,36 @@
+/*
+ * 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.mxc
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.mxc.MxcTools
+
+@ContributesBinding(AppScope::class)
+class DefaultMxcTools : MxcTools {
+    /**
+     * Regex to match a Matrix Content (mxc://) URI.
+     *
+     * See: https://spec.matrix.org/v1.8/client-server-api/#matrix-content-mxc-uris
+     */
+    private val mxcRegex = Regex("""^mxc://([^/]+)/([^/]+)$""")
+
+    /**
+     * Sanitizes an mxcUri to be used as a relative file path.
+     *
+     * @param mxcUri the Matrix Content (mxc://) URI of the file.
+     * @return the relative file path as "<server-name>/<media-id>" or null if the mxcUri is invalid.
+     */
+    override fun mxcUri2FilePath(mxcUri: String): String? = mxcRegex.matchEntire(mxcUri)?.let { match ->
+        buildString {
+            append(match.groupValues[1])
+            append("/")
+            append(match.groupValues[2])
+        }
+    }
+}
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 e7831bc492..511c899fdb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ 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.SessionId
+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
@@ -38,11 +40,11 @@ class NotificationMapper(
                     isDirect = item.roomInfo.isDirect,
                     activeMembersCount = item.roomInfo.joinedMembersCount.toInt(),
                 )
+                val timestamp = item.timestamp() ?: clock.epochMillis()
                 NotificationData(
                     sessionId = sessionId,
                     eventId = eventId,
-                    // FIXME once the `NotificationItem` in the SDK returns the thread id
-                    threadId = null,
+                    threadId = item.threadId?.let(::ThreadId),
                     roomId = roomId,
                     senderAvatarUrl = item.senderInfo.avatarUrl,
                     senderDisplayName = item.senderInfo.displayName,
@@ -51,10 +53,11 @@ class NotificationMapper(
                     roomDisplayName = item.roomInfo.displayName,
                     isDirect = item.roomInfo.isDirect,
                     isDm = isDm,
+                    isSpace = item.roomInfo.isSpace,
                     isEncrypted = item.roomInfo.isEncrypted.orFalse(),
                     isNoisy = item.isNoisy.orFalse(),
-                    timestamp = item.timestamp() ?: clock.epochMillis(),
-                    content = item.event.use { notificationContentMapper.map(it) }.getOrThrow(),
+                    timestamp = timestamp,
+                    content = notificationContentMapper.map(item.event).getOrThrow(),
                     hasMention = item.hasMention.orFalse(),
                 )
             }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
index 1379392ae3..59d95af05b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -44,7 +45,7 @@ class RustNotificationService(
             }
             val items = notificationClient.getNotifications(requests)
             buildMap {
-                val eventIds = requests.flatMap { it.eventIds }
+                val eventIds = requests.flatMap { it.eventIds }.distinct()
                 for (rawEventId in eventIds) {
                     val roomId = RoomId(requests.find { it.eventIds.contains(rawEventId) }?.roomId!!)
                     val eventId = EventId(rawEventId)
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 2ca4a3c823..450216b452 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import io.element.android.libraries.matrix.impl.timeline.item.event.EventMessage
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
 import org.matrix.rustcomponents.sdk.StateEventContent
 import org.matrix.rustcomponents.sdk.TimelineEvent
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 import org.matrix.rustcomponents.sdk.use
 import org.matrix.rustcomponents.sdk.RtcNotificationType as SdkRtcNotificationType
 
@@ -25,18 +26,19 @@ class TimelineEventToNotificationContentMapper {
     fun map(timelineEvent: TimelineEvent): Result<NotificationContent> {
         return runCatchingExceptions {
             timelineEvent.use {
-                timelineEvent.eventType().use { eventType ->
-                    eventType.toContent(senderId = UserId(timelineEvent.senderId()))
+                val senderId = UserId(timelineEvent.senderId())
+                timelineEvent.content().use { eventContent ->
+                    eventContent.toContent(senderId = senderId)
                 }
             }
         }
     }
 }
 
-private fun TimelineEventType.toContent(senderId: UserId): NotificationContent {
+private fun TimelineEventContent.toContent(senderId: UserId): NotificationContent {
     return when (this) {
-        is TimelineEventType.MessageLike -> content.toContent(senderId)
-        is TimelineEventType.State -> content.toContent()
+        is TimelineEventContent.MessageLike -> content.toContent(senderId)
+        is TimelineEventContent.State -> content.toContent()
     }
 }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RoomNotificationSettingsMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RoomNotificationSettingsMapper.kt
index f83f7890d0..f453c93ec1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RoomNotificationSettingsMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RoomNotificationSettingsMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b4f3e70754..7da0f14d14 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -130,13 +131,17 @@ class RustNotificationSettingsService(
         }
     }
 
-    override suspend fun getRoomsWithUserDefinedRules(): Result<List<String>> =
+    override suspend fun getRoomsWithUserDefinedRules(): Result<List<RoomId>> =
         runCatchingExceptions {
-            notificationSettings.await().getRoomsWithUserDefinedRules(enabled = true)
+            notificationSettings.await().getRoomsWithUserDefinedRules(enabled = true).map(::RoomId)
         }
 
     override suspend fun canHomeServerPushEncryptedEventsToDevice(): Result<Boolean> =
         runCatchingExceptions {
             notificationSettings.await().canPushEncryptedEventToDevice()
         }
+
+    override suspend fun getRawPushRules(): Result<String?> = runCatchingExceptions {
+        notificationSettings.await().getRawPushRules()
+    }
 }
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/oidc/AccountManagementAction.kt
index 2fa852f1f9..f998126e17 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/oidc/AccountManagementAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 16e7854b80..1888cd0f88 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d583872503..d2e519fa9e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverter.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverter.kt
index c03be3bbe9..efb106acd3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverter.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import android.net.Uri
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.MatrixConfiguration
 import io.element.android.libraries.core.extensions.replacePrefix
 import io.element.android.libraries.matrix.api.permalink.MatrixToConverter
@@ -20,7 +20,6 @@ import io.element.android.libraries.matrix.api.permalink.MatrixToConverter
  * Mapping of an input URI to a matrix.to compliant URI.
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMatrixToConverter : MatrixToConverter {
     /**
      * Try to convert a URL from an element web instance or from a client permalink to a matrix.to url.
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkBuilder.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkBuilder.kt
index 2ed7990ee4..2b34138dc9 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkBuilder.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkBuilder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.matrix.impl.permalink
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.MatrixPatterns
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -20,7 +20,6 @@ import org.matrix.rustcomponents.sdk.matrixToRoomAliasPermalink
 import org.matrix.rustcomponents.sdk.matrixToUserPermalink
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPermalinkBuilder : PermalinkBuilder {
     override fun permalinkForUser(userId: UserId): Result<String> {
         if (!MatrixPatterns.isUserId(userId.value)) {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkParser.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkParser.kt
index 0454b719e3..e59530e874 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkParser.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.matrix.impl.permalink
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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.RoomAlias
@@ -32,7 +32,6 @@ import org.matrix.rustcomponents.sdk.parseMatrixEntityFrom
  * or matrix: permalinks (e.g. matrix:u/chagai95:matrix.org)
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPermalinkParser(
     private val matrixToConverter: MatrixToConverter
 ) : PermalinkParser {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/platform/RustInitPlatformService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/platform/RustInitPlatformService.kt
index 492d5e5792..cb1fdc93fd 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/platform/RustInitPlatformService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/platform/RustInitPlatformService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,12 @@ package io.element.android.libraries.matrix.impl.platform
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.platform.InitPlatformService
 import io.element.android.libraries.matrix.api.tracing.TracingConfiguration
 import io.element.android.libraries.matrix.impl.tracing.map
 import org.matrix.rustcomponents.sdk.initPlatform
 
 @ContributesBinding(AppScope::class)
-@Inject
 class RustInitPlatformService : InitPlatformService {
     override fun init(tracingConfiguration: TracingConfiguration) {
         initPlatform(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollAnswer.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollAnswer.kt
index 070ce1a5c6..df9eb142c6 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollAnswer.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollAnswer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollKind.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollKind.kt
index ad434d36d9..d1d7bdc934 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollKind.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/poll/PollKind.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/DefaultProxyProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/DefaultProxyProvider.kt
index e5318671f5..79dc7e6271 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/DefaultProxyProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/DefaultProxyProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import android.provider.Settings
 import androidx.core.content.getSystemService
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import timber.log.Timber
 
@@ -29,7 +29,6 @@ import timber.log.Timber
  * ```
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultProxyProvider(
     @ApplicationContext
     private val context: Context
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/ProxyProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/ProxyProvider.kt
index 85707b1029..1428183df6 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/ProxyProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/proxy/ProxyProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0fed390b14..860993d4bc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/FocusEventException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/FocusEventException.kt
index 4b17fbba90..4199b2816c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/FocusEventException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/FocusEventException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 baa9f85906..770efb3918 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -50,13 +51,16 @@ import io.element.android.libraries.matrix.impl.widget.generateWidgetWebViewUrl
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.DateDividerMode
 import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
@@ -73,6 +77,7 @@ import org.matrix.rustcomponents.sdk.getElementCallRequiredPermissions
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk.RoomPowerLevelChanges
+import uniffi.matrix_sdk_ui.TimelineReadReceiptTracking
 import kotlin.coroutines.cancellation.CancellationException
 import org.matrix.rustcomponents.sdk.IdentityStatusChange as RustIdentityStateChange
 import org.matrix.rustcomponents.sdk.KnockRequest as InnerKnockRequest
@@ -91,8 +96,6 @@ class JoinedRustRoom(
     private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
     private val innerRoom = baseRoom.innerRoom
 
-    override val syncUpdateFlow = MutableStateFlow(0L)
-
     override val roomTypingMembersFlow: Flow<List<UserId>> = mxCallbackFlow {
         val initial = emptyList<UserId>()
         channel.trySend(initial)
@@ -135,11 +138,24 @@ class JoinedRustRoom(
 
     override val roomNotificationSettingsStateFlow = MutableStateFlow<RoomNotificationSettingsState>(RoomNotificationSettingsState.Unknown)
 
-    override val liveTimeline = liveInnerTimeline.map(mode = Timeline.Mode.Live) {
-        syncUpdateFlow.value = systemClock.epochMillis()
-    }
+    override val liveTimeline = liveInnerTimeline.map(mode = Timeline.Mode.Live)
+
+    override val syncUpdateFlow = flow {
+        var counter = 0L
+        liveTimeline.onSyncedEventReceived.collect {
+            emit(++counter)
+        }
+    }.stateIn(
+        scope = roomCoroutineScope,
+        started = WhileSubscribed(),
+        initialValue = 0L,
+    )
 
     init {
+        subscribeToRoomMembersChange()
+    }
+
+    private fun subscribeToRoomMembersChange() {
         val powerLevelChanges = roomInfoFlow.map { it.roomPowerLevels }.distinctUntilChanged()
         val membershipChanges = liveTimeline.membershipChangeEventReceived.onStart { emit(Unit) }
         combine(membershipChanges, powerLevelChanges) { _, _ -> }
@@ -222,7 +238,7 @@ class JoinedRustRoom(
                     filter = filter,
                     internalIdPrefix = internalIdPrefix,
                     dateDividerMode = dateDividerMode,
-                    trackReadReceipts = trackReadReceipts,
+                    trackReadReceipts = if (trackReadReceipts) TimelineReadReceiptTracking.ALL_EVENTS else TimelineReadReceiptTracking.DISABLED,
                     reportUtds = true,
                 )
             ).let { innerTimeline ->
@@ -381,10 +397,12 @@ class JoinedRustRoom(
                 invite = roomPowerLevelsValues.invite,
                 kick = roomPowerLevelsValues.kick,
                 redact = roomPowerLevelsValues.redactEvents,
-                eventsDefault = roomPowerLevelsValues.sendEvents,
+                stateDefault = roomPowerLevelsValues.stateDefault,
+                eventsDefault = roomPowerLevelsValues.eventsDefault,
                 roomName = roomPowerLevelsValues.roomName,
                 roomAvatar = roomPowerLevelsValues.roomAvatar,
                 roomTopic = roomPowerLevelsValues.roomTopic,
+                spaceChild = roomPowerLevelsValues.spaceChild,
             )
             innerRoom.applyPowerLevelChanges(changes)
         }
@@ -473,11 +491,11 @@ class JoinedRustRoom(
     override fun destroy() {
         baseRoom.destroy()
         liveInnerTimeline.destroy()
+        Timber.d("Room $roomId destroyed")
     }
 
     private fun InnerTimeline.map(
         mode: Timeline.Mode,
-        onNewSyncedEvent: () -> Unit = {},
     ): Timeline {
         val timelineCoroutineScope = roomCoroutineScope.childScope(coroutineDispatchers.main, "TimelineScope-$roomId-$this")
         return RustTimeline(
@@ -488,7 +506,6 @@ class JoinedRustRoom(
             coroutineScope = timelineCoroutineScope,
             dispatcher = roomDispatcher,
             roomContentForwarder = roomContentForwarder,
-            onNewSyncedEvent = onNewSyncedEvent,
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/Mention.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/Mention.kt
index a8e039720d..22303ae68c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/Mention.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/Mention.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 14bd6d5e9d..47b37b7923 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,11 +12,21 @@ import io.element.android.libraries.matrix.api.room.MessageEventType
 import org.matrix.rustcomponents.sdk.MessageLikeEventType
 
 fun MessageEventType.map(): MessageLikeEventType = when (this) {
+    MessageEventType.Audio -> MessageLikeEventType.Audio
+    MessageEventType.Beacon -> MessageLikeEventType.Beacon
     MessageEventType.CallAnswer -> MessageLikeEventType.CallAnswer
+    MessageEventType.CallCandidates -> MessageLikeEventType.CallCandidates
     MessageEventType.CallInvite -> MessageLikeEventType.CallInvite
     MessageEventType.CallHangup -> MessageLikeEventType.CallHangup
-    MessageEventType.CallCandidates -> MessageLikeEventType.CallCandidates
-    MessageEventType.RtcNotification -> MessageLikeEventType.RtcNotification
+    MessageEventType.CallNegotiate -> MessageLikeEventType.CallNegotiate
+    MessageEventType.CallNotify -> MessageLikeEventType.CallNotify
+    MessageEventType.CallReject -> MessageLikeEventType.CallReject
+    MessageEventType.CallSdpStreamMetadataChanged -> MessageLikeEventType.CallSdpStreamMetadataChanged
+    MessageEventType.CallSelectAnswer -> MessageLikeEventType.CallSelectAnswer
+    MessageEventType.Emote -> MessageLikeEventType.Emote
+    MessageEventType.Encrypted -> MessageLikeEventType.Encrypted
+    MessageEventType.File -> MessageLikeEventType.File
+    MessageEventType.Image -> MessageLikeEventType.Image
     MessageEventType.KeyVerificationReady -> MessageLikeEventType.KeyVerificationReady
     MessageEventType.KeyVerificationStart -> MessageLikeEventType.KeyVerificationStart
     MessageEventType.KeyVerificationCancel -> MessageLikeEventType.KeyVerificationCancel
@@ -23,17 +34,23 @@ fun MessageEventType.map(): MessageLikeEventType = when (this) {
     MessageEventType.KeyVerificationKey -> MessageLikeEventType.KeyVerificationKey
     MessageEventType.KeyVerificationMac -> MessageLikeEventType.KeyVerificationMac
     MessageEventType.KeyVerificationDone -> MessageLikeEventType.KeyVerificationDone
+    MessageEventType.Location -> MessageLikeEventType.Location
+    MessageEventType.Message -> MessageLikeEventType.Message
     MessageEventType.Reaction -> MessageLikeEventType.Reaction
     MessageEventType.RoomEncrypted -> MessageLikeEventType.RoomEncrypted
     MessageEventType.RoomMessage -> MessageLikeEventType.RoomMessage
     MessageEventType.RoomRedaction -> MessageLikeEventType.RoomRedaction
+    MessageEventType.RtcDecline -> MessageLikeEventType.RtcDecline
     MessageEventType.Sticker -> MessageLikeEventType.Sticker
     MessageEventType.PollEnd -> MessageLikeEventType.PollEnd
     MessageEventType.PollResponse -> MessageLikeEventType.PollResponse
     MessageEventType.PollStart -> MessageLikeEventType.PollStart
+    MessageEventType.RtcNotification -> MessageLikeEventType.RtcNotification
     MessageEventType.UnstablePollEnd -> MessageLikeEventType.UnstablePollEnd
     MessageEventType.UnstablePollResponse -> MessageLikeEventType.UnstablePollResponse
     MessageEventType.UnstablePollStart -> MessageLikeEventType.UnstablePollStart
+    MessageEventType.Video -> MessageLikeEventType.Video
+    MessageEventType.Voice -> MessageLikeEventType.Voice
     is MessageEventType.Other -> MessageLikeEventType.Other(type)
 }
 
@@ -61,5 +78,21 @@ fun MessageLikeEventType.map(): MessageEventType = when (this) {
     MessageLikeEventType.UnstablePollEnd -> MessageEventType.UnstablePollEnd
     MessageLikeEventType.UnstablePollResponse -> MessageEventType.UnstablePollResponse
     MessageLikeEventType.UnstablePollStart -> MessageEventType.UnstablePollStart
+    MessageLikeEventType.Audio -> MessageEventType.Audio
+    MessageLikeEventType.Beacon -> MessageEventType.Beacon
+    MessageLikeEventType.CallNegotiate -> MessageEventType.CallNegotiate
+    MessageLikeEventType.CallNotify -> MessageEventType.CallNotify
+    MessageLikeEventType.CallReject -> MessageEventType.CallReject
+    MessageLikeEventType.CallSdpStreamMetadataChanged -> MessageEventType.CallSdpStreamMetadataChanged
+    MessageLikeEventType.CallSelectAnswer -> MessageEventType.CallSelectAnswer
+    MessageLikeEventType.Emote -> MessageEventType.Emote
+    MessageLikeEventType.Encrypted -> MessageEventType.Encrypted
+    MessageLikeEventType.File -> MessageEventType.File
+    MessageLikeEventType.Image -> MessageEventType.Image
+    MessageLikeEventType.Location -> MessageEventType.Location
+    MessageLikeEventType.Message -> MessageEventType.Message
+    MessageLikeEventType.RtcDecline -> MessageEventType.RtcDecline
+    MessageLikeEventType.Video -> MessageEventType.Video
+    MessageLikeEventType.Voice -> MessageEventType.Voice
     is MessageLikeEventType.Other -> MessageEventType.Other(v1)
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt
index fb88cf625b..973a36365c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt
@@ -1,13 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import androidx.compose.runtime.Immutable
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.room.NotJoinedRoom
@@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
 
-@Immutable
 class NotJoinedRustRoom(
     private val sessionId: SessionId,
     override val localRoom: RustBaseRoom?,
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 323b4b50f8..e000c2f916 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2b5df7484a..668cfc46df 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4339b69101..36da41f28a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSyncSubscriber.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSyncSubscriber.kt
index c630aea6cf..724e3f62f0 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSyncSubscriber.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSyncSubscriber.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,7 +34,7 @@ class RoomSyncSubscriber(
                     }
                     subscribedRoomIds.add(roomId)
                 } catch (exception: Exception) {
-                    Timber.e("Failed to subscribe to room $roomId")
+                    Timber.e(exception, "Failed to subscribe to room $roomId")
                 }
             }
         }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomType.kt
index c9940a6a58..a8681e1217 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6061ebd79c..8c4847a73f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,13 +18,12 @@ 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.core.UserId
 import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
 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.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+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
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
@@ -32,6 +32,7 @@ import io.element.android.libraries.matrix.impl.room.draft.into
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
 import io.element.android.libraries.matrix.impl.room.powerlevels.RoomPowerLevelsValuesMapper
+import io.element.android.libraries.matrix.impl.room.powerlevels.RustRoomPermissions
 import io.element.android.libraries.matrix.impl.room.tombstone.map
 import io.element.android.libraries.matrix.impl.roomdirectory.map
 import io.element.android.libraries.matrix.impl.timeline.toRustReceiptType
@@ -84,7 +85,9 @@ class RustBaseRoom(
     }.stateIn(roomCoroutineScope, started = SharingStarted.Lazily, initialValue = initialRoomInfo)
 
     override fun predecessorRoom(): PredecessorRoom? {
-        return innerRoom.predecessorRoom()?.map()
+        return runCatchingExceptions { innerRoom.predecessorRoom()?.map() }
+            .onFailure { Timber.e(it, "Could not get predecessor room") }
+            .getOrNull()
     }
 
     override suspend fun subscribeToSync() = roomSyncSubscriber.subscribe(roomId)
@@ -177,57 +180,9 @@ class RustBaseRoom(
         }
     }
 
-    override suspend fun canUserInvite(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+    override suspend fun roomPermissions(): Result<RoomPermissions> = withContext(roomDispatcher) {
         runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserInvite(userId.value) }
-        }
-    }
-
-    override suspend fun canUserKick(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserKick(userId.value) }
-        }
-    }
-
-    override suspend fun canUserBan(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserBan(userId.value) }
-        }
-    }
-
-    override suspend fun canUserRedactOwn(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserRedactOwn(userId.value) }
-        }
-    }
-
-    override suspend fun canUserRedactOther(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserRedactOther(userId.value) }
-        }
-    }
-
-    override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserSendState(userId.value, type.map()) }
-        }
-    }
-
-    override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserSendMessage(userId.value, type.map()) }
-        }
-    }
-
-    override suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserTriggerRoomNotification(userId.value) }
-        }
-    }
-
-    override suspend fun canUserPinUnpin(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.getPowerLevels().use { it.canUserPinUnpin(userId.value) }
+            RustRoomPermissions(innerRoom.getPowerLevels())
         }
     }
 
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 ee9e7bfe52..cbc39b1c61 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,6 +23,11 @@ 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.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
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.NonCancellable
@@ -31,10 +37,12 @@ import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.DateDividerMode
 import org.matrix.rustcomponents.sdk.Membership
 import org.matrix.rustcomponents.sdk.Room
+import org.matrix.rustcomponents.sdk.RoomInfo
 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_ui.TimelineReadReceiptTracking
 import java.util.concurrent.atomic.AtomicBoolean
 import org.matrix.rustcomponents.sdk.RoomListService as InnerRoomListService
 
@@ -53,8 +61,9 @@ class RustRoomFactory(
     private val featureFlagService: FeatureFlagService,
     private val roomMembershipObserver: RoomMembershipObserver,
     private val roomInfoMapper: RoomInfoMapper,
+    private val analyticsService: AnalyticsService,
 ) {
-    private val dispatcher = dispatchers.io.limitedParallelism(1)
+    private val dispatcher = dispatchers.computation.limitedParallelism(1)
     private val mutex = Mutex()
     private val isDestroyed: AtomicBoolean = AtomicBoolean(false)
 
@@ -80,24 +89,21 @@ class RustRoomFactory(
                 return@withContext null
             }
             val room = awaitRoomInRoomList(roomId) ?: return@withContext null
-            getBaseRoom(room)
+            getBaseRoom(sdkRoom = room, roomInfo = room.roomInfo())
         }
     }
 
-    private suspend fun getBaseRoom(sdkRoom: Room): RustBaseRoom {
-        val initialRoomInfo = sdkRoom.roomInfo()
-        return RustBaseRoom(
-            sessionId = sessionId,
-            deviceId = deviceId,
-            innerRoom = sdkRoom,
-            coroutineDispatchers = dispatchers,
-            roomSyncSubscriber = roomSyncSubscriber,
-            roomMembershipObserver = roomMembershipObserver,
-            roomInfoMapper = roomInfoMapper,
-            initialRoomInfo = roomInfoMapper.map(initialRoomInfo),
-            sessionCoroutineScope = sessionCoroutineScope,
-        )
-    }
+    private fun getBaseRoom(sdkRoom: Room, roomInfo: RoomInfo) = RustBaseRoom(
+        sessionId = sessionId,
+        deviceId = deviceId,
+        innerRoom = sdkRoom,
+        coroutineDispatchers = dispatchers,
+        roomSyncSubscriber = roomSyncSubscriber,
+        roomMembershipObserver = roomMembershipObserver,
+        roomInfoMapper = roomInfoMapper,
+        initialRoomInfo = roomInfoMapper.map(roomInfo),
+        sessionCoroutineScope = sessionCoroutineScope,
+    )
 
     suspend fun getJoinedRoomOrPreview(roomId: RoomId, serverNames: List<String>): GetRoomResult? = withContext(dispatcher) {
         mutex.withLock {
@@ -105,48 +111,71 @@ class RustRoomFactory(
                 Timber.d("Room factory is destroyed, returning null for $roomId")
                 return@withContext null
             }
-            val sdkRoom = awaitRoomInRoomList(roomId) ?: return@withContext null
 
-            if (sdkRoom.membership() == Membership.JOINED) {
-                val hideThreadedEvents = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
-                // Init the live timeline in the SDK from the Room
-                val timeline = sdkRoom.timelineWithConfiguration(
-                    TimelineConfiguration(
-                        focus = TimelineFocus.Live(hideThreadedEvents = hideThreadedEvents),
-                        filter = eventFilters?.let(TimelineFilter::EventTypeFilter) ?: TimelineFilter.All,
-                        internalIdPrefix = "live",
-                        dateDividerMode = DateDividerMode.DAILY,
-                        trackReadReceipts = true,
-                        reportUtds = true,
-                    )
-                )
+            val sdkRoom = awaitRoomInRoomList(roomId) ?: return@withLock null
+            val roomInfo = sdkRoom.roomInfo()
 
-                GetRoomResult.Joined(
-                    JoinedRustRoom(
-                        baseRoom = getBaseRoom(sdkRoom),
-                        notificationSettingsService = notificationSettingsService,
-                        roomContentForwarder = roomContentForwarder,
-                        liveInnerTimeline = timeline,
-                        coroutineDispatchers = dispatchers,
-                        systemClock = systemClock,
-                        featureFlagService = featureFlagService,
+            val parentTransaction = analyticsService.getLongRunningTransaction(AnalyticsLongRunningTransaction.OpenRoom)
+
+            if (roomInfo.membership == Membership.JOINED) {
+                analyticsService.recordTransaction(
+                    name = "Get joined room",
+                    operation = "RustRoomFactory.getJoinedRoomOrPreview",
+                    parentTransaction = parentTransaction,
+                ) { transaction ->
+                    val hideThreadedEvents = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
+                    // Init the live timeline in the SDK from the Room
+                    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::EventTypeFilter) ?: TimelineFilter.All,
+                                    internalIdPrefix = "live",
+                                    dateDividerMode = DateDividerMode.DAILY,
+                                    trackReadReceipts = TimelineReadReceiptTracking.ALL_EVENTS,
+                                    reportUtds = true,
+                                )
+                            )
+                        }
+                    }
+
+                    GetRoomResult.Joined(
+                        JoinedRustRoom(
+                            baseRoom = getBaseRoom(sdkRoom, roomInfo),
+                            notificationSettingsService = notificationSettingsService,
+                            roomContentForwarder = roomContentForwarder,
+                            liveInnerTimeline = timeline,
+                            coroutineDispatchers = dispatchers,
+                            systemClock = systemClock,
+                            featureFlagService = featureFlagService,
+                        )
                     )
-                )
-            } else {
-                val preview = try {
-                    sdkRoom.previewRoom(via = serverNames)
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to get room preview for $roomId")
-                    return@withContext null
                 }
+            } else {
+                analyticsService.recordTransaction(
+                    name = "Get preview of room",
+                    operation = "RustRoomFactory.getJoinedRoomOrPreview",
+                    parentTransaction = parentTransaction,
+                ) {
+                    val preview = try {
+                        sdkRoom.previewRoom(via = serverNames)
+                    } catch (e: Exception) {
+                        Timber.e(e, "Failed to get room preview for $roomId")
+                        return@recordTransaction null
+                    }
 
-                GetRoomResult.NotJoined(
-                    NotJoinedRustRoom(
-                        sessionId = sessionId,
-                        localRoom = getBaseRoom(sdkRoom),
-                        previewInfo = RoomPreviewInfoMapper.map(preview.info()),
+                    GetRoomResult.NotJoined(
+                        NotJoinedRustRoom(
+                            sessionId = sessionId,
+                            localRoom = getBaseRoom(sdkRoom, roomInfo),
+                            previewInfo = RoomPreviewInfoMapper.map(preview.info()),
+                        )
                     )
-                )
+                }
             }
         }
     }
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 70e74c88bd..76fea0beef 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,51 +12,61 @@ import io.element.android.libraries.matrix.api.room.StateEventType
 import org.matrix.rustcomponents.sdk.StateEventType as RustStateEventType
 
 fun StateEventType.map(): RustStateEventType = when (this) {
-    StateEventType.POLICY_RULE_ROOM -> RustStateEventType.POLICY_RULE_ROOM
-    StateEventType.POLICY_RULE_SERVER -> RustStateEventType.POLICY_RULE_SERVER
-    StateEventType.POLICY_RULE_USER -> RustStateEventType.POLICY_RULE_USER
-    StateEventType.CALL_MEMBER -> RustStateEventType.CALL_MEMBER
-    StateEventType.ROOM_ALIASES -> RustStateEventType.ROOM_ALIASES
-    StateEventType.ROOM_AVATAR -> RustStateEventType.ROOM_AVATAR
-    StateEventType.ROOM_CANONICAL_ALIAS -> RustStateEventType.ROOM_CANONICAL_ALIAS
-    StateEventType.ROOM_CREATE -> RustStateEventType.ROOM_CREATE
-    StateEventType.ROOM_ENCRYPTION -> RustStateEventType.ROOM_ENCRYPTION
-    StateEventType.ROOM_GUEST_ACCESS -> RustStateEventType.ROOM_GUEST_ACCESS
-    StateEventType.ROOM_HISTORY_VISIBILITY -> RustStateEventType.ROOM_HISTORY_VISIBILITY
-    StateEventType.ROOM_JOIN_RULES -> RustStateEventType.ROOM_JOIN_RULES
-    StateEventType.ROOM_MEMBER_EVENT -> RustStateEventType.ROOM_MEMBER_EVENT
-    StateEventType.ROOM_NAME -> RustStateEventType.ROOM_NAME
-    StateEventType.ROOM_PINNED_EVENTS -> RustStateEventType.ROOM_PINNED_EVENTS
-    StateEventType.ROOM_POWER_LEVELS -> RustStateEventType.ROOM_POWER_LEVELS
-    StateEventType.ROOM_SERVER_ACL -> RustStateEventType.ROOM_SERVER_ACL
-    StateEventType.ROOM_THIRD_PARTY_INVITE -> RustStateEventType.ROOM_THIRD_PARTY_INVITE
-    StateEventType.ROOM_TOMBSTONE -> RustStateEventType.ROOM_TOMBSTONE
-    StateEventType.ROOM_TOPIC -> RustStateEventType.ROOM_TOPIC
-    StateEventType.SPACE_CHILD -> RustStateEventType.SPACE_CHILD
-    StateEventType.SPACE_PARENT -> RustStateEventType.SPACE_PARENT
+    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
+    StateEventType.RoomEncryption -> RustStateEventType.RoomEncryption
+    StateEventType.RoomGuestAccess -> RustStateEventType.RoomGuestAccess
+    StateEventType.RoomHistoryVisibility -> RustStateEventType.RoomHistoryVisibility
+    StateEventType.RoomJoinRules -> RustStateEventType.RoomJoinRules
+    StateEventType.RoomMemberEvent -> RustStateEventType.RoomMemberEvent
+    StateEventType.RoomName -> RustStateEventType.RoomName
+    StateEventType.RoomPinnedEvents -> RustStateEventType.RoomPinnedEvents
+    StateEventType.RoomPowerLevels -> RustStateEventType.RoomPowerLevels
+    StateEventType.RoomServerAcl -> RustStateEventType.RoomServerAcl
+    StateEventType.RoomThirdPartyInvite -> RustStateEventType.RoomThirdPartyInvite
+    StateEventType.RoomTombstone -> RustStateEventType.RoomTombstone
+    StateEventType.RoomTopic -> RustStateEventType.RoomTopic
+    StateEventType.SpaceChild -> RustStateEventType.SpaceChild
+    StateEventType.SpaceParent -> RustStateEventType.SpaceParent
+    StateEventType.BeaconInfo -> RustStateEventType.BeaconInfo
+    StateEventType.MemberHints -> RustStateEventType.MemberHints
+    StateEventType.RoomImagePack -> RustStateEventType.RoomImagePack
+    StateEventType.RoomLanguage -> RustStateEventType.RoomLanguage
+    is StateEventType.Custom -> RustStateEventType.Custom(type)
 }
 
 fun RustStateEventType.map(): StateEventType = when (this) {
-    RustStateEventType.POLICY_RULE_ROOM -> StateEventType.POLICY_RULE_ROOM
-    RustStateEventType.POLICY_RULE_SERVER -> StateEventType.POLICY_RULE_SERVER
-    RustStateEventType.POLICY_RULE_USER -> StateEventType.POLICY_RULE_USER
-    RustStateEventType.CALL_MEMBER -> StateEventType.CALL_MEMBER
-    RustStateEventType.ROOM_ALIASES -> StateEventType.ROOM_ALIASES
-    RustStateEventType.ROOM_AVATAR -> StateEventType.ROOM_AVATAR
-    RustStateEventType.ROOM_CANONICAL_ALIAS -> StateEventType.ROOM_CANONICAL_ALIAS
-    RustStateEventType.ROOM_CREATE -> StateEventType.ROOM_CREATE
-    RustStateEventType.ROOM_ENCRYPTION -> StateEventType.ROOM_ENCRYPTION
-    RustStateEventType.ROOM_GUEST_ACCESS -> StateEventType.ROOM_GUEST_ACCESS
-    RustStateEventType.ROOM_HISTORY_VISIBILITY -> StateEventType.ROOM_HISTORY_VISIBILITY
-    RustStateEventType.ROOM_JOIN_RULES -> StateEventType.ROOM_JOIN_RULES
-    RustStateEventType.ROOM_MEMBER_EVENT -> StateEventType.ROOM_MEMBER_EVENT
-    RustStateEventType.ROOM_NAME -> StateEventType.ROOM_NAME
-    RustStateEventType.ROOM_PINNED_EVENTS -> StateEventType.ROOM_PINNED_EVENTS
-    RustStateEventType.ROOM_POWER_LEVELS -> StateEventType.ROOM_POWER_LEVELS
-    RustStateEventType.ROOM_SERVER_ACL -> StateEventType.ROOM_SERVER_ACL
-    RustStateEventType.ROOM_THIRD_PARTY_INVITE -> StateEventType.ROOM_THIRD_PARTY_INVITE
-    RustStateEventType.ROOM_TOMBSTONE -> StateEventType.ROOM_TOMBSTONE
-    RustStateEventType.ROOM_TOPIC -> StateEventType.ROOM_TOPIC
-    RustStateEventType.SPACE_CHILD -> StateEventType.SPACE_CHILD
-    RustStateEventType.SPACE_PARENT -> StateEventType.SPACE_PARENT
+    RustStateEventType.PolicyRuleRoom -> StateEventType.PolicyRuleRoom
+    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
+    RustStateEventType.RoomEncryption -> StateEventType.RoomEncryption
+    RustStateEventType.RoomGuestAccess -> StateEventType.RoomGuestAccess
+    RustStateEventType.RoomHistoryVisibility -> StateEventType.RoomHistoryVisibility
+    RustStateEventType.RoomJoinRules -> StateEventType.RoomJoinRules
+    RustStateEventType.RoomMemberEvent -> StateEventType.RoomMemberEvent
+    RustStateEventType.RoomName -> StateEventType.RoomName
+    RustStateEventType.RoomPinnedEvents -> StateEventType.RoomPinnedEvents
+    RustStateEventType.RoomPowerLevels -> StateEventType.RoomPowerLevels
+    RustStateEventType.RoomServerAcl -> StateEventType.RoomServerAcl
+    RustStateEventType.RoomThirdPartyInvite -> StateEventType.RoomThirdPartyInvite
+    RustStateEventType.RoomTombstone -> StateEventType.RoomTombstone
+    RustStateEventType.RoomTopic -> StateEventType.RoomTopic
+    RustStateEventType.SpaceChild -> StateEventType.SpaceChild
+    RustStateEventType.SpaceParent -> StateEventType.SpaceParent
+    RustStateEventType.BeaconInfo -> StateEventType.BeaconInfo
+    RustStateEventType.MemberHints -> StateEventType.MemberHints
+    RustStateEventType.RoomImagePack -> StateEventType.RoomImagePack
+    RustStateEventType.RoomLanguage -> StateEventType.RoomLanguage
+    is RustStateEventType.Custom -> StateEventType.Custom(value)
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventTypeFilterFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventTypeFilterFactory.kt
index 29f72848b8..d25f595569 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventTypeFilterFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventTypeFilterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.matrix.impl.room
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.room.StateEventType
 import org.matrix.rustcomponents.sdk.FilterTimelineEventType
 import org.matrix.rustcomponents.sdk.TimelineEventTypeFilter
@@ -19,7 +19,6 @@ interface TimelineEventTypeFilterFactory {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class RustTimelineEventTypeFilterFactory : TimelineEventTypeFilterFactory {
     override fun create(listStateEventType: List<StateEventType>): TimelineEventTypeFilter {
         return TimelineEventTypeFilter.exclude(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/alias/DefaultRoomAliasHelper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/alias/DefaultRoomAliasHelper.kt
index 039144bf55..3db3c12f41 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/alias/DefaultRoomAliasHelper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/alias/DefaultRoomAliasHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.libraries.matrix.impl.room.alias
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRoomAliasHelper : RoomAliasHelper {
     override fun roomAliasNameFromRoomDisplayName(name: String): String {
         return org.matrix.rustcomponents.sdk.roomAliasNameFromRoomDisplayName(name)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/draft/ComposerDraftMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/draft/ComposerDraftMapper.kt
index 1bdadb96fc..5e69b667cb 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/draft/ComposerDraftMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/draft/ComposerDraftMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,9 @@ internal fun ComposerDraft.into(): RustComposerDraft {
     return RustComposerDraft(
         plainText = plainText,
         htmlText = htmlText,
-        draftType = draftType.into()
+        draftType = draftType.into(),
+        // TODO add media attachments to the draft
+        attachments = emptyList(),
     )
 }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/history/RoomHistoryVisibilityMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/history/RoomHistoryVisibilityMapper.kt
index 60ff7cc698..30c8d7fb02 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/history/RoomHistoryVisibilityMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/history/RoomHistoryVisibilityMapper.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/AllowRule.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/AllowRule.kt
index a93ce58236..2de5197a4f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/AllowRule.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/AllowRule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoom.kt
index 5a790acd7a..66be1492a3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoom.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.join
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.di.SessionScope
@@ -21,7 +21,6 @@ import io.element.android.libraries.matrix.impl.analytics.toAnalyticsJoinedRoom
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultJoinRoom(
     private val client: MatrixClient,
     private val analyticsService: AnalyticsService,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/JoinRule.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/JoinRule.kt
index e145cbdb91..aac57451db 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/JoinRule.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/join/JoinRule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/knock/RustKnockRequest.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/knock/RustKnockRequest.kt
index 02e405969b..9e27b7bc50 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/knock/RustKnockRequest.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/knock/RustKnockRequest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetType.kt
index 5a73223222..c7c2c88fcc 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt
index fc394e4ce7..cfe36a23a5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 af7376e445..447fa427a6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt
deleted file mode 100644
index 311b1ab5fb..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.matrix.impl.room.message
-
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
-import io.element.android.libraries.matrix.impl.timeline.item.event.EventTimelineItemMapper
-import org.matrix.rustcomponents.sdk.EventTimelineItem as RustEventTimelineItem
-
-class RoomMessageFactory(
-    private val eventTimelineItemMapper: EventTimelineItemMapper = EventTimelineItemMapper(),
-) {
-    fun create(eventTimelineItem: RustEventTimelineItem?): RoomMessage? {
-        eventTimelineItem ?: return null
-        val mappedTimelineItem = eventTimelineItemMapper.map(eventTimelineItem)
-        return RoomMessage(
-            eventId = mappedTimelineItem.eventId ?: return null,
-            event = mappedTimelineItem,
-            sender = mappedTimelineItem.sender,
-            originServerTs = mappedTimelineItem.timestamp,
-        )
-    }
-}
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 9121d8bdf0..5e2a1c82da 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,11 +19,13 @@ object RoomPowerLevelsValuesMapper {
             ban = values.ban,
             invite = values.invite,
             kick = values.kick,
-            sendEvents = values.eventsDefault,
+            eventsDefault = values.eventsDefault,
+            stateDefault = values.stateDefault,
             redactEvents = values.redact,
             roomName = values.roomName,
             roomAvatar = values.roomAvatar,
             roomTopic = values.roomTopic,
+            spaceChild = values.spaceChild,
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RustRoomPermissions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RustRoomPermissions.kt
new file mode 100644
index 0000000000..57e20b166f
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RustRoomPermissions.kt
@@ -0,0 +1,95 @@
+/*
+ * 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.powerlevels
+
+import io.element.android.libraries.matrix.api.core.UserId
+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
+import io.element.android.libraries.matrix.impl.room.map
+import org.matrix.rustcomponents.sdk.RoomPowerLevels
+
+class RustRoomPermissions(
+    private val inner: RoomPowerLevels,
+) : RoomPermissions {
+    override fun canOwnUserBan(): Boolean {
+        return inner.canOwnUserBan()
+    }
+
+    override fun canOwnUserInvite(): Boolean {
+        return inner.canOwnUserInvite()
+    }
+
+    override fun canOwnUserKick(): Boolean {
+        return inner.canOwnUserKick()
+    }
+
+    override fun canOwnUserPinUnpin(): Boolean {
+        return inner.canOwnUserPinUnpin()
+    }
+
+    override fun canOwnUserRedactOther(): Boolean {
+        return inner.canOwnUserRedactOther()
+    }
+
+    override fun canOwnUserRedactOwn(): Boolean {
+        return inner.canOwnUserRedactOwn()
+    }
+
+    override fun canOwnUserSendMessage(message: MessageEventType): Boolean {
+        return inner.canOwnUserSendMessage(message.map())
+    }
+
+    override fun canOwnUserSendState(stateEvent: StateEventType): Boolean {
+        return inner.canOwnUserSendState(stateEvent.map())
+    }
+
+    override fun canOwnUserTriggerRoomNotification(): Boolean {
+        return inner.canOwnUserTriggerRoomNotification()
+    }
+
+    override fun canUserBan(userId: UserId): Boolean {
+        return inner.canUserBan(userId.value)
+    }
+
+    override fun canUserInvite(userId: UserId): Boolean {
+        return inner.canUserInvite(userId.value)
+    }
+
+    override fun canUserKick(userId: UserId): Boolean {
+        return inner.canUserKick(userId.value)
+    }
+
+    override fun canUserPinUnpin(userId: UserId): Boolean {
+        return inner.canUserPinUnpin(userId.value)
+    }
+
+    override fun canUserRedactOther(userId: UserId): Boolean {
+        return inner.canUserRedactOther(userId.value)
+    }
+
+    override fun canUserRedactOwn(userId: UserId): Boolean {
+        return inner.canUserRedactOwn(userId.value)
+    }
+
+    override fun canUserSendMessage(userId: UserId, message: MessageEventType): Boolean {
+        return inner.canUserSendMessage(userId.value, message.map())
+    }
+
+    override fun canUserSendState(userId: UserId, stateEvent: StateEventType): Boolean {
+        return inner.canUserSendState(userId.value, stateEvent.map())
+    }
+
+    override fun canUserTriggerRoomNotification(userId: UserId): Boolean {
+        return inner.canUserTriggerRoomNotification(userId.value)
+    }
+
+    override fun close() {
+        inner.close()
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt
index cb1867ec8e..5e2bdd265a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/PredecessorRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/PredecessorRoom.kt
index a09867bf6c..c9d493f993 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/PredecessorRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/PredecessorRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/SuccessorRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/SuccessorRoom.kt
index afc0ee96af..f806e3f1d7 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/SuccessorRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/tombstone/SuccessorRoom.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
index 76a6394e94..dd17a2432c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchExtension.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchExtension.kt
index 73e5e6f1fa..c560e3dc32 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchExtension.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessor.kt
index abd38834dd..7c4f1e207a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomVisibilityMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomVisibilityMapper.kt
index bfbc48d3b9..a66d0a30dd 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomVisibilityMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomVisibilityMapper.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryList.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryList.kt
index e91fef7810..699291f68e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryList.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -73,9 +74,9 @@ class RustRoomDirectoryList(
         return !inner.isAtLastPage()
     }
 
-    override val state: Flow<RoomDirectoryList.State> =
+    override val state: Flow<RoomDirectoryList.SearchResult> =
         combine(hasMoreToLoad, processor.roomDescriptionsFlow) { hasMoreToLoad, items ->
-            RoomDirectoryList.State(
+            RoomDirectoryList.SearchResult(
                 hasMoreToLoad = hasMoreToLoad,
                 items = items
             )
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryService.kt
index 35ad336f9a..216991fdd1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListDynamicEvents.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListDynamicEvents.kt
index 9d7cdf5f3b..48d97cc684 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListDynamicEvents.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListDynamicEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 99d1646c72..27b19ebf19 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
index 8cdcd13f22..ae241e9c02 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -47,7 +48,7 @@ fun RoomListInterface.loadingStateFlow(): Flow<RoomListLoadingState> =
         try {
             send(result.state)
         } catch (exception: Exception) {
-            Timber.d("loadingStateFlow() initialState failed.")
+            Timber.d(exception, "loadingStateFlow() initialState failed.")
         }
         result.stateStream
     }.catch {
@@ -65,7 +66,11 @@ internal fun RoomListInterface.entriesFlow(
                 trySendBlocking(roomEntriesUpdate)
             }
         }
-        val result = entriesWithDynamicAdapters(pageSize.toUInt(), listener)
+        val result = entriesWithDynamicAdaptersWith(
+            pageSize = pageSize.toUInt(),
+            enableLatestEventSorter = true,
+            listener = listener,
+        )
         val controller = result.controller()
         controller.setFilter(initialFilterKind)
         roomListDynamicEvents.onEach { controllerEvents ->
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
index 53b8127ab8..b15411c382 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,9 @@ import io.element.android.libraries.matrix.api.roomlist.DynamicRoomList
 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.roomlist.RoomSummary
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -35,8 +39,9 @@ private val ROOM_LIST_RUST_FILTERS = listOf(
 internal class RoomListFactory(
     private val innerRoomListService: RoomListService,
     private val sessionCoroutineScope: CoroutineScope,
+    private val analyticsService: AnalyticsService,
 ) {
-    private val roomSummaryDetailsFactory: RoomSummaryFactory = RoomSummaryFactory()
+    private val roomSummaryFactory: RoomSummaryFactory = RoomSummaryFactory()
 
     /**
      * Creates a room list that can be used to load more rooms and filter them dynamically.
@@ -51,13 +56,15 @@ internal class RoomListFactory(
         val loadingStateFlow: MutableStateFlow<RoomList.LoadingState> = MutableStateFlow(RoomList.LoadingState.NotLoaded)
         val filteredSummariesFlow = MutableSharedFlow<List<RoomSummary>>(replay = 1, extraBufferCapacity = 1)
         val summariesFlow = MutableSharedFlow<List<RoomSummary>>(replay = 1, extraBufferCapacity = 1)
-        val processor = RoomSummaryListProcessor(summariesFlow, innerRoomListService, coroutineContext, roomSummaryDetailsFactory)
+        val processor = RoomSummaryListProcessor(summariesFlow, innerRoomListService, coroutineContext, roomSummaryFactory)
         // Makes sure we don't miss any events
         val dynamicEvents = MutableSharedFlow<RoomListDynamicEvents>(replay = 100)
         val currentFilter = MutableStateFlow(initialFilter)
         val loadedPages = MutableStateFlow(1)
         var innerRoomList: InnerRoomList? = null
 
+        val firstRoomsTransaction = analyticsService.startTransaction("Load first set of rooms", "innerRoomList.entriesFlow")
+
         coroutineScope.launch(coroutineContext) {
             innerRoomList = innerProvider()
             innerRoomList.let { innerRoomList ->
@@ -66,6 +73,10 @@ internal class RoomListFactory(
                     roomListDynamicEvents = dynamicEvents,
                     initialFilterKind = RoomListEntriesDynamicFilterKind.All(ROOM_LIST_RUST_FILTERS),
                 ).onEach { update ->
+                    if (!firstRoomsTransaction.isFinished()) {
+                        analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.FirstRoomsDisplayed)
+                        firstRoomsTransaction.finish()
+                    }
                     processor.postUpdate(update)
                 }.launchIn(this)
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt
index 3fc59d7c44..ed4d5735e0 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
index 69f48a578e..738c1f72ea 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
@@ -1,30 +1,63 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.roomlist
 
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.impl.room.RoomInfoMapper
-import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
+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.Room
 import org.matrix.rustcomponents.sdk.use
+import uniffi.matrix_sdk_ui.LatestEventValueLocalState
+import org.matrix.rustcomponents.sdk.LatestEventValue as RustLatestEventValue
 
 class RoomSummaryFactory(
-    private val roomMessageFactory: RoomMessageFactory = RoomMessageFactory(),
+    private val contentMapper: TimelineEventContentMapper = TimelineEventContentMapper(),
     private val roomInfoMapper: RoomInfoMapper = RoomInfoMapper(),
 ) {
     suspend fun create(room: Room): RoomSummary {
         val roomInfo = room.roomInfo().let(roomInfoMapper::map)
-        val latestRoomMessage = room.latestEvent().use { event ->
-            roomMessageFactory.create(event)
+        val latestEvent = room.latestEvent().use { event ->
+            when (event) {
+                is RustLatestEventValue.None -> LatestEventValue.None
+                is RustLatestEventValue.Local -> when (event.state) {
+                    LatestEventValueLocalState.IS_SENDING,
+                    LatestEventValueLocalState.CANNOT_BE_SENT -> LatestEventValue.Local(
+                        timestamp = event.timestamp.toLong(),
+                        content = contentMapper.map(event.content),
+                        isSending = event.state == LatestEventValueLocalState.IS_SENDING,
+                        senderId = UserId(event.sender),
+                        senderProfile = event.profile.map(),
+                    )
+                    // This is the same as a remote event, we just haven't received the local -> remote update yet
+                    LatestEventValueLocalState.HAS_BEEN_SENT -> LatestEventValue.Remote(
+                        timestamp = event.timestamp.toLong(),
+                        content = contentMapper.map(event.content),
+                        senderId = UserId(event.sender),
+                        senderProfile = event.profile.map(),
+                        isOwn = true,
+                    )
+                }
+                is RustLatestEventValue.Remote -> LatestEventValue.Remote(
+                    timestamp = event.timestamp.toLong(),
+                    content = contentMapper.map(event.content),
+                    senderId = UserId(event.sender),
+                    senderProfile = event.profile.map(),
+                    isOwn = event.isOwn,
+                )
+            }
         }
         return RoomSummary(
             info = roomInfo,
-            lastMessage = latestRoomMessage,
+            latestEvent = latestEvent,
         )
     }
 }
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 e26cea1c94..3f5a919139 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,7 +24,7 @@ class RoomSummaryListProcessor(
     private val roomSummaries: MutableSharedFlow<List<RoomSummary>>,
     private val roomListService: RoomListServiceInterface,
     private val coroutineContext: CoroutineContext,
-    private val roomSummaryDetailsFactory: RoomSummaryFactory = RoomSummaryFactory(),
+    private val roomSummaryFactory: RoomSummaryFactory,
 ) {
     private val mutex = Mutex()
 
@@ -102,7 +103,7 @@ class RoomSummaryListProcessor(
     }
 
     private suspend fun buildSummaryForRoomListEntry(entry: Room): RoomSummary {
-        return entry.use { roomSummaryDetailsFactory.create(room = it) }
+        return entry.use { roomSummaryFactory.create(room = it) }
     }
 
     private suspend fun buildRoomSummaryForIdentifier(identifier: String): RoomSummary? {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListService.kt
index de075fc1b7..9c462ddaf5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolver.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolver.kt
index ff62708f65..da21c03322 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolver.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolver.kt
@@ -1,20 +1,19 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.server
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.server.UserServerResolver
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultUserServerResolver(
     private val matrixClient: MatrixClient,
 ) : UserServerResolver {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt
index e7e629b40b..10e329e46f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustLeaveSpaceHandle.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt
index b94c3ffd1b..c6fe86700e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomList.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
index 88f738f0c4..ba816c11c7 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -50,7 +51,7 @@ class RustSpaceService(
 
     override suspend fun joinedSpaces(): Result<List<SpaceRoom>> = withContext(sessionDispatcher) {
         runCatchingExceptions {
-            innerSpaceService.joinedSpaces()
+            innerSpaceService.topLevelJoinedSpaces()
                 .map {
                     it.let(spaceRoomMapper::map)
                 }
@@ -96,7 +97,7 @@ internal fun SpaceServiceInterface.spaceListUpdate(): Flow<List<SpaceListUpdate>
             }
         }
         Timber.d("Open spaceDiffFlow for SpaceServiceInterface ${this@spaceListUpdate}")
-        val taskHandle = subscribeToJoinedSpaces(listener)
+        val taskHandle = subscribeToTopLevelJoinedSpaces(listener)
         awaitClose {
             Timber.d("Close spaceDiffFlow for SpaceServiceInterface ${this@spaceListUpdate}")
             taskHandle.cancelAndDestroy()
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt
index 40310561e2..41f2cc1266 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceListUpdateProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt
index c7107f745f..62b65a4886 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomListExtensions.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3a9b78c3f9..f83cd648a6 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..7b5d9fb31c
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilder.kt
@@ -0,0 +1,35 @@
+/*
+ * 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.storage
+
+import io.element.android.libraries.matrix.impl.paths.SessionPaths
+import org.matrix.rustcomponents.sdk.ClientBuilder
+import org.matrix.rustcomponents.sdk.SqliteStoreBuilder as SdkSqliteStoreBuilder
+
+interface SqliteStoreBuilder {
+    fun passphrase(passphrase: String?): SqliteStoreBuilder
+    fun setupClientBuilder(clientBuilder: ClientBuilder): ClientBuilder
+}
+
+class RustSqliteStoreBuilder(
+    private val sessionPaths: SessionPaths,
+) : SqliteStoreBuilder {
+    private var inner = SdkSqliteStoreBuilder(
+        dataPath = sessionPaths.fileDirectory.absolutePath,
+        cachePath = sessionPaths.cacheDirectory.absolutePath,
+    )
+
+    override fun passphrase(passphrase: String?): SqliteStoreBuilder {
+        inner = inner.passphrase(passphrase)
+        return this
+    }
+
+    override fun setupClientBuilder(clientBuilder: ClientBuilder): ClientBuilder {
+        return clientBuilder.sqliteStore(this.inner)
+    }
+}
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
new file mode 100644
index 0000000000..29a30f3c56
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilderProvider.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.storage
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.impl.paths.SessionPaths
+
+interface SqliteStoreBuilderProvider {
+    fun provide(sessionPaths: SessionPaths): SqliteStoreBuilder
+}
+
+@ContributesBinding(AppScope::class)
+class RustSqliteStoreBuilderProvider : SqliteStoreBuilderProvider {
+    override fun provide(sessionPaths: SessionPaths): SqliteStoreBuilder {
+        return RustSqliteStoreBuilder(sessionPaths)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt
index 5620b286a6..53ffb62bb8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt
index 24baa79dfe..f7732cd9b7 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/RustSyncService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,7 +30,7 @@ import org.matrix.rustcomponents.sdk.SyncService as InnerSyncService
 class RustSyncService(
     private val inner: InnerSyncService,
     private val dispatcher: CoroutineDispatcher,
-    sessionCoroutineScope: CoroutineScope
+    sessionCoroutineScope: CoroutineScope,
 ) : SyncService {
     private val isServiceReady = AtomicBoolean(true)
 
@@ -70,10 +71,10 @@ class RustSyncService(
     override val syncState: StateFlow<SyncState> =
         inner.stateFlow()
             .map(SyncServiceState::toSyncState)
+            .distinctUntilChanged()
             .onEach { state ->
                 Timber.i("Sync state=$state")
             }
-            .distinctUntilChanged()
             .stateIn(sessionCoroutineScope, SharingStarted.Eagerly, SyncState.Idle)
 
     override val isOnline: StateFlow<Boolean> = syncState.mapState { it != SyncState.Offline }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SlidingSyncVersion.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SlidingSyncVersion.kt
index 6284e0028f..8a1ed28095 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SlidingSyncVersion.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SlidingSyncVersion.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SyncServiceExtension.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SyncServiceExtension.kt
index 8a130e7f02..34332576de 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SyncServiceExtension.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/SyncServiceExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/EventOrTransactionId.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/EventOrTransactionId.kt
index af51c0893b..67528061b0 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/EventOrTransactionId.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/EventOrTransactionId.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
index eb27f2d667..c522016ee1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
@@ -1,15 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
+import androidx.compose.ui.util.fastForEach
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
-import kotlinx.coroutines.flow.Flow
+import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
@@ -20,58 +22,60 @@ import timber.log.Timber
 
 internal class MatrixTimelineDiffProcessor(
     private val timelineItems: MutableSharedFlow<List<MatrixTimelineItem>>,
-    private val timelineItemFactory: MatrixTimelineItemMapper,
+    private val membershipChangeEventReceivedFlow: MutableSharedFlow<Unit>,
+    private val syncedEventReceivedFlow: MutableSharedFlow<Unit>,
+    private val timelineItemMapper: MatrixTimelineItemMapper,
 ) {
     private val mutex = Mutex()
 
-    private val _membershipChangeEventReceived = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
-    val membershipChangeEventReceived: Flow<Unit> = _membershipChangeEventReceived
-
     suspend fun postDiffs(diffs: List<TimelineDiff>) {
-        updateTimelineItems {
+        mutex.withLock {
             Timber.v("Update timeline items from postDiffs (with ${diffs.size} items) on ${Thread.currentThread()}")
-            diffs.forEach { diff ->
-                applyDiff(diff)
+            val result = processDiffs(diffs)
+            timelineItems.emit(result.items())
+            if (result.hasNewEventsFromSync) {
+                syncedEventReceivedFlow.emit(Unit)
+            }
+            if (result.hasMembershipChangeEventFromSync) {
+                membershipChangeEventReceivedFlow.emit(Unit)
             }
         }
     }
 
-    private suspend fun updateTimelineItems(block: MutableList<MatrixTimelineItem>.() -> Unit) =
-        mutex.withLock {
-            val mutableTimelineItems = if (timelineItems.replayCache.isNotEmpty()) {
-                timelineItems.first().toMutableList()
-            } else {
-                mutableListOf()
-            }
-            block(mutableTimelineItems)
-            timelineItems.tryEmit(mutableTimelineItems)
+    private suspend fun processDiffs(diffs: List<TimelineDiff>): DiffingResult {
+        val timelineItems = if (timelineItems.replayCache.isNotEmpty()) {
+            timelineItems.first()
+        } else {
+            emptyList()
         }
+        val result = DiffingResult(timelineItems)
+        diffs.forEach { diff ->
+            result.applyDiff(diff)
+        }
+        return result
+    }
 
-    private fun MutableList<MatrixTimelineItem>.applyDiff(diff: TimelineDiff) {
+    private fun DiffingResult.applyDiff(diff: TimelineDiff) {
         when (diff) {
             is TimelineDiff.Append -> {
-                val items = diff.values.map { it.asMatrixTimelineItem() }
-                addAll(items)
+                diff.values.fastForEach { item ->
+                    add(item.map())
+                }
             }
             is TimelineDiff.PushBack -> {
-                val item = diff.value.asMatrixTimelineItem()
-                if (item is MatrixTimelineItem.Event && item.event.content is RoomMembershipContent) {
-                    // TODO - This is a temporary solution to notify the room screen about membership changes
-                    // Ideally, this should be implemented by the Rust SDK
-                    _membershipChangeEventReceived.tryEmit(Unit)
-                }
+                val item = diff.value.map()
                 add(item)
             }
             is TimelineDiff.PushFront -> {
-                val item = diff.value.asMatrixTimelineItem()
+                val item = diff.value.map()
                 add(0, item)
             }
             is TimelineDiff.Set -> {
-                val item = diff.value.asMatrixTimelineItem()
+                val item = diff.value.map()
                 set(diff.index.toInt(), item)
             }
             is TimelineDiff.Insert -> {
-                val item = diff.value.asMatrixTimelineItem()
+                val item = diff.value.map()
                 add(diff.index.toInt(), item)
             }
             is TimelineDiff.Remove -> {
@@ -79,25 +83,91 @@ internal class MatrixTimelineDiffProcessor(
             }
             is TimelineDiff.Reset -> {
                 clear()
-                val items = diff.values.map { it.asMatrixTimelineItem() }
-                addAll(items)
+                diff.values.fastForEach { item ->
+                    add(item.map())
+                }
             }
             TimelineDiff.PopFront -> {
-                removeFirstOrNull()
+                removeFirst()
             }
             TimelineDiff.PopBack -> {
-                removeLastOrNull()
+                removeLast()
             }
             TimelineDiff.Clear -> {
                 clear()
             }
             is TimelineDiff.Truncate -> {
-                subList(diff.length.toInt(), size).clear()
+                truncate(diff.length.toInt())
             }
         }
     }
 
-    private fun TimelineItem.asMatrixTimelineItem(): MatrixTimelineItem {
-        return timelineItemFactory.map(this)
+    private fun TimelineItem.map(): MatrixTimelineItem {
+        return timelineItemMapper.map(this)
+    }
+}
+
+private class DiffingResult(initialItems: List<MatrixTimelineItem>) {
+    private val items = initialItems.toMutableList()
+    var hasNewEventsFromSync: Boolean = false
+        private set
+    var hasMembershipChangeEventFromSync: Boolean = false
+        private set
+
+    fun items(): List<MatrixTimelineItem> = items
+
+    fun add(item: MatrixTimelineItem) {
+        processItem(item)
+        items.add(item)
+    }
+
+    fun add(index: Int, item: MatrixTimelineItem) {
+        processItem(item)
+        items.add(index, item)
+    }
+
+    fun set(index: Int, item: MatrixTimelineItem) {
+        processItem(item)
+        items[index] = item
+    }
+
+    fun removeAt(index: Int) {
+        items.removeAt(index)
+    }
+
+    fun removeFirst() {
+        items.removeFirstOrNull()
+    }
+
+    fun removeLast() {
+        items.removeLastOrNull()
+    }
+
+    fun truncate(length: Int) {
+        items.subList(length, items.size).clear()
+    }
+
+    fun clear() {
+        items.clear()
+    }
+
+    private fun processItem(item: MatrixTimelineItem) {
+        if (skipProcessing()) return
+        when (item) {
+            is MatrixTimelineItem.Event -> {
+                if (item.event.origin == TimelineItemEventOrigin.SYNC) {
+                    hasNewEventsFromSync = true
+                    when (item.event.content) {
+                        is RoomMembershipContent -> hasMembershipChangeEventFromSync = true
+                        else -> Unit
+                    }
+                }
+            }
+            else -> Unit
+        }
+    }
+
+    private fun skipProcessing(): Boolean {
+        return hasNewEventsFromSync && hasMembershipChangeEventFromSync
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt
index 310d68d4b9..affaf242b9 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineItemMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapper.kt
index 51998d2d51..36591c1478 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RoomTimelineExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RoomTimelineExtensions.kt
index 49fe7d90cc..bc0e5eed99 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RoomTimelineExtensions.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RoomTimelineExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4c52e78205..391349b52d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,7 +30,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransa
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 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.media.toMSC3246range
 import io.element.android.libraries.matrix.impl.poll.toInner
 import io.element.android.libraries.matrix.impl.room.RoomContentForwarder
 import io.element.android.libraries.matrix.impl.room.location.toInner
@@ -81,16 +81,18 @@ private const val PAGINATION_SIZE = 50
 class RustTimeline(
     private val inner: InnerTimeline,
     override val mode: Timeline.Mode,
-    systemClock: SystemClock,
+    private val systemClock: SystemClock,
     private val joinedRoom: JoinedRoom,
     private val coroutineScope: CoroutineScope,
     private val dispatcher: CoroutineDispatcher,
     private val roomContentForwarder: RoomContentForwarder,
-    onNewSyncedEvent: () -> Unit,
 ) : Timeline {
     private val _timelineItems: MutableSharedFlow<List<MatrixTimelineItem>> =
         MutableSharedFlow(replay = 1, extraBufferCapacity = Int.MAX_VALUE)
 
+    private val _membershipChangeEventReceived = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    private val _onSyncedEventReceived: MutableSharedFlow<Unit> = MutableSharedFlow(extraBufferCapacity = 1)
+
     private val timelineEventContentMapper = TimelineEventContentMapper()
     private val inReplyToMapper = InReplyToMapper(timelineEventContentMapper)
     private val timelineItemMapper = MatrixTimelineItemMapper(
@@ -99,18 +101,19 @@ class RustTimeline(
         virtualTimelineItemMapper = VirtualTimelineItemMapper(),
         eventTimelineItemMapper = EventTimelineItemMapper(
             contentMapper = timelineEventContentMapper
-        )
+        ),
     )
     private val timelineDiffProcessor = MatrixTimelineDiffProcessor(
         timelineItems = _timelineItems,
-        timelineItemFactory = timelineItemMapper,
+        membershipChangeEventReceivedFlow = _membershipChangeEventReceived,
+        syncedEventReceivedFlow = _onSyncedEventReceived,
+        timelineItemMapper = timelineItemMapper,
     )
     private val timelineItemsSubscriber = TimelineItemsSubscriber(
         timeline = inner,
         timelineCoroutineScope = coroutineScope,
         timelineDiffProcessor = timelineDiffProcessor,
         dispatcher = dispatcher,
-        onNewSyncedEvent = onNewSyncedEvent,
     )
 
     private val roomBeginningPostProcessor = RoomBeginningPostProcessor(mode)
@@ -152,7 +155,13 @@ class RustTimeline(
             .launchIn(this)
     }
 
-    override val membershipChangeEventReceived: Flow<Unit> = timelineDiffProcessor.membershipChangeEventReceived
+    override val membershipChangeEventReceived: Flow<Unit> = _membershipChangeEventReceived
+        .onStart { timelineItemsSubscriber.subscribeIfNeeded() }
+        .onCompletion { timelineItemsSubscriber.unsubscribeIfNeeded() }
+
+    override val onSyncedEventReceived: Flow<Unit> = _onSyncedEventReceived
+        .onStart { timelineItemsSubscriber.subscribeIfNeeded() }
+        .onCompletion { timelineItemsSubscriber.unsubscribeIfNeeded() }
 
     override suspend fun sendReadReceipt(eventId: EventId, receiptType: ReceiptType): Result<Unit> = withContext(dispatcher) {
         runCatchingExceptions {
@@ -160,6 +169,12 @@ class RustTimeline(
         }
     }
 
+    override suspend fun markAsRead(receiptType: ReceiptType): Result<Unit> = withContext(dispatcher) {
+        runCatchingExceptions {
+            inner.markAsRead(receiptType.toRustReceiptType())
+        }
+    }
+
     private fun updatePaginationStatus(direction: Timeline.PaginationDirection, update: (Timeline.PaginationStatus) -> Timeline.PaginationStatus) {
         when (direction) {
             Timeline.PaginationDirection.BACKWARDS -> backwardPaginationStatus.getAndUpdate(update)
@@ -202,10 +217,12 @@ class RustTimeline(
         backwardPaginationStatus,
         forwardPaginationStatus,
         joinedRoom.roomInfoFlow.map { it.creators to it.isDm }.distinctUntilChanged(),
-    ) { timelineItems,
+    ) {
+        timelineItems,
         backwardPaginationStatus,
         forwardPaginationStatus,
-        (roomCreators, isDm) ->
+        (roomCreators, isDm),
+        ->
         withContext(dispatcher) {
             timelineItems
                 .let { items ->
@@ -484,7 +501,7 @@ class RustTimeline(
                     inReplyTo = inReplyToEventId?.value,
                 ),
                 audioInfo = audioInfo.map(),
-                waveform = waveform.toMSC3246range(),
+                waveform = waveform,
             )
         }
     }
@@ -587,6 +604,12 @@ class RustTimeline(
         }
     }
 
+    override suspend fun getLatestEventId(): Result<EventId?> = withContext(dispatcher) {
+        runCatchingExceptions {
+            inner.latestEventId()?.let(::EventId)
+        }
+    }
+
     private suspend fun fetchDetailsForEvent(eventId: EventId): Result<Unit> = withContext(dispatcher) {
         runCatchingExceptions {
             inner.fetchDetailsForEvent(eventId.value)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
deleted file mode 100644
index 2da28399f6..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineDiffExt.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.matrix.impl.timeline
-
-import org.matrix.rustcomponents.sdk.TimelineDiff
-import org.matrix.rustcomponents.sdk.TimelineItem
-import uniffi.matrix_sdk_ui.EventItemOrigin
-
-/**
- * Tries to get an event origin from the TimelineDiff.
- * If there is multiple events in the diff, uses the first one as it should be a good indicator.
- */
-internal fun TimelineDiff.eventOrigin(): EventItemOrigin? {
-    return when (this) {
-        is TimelineDiff.Append -> values.firstOrNull()?.eventOrigin()
-        is TimelineDiff.PushBack -> value.eventOrigin()
-        is TimelineDiff.PushFront -> value.eventOrigin()
-        is TimelineDiff.Set -> value.eventOrigin()
-        is TimelineDiff.Insert -> value.eventOrigin()
-        is TimelineDiff.Reset -> values.firstOrNull()?.eventOrigin()
-        else -> null
-    }
-}
-
-private fun TimelineItem.eventOrigin(): EventItemOrigin? {
-    return asEvent()?.origin
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriber.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriber.kt
index 3d95d660ff..adf9102b3e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriber.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriber.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,13 +12,11 @@ import io.element.android.libraries.core.coroutine.childScope
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.matrix.rustcomponents.sdk.Timeline
-import uniffi.matrix_sdk_ui.EventItemOrigin
 
 /**
  * This class is responsible for subscribing to a timeline and post the items/diffs to the timelineDiffProcessor.
@@ -28,7 +27,6 @@ internal class TimelineItemsSubscriber(
     dispatcher: CoroutineDispatcher,
     private val timeline: Timeline,
     private val timelineDiffProcessor: MatrixTimelineDiffProcessor,
-    private val onNewSyncedEvent: () -> Unit,
 ) {
     private var subscriptionCount = 0
     private val mutex = Mutex()
@@ -43,9 +41,6 @@ internal class TimelineItemsSubscriber(
         if (subscriptionCount == 0) {
             timeline.timelineDiffFlow()
                 .onEach { diffs ->
-                    if (diffs.any { diff -> diff.eventOrigin() == EventItemOrigin.SYNC }) {
-                        onNewSyncedEvent()
-                    }
                     timelineDiffProcessor.postDiffs(diffs)
                 }
                 .launchIn(coroutineScope)
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 ed38c328f6..813bf0ec11 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventOrTransactionIdExtension.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventOrTransactionIdExtension.kt
index d247bb72d0..211e2ce39d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventOrTransactionIdExtension.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventOrTransactionIdExtension.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d923cd420c..6715169899 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventReaction
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 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.TimelineItemEventOrigin
@@ -63,12 +64,12 @@ class EventTimelineItemMapper(
     }
 }
 
-fun RustProfileDetails.map(): ProfileTimelineDetails {
+fun RustProfileDetails.map(): ProfileDetails {
     return when (this) {
-        RustProfileDetails.Pending -> ProfileTimelineDetails.Pending
-        RustProfileDetails.Unavailable -> ProfileTimelineDetails.Unavailable
-        is RustProfileDetails.Error -> ProfileTimelineDetails.Error(message)
-        is RustProfileDetails.Ready -> ProfileTimelineDetails.Ready(
+        RustProfileDetails.Pending -> ProfileDetails.Pending
+        RustProfileDetails.Unavailable -> ProfileDetails.Unavailable
+        is RustProfileDetails.Error -> ProfileDetails.Error(message)
+        is RustProfileDetails.Ready -> ProfileDetails.Ready(
             displayName = displayName,
             displayNameAmbiguous = displayNameAmbiguous,
             avatarUrl = avatarUrl
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 1b941009e0..b1758fb734 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,9 +32,11 @@ import io.element.android.libraries.matrix.api.timeline.item.event.UnknownConten
 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 kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import org.matrix.rustcomponents.sdk.EmbeddedEventDetails
+import org.matrix.rustcomponents.sdk.MsgLikeContent
 import org.matrix.rustcomponents.sdk.MsgLikeKind
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 import org.matrix.rustcomponents.sdk.use
@@ -66,37 +69,11 @@ class TimelineEventContentMapper(
                     when (val kind = it.content.kind) {
                         is MsgLikeKind.Message -> {
                             val inReplyTo = it.content.inReplyTo
-                            val threadSummary = it.content.threadSummary?.use { summary ->
-                                val numberOfReplies = summary.numReplies().toLong()
-                                val latestEvent = summary.latestEvent()
-                                val details = when (latestEvent) {
-                                    is EmbeddedEventDetails.Unavailable -> AsyncData.Uninitialized
-                                    is EmbeddedEventDetails.Pending -> AsyncData.Loading()
-                                    is EmbeddedEventDetails.Error -> AsyncData.Failure(IllegalStateException(latestEvent.message))
-                                    is EmbeddedEventDetails.Ready -> {
-                                        AsyncData.Success(
-                                            EmbeddedEventInfo(
-                                                eventOrTransactionId = latestEvent.eventOrTransactionId.map(),
-                                                content = map(latestEvent.content),
-                                                senderId = UserId(latestEvent.sender),
-                                                senderProfile = latestEvent.senderProfile.map(),
-                                                timestamp = latestEvent.timestamp.toLong(),
-                                            )
-                                        )
-                                    }
-                                }
-                                ThreadSummary(
-                                    latestEvent = details,
-                                    numberOfReplies = numberOfReplies,
-                                )
-                            }
-                            val threadRootId = it.content.threadRoot?.let(::ThreadId)
-                            val threadInfo = when {
-                                threadSummary != null -> EventThreadInfo.ThreadRoot(threadSummary)
-                                threadRootId != null -> EventThreadInfo.ThreadResponse(threadRootId)
-                                else -> null
-                            }
-                            eventMessageMapper.map(kind, inReplyTo, threadInfo)
+                            eventMessageMapper.map(
+                                message = kind,
+                                inReplyTo = inReplyTo,
+                                threadInfo = extractThreadInfo(it.content)
+                            )
                         }
                         is MsgLikeKind.Redacted -> {
                             RedactedContent
@@ -112,11 +89,13 @@ class TimelineEventContentMapper(
                                 }.toImmutableMap(),
                                 endTime = kind.endTime,
                                 isEdited = kind.hasBeenEdited,
+                                threadInfo = extractThreadInfo(it.content),
                             )
                         }
                         is MsgLikeKind.UnableToDecrypt -> {
                             UnableToDecryptContent(
-                                data = kind.msg.map()
+                                data = kind.msg.map(),
+                                threadInfo = extractThreadInfo(it.content),
                             )
                         }
                         is MsgLikeKind.Sticker -> {
@@ -125,6 +104,7 @@ class TimelineEventContentMapper(
                                 body = null,
                                 info = kind.info.map(),
                                 source = kind.source.map(),
+                                threadInfo = extractThreadInfo(it.content),
                             )
                         }
                         is MsgLikeKind.Other -> UnknownContent
@@ -157,6 +137,43 @@ class TimelineEventContentMapper(
             }
         }
     }
+
+    private fun extractThreadInfo(content: MsgLikeContent): EventThreadInfo? {
+        val threadSummary = extractThreadSummary(content.threadSummary)
+        val threadRootId = content.threadRoot?.let(::ThreadId)
+        return when {
+            threadSummary != null -> EventThreadInfo.ThreadRoot(threadSummary)
+            threadRootId != null -> EventThreadInfo.ThreadResponse(threadRootId)
+            else -> null
+        }
+    }
+
+    private fun extractThreadSummary(threadSummary: org.matrix.rustcomponents.sdk.ThreadSummary?): ThreadSummary? {
+        return threadSummary?.use { summary ->
+            val numberOfReplies = summary.numReplies().toLong()
+            val latestEvent = summary.latestEvent()
+            val details = when (latestEvent) {
+                is EmbeddedEventDetails.Unavailable -> AsyncData.Uninitialized
+                is EmbeddedEventDetails.Pending -> AsyncData.Loading()
+                is EmbeddedEventDetails.Error -> AsyncData.Failure(IllegalStateException(latestEvent.message))
+                is EmbeddedEventDetails.Ready -> {
+                    AsyncData.Success(
+                        EmbeddedEventInfo(
+                            eventOrTransactionId = latestEvent.eventOrTransactionId.map(),
+                            content = map(latestEvent.content),
+                            senderId = UserId(latestEvent.sender),
+                            senderProfile = latestEvent.senderProfile.map(),
+                            timestamp = latestEvent.timestamp.toLong(),
+                        )
+                    )
+                }
+            }
+            ThreadSummary(
+                latestEvent = details,
+                numberOfReplies = numberOfReplies,
+            )
+        }
+    }
 }
 
 private fun RustMembershipChange.map(): MembershipChange {
@@ -209,7 +226,7 @@ private fun RustOtherState.map(): OtherState {
         RustOtherState.RoomEncryption -> OtherState.RoomEncryption
         RustOtherState.RoomGuestAccess -> OtherState.RoomGuestAccess
         RustOtherState.RoomHistoryVisibility -> OtherState.RoomHistoryVisibility
-        RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules
+        is RustOtherState.RoomJoinRules -> OtherState.RoomJoinRules(joinRule?.map())
         is RustOtherState.RoomName -> OtherState.RoomName(name)
         is RustOtherState.RoomPinnedEvents -> OtherState.RoomPinnedEvents(change.map())
         is RustOtherState.RoomPowerLevels -> OtherState.RoomUserPowerLevels(users)
@@ -219,6 +236,8 @@ private fun RustOtherState.map(): OtherState {
         is RustOtherState.RoomTopic -> OtherState.RoomTopic(topic)
         RustOtherState.SpaceChild -> OtherState.SpaceChild
         RustOtherState.SpaceParent -> OtherState.SpaceParent
+        is RustOtherState.RoomCreate -> OtherState.RoomCreate
+        is RustOtherState.RoomHistoryVisibility -> OtherState.RoomHistoryVisibility
     }
 }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/virtual/VirtualTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/virtual/VirtualTimelineItemMapper.kt
index d60d88f168..770de4f5be 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/virtual/VirtualTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/virtual/VirtualTimelineItemMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt
index c3e8237b72..68be5cbfa0 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
index 6d42af54b5..6f20cfe465 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 639f1b879f..397280231d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/TypingNotificationPostProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/TypingNotificationPostProcessor.kt
index 4c888fa7f2..d56d53632a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/TypingNotificationPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/TypingNotificationPostProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/reply/InReplyToMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/reply/InReplyToMapper.kt
index 1b329bfe0a..93e12d07e2 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/reply/InReplyToMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/reply/InReplyToMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/LogEventLocation.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/LogEventLocation.kt
index cf4f951a8c..c84e042b47 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/LogEventLocation.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/LogEventLocation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt
index 9df7f459ac..6f235cd0db 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.matrix.impl.tracing
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.tracing.LogLevel
 import io.element.android.libraries.matrix.api.tracing.TracingConfiguration
@@ -20,7 +20,6 @@ import org.matrix.rustcomponents.sdk.reloadTracingFileWriter
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class)
-@Inject
 class RustTracingService(private val buildMeta: BuildMeta) : TracingService {
     override fun createTimberTree(target: String): Timber.Tree {
         return RustTracingTree(target = target, retrieveFromStackTrace = buildMeta.isDebuggable)
@@ -61,5 +60,5 @@ fun TracingConfiguration.map(): org.matrix.rustcomponents.sdk.TracingConfigurati
     extraTargets = extraTargets,
     traceLogPacks = traceLogPacks.map(),
     writeToFiles = writesToFilesConfiguration.toTracingFileConfiguration(),
-    sentryDsn = null,
+    sentryDsn = sdkSentryDsn,
 )
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingTree.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingTree.kt
index cdd545197b..47e6c8f74f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingTree.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingTree.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/TraceLogPacksMapping.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/TraceLogPacksMapping.kt
index 53876e9600..ec70fc90f8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/TraceLogPacksMapping.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/TraceLogPacksMapping.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,8 @@ fun TraceLogPack.map(): RustTraceLogPack = when (this) {
     TraceLogPack.EVENT_CACHE -> RustTraceLogPack.EVENT_CACHE
     TraceLogPack.TIMELINE -> RustTraceLogPack.TIMELINE
     TraceLogPack.NOTIFICATION_CLIENT -> RustTraceLogPack.NOTIFICATION_CLIENT
+    TraceLogPack.LATEST_EVENTS -> RustTraceLogPack.LATEST_EVENTS
+    TraceLogPack.SYNC_PROFILING -> RustTraceLogPack.SYNC_PROFILING
 }
 
 fun Collection<TraceLogPack>.map(): List<RustTraceLogPack> {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapper.kt
index 172f3c4cb0..5a6481b4f8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/CallbackFlow.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/CallbackFlow.kt
index d01172a535..c7219e552e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/CallbackFlow.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/CallbackFlow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Disposables.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Disposables.kt
index e787cdc02f..0107d6cbf5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Disposables.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Disposables.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Error.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Error.kt
index 90681e8a5d..70fea1287e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Error.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Error.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,10 +14,10 @@ import timber.log.Timber
 fun logError(throwable: Throwable) {
     when (throwable) {
         is ClientException.Generic -> {
-            Timber.e("Error ${throwable.msg}", throwable)
+            Timber.e(throwable, "Error ${throwable.msg}")
         }
         else -> {
-            Timber.e("Error", throwable)
+            Timber.e(throwable, "Error")
         }
     }
 }
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 aa7bcb8785..3e320116c6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 41abd80a67..0030c6e23e 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/TaskHandle.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/TaskHandle.kt
index 36f9bf4cd0..96b075c67f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/TaskHandle.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/TaskHandle.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 38d83d9cc2..815e134cf2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 12e72eac0b..f613ce8dff 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -43,6 +44,7 @@ import org.matrix.rustcomponents.sdk.VerificationState
 import org.matrix.rustcomponents.sdk.VerificationStateListener
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.time.Duration.Companion.seconds
 import org.matrix.rustcomponents.sdk.SessionVerificationData as RustSessionVerificationData
 import org.matrix.rustcomponents.sdk.SessionVerificationRequestDetails as RustSessionVerificationRequestDetails
@@ -65,9 +67,16 @@ class RustSessionVerificationService(
 
     private val recoveryState = MutableStateFlow(RecoveryState.UNKNOWN)
 
+    private val isInitialized = AtomicBoolean(false)
+
     // Listen for changes in verification status and update accordingly
     private val verificationStateListenerTaskHandle = encryptionService.verificationStateListener(object : VerificationStateListener {
         override fun onUpdate(status: VerificationState) {
+            if (!isInitialized.get()) {
+                Timber.d("Discarding new verifications state: $status. E2EE is not initialised yet")
+                return
+            }
+
             Timber.d("New verification state: $status")
             _sessionVerifiedStatus.value = status.map()
         }
@@ -76,6 +85,11 @@ class RustSessionVerificationService(
     // In case we enter the recovery key instead we check changes in the recovery state, since the listener above won't be triggered
     private val recoveryStateListenerTaskHandle = encryptionService.recoveryStateListener(object : RecoveryStateListener {
         override fun onUpdate(status: RecoveryState) {
+            if (!isInitialized.get()) {
+                Timber.d("Discarding new recovery state: $status. E2EE is not initialised yet")
+                return
+            }
+
             Timber.d("New recovery state: $status")
             // We could check the `RecoveryState`, but it's easier to just use the verification state directly
             recoveryState.value = status
@@ -86,7 +100,7 @@ class RustSessionVerificationService(
      * The internal service that checks verification can only run after the initial sync.
      * This [StateFlow] will notify consumers when the service is ready to be used.
      */
-    private val isReady = isSyncServiceReady.stateIn(sessionCoroutineScope, SharingStarted.Eagerly, false)
+    private val canVerify = isSyncServiceReady.stateIn(sessionCoroutineScope, SharingStarted.Eagerly, false)
 
     override val needsSessionVerification = sessionVerifiedStatus.map { verificationStatus ->
         verificationStatus == SessionVerifiedStatus.NotVerified
@@ -98,14 +112,11 @@ class RustSessionVerificationService(
 
     private var listener: SessionVerificationServiceListener? = null
 
+    private val initializationMutex = Mutex()
+
     init {
         // Instantiate the verification controller when possible, this is needed to get incoming verification requests
-        sessionCoroutineScope.launch {
-            tryOrNull {
-                encryptionService.waitForE2eeInitializationTasks()
-                initVerificationControllerIfNeeded()
-            }
-        }
+        sessionCoroutineScope.launch { ensureEncryptionIsInitialized() }
     }
 
     override fun setListener(listener: SessionVerificationServiceListener?) {
@@ -113,13 +124,13 @@ class RustSessionVerificationService(
     }
 
     override suspend fun requestCurrentSessionVerification() = tryOrFail {
-        initVerificationControllerIfNeeded()
+        ensureEncryptionIsInitialized()
         verificationController.requestDeviceVerification()
         currentVerificationRequest = VerificationRequest.Outgoing.CurrentSession
     }
 
     override suspend fun requestUserVerification(userId: UserId) = tryOrFail {
-        initVerificationControllerIfNeeded()
+        ensureEncryptionIsInitialized()
         verificationController.requestUserVerification(userId.value)
         currentVerificationRequest = VerificationRequest.Outgoing.User(userId)
     }
@@ -139,7 +150,7 @@ class RustSessionVerificationService(
     }
 
     override suspend fun acknowledgeVerificationRequest(verificationRequest: VerificationRequest.Incoming) = tryOrFail {
-        initVerificationControllerIfNeeded()
+        ensureEncryptionIsInitialized()
         verificationController.acknowledgeVerificationRequest(
             senderId = verificationRequest.details.senderProfile.userId.value,
             flowId = verificationRequest.details.flowId.value,
@@ -224,7 +235,7 @@ class RustSessionVerificationService(
 
     override suspend fun reset(cancelAnyPendingVerificationAttempt: Boolean) {
         currentVerificationRequest = null
-        if (isReady.value && cancelAnyPendingVerificationAttempt) {
+        if (canVerify.value && cancelAnyPendingVerificationAttempt) {
             // Cancel any pending verification attempt
             tryOrNull { verificationController.cancelVerification() }
         }
@@ -240,23 +251,28 @@ class RustSessionVerificationService(
         }
     }
 
-    private var initControllerMutex = Mutex()
-
-    private suspend fun initVerificationControllerIfNeeded() = initControllerMutex.withLock {
-        if (!this::verificationController.isInitialized) {
-            tryOrFail {
-                verificationController = client.getSessionVerificationController()
-                verificationController.setDelegate(this)
-            }
-        }
-    }
-
     private fun updateVerificationStatus() {
         runCatchingExceptions {
             _sessionVerifiedStatus.value = encryptionService.verificationState().map()
             Timber.d("New verification status: ${_sessionVerifiedStatus.value}")
         }
     }
+
+    private suspend fun ensureEncryptionIsInitialized() = initializationMutex.withLock {
+        // We're keeping the separate checks instead of unconditionally calling the suspend methods
+        // so we can skip crossing the FFI layer when it's not needed
+        tryOrFail {
+            if (!isInitialized.get()) {
+                encryptionService.waitForE2eeInitializationTasks()
+                isInitialized.set(true)
+            }
+
+            if (!this::verificationController.isInitialized) {
+                verificationController = client.getSessionVerificationController()
+                verificationController.setDelegate(this)
+            }
+        }
+    }
 }
 
 private fun VerificationState.map() = when (this) {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt
index cd398fbfc1..d88f9fd6ce 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/SessionVerificationRequestDetails.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt
index 00947f99a2..60a0bead33 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/DefaultCallWidgetSettingsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.matrix.impl.widget
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.matrix.api.widget.CallAnalyticCredentialsProvider
@@ -25,7 +25,6 @@ import uniffi.matrix_sdk.VirtualElementCallWidgetProperties
 import uniffi.matrix_sdk.Intent as CallIntent
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCallWidgetSettingsProvider(
     private val buildMeta: BuildMeta,
     private val callAnalyticsCredentialsProvider: CallAnalyticCredentialsProvider,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/MatrixWidgetSettings.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/MatrixWidgetSettings.kt
index 74ac962b72..37a0b23e7f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/MatrixWidgetSettings.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/MatrixWidgetSettings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/RustWidgetDriver.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/RustWidgetDriver.kt
index c80313f5da..b908082ab6 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/RustWidgetDriver.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/widget/RustWidgetDriver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -61,7 +62,7 @@ class RustWidgetDriver(
     override suspend fun send(message: String) {
         try {
             driverAndHandle.handle.send(message)
-        } catch (e: IllegalStateException) {
+        } catch (_: IllegalStateException) {
             // The handle is closed, ignore
         }
     }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/PerformDatabaseVacuumWorkManagerRequest.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/PerformDatabaseVacuumWorkManagerRequest.kt
new file mode 100644
index 0000000000..9c192bd96d
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/PerformDatabaseVacuumWorkManagerRequest.kt
@@ -0,0 +1,40 @@
+/*
+ * 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.workmanager
+
+import androidx.work.Constraints
+import androidx.work.Data
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkRequest
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.impl.workmanager.VacuumDatabaseWorker.Companion.SESSION_ID_PARAM
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.workManagerTag
+import java.util.concurrent.TimeUnit
+
+class PerformDatabaseVacuumWorkManagerRequest(
+    private val sessionId: SessionId,
+) : WorkManagerRequest {
+    override fun build(): Result<List<WorkRequest>> {
+        val data = Data.Builder().putString(SESSION_ID_PARAM, sessionId.value).build()
+        val workRequest = PeriodicWorkRequest.Builder(
+            workerClass = VacuumDatabaseWorker::class,
+            // Run once a day
+            repeatInterval = 1,
+            repeatIntervalTimeUnit = TimeUnit.DAYS,
+        )
+            .addTag(workManagerTag(sessionId, WorkManagerRequestType.DB_VACUUM))
+            .setInputData(data)
+            // Only run when the device is idle to avoid impacting user experience
+            .setConstraints(Constraints.Builder().setRequiresDeviceIdle(true).build())
+            .build()
+
+        return Result.success(listOf(workRequest))
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/VacuumDatabaseWorker.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/VacuumDatabaseWorker.kt
new file mode 100644
index 0000000000..d52edddbb4
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/VacuumDatabaseWorker.kt
@@ -0,0 +1,63 @@
+/*
+ * 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.workmanager
+
+import android.content.Context
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.binding
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.matrix.api.MatrixClientProvider
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
+import io.element.android.libraries.workmanager.api.di.WorkerKey
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.recordTransaction
+import timber.log.Timber
+
+@AssistedInject
+class VacuumDatabaseWorker(
+    @Assisted workerParams: WorkerParameters,
+    @ApplicationContext private val context: Context,
+    private val matrixClientProvider: MatrixClientProvider,
+    private val analyticsService: AnalyticsService,
+) : CoroutineWorker(context, workerParams) {
+    companion object {
+        const val SESSION_ID_PARAM = "session_id"
+    }
+
+    override suspend fun doWork(): Result {
+        Timber.d("Starting database vacuuming...")
+        val sessionId = inputData.getString(SESSION_ID_PARAM)?.let(::SessionId) ?: return Result.failure()
+        val client = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return Result.failure()
+        return analyticsService.recordTransaction("Vacuuming DBs", "vacuuming") { transaction ->
+            client.performDatabaseVacuum()
+                .fold(
+                    onSuccess = {
+                        Timber.d("Database vacuuming finished successfully")
+                        Result.success()
+                    },
+                    onFailure = { error ->
+                        transaction.attachError(error)
+                        Timber.e(error, "Database vacuuming failed")
+                        Result.failure()
+                    }
+                )
+        }
+    }
+
+    @ContributesIntoMap(AppScope::class, binding = binding<MetroWorkerFactory.WorkerInstanceFactory<*>>())
+    @WorkerKey(VacuumDatabaseWorker::class)
+    @AssistedFactory
+    interface Factory : MetroWorkerFactory.WorkerInstanceFactory<VacuumDatabaseWorker>
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeClientBuilderProvider.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeClientBuilderProvider.kt
index 89e0574fdf..97aedb90f4 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeClientBuilderProvider.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeClientBuilderProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeFfiSqliteStoreBuilder.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeFfiSqliteStoreBuilder.kt
new file mode 100644
index 0000000000..8e3240f5be
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/FakeFfiSqliteStoreBuilder.kt
@@ -0,0 +1,19 @@
+/*
+ * 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
+
+import org.matrix.rustcomponents.sdk.NoHandle
+import org.matrix.rustcomponents.sdk.SqliteStoreBuilder
+
+class FakeFfiSqliteStoreBuilder : SqliteStoreBuilder(NoHandle) {
+    override fun cacheSize(cacheSize: UInt?): SqliteStoreBuilder = this
+    override fun journalSizeLimit(limit: UInt?): SqliteStoreBuilder = this
+    override fun passphrase(passphrase: String?): SqliteStoreBuilder = this
+    override fun poolMaxSize(poolMaxSize: UInt?): SqliteStoreBuilder = this
+    override fun systemIsMemoryConstrained(): SqliteStoreBuilder = this
+}
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 224c4118fb..7c63348298 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 92f9438322..fa69752afe 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,16 @@ import io.element.android.libraries.matrix.api.core.SessionId
 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.FakeTimelineEventTypeFilterFactory
+import io.element.android.libraries.matrix.impl.storage.FakeSqliteStoreBuilderProvider
 import io.element.android.libraries.network.useragent.SimpleUserAgentProvider
 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.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.test.FakeWorkManagerScheduler
 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.testCoroutineDispatchers
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
@@ -28,9 +33,14 @@ import java.io.File
 class RustMatrixClientFactoryTest {
     @Test
     fun test() = runTest {
-        val sut = createRustMatrixClientFactory()
+        val scheduleVacuumLambda = lambdaRecorder<WorkManagerRequest, Unit> {}
+        val workManagerScheduler = FakeWorkManagerScheduler(submitLambda = scheduleVacuumLambda)
+        val sut = createRustMatrixClientFactory(workManagerScheduler = workManagerScheduler)
+
         val result = sut.create(aSessionData())
+
         assertThat(result.sessionId).isEqualTo(SessionId("@alice:server.org"))
+        scheduleVacuumLambda.assertions().isCalledOnce()
         result.destroy()
     }
 }
@@ -41,6 +51,7 @@ fun TestScope.createRustMatrixClientFactory(
         updateUserProfileResult = { _, _, _ -> },
     ),
     clientBuilderProvider: ClientBuilderProvider = FakeClientBuilderProvider(),
+    workManagerScheduler: FakeWorkManagerScheduler = FakeWorkManagerScheduler(),
 ) = RustMatrixClientFactory(
     cacheDirectory = cacheDirectory,
     appCoroutineScope = backgroundScope,
@@ -54,4 +65,6 @@ fun TestScope.createRustMatrixClientFactory(
     featureFlagService = FakeFeatureFlagService(),
     timelineEventTypeFilterFactory = FakeTimelineEventTypeFilterFactory(),
     clientBuilderProvider = clientBuilderProvider,
+    sqliteStoreBuilderProvider = FakeSqliteStoreBuilderProvider(),
+    workManagerScheduler = workManagerScheduler,
 )
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 dec0f4cd4f..fc459dba86 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,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.impl.fixtures.fakes.FakeFfiClient
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiSyncService
@@ -21,6 +23,8 @@ import io.element.android.libraries.matrix.test.A_USER_NAME
 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.libraries.workmanager.test.FakeWorkManagerScheduler
+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.lambda.value
@@ -31,6 +35,7 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.Client
+import org.matrix.rustcomponents.sdk.StoreSizes
 import org.matrix.rustcomponents.sdk.UserProfile
 import java.io.File
 
@@ -95,6 +100,20 @@ class RustMatrixClientTest {
         client.destroy()
     }
 
+    @Test
+    fun `getDatabaseSizes returns the database sizes`() = runTest {
+        val client = createRustMatrixClient(
+            client = FakeFfiClient(getStoreSizesResult = { StoreSizes(null, 10uL, 11uL, 12uL) })
+        )
+
+        client.getDatabaseSizes().getOrThrow().run {
+            assertThat(cryptoStore).isNull()
+            assertThat(stateStore).isEqualTo(10.bytes)
+            assertThat(eventCacheStore).isEqualTo(11.bytes)
+            assertThat(mediaStore).isEqualTo(12.bytes)
+        }
+    }
+
     private fun TestScope.createRustMatrixClient(
         client: Client = FakeFfiClient(),
         sessionStore: SessionStore = InMemorySessionStore(
@@ -113,5 +132,7 @@ class RustMatrixClientTest {
         clock = FakeSystemClock(),
         timelineEventTypeFilterFactory = FakeTimelineEventTypeFilterFactory(),
         featureFlagService = FakeFeatureFlagService(),
+        analyticsService = FakeAnalyticsService(),
+        workManagerScheduler = FakeWorkManagerScheduler(submitLambda = {}),
     )
 }
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 8bf86c5978..68adfe00a2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt
index 4ff320dd32..e59329bd44 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c73ba1424b..a2425525bc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,10 +17,10 @@ import org.matrix.rustcomponents.sdk.OidcException
 
 class AuthenticationExceptionMappingTest {
     @Test
-    fun `mapping an exception with no message returns 'Unknown error' message`() {
+    fun `mapping an exception with no message returns null message`() {
         val exception = Exception()
         val mappedException = exception.mapAuthenticationException()
-        assertThat(mappedException.message).isEqualTo("Unknown error")
+        assertThat(mappedException.message).isNull()
     }
 
     @Test
@@ -46,7 +47,7 @@ class AuthenticationExceptionMappingTest {
         assertThat(ClientBuildException.Sdk("SDK issue").mapAuthenticationException())
             .isException<AuthenticationException.Generic>("SDK issue")
         assertThat(ClientBuildException.ServerUnreachable("Server unreachable").mapAuthenticationException())
-            .isException<AuthenticationException.Generic>("Server unreachable")
+            .isException<AuthenticationException.ServerUnreachable>("Server unreachable")
         assertThat(ClientBuildException.SlidingSync("Sliding Sync").mapAuthenticationException())
             .isException<AuthenticationException.Generic>("Sliding Sync")
         assertThat(ClientBuildException.WellKnownDeserializationException("WellKnown Deserialization").mapAuthenticationException())
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
index cc77221c19..a089920422 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeProxyProvider.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeProxyProvider.kt
index b056b2eda1..4fa0c06cd5 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeProxyProvider.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeProxyProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index e2af963501..bf4f697eb6 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 eb3ac75cf6..a5c7b2dbc8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/OidcConfigurationProviderTest.kt
index 96d1b46f93..095cf54946 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/OidcConfigurationProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..50d1f3723b
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeserverLoginCompatibilityCheckerTest.kt
@@ -0,0 +1,54 @@
+/*
+ * 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.matrix.impl.auth
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.impl.FakeClientBuilderProvider
+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 kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class RustHomeserverLoginCompatibilityCheckerTest {
+    @Test
+    fun `check - is valid if it supports OIDC login`() = runTest {
+        val sut = createChecker { FakeFfiHomeserverLoginDetails(supportsOidcLogin = true) }
+        assertThat(sut.check("https://matrix.host.org").getOrNull()).isTrue()
+    }
+
+    @Test
+    fun `check - is valid if it supports password login`() = runTest {
+        val sut = createChecker { FakeFfiHomeserverLoginDetails(supportsPasswordLogin = true) }
+        assertThat(sut.check("https://matrix.host.org").getOrNull()).isTrue()
+    }
+
+    @Test
+    fun `check - is not valid if it only supports SSO login`() = runTest {
+        val sut = createChecker { FakeFfiHomeserverLoginDetails(supportsSsoLogin = true) }
+        assertThat(sut.check("https://matrix.host.org").getOrNull()).isFalse()
+    }
+
+    @Test
+    fun `check - is not valid if fetching the data fails`() = runTest {
+        val sut = createChecker { error("Unexpected error!") }
+        assertThat(sut.check("https://matrix.host.org").isFailure).isTrue()
+    }
+
+    private fun createChecker(
+        result: () -> FakeFfiHomeserverLoginDetails,
+    ) = RustHomeServerLoginCompatibilityChecker(
+        clientBuilderProvider = FakeClientBuilderProvider {
+            FakeFfiClientBuilder {
+                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 490c921aa9..f4ce7b1fdd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 439ed109f3..0ef20c82a6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensionsKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensionsKtTest.kt
index 669c599ff7..94d1833d02 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensionsKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrLoginProgressExtensionsKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginDataTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginDataTest.kt
index 1ba998fc41..a0c8f4598f 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginDataTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/SdkQrCodeLoginDataTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapperKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapperKtTest.kt
index 093bc8ecda..63b7c9a1b9 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapperKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/core/ProgressWatcherWrapperKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapperTest.kt
index d0dc2e526b..66e71ae288 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupStateMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapperTest.kt
index ac68884f13..8818607c87 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/BackupUploadStateMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapperTest.kt
index b9ef597eb8..a0227c9332 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/EnableRecoveryProgressMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapperTest.kt
index dd5b1ebb28..108351980d 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RecoveryStateMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fbbb6c3375..c106b6b39e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,14 +21,14 @@ import org.matrix.rustcomponents.sdk.ShieldState
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 import uniffi.matrix_sdk_ui.EventItemOrigin
 
-fun aRustEventTimelineItem(
+internal fun aRustEventTimelineItem(
     isRemote: Boolean = true,
     eventOrTransactionId: EventOrTransactionId = EventOrTransactionId.EventId(AN_EVENT_ID.value),
     sender: String = A_USER_ID.value,
     senderProfile: ProfileDetails = ProfileDetails.Unavailable,
     isOwn: Boolean = true,
     isEditable: Boolean = true,
-    content: TimelineItemContent = aRustTimelineItemMessageContent(),
+    content: TimelineItemContent = aRustTimelineItemContentMsgLike(),
     timestamp: ULong = 0uL,
     debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
     localSendState: EventSendState? = null,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemDebugInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemDebugInfo.kt
index 61c15cf77a..badd4c3aba 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemDebugInfo.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemDebugInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 
 import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo
 
-fun anEventTimelineItemDebugInfo(
+internal fun anEventTimelineItemDebugInfo(
     model: String = "model",
     originalJson: String? = null,
     latestEditJson: String? = null,
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 ee5e3ac4e2..672439ad6c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,6 +12,8 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 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
+import org.matrix.rustcomponents.sdk.Action
+import org.matrix.rustcomponents.sdk.BatchNotificationResult
 import org.matrix.rustcomponents.sdk.JoinRule
 import org.matrix.rustcomponents.sdk.NotificationEvent
 import org.matrix.rustcomponents.sdk.NotificationItem
@@ -19,13 +22,14 @@ import org.matrix.rustcomponents.sdk.NotificationSenderInfo
 import org.matrix.rustcomponents.sdk.NotificationStatus
 import org.matrix.rustcomponents.sdk.TimelineEvent
 
-fun aRustNotificationItem(
+internal fun aRustNotificationItem(
     event: NotificationEvent = aRustNotificationEventTimeline(),
     senderInfo: NotificationSenderInfo = aRustNotificationSenderInfo(),
     roomInfo: NotificationRoomInfo = aRustNotificationRoomInfo(),
     isNoisy: Boolean? = false,
     hasMention: Boolean? = false,
     threadId: ThreadId? = null,
+    actions: List<Action>? = null,
 ) = NotificationItem(
     event = event,
     senderInfo = senderInfo,
@@ -33,15 +37,16 @@ fun aRustNotificationItem(
     isNoisy = isNoisy,
     hasMention = hasMention,
     threadId = threadId?.value,
+    actions = actions,
 )
 
-fun aRustBatchNotificationResult(
+internal fun aRustBatchNotificationResultOk(
     notificationStatus: NotificationStatus = NotificationStatus.Event(aRustNotificationItem()),
-) = org.matrix.rustcomponents.sdk.BatchNotificationResult.Ok(
+) = BatchNotificationResult.Ok(
     status = notificationStatus,
 )
 
-fun aRustNotificationSenderInfo(
+internal fun aRustNotificationSenderInfo(
     displayName: String? = A_USER_NAME,
     avatarUrl: String? = null,
     isNameAmbiguous: Boolean = false,
@@ -51,7 +56,7 @@ fun aRustNotificationSenderInfo(
     isNameAmbiguous = isNameAmbiguous,
 )
 
-fun aRustNotificationRoomInfo(
+internal fun aRustNotificationRoomInfo(
     displayName: String = A_ROOM_NAME,
     avatarUrl: String? = null,
     canonicalAlias: String? = null,
@@ -60,6 +65,7 @@ fun aRustNotificationRoomInfo(
     isEncrypted: Boolean? = true,
     isDirect: Boolean = false,
     joinRule: JoinRule? = null,
+    isSpace: Boolean = false,
 ) = NotificationRoomInfo(
     displayName = displayName,
     avatarUrl = avatarUrl,
@@ -69,9 +75,10 @@ fun aRustNotificationRoomInfo(
     isEncrypted = isEncrypted,
     isDirect = isDirect,
     joinRule = joinRule,
+    isSpace = isSpace,
 )
 
-fun aRustNotificationEventTimeline(
+internal fun aRustNotificationEventTimeline(
     event: TimelineEvent = FakeFfiTimelineEvent(),
 ) = NotificationEvent.Timeline(
     event = event,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomDescription.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomDescription.kt
index 270d41ec18..14960e9f70 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomDescription.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomDescription.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,15 +22,13 @@ internal fun aRustRoomDescription(
     joinRule: PublicRoomJoinRule = PublicRoomJoinRule.PUBLIC,
     isWorldReadable: Boolean = true,
     joinedMembers: ULong = 2u,
-): RoomDescription {
-    return RoomDescription(
-        roomId = roomId,
-        name = name,
-        topic = topic,
-        alias = alias,
-        avatarUrl = avatarUrl,
-        joinRule = joinRule,
-        isWorldReadable = isWorldReadable,
-        joinedMembers = joinedMembers,
-    )
-}
+) = RoomDescription(
+    roomId = roomId,
+    name = name,
+    topic = topic,
+    alias = alias,
+    avatarUrl = avatarUrl,
+    joinRule = joinRule,
+    isWorldReadable = isWorldReadable,
+    joinedMembers = joinedMembers,
+)
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 ee0123b8ad..6abb08c667 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,10 +14,8 @@ import org.matrix.rustcomponents.sdk.RoomHero
 
 internal fun aRustRoomHero(
     userId: UserId = A_USER_ID,
-): RoomHero {
-    return RoomHero(
-        userId = userId.value,
-        displayName = "displayName",
-        avatarUrl = "avatarUrl",
-    )
-}
+) = RoomHero(
+    userId = userId.value,
+    displayName = "displayName",
+    avatarUrl = "avatarUrl",
+)
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 b076b33f80..298db5e722 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,7 +22,7 @@ import org.matrix.rustcomponents.sdk.RoomPowerLevels
 import org.matrix.rustcomponents.sdk.SuccessorRoom
 import uniffi.matrix_sdk_base.EncryptionState
 
-fun aRustRoomInfo(
+internal fun aRustRoomInfo(
     id: String = A_ROOM_ID.value,
     displayName: String? = A_ROOM_NAME,
     rawName: String? = A_ROOM_NAME,
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 d606008989..77fa814cca 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ import org.matrix.rustcomponents.sdk.PowerLevel
 import org.matrix.rustcomponents.sdk.RoomMember
 import uniffi.matrix_sdk.RoomMemberRole
 
-fun aRustRoomMember(
+internal fun aRustRoomMember(
     userId: UserId,
     displayName: String? = null,
     avatarUrl: String? = null,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomNotificationSettings.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomNotificationSettings.kt
index ca96d985f8..a66fb3f332 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomNotificationSettings.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomNotificationSettings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,7 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 import org.matrix.rustcomponents.sdk.RoomNotificationMode
 import org.matrix.rustcomponents.sdk.RoomNotificationSettings
 
-fun aRustRoomNotificationSettings(
+internal fun aRustRoomNotificationSettings(
     mode: RoomNotificationMode = RoomNotificationMode.ALL_MESSAGES,
     isDefault: Boolean = true,
 ) = RoomNotificationSettings(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevels.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
similarity index 84%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevels.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
index 79d1606957..1c1bbb42e3 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevels.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,6 +21,7 @@ internal fun aRustRoomPowerLevelsValues(
     roomName: Long,
     roomAvatar: Long,
     roomTopic: Long,
+    spaceChild: Long,
 ) = RoomPowerLevelsValues(
     ban = ban,
     invite = invite,
@@ -31,4 +33,5 @@ internal fun aRustRoomPowerLevelsValues(
     roomName = roomName,
     roomAvatar = roomAvatar,
     roomTopic = roomTopic,
+    spaceChild = spaceChild
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPreviewInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPreviewInfo.kt
index c3bcd98497..aacb809a70 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPreviewInfo.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPreviewInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,20 +19,18 @@ internal fun aRustRoomPreviewInfo(
     canonicalAlias: String? = A_ROOM_ALIAS.value,
     membership: Membership? = Membership.JOINED,
     joinRule: JoinRule = JoinRule.Public,
-): RoomPreviewInfo {
-    return RoomPreviewInfo(
-        roomId = A_ROOM_ID.value,
-        canonicalAlias = canonicalAlias,
-        name = "name",
-        topic = "topic",
-        avatarUrl = "avatarUrl",
-        numJoinedMembers = 1u,
-        numActiveMembers = 1u,
-        isDirect = false,
-        roomType = RoomType.Room,
-        isHistoryWorldReadable = true,
-        membership = membership,
-        joinRule = joinRule,
-        heroes = null,
-    )
-}
+) = RoomPreviewInfo(
+    roomId = A_ROOM_ID.value,
+    canonicalAlias = canonicalAlias,
+    name = "name",
+    topic = "topic",
+    avatarUrl = "avatarUrl",
+    numJoinedMembers = 1u,
+    numActiveMembers = 1u,
+    isDirect = false,
+    roomType = RoomType.Room,
+    isHistoryWorldReadable = true,
+    membership = membership,
+    joinRule = joinRule,
+    heroes = null,
+)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchUsersResults.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchUsersResults.kt
index bfd232ae38..7782eb59e5 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchUsersResults.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchUsersResults.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b1301d0777..4671c457b0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,14 +18,12 @@ internal fun aRustSession(
     proxy: SlidingSyncVersion = SlidingSyncVersion.NONE,
     accessToken: String = "accessToken",
     refreshToken: String = "refreshToken",
-): Session {
-    return Session(
-        accessToken = accessToken,
-        refreshToken = refreshToken,
-        userId = A_USER_ID.value,
-        deviceId = A_DEVICE_ID.value,
-        homeserverUrl = A_HOMESERVER_URL,
-        oidcData = null,
-        slidingSyncVersion = proxy,
-    )
-}
+) = Session(
+    accessToken = accessToken,
+    refreshToken = refreshToken,
+    userId = A_USER_ID.value,
+    deviceId = A_DEVICE_ID.value,
+    homeserverUrl = A_HOMESERVER_URL,
+    oidcData = 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 58a86ffe2e..50115055c2 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,7 @@ import org.matrix.rustcomponents.sdk.RoomHero
 import org.matrix.rustcomponents.sdk.RoomType
 import org.matrix.rustcomponents.sdk.SpaceRoom
 
-fun aRustSpaceRoom(
+internal fun aRustSpaceRoom(
     roomId: RoomId = A_ROOM_ID,
     isDirect: Boolean = false,
     canonicalAlias: String? = null,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
similarity index 72%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
index 7c70d54154..877f2056e9 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,17 +13,15 @@ import org.matrix.rustcomponents.sdk.FormattedBody
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
 import org.matrix.rustcomponents.sdk.MessageType
 import org.matrix.rustcomponents.sdk.TextMessageContent
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 
-fun aRustTimelineEventTypeMessageLike(
+internal fun aRustTimelineEventContentMessageLike(
     content: MessageLikeEventContent = aRustMessageLikeEventContentRoomMessage(),
-): TimelineEventType.MessageLike {
-    return TimelineEventType.MessageLike(
-        content = content,
-    )
-}
+) = TimelineEventContent.MessageLike(
+    content = content,
+)
 
-fun aRustMessageLikeEventContentRoomMessage(
+internal fun aRustMessageLikeEventContentRoomMessage(
     messageType: MessageType = aRustMessageTypeText(),
     inReplyToEventId: String? = null,
 ) = MessageLikeEventContent.RoomMessage(
@@ -30,13 +29,13 @@ fun aRustMessageLikeEventContentRoomMessage(
     inReplyToEventId = inReplyToEventId,
 )
 
-fun aRustMessageTypeText(
+internal fun aRustMessageTypeText(
     content: TextMessageContent = aRustTextMessageContent(),
 ) = MessageType.Text(
     content = content,
 )
 
-fun aRustTextMessageContent(
+internal fun aRustTextMessageContent(
     body: String = A_MESSAGE,
     formatted: FormattedBody? = null,
 ) = TextMessageContent(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineItemContentMsgLike.kt
similarity index 82%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineItemContentMsgLike.kt
index b7ea8510c2..0db7590a5c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineItemContentMsgLike.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,9 @@ import org.matrix.rustcomponents.sdk.MsgLikeKind
 import org.matrix.rustcomponents.sdk.TextMessageContent
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 
-fun aRustTimelineItemMessageContent(body: String = "Hello") = TimelineItemContent.MsgLike(
+internal fun aRustTimelineItemContentMsgLike(
+    body: String = "Hello",
+) = TimelineItemContent.MsgLike(
     content = MsgLikeContent(
         kind = MsgLikeKind.Message(
             content = MessageContent(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt
index 2239b5fffc..4faa914e8c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,14 +19,12 @@ internal fun aRustUnableToDecryptInfo(
     userTrustsOwnIdentity: Boolean = false,
     senderHomeserver: String = "",
     ownHomeserver: String = "",
-): UnableToDecryptInfo {
-    return UnableToDecryptInfo(
-        eventId = eventId,
-        timeToDecryptMs = timeToDecryptMs,
-        cause = cause,
-        eventLocalAgeMillis = eventLocalAgeMillis,
-        userTrustsOwnIdentity = userTrustsOwnIdentity,
-        senderHomeserver = senderHomeserver,
-        ownHomeserver = ownHomeserver,
-    )
-}
+) = UnableToDecryptInfo(
+    eventId = eventId,
+    timeToDecryptMs = timeToDecryptMs,
+    cause = cause,
+    eventLocalAgeMillis = eventLocalAgeMillis,
+    userTrustsOwnIdentity = userTrustsOwnIdentity,
+    senderHomeserver = senderHomeserver,
+    ownHomeserver = ownHomeserver,
+)
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 ee1ab3d84e..8713e08f1c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,7 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 import io.element.android.libraries.matrix.test.A_USER_ID
 import org.matrix.rustcomponents.sdk.UserProfile
 
-fun aRustUserProfile(
+internal fun aRustUserProfile(
     userId: String = A_USER_ID.value,
     displayName: String = "displayName",
     avatarUrl: String = "avatarUrl",
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiCheckCodeSender.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiCheckCodeSender.kt
new file mode 100644
index 0000000000..a19c4e3766
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiCheckCodeSender.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.fixtures.fakes
+
+import io.element.android.tests.testutils.lambda.lambdaError
+import org.matrix.rustcomponents.sdk.CheckCodeSender
+import org.matrix.rustcomponents.sdk.NoHandle
+
+class FakeFfiCheckCodeSender(
+    private val sendResult: (UByte) -> Unit = { _ -> lambdaError() }
+) : CheckCodeSender(NoHandle) {
+    override suspend fun send(code: UByte) {
+        sendResult(code)
+    }
+}
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 3f53d9d5e2..dc9d21cddc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import org.matrix.rustcomponents.sdk.ClientDelegate
 import org.matrix.rustcomponents.sdk.Encryption
 import org.matrix.rustcomponents.sdk.HomeserverLoginDetails
 import org.matrix.rustcomponents.sdk.IgnoredUsersListener
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.NotificationClient
 import org.matrix.rustcomponents.sdk.NotificationProcessSetup
 import org.matrix.rustcomponents.sdk.NotificationSettings
@@ -27,11 +28,13 @@ import org.matrix.rustcomponents.sdk.RoomDirectorySearch
 import org.matrix.rustcomponents.sdk.Session
 import org.matrix.rustcomponents.sdk.SessionVerificationController
 import org.matrix.rustcomponents.sdk.SpaceService
+import org.matrix.rustcomponents.sdk.StoreSizes
 import org.matrix.rustcomponents.sdk.SyncService
 import org.matrix.rustcomponents.sdk.SyncServiceBuilder
 import org.matrix.rustcomponents.sdk.TaskHandle
 import org.matrix.rustcomponents.sdk.UnableToDecryptDelegate
 import org.matrix.rustcomponents.sdk.UserProfile
+import uniffi.matrix_sdk_base.MediaRetentionPolicy
 
 class FakeFfiClient(
     private val userId: String = A_USER_ID.value,
@@ -44,8 +47,9 @@ class FakeFfiClient(
     private val withUtdHook: (UnableToDecryptDelegate) -> Unit = { lambdaError() },
     private val getProfileResult: (String) -> UserProfile = { UserProfile(userId = userId, displayName = null, avatarUrl = null) },
     private val homeserverLoginDetailsResult: () -> HomeserverLoginDetails = { lambdaError() },
+    private val getStoreSizesResult: () -> StoreSizes = { lambdaError() },
     private val closeResult: () -> Unit = {},
-) : Client(NoPointer) {
+) : Client(NoHandle) {
     override fun userId(): String = userId
     override fun deviceId(): String = deviceId
     override suspend fun notificationClient(processSetup: NotificationProcessSetup) = notificationClient
@@ -56,7 +60,7 @@ class FakeFfiClient(
     override suspend fun cachedAvatarUrl(): String? = null
     override suspend fun restoreSession(session: Session) = Unit
     override fun syncService(): SyncServiceBuilder = FakeFfiSyncServiceBuilder()
-    override fun spaceService(): SpaceService = FakeFfiSpaceService()
+    override suspend fun spaceService(): SpaceService = FakeFfiSpaceService()
     override fun roomDirectorySearch(): RoomDirectorySearch = FakeFfiRoomDirectorySearch()
     override suspend fun setPusher(
         identifiers: PusherIdentifiers,
@@ -87,5 +91,11 @@ class FakeFfiClient(
         return homeserverLoginDetailsResult()
     }
 
+    override suspend fun setMediaRetentionPolicy(policy: MediaRetentionPolicy) {}
+
+    override suspend fun getStoreSizes(): StoreSizes {
+        return getStoreSizesResult()
+    }
+
     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 d2dce3816c..fa10a63e42 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,16 +11,17 @@ package io.element.android.libraries.matrix.impl.fixtures.fakes
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientBuilder
 import org.matrix.rustcomponents.sdk.ClientSessionDelegate
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 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_crypto.CollectStrategy
 import uniffi.matrix_sdk_crypto.DecryptionSettings
 
 class FakeFfiClientBuilder(
     val buildResult: () -> Client = { FakeFfiClient(withUtdHook = {}) }
-) : ClientBuilder(NoPointer) {
+) : ClientBuilder(NoHandle) {
     override fun addRootCertificates(certificates: List<ByteArray>) = this
     override fun autoEnableBackups(autoEnableBackups: Boolean) = this
     override fun autoEnableCrossSigning(autoEnableCrossSigning: Boolean) = this
@@ -29,7 +31,6 @@ class FakeFfiClientBuilder(
     override fun decryptionSettings(decryptionSettings: DecryptionSettings): ClientBuilder = this
     override fun disableSslVerification() = this
     override fun homeserverUrl(url: String) = this
-    override fun sessionPassphrase(passphrase: String?) = this
     override fun proxy(url: String) = this
     override fun requestConfig(config: RequestConfig) = this
     override fun roomKeyRecipientStrategy(strategy: CollectStrategy) = this
@@ -42,5 +43,7 @@ class FakeFfiClientBuilder(
     override fun username(username: String) = this
     override fun enableShareHistoryOnInvite(enableShareHistoryOnInvite: Boolean): ClientBuilder = this
     override fun threadsEnabled(enabled: Boolean, threadSubscriptions: Boolean): ClientBuilder = this
+    override fun sqliteStore(config: SqliteStoreBuilder): ClientBuilder = this
+    override fun inMemoryStore(): ClientBuilder = this
     override suspend fun build() = buildResult()
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiEncryption.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiEncryption.kt
index 177ab5b251..89cfd57fbc 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiEncryption.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiEncryption.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,13 +12,13 @@ import io.element.android.tests.testutils.simulateLongTask
 import org.matrix.rustcomponents.sdk.BackupState
 import org.matrix.rustcomponents.sdk.BackupStateListener
 import org.matrix.rustcomponents.sdk.Encryption
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RecoveryState
 import org.matrix.rustcomponents.sdk.RecoveryStateListener
 import org.matrix.rustcomponents.sdk.TaskHandle
 import org.matrix.rustcomponents.sdk.VerificationStateListener
 
-class FakeFfiEncryption : Encryption(NoPointer) {
+class FakeFfiEncryption : Encryption(NoHandle) {
     override fun verificationStateListener(listener: VerificationStateListener): TaskHandle {
         return FakeFfiTaskHandle()
     }
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
new file mode 100644
index 0000000000..cd0733695b
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
@@ -0,0 +1,41 @@
+/*
+ * 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.fixtures.fakes
+
+import org.matrix.rustcomponents.sdk.GrantGeneratedQrLoginProgress
+import org.matrix.rustcomponents.sdk.GrantGeneratedQrLoginProgressListener
+import org.matrix.rustcomponents.sdk.GrantLoginWithQrCodeHandler
+import org.matrix.rustcomponents.sdk.GrantQrLoginProgress
+import org.matrix.rustcomponents.sdk.GrantQrLoginProgressListener
+import org.matrix.rustcomponents.sdk.NoHandle
+import org.matrix.rustcomponents.sdk.QrCodeData
+
+class FakeFfiGrantLoginWithQrCodeHandler(
+    private val generateResult: () -> Unit = {},
+    private val scanResult: (QrCodeData) -> Unit = {},
+) : GrantLoginWithQrCodeHandler(NoHandle) {
+    private var generateProgressListener: GrantGeneratedQrLoginProgressListener? = null
+    private var scanProgressListener: GrantQrLoginProgressListener? = null
+    override suspend fun generate(progressListener: GrantGeneratedQrLoginProgressListener) {
+        generateProgressListener = progressListener
+        generateResult()
+    }
+
+    fun emitGenerateProgress(progress: GrantGeneratedQrLoginProgress) {
+        generateProgressListener?.onUpdate(progress)
+    }
+
+    override suspend fun scan(qrCodeData: QrCodeData, progressListener: GrantQrLoginProgressListener) {
+        scanProgressListener = progressListener
+        scanResult(qrCodeData)
+    }
+
+    fun emitScanProgress(progress: GrantQrLoginProgress) {
+        scanProgressListener?.onUpdate(progress)
+    }
+}
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 8977470365..ade3a2328f 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
@@ -1,21 +1,24 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.HomeserverLoginDetails
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 
 class FakeFfiHomeserverLoginDetails(
     private val url: String = "https://example.org",
-    private val supportsPasswordLogin: Boolean = true,
-    private val supportsOidcLogin: Boolean = false
-) : HomeserverLoginDetails(NoPointer) {
+    private val supportsPasswordLogin: Boolean = false,
+    private val supportsOidcLogin: Boolean = false,
+    private val supportsSsoLogin: Boolean = false,
+) : HomeserverLoginDetails(NoHandle) {
     override fun url(): String = url
     override fun supportsOidcLogin(): Boolean = supportsOidcLogin
     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/FakeFfiLazyTimelineItemProvider.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiLazyTimelineItemProvider.kt
index 6149a9164d..8ee167d769 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiLazyTimelineItemProvider.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiLazyTimelineItemProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,14 +11,14 @@ package io.element.android.libraries.matrix.impl.fixtures.fakes
 import io.element.android.libraries.matrix.impl.fixtures.factories.anEventTimelineItemDebugInfo
 import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo
 import org.matrix.rustcomponents.sdk.LazyTimelineItemProvider
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.SendHandle
 import org.matrix.rustcomponents.sdk.ShieldState
 
 class FakeFfiLazyTimelineItemProvider(
     private val debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
     private val shieldsState: ShieldState? = null,
-) : LazyTimelineItemProvider(NoPointer) {
+) : LazyTimelineItemProvider(NoHandle) {
     override fun getShields(strict: Boolean) = shieldsState
     override fun debugInfo() = debugInfo
     override fun getSendHandle(): SendHandle? = null
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationClient.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationClient.kt
index d17f4f949c..782cf0effb 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationClient.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationClient.kt
@@ -1,21 +1,22 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.BatchNotificationResult
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.NotificationClient
 import org.matrix.rustcomponents.sdk.NotificationItemsRequest
 
 class FakeFfiNotificationClient(
     var notificationItemResult: Map<String, BatchNotificationResult> = emptyMap(),
     val closeResult: () -> Unit = { }
-) : NotificationClient(NoPointer) {
+) : NotificationClient(NoHandle) {
     override suspend fun getNotifications(requests: List<NotificationItemsRequest>): Map<String, BatchNotificationResult> {
         return notificationItemResult
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationSettings.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationSettings.kt
index 7a65b8d2cd..d2ed0ce8b8 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationSettings.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiNotificationSettings.kt
@@ -1,21 +1,22 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.libraries.matrix.impl.fixtures.factories.aRustRoomNotificationSettings
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.NotificationSettings
 import org.matrix.rustcomponents.sdk.NotificationSettingsDelegate
 import org.matrix.rustcomponents.sdk.RoomNotificationSettings
 
 class FakeFfiNotificationSettings(
     private val roomNotificationSettings: RoomNotificationSettings = aRustRoomNotificationSettings(),
-) : NotificationSettings(NoPointer) {
+) : NotificationSettings(NoHandle) {
     private var delegate: NotificationSettingsDelegate? = null
 
     override fun setDelegate(delegate: NotificationSettingsDelegate?) {
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiQrCodeData.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiQrCodeData.kt
index 1be8b87a66..4070d1b2cd 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiQrCodeData.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiQrCodeData.kt
@@ -1,20 +1,26 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.QrCodeData
 
 class FakeFfiQrCodeData(
     private val serverNameResult: () -> String? = { lambdaError() },
-) : QrCodeData(NoPointer) {
+    private val toBytesResult: () -> ByteArray = { lambdaError() },
+) : QrCodeData(NoHandle) {
     override fun serverName(): String? {
         return serverNameResult()
     }
+
+    override fun toBytes(): ByteArray {
+        return toBytesResult()
+    }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoom.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoom.kt
index 41a0424991..953e42b132 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoom.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,8 +12,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomInfo
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.tests.testutils.lambda.lambdaError
-import org.matrix.rustcomponents.sdk.EventTimelineItem
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.LatestEventValue
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.RoomMembersIterator
@@ -23,10 +24,10 @@ class FakeFfiRoom(
     private val getMembers: () -> RoomMembersIterator = { lambdaError() },
     private val getMembersNoSync: () -> RoomMembersIterator = { lambdaError() },
     private val leaveLambda: () -> Unit = { lambdaError() },
-    private val latestEventLambda: () -> EventTimelineItem? = { lambdaError() },
+    private val latestEventLambda: () -> LatestEventValue = { lambdaError() },
     private val suggestedRoleForUserLambda: (String) -> RoomMemberRole = { lambdaError() },
     private val roomInfo: RoomInfo = aRustRoomInfo(id = roomId.value),
-) : Room(NoPointer) {
+) : Room(NoHandle) {
     override fun id(): String {
         return roomId.value
     }
@@ -47,7 +48,7 @@ class FakeFfiRoom(
         return roomInfo
     }
 
-    override suspend fun latestEvent(): EventTimelineItem? {
+    override suspend fun latestEvent(): LatestEventValue {
         return latestEventLambda()
     }
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomDirectorySearch.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomDirectorySearch.kt
index b090262e31..f941b325c3 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomDirectorySearch.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomDirectorySearch.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.simulateLongTask
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RoomDirectorySearch
 import org.matrix.rustcomponents.sdk.RoomDirectorySearchEntriesListener
 import org.matrix.rustcomponents.sdk.RoomDirectorySearchEntryUpdate
@@ -16,7 +17,7 @@ import org.matrix.rustcomponents.sdk.TaskHandle
 
 class FakeFfiRoomDirectorySearch(
     var isAtLastPage: Boolean = false,
-) : RoomDirectorySearch(NoPointer) {
+) : RoomDirectorySearch(NoHandle) {
     override suspend fun isAtLastPage(): Boolean {
         return isAtLastPage
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomList.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomList.kt
index d51a742368..f3d71208e7 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomList.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomList.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RoomList
 
-class FakeFfiRoomList : RoomList(NoPointer)
+class FakeFfiRoomList : RoomList(NoHandle)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomListService.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomListService.kt
index 604f5289a0..5f6519402e 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomListService.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomListService.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RoomList
 import org.matrix.rustcomponents.sdk.RoomListService
 import org.matrix.rustcomponents.sdk.RoomListServiceStateListener
@@ -15,7 +16,7 @@ import org.matrix.rustcomponents.sdk.RoomListServiceSyncIndicator
 import org.matrix.rustcomponents.sdk.RoomListServiceSyncIndicatorListener
 import org.matrix.rustcomponents.sdk.TaskHandle
 
-class FakeFfiRoomListService : RoomListService(NoPointer) {
+class FakeFfiRoomListService : RoomListService(NoHandle) {
     override suspend fun allRooms(): RoomList {
         return FakeFfiRoomList()
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomMembersIterator.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomMembersIterator.kt
index 28ee4791e5..06dc79365f 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomMembersIterator.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomMembersIterator.kt
@@ -1,19 +1,20 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RoomMember
 import org.matrix.rustcomponents.sdk.RoomMembersIterator
 
 class FakeFfiRoomMembersIterator(
     private var members: List<RoomMember>? = null
-) : RoomMembersIterator(NoPointer) {
+) : RoomMembersIterator(NoHandle) {
     override fun len(): UInt {
         return members?.size?.toUInt() ?: 0u
     }
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 32e7dc891d..c47c4406b6 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
@@ -1,20 +1,21 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RoomPowerLevels
 import org.matrix.rustcomponents.sdk.RoomPowerLevelsValues
 
 class FakeFfiRoomPowerLevels(
     private val values: RoomPowerLevelsValues = defaultFfiRoomPowerLevelValues(),
     private val users: Map<String, Long> = emptyMap(),
-) : RoomPowerLevels(NoPointer) {
+) : RoomPowerLevels(NoHandle) {
     override fun values(): RoomPowerLevelsValues = values
     override fun userPowerLevels(): Map<String, Long> = users
 }
@@ -24,10 +25,11 @@ fun defaultFfiRoomPowerLevelValues() = RoomPowerLevelsValues(
     invite = 0,
     kick = 50,
     eventsDefault = 0,
+    stateDefault = 50,
     redact = 50,
-    roomName = 100,
-    roomAvatar = 100,
-    roomTopic = 100,
-    stateDefault = 0,
+    roomName = 50,
+    roomAvatar = 50,
+    roomTopic = 50,
+    spaceChild = 50,
     usersDefault = 0,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSessionVerificationController.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSessionVerificationController.kt
index 2ff1e1d6ac..c6aa5475af 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSessionVerificationController.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSessionVerificationController.kt
@@ -1,16 +1,17 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.SessionVerificationController
 import org.matrix.rustcomponents.sdk.SessionVerificationControllerDelegate
 
-class FakeFfiSessionVerificationController : SessionVerificationController(NoPointer) {
+class FakeFfiSessionVerificationController : SessionVerificationController(NoHandle) {
     override fun setDelegate(delegate: SessionVerificationControllerDelegate?) {}
 }
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 171afd49fc..40c36271ea 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@ package io.element.android.libraries.matrix.impl.fixtures.fakes
 
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.SpaceListUpdate
 import org.matrix.rustcomponents.sdk.SpaceRoom
 import org.matrix.rustcomponents.sdk.SpaceRoomList
@@ -22,7 +23,7 @@ class FakeFfiSpaceRoomList(
     private val paginateResult: () -> Unit = { lambdaError() },
     private val paginationStateResult: () -> SpaceRoomListPaginationState = { lambdaError() },
     private val roomsResult: () -> List<SpaceRoom> = { lambdaError() },
-) : SpaceRoomList(NoPointer) {
+) : SpaceRoomList(NoHandle) {
     private var spaceRoomListPaginationStateListener: SpaceRoomListPaginationStateListener? = null
     private var spaceRoomListEntriesListener: SpaceRoomListEntriesListener? = null
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceService.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceService.kt
index 3dae78ae1b..ca9ec75a24 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceService.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceService.kt
@@ -1,13 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.SpaceService
 
-class FakeFfiSpaceService : SpaceService(NoPointer)
+class FakeFfiSpaceService : SpaceService(NoHandle)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncService.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncService.kt
index 5d32139c8e..d4d87d0ae8 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncService.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncService.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.RoomListService
 import org.matrix.rustcomponents.sdk.SyncService
 import org.matrix.rustcomponents.sdk.SyncServiceStateObserver
@@ -15,7 +16,7 @@ import org.matrix.rustcomponents.sdk.TaskHandle
 
 class FakeFfiSyncService(
     private val roomListService: RoomListService = FakeFfiRoomListService(),
-) : SyncService(NoPointer) {
+) : SyncService(NoHandle) {
     override fun roomListService(): RoomListService = roomListService
     override fun state(listener: SyncServiceStateObserver): TaskHandle {
         return FakeFfiTaskHandle()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncServiceBuilder.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncServiceBuilder.kt
index f423d0295b..2cb67f2519 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncServiceBuilder.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSyncServiceBuilder.kt
@@ -1,17 +1,18 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.SyncService
 import org.matrix.rustcomponents.sdk.SyncServiceBuilder
 
-class FakeFfiSyncServiceBuilder : SyncServiceBuilder(NoPointer) {
+class FakeFfiSyncServiceBuilder : SyncServiceBuilder(NoHandle) {
     override fun withOfflineMode(): SyncServiceBuilder = this
     override fun withSharePos(enable: Boolean): SyncServiceBuilder = this
     override suspend fun finish(): SyncService = FakeFfiSyncService()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTaskHandle.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTaskHandle.kt
index 66c51017df..24d7884547 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTaskHandle.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTaskHandle.kt
@@ -1,16 +1,17 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.TaskHandle
 
-class FakeFfiTaskHandle : TaskHandle(NoPointer) {
+class FakeFfiTaskHandle : TaskHandle(NoHandle) {
     override fun cancel() = Unit
     override fun destroy() = Unit
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimeline.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimeline.kt
index 09d79f8790..d45330bd3f 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimeline.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimeline.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.PaginationStatusListener
 import org.matrix.rustcomponents.sdk.TaskHandle
 import org.matrix.rustcomponents.sdk.Timeline
@@ -15,7 +16,7 @@ import org.matrix.rustcomponents.sdk.TimelineDiff
 import org.matrix.rustcomponents.sdk.TimelineListener
 import uniffi.matrix_sdk.RoomPaginationStatus
 
-class FakeFfiTimeline : Timeline(NoPointer) {
+class FakeFfiTimeline : Timeline(NoHandle) {
     private var listener: TimelineListener? = null
     override suspend fun addListener(listener: TimelineListener): TaskHandle {
         this.listener = listener
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
index 41eb9c798e..80eec5efe7 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEvent.kt
@@ -1,25 +1,26 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.libraries.matrix.impl.fixtures.factories.aRustTimelineEventTypeMessageLike
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustTimelineEventContentMessageLike
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.TimelineEvent
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 
 open class FakeFfiTimelineEvent(
     val timestamp: ULong = A_FAKE_TIMESTAMP.toULong(),
-    val timelineEventType: TimelineEventType = aRustTimelineEventTypeMessageLike(),
+    val timelineEventContent: TimelineEventContent = aRustTimelineEventContentMessageLike(),
     val senderId: String = A_USER_ID_2.value,
-) : TimelineEvent(NoPointer) {
+) : TimelineEvent(NoHandle) {
     override fun timestamp(): ULong = timestamp
-    override fun eventType(): TimelineEventType = timelineEventType
+    override fun content(): TimelineEventContent = timelineEventContent
     override fun senderId(): String = senderId
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEventTypeFilter.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEventTypeFilter.kt
index dcab0bba6e..067567c4e9 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEventTypeFilter.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineEventTypeFilter.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.TimelineEventTypeFilter
 
-class FakeFfiTimelineEventTypeFilter : TimelineEventTypeFilter(NoPointer)
+class FakeFfiTimelineEventTypeFilter : TimelineEventTypeFilter(NoHandle)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineItem.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineItem.kt
index a3f7a18c21..eb7f8a1462 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineItem.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiTimelineItem.kt
@@ -1,21 +1,22 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.EventTimelineItem
-import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.TimelineItem
 import org.matrix.rustcomponents.sdk.TimelineUniqueId
 import org.matrix.rustcomponents.sdk.VirtualTimelineItem
 
 class FakeFfiTimelineItem(
     private val asEventResult: EventTimelineItem? = null,
-) : TimelineItem(NoPointer) {
+) : TimelineItem(NoHandle) {
     override fun asEvent(): EventTimelineItem? = asEventResult
     override fun asVirtual(): VirtualTimelineItem? = null
     override fun fmtDebug(): String = "fmtDebug"
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
index 2426aa6c31..465d920074 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/FakeQrCodeDataParser.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/FakeQrCodeDataParser.kt
new file mode 100644
index 0000000000..254258fcf7
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/FakeQrCodeDataParser.kt
@@ -0,0 +1,17 @@
+/*
+ * 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.linknewdevice
+
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiQrCodeData
+import org.matrix.rustcomponents.sdk.QrCodeData
+
+class FakeQrCodeDataParser : QrCodeDataParser {
+    override fun parse(data: ByteArray): QrCodeData {
+        return FakeFfiQrCodeData()
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustCheckCodeSenderTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustCheckCodeSenderTest.kt
new file mode 100644
index 0000000000..5fb4698976
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustCheckCodeSenderTest.kt
@@ -0,0 +1,41 @@
+/*
+ * 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.linknewdevice
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiCheckCodeSender
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class RustCheckCodeSenderTest {
+    @Test
+    fun `send invokes the Ffi object`() = runTest {
+        val sendResult = lambdaRecorder<UByte, Unit> { }
+        val sut = RustCheckCodeSender(
+            inner = FakeFfiCheckCodeSender(
+                sendResult = sendResult,
+            ),
+            sessionDispatcher = StandardTestDispatcher(testScheduler),
+        )
+        sut.send(1.toUByte())
+        sendResult.assertions().isCalledOnce().with(value(1.toUByte()))
+    }
+
+    @Test
+    fun `validate always returns true for now`() = runTest {
+        val sut = RustCheckCodeSender(
+            inner = FakeFfiCheckCodeSender(),
+            sessionDispatcher = StandardTestDispatcher(testScheduler),
+        )
+        val result = sut.validate(1.toUByte())
+        assertThat(result).isTrue()
+    }
+}
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
new file mode 100644
index 0000000000..a180e4d515
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.libraries.matrix.impl.linknewdevice
+
+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.FakeFfiGrantLoginWithQrCodeHandler
+import io.element.android.libraries.matrix.test.QR_CODE_DATA
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.GrantQrLoginProgress
+import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
+import org.matrix.rustcomponents.sdk.QrCodeDecodeException
+
+class RustLinkDesktopHandlerTest {
+    @Test
+    fun `handleScannedQrCode function works as expected`() = runTest {
+        val handler = FakeFfiGrantLoginWithQrCodeHandler()
+        val sut = createRustLinkDesktopHandler(
+            handler,
+        )
+        sut.linkDesktopStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkDesktopStep.Uninitialized)
+            backgroundScope.launch {
+                sut.handleScannedQrCode(QR_CODE_DATA)
+            }
+            runCurrent()
+            // progress from the handler is mapped and emitted
+            listOf(
+                GrantQrLoginProgress.Starting to LinkDesktopStep.Starting,
+                GrantQrLoginProgress.SyncingSecrets to LinkDesktopStep.SyncingSecrets,
+                GrantQrLoginProgress.WaitingForAuth("aVerificationUri")
+                    to LinkDesktopStep.WaitingForAuth("aVerificationUri"),
+                GrantQrLoginProgress.EstablishingSecureChannel(1.toUByte(), "1")
+                    to LinkDesktopStep.EstablishingSecureChannel(1.toUByte(), "1"),
+                GrantQrLoginProgress.Done to LinkDesktopStep.Done,
+            ).forEach { (progress, expectedStep) ->
+                handler.emitScanProgress(progress)
+                assertThat(awaitItem()).isEqualTo(expectedStep)
+            }
+        }
+    }
+
+    @Test
+    fun `when handleScannedQrCode throws QrCodeDecodeException, the handler emits error step`() = runTest {
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            scanResult = { throw QrCodeDecodeException.Crypto("Scan failed") }
+        )
+        val sut = createRustLinkDesktopHandler(
+            handler,
+        )
+        sut.linkDesktopStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkDesktopStep.Uninitialized)
+            backgroundScope.launch {
+                sut.handleScannedQrCode(QR_CODE_DATA)
+            }
+            runCurrent()
+            val errorState = awaitItem()
+            assertThat(errorState).isInstanceOf(LinkDesktopStep.InvalidQrCode::class.java)
+        }
+    }
+
+    @Test
+    fun `when handleScannedQrCode throws HumanQrGrantLoginException, the handler emits error step`() = runTest {
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            scanResult = { throw HumanQrGrantLoginException.InvalidCheckCode("Invalid check code") }
+        )
+        val sut = createRustLinkDesktopHandler(
+            handler,
+        )
+        sut.linkDesktopStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkDesktopStep.Uninitialized)
+            backgroundScope.launch {
+                sut.handleScannedQrCode(QR_CODE_DATA)
+            }
+            runCurrent()
+            val errorState = awaitItem()
+            assertThat(errorState).isInstanceOf(LinkDesktopStep.Error::class.java)
+            val errorType = (errorState as LinkDesktopStep.Error).errorType
+            assertThat(errorType).isInstanceOf(ErrorType.InvalidCheckCode::class.java)
+        }
+    }
+
+    private fun TestScope.createRustLinkDesktopHandler(
+        handler: FakeFfiGrantLoginWithQrCodeHandler = FakeFfiGrantLoginWithQrCodeHandler(),
+    ) = RustLinkDesktopHandler(
+        inner = handler,
+        sessionCoroutineScope = backgroundScope,
+        sessionDispatcher = StandardTestDispatcher(testScheduler),
+        qrCodeDataParser = FakeQrCodeDataParser(),
+    )
+}
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
new file mode 100644
index 0000000000..aa13996e8a
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.libraries.matrix.impl.linknewdevice
+
+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.LinkMobileStep
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiCheckCodeSender
+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.ExperimentalCoroutinesApi
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.GrantGeneratedQrLoginProgress
+import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
+
+class RustLinkMobileHandlerTest {
+    @Test
+    fun `start function works as expected`() = runTest {
+        val handler = FakeFfiGrantLoginWithQrCodeHandler()
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            // progress from the handler is mapped and emitted
+            listOf(
+                GrantGeneratedQrLoginProgress.Starting to LinkMobileStep.Starting::class.java,
+                GrantGeneratedQrLoginProgress.SyncingSecrets to LinkMobileStep.SyncingSecrets::class.java,
+                GrantGeneratedQrLoginProgress.WaitingForAuth("aVerificationUri")
+                    to LinkMobileStep.WaitingForAuth::class.java,
+                GrantGeneratedQrLoginProgress.QrScanned(FakeFfiCheckCodeSender())
+                    to LinkMobileStep.QrScanned::class.java,
+                GrantGeneratedQrLoginProgress.QrReady(FakeFfiQrCodeData(toBytesResult = { QR_CODE_DATA_RECIPROCATE }))
+                    to LinkMobileStep.QrReady::class.java,
+                GrantGeneratedQrLoginProgress.Done to LinkMobileStep.Done::class.java,
+            ).forEach { (progress, expectedStepClass) ->
+                handler.emitGenerateProgress(progress)
+                assertThat(awaitItem()).isInstanceOf(expectedStepClass)
+            }
+        }
+    }
+
+    @Test
+    fun `when start throws HumanQrGrantLoginException, the handler emits error step`() = runTest {
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = { throw HumanQrGrantLoginException.NotFound("Timeout") }
+        )
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            val errorState = awaitItem()
+            assertThat(errorState).isInstanceOf(LinkMobileStep.Error::class.java)
+            val errorType = (errorState as LinkMobileStep.Error).errorType
+            assertThat(errorType).isInstanceOf(ErrorType.NotFound::class.java)
+        }
+    }
+
+    private fun TestScope.createRustLinkMobileHandler(
+        handler: FakeFfiGrantLoginWithQrCodeHandler = FakeFfiGrantLoginWithQrCodeHandler(),
+    ) = RustLinkMobileHandler(
+        inner = handler,
+        sessionCoroutineScope = backgroundScope,
+        sessionDispatcher = StandardTestDispatcher(testScheduler),
+    )
+}
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 46a4d35c37..e5fc8b154f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,7 +19,6 @@ 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.LoginType
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.SlidingSyncVersion
 import java.io.File
 
 class SessionKtTest {
@@ -37,7 +37,6 @@ class SessionKtTest {
         assertThat(result.homeserverUrl).isEqualTo(A_HOMESERVER_URL)
         assertThat(result.isTokenValid).isTrue()
         assertThat(result.oidcData).isNull()
-        assertThat(result.slidingSyncProxy).isNull()
         assertThat(result.loginType).isEqualTo(LoginType.PASSWORD)
         assertThat(result.loginTimestamp).isNotNull()
         assertThat(result.passphrase).isEqualTo(A_SECRET)
@@ -69,20 +68,6 @@ class SessionKtTest {
         assertThat(result.homeserverUrl).isEqualTo(A_HOMESERVER_URL_2)
     }
 
-    @Test
-    fun `toSessionData copy the sliding sync url if present`() {
-        val result = aRustSession(
-            proxy = SlidingSyncVersion.NATIVE
-        ).toSessionData(
-            isTokenValid = true,
-            loginType = LoginType.PASSWORD,
-            passphrase = A_SECRET,
-            sessionPaths = SessionPaths(File("/a/file"), File("/a/cache")),
-            homeserverUrl = A_HOMESERVER_URL_2,
-        )
-        assertThat(result.slidingSyncProxy).isNull()
-    }
-
     @Test
     fun `ExternalSession toSessionData compute the expected result`() {
         val result = anExternalSession().toSessionData(
@@ -98,7 +83,6 @@ class SessionKtTest {
         assertThat(result.homeserverUrl).isEqualTo(A_HOMESERVER_URL)
         assertThat(result.isTokenValid).isTrue()
         assertThat(result.oidcData).isNull()
-        assertThat(result.slidingSyncProxy).isNull()
         assertThat(result.loginType).isEqualTo(LoginType.PASSWORD)
         assertThat(result.loginTimestamp).isNotNull()
         assertThat(result.passphrase).isEqualTo(A_SECRET)
@@ -124,12 +108,10 @@ private fun anExternalSession(
     accessToken: String = "accessToken",
     refreshToken: String? = null,
     homeserverUrl: String = A_HOMESERVER_URL,
-    slidingSyncProxy: String? = null,
 ) = ExternalSession(
     userId = userId,
     deviceId = deviceId,
     accessToken = accessToken,
     refreshToken = refreshToken,
     homeserverUrl = homeserverUrl,
-    slidingSyncProxy = slidingSyncProxy,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapperTest.kt
index ea2d971056..61e5886356 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/UserProfileMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/mxc/MxcToolsTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcToolsTest.kt
similarity index 75%
rename from libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/mxc/MxcToolsTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcToolsTest.kt
index 97242af95c..56863c51c4 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/mxc/MxcToolsTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mxc/DefaultMxcToolsTest.kt
@@ -1,19 +1,20 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.mxc
+package io.element.android.libraries.matrix.impl.mxc
 
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 
-class MxcToolsTest {
+class DefaultMxcToolsTest {
     @Test
     fun `mxcUri2FilePath returns extracted path`() {
-        val mxcTools = MxcTools()
+        val mxcTools = DefaultMxcTools()
         val mxcUri = "mxc://server.org/abc123"
         val filePath = mxcTools.mxcUri2FilePath(mxcUri)
         assertThat(filePath).isEqualTo("server.org/abc123")
@@ -21,7 +22,7 @@ class MxcToolsTest {
 
     @Test
     fun `mxcUri2FilePath returns null for invalid data`() {
-        val mxcTools = MxcTools()
+        val mxcTools = DefaultMxcTools()
         assertThat(mxcTools.mxcUri2FilePath("")).isNull()
         assertThat(mxcTools.mxcUri2FilePath("mxc://server.org")).isNull()
         assertThat(mxcTools.mxcUri2FilePath("mxc://server.org/")).isNull()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationServiceTest.kt
index 2b6717910b..eecc37a529 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.exception.NotificationResolverException
 import io.element.android.libraries.matrix.api.notification.NotificationContent
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.impl.fixtures.factories.aRustBatchNotificationResult
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustBatchNotificationResultOk
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustNotificationEventTimeline
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustNotificationItem
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiNotificationClient
@@ -31,13 +32,13 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.NotificationClient
 import org.matrix.rustcomponents.sdk.NotificationStatus
-import org.matrix.rustcomponents.sdk.TimelineEventType
+import org.matrix.rustcomponents.sdk.TimelineEventContent
 
 class RustNotificationServiceTest {
     @Test
     fun test() = runTest {
         val notificationClient = FakeFfiNotificationClient(
-            notificationItemResult = mapOf(AN_EVENT_ID.value to aRustBatchNotificationResult()),
+            notificationItemResult = mapOf(AN_EVENT_ID.value to aRustBatchNotificationResultOk()),
         )
         val sut = createRustNotificationService(
             notificationClient = notificationClient,
@@ -57,18 +58,18 @@ class RustNotificationServiceTest {
 
     @Test
     fun `test mapping invalid item only drops that item`() = runTest {
-        val error = IllegalStateException("This event type is not supported")
+        val error = IllegalStateException("This event content is not supported")
         val faultyEvent = object : FakeFfiTimelineEvent() {
-            override fun eventType(): TimelineEventType {
+            override fun content(): TimelineEventContent {
                 throw error
             }
         }
         val notificationClient = FakeFfiNotificationClient(
             notificationItemResult = mapOf(
-                AN_EVENT_ID.value to aRustBatchNotificationResult(
+                AN_EVENT_ID.value to aRustBatchNotificationResultOk(
                     notificationStatus = NotificationStatus.Event(aRustNotificationItem(aRustNotificationEventTimeline(faultyEvent)))
                 ),
-                AN_EVENT_ID_2.value to aRustBatchNotificationResult()
+                AN_EVENT_ID_2.value to aRustBatchNotificationResultOk()
             ),
         )
         val sut = createRustNotificationService(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsServiceTest.kt
index d2dd425132..73b7b888b2 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/oidc/AccountManagementActionKtTest.kt
index c80f265a22..8115465679 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/oidc/AccountManagementActionKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a63dda184e..dcd2c4594c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/poll/PollKindKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/poll/PollKindKtTest.kt
index cad975da5c..ed475dc1b4 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/poll/PollKindKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/poll/PollKindKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 22e015a27c..61b2965cdd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventTypeFilterFactory.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventTypeFilterFactory.kt
index d7d800ac23..52da51a123 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventTypeFilterFactory.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventTypeFilterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 02e503c56e..654989a393 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b52959712d..86a50c3926 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a95720baef..5c1c4a2aa3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomTypeKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomTypeKtTest.kt
index 23447f6879..a6920b6efc 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomTypeKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomTypeKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoomTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoomTest.kt
index 50d6c348b5..6508c04112 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoomTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoomTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,6 @@ 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.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
-import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoom
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoomListService
@@ -23,6 +23,7 @@ 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.A_USER_ID
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.flow.SharingStarted
@@ -125,7 +126,7 @@ class RustBaseRoomTest {
         val rustBaseRoom = createRustBaseRoom(
             initialRoomInfo = aRoomInfo(
                 roomPowerLevels = RoomPowerLevels(
-                    values = RoomPowerLevelsValues(50, 50, 50, 50, 50, 50, 50, 50),
+                    values = defaultRoomPowerLevelValues(),
                     users = persistentMapOf(A_USER_ID to 100L)
                 )
             ),
@@ -173,8 +174,7 @@ class RustBaseRoomTest {
                 dispatchers = dispatchers,
             ),
             roomMembershipObserver = roomMembershipObserver,
-            // Not using backgroundScope here, but the test scope
-            sessionCoroutineScope = this,
+            sessionCoroutineScope = backgroundScope,
             roomInfoMapper = RoomInfoMapper(),
             initialRoomInfo = initialRoomInfo,
         )
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 7bee4fbc80..428bb7db7a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,53 +16,55 @@ import org.matrix.rustcomponents.sdk.StateEventType as RustStateEventType
 class StateEventTypeTest {
     @Test
     fun `mapping Rust type should work`() {
-        assertThat(RustStateEventType.CALL_MEMBER.map()).isEqualTo(StateEventType.CALL_MEMBER)
-        assertThat(RustStateEventType.POLICY_RULE_ROOM.map()).isEqualTo(StateEventType.POLICY_RULE_ROOM)
-        assertThat(RustStateEventType.POLICY_RULE_SERVER.map()).isEqualTo(StateEventType.POLICY_RULE_SERVER)
-        assertThat(RustStateEventType.POLICY_RULE_USER.map()).isEqualTo(StateEventType.POLICY_RULE_USER)
-        assertThat(RustStateEventType.ROOM_ALIASES.map()).isEqualTo(StateEventType.ROOM_ALIASES)
-        assertThat(RustStateEventType.ROOM_AVATAR.map()).isEqualTo(StateEventType.ROOM_AVATAR)
-        assertThat(RustStateEventType.ROOM_CANONICAL_ALIAS.map()).isEqualTo(StateEventType.ROOM_CANONICAL_ALIAS)
-        assertThat(RustStateEventType.ROOM_CREATE.map()).isEqualTo(StateEventType.ROOM_CREATE)
-        assertThat(RustStateEventType.ROOM_ENCRYPTION.map()).isEqualTo(StateEventType.ROOM_ENCRYPTION)
-        assertThat(RustStateEventType.ROOM_GUEST_ACCESS.map()).isEqualTo(StateEventType.ROOM_GUEST_ACCESS)
-        assertThat(RustStateEventType.ROOM_HISTORY_VISIBILITY.map()).isEqualTo(StateEventType.ROOM_HISTORY_VISIBILITY)
-        assertThat(RustStateEventType.ROOM_JOIN_RULES.map()).isEqualTo(StateEventType.ROOM_JOIN_RULES)
-        assertThat(RustStateEventType.ROOM_MEMBER_EVENT.map()).isEqualTo(StateEventType.ROOM_MEMBER_EVENT)
-        assertThat(RustStateEventType.ROOM_NAME.map()).isEqualTo(StateEventType.ROOM_NAME)
-        assertThat(RustStateEventType.ROOM_PINNED_EVENTS.map()).isEqualTo(StateEventType.ROOM_PINNED_EVENTS)
-        assertThat(RustStateEventType.ROOM_POWER_LEVELS.map()).isEqualTo(StateEventType.ROOM_POWER_LEVELS)
-        assertThat(RustStateEventType.ROOM_SERVER_ACL.map()).isEqualTo(StateEventType.ROOM_SERVER_ACL)
-        assertThat(RustStateEventType.ROOM_THIRD_PARTY_INVITE.map()).isEqualTo(StateEventType.ROOM_THIRD_PARTY_INVITE)
-        assertThat(RustStateEventType.ROOM_TOMBSTONE.map()).isEqualTo(StateEventType.ROOM_TOMBSTONE)
-        assertThat(RustStateEventType.ROOM_TOPIC.map()).isEqualTo(StateEventType.ROOM_TOPIC)
-        assertThat(RustStateEventType.SPACE_CHILD.map()).isEqualTo(StateEventType.SPACE_CHILD)
-        assertThat(RustStateEventType.SPACE_PARENT.map()).isEqualTo(StateEventType.SPACE_PARENT)
+        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)
+        assertThat(RustStateEventType.RoomEncryption.map()).isEqualTo(StateEventType.RoomEncryption)
+        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.RoomName.map()).isEqualTo(StateEventType.RoomName)
+        assertThat(RustStateEventType.RoomPinnedEvents.map()).isEqualTo(StateEventType.RoomPinnedEvents)
+        assertThat(RustStateEventType.RoomPowerLevels.map()).isEqualTo(StateEventType.RoomPowerLevels)
+        assertThat(RustStateEventType.RoomServerAcl.map()).isEqualTo(StateEventType.RoomServerAcl)
+        assertThat(RustStateEventType.RoomThirdPartyInvite.map()).isEqualTo(StateEventType.RoomThirdPartyInvite)
+        assertThat(RustStateEventType.RoomTombstone.map()).isEqualTo(StateEventType.RoomTombstone)
+        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"))
     }
 
     @Test
     fun `mapping Kotlin type should work`() {
-        assertThat(StateEventType.CALL_MEMBER.map()).isEqualTo(RustStateEventType.CALL_MEMBER)
-        assertThat(StateEventType.POLICY_RULE_ROOM.map()).isEqualTo(RustStateEventType.POLICY_RULE_ROOM)
-        assertThat(StateEventType.POLICY_RULE_SERVER.map()).isEqualTo(RustStateEventType.POLICY_RULE_SERVER)
-        assertThat(StateEventType.POLICY_RULE_USER.map()).isEqualTo(RustStateEventType.POLICY_RULE_USER)
-        assertThat(StateEventType.ROOM_ALIASES.map()).isEqualTo(RustStateEventType.ROOM_ALIASES)
-        assertThat(StateEventType.ROOM_AVATAR.map()).isEqualTo(RustStateEventType.ROOM_AVATAR)
-        assertThat(StateEventType.ROOM_CANONICAL_ALIAS.map()).isEqualTo(RustStateEventType.ROOM_CANONICAL_ALIAS)
-        assertThat(StateEventType.ROOM_CREATE.map()).isEqualTo(RustStateEventType.ROOM_CREATE)
-        assertThat(StateEventType.ROOM_ENCRYPTION.map()).isEqualTo(RustStateEventType.ROOM_ENCRYPTION)
-        assertThat(StateEventType.ROOM_GUEST_ACCESS.map()).isEqualTo(RustStateEventType.ROOM_GUEST_ACCESS)
-        assertThat(StateEventType.ROOM_HISTORY_VISIBILITY.map()).isEqualTo(RustStateEventType.ROOM_HISTORY_VISIBILITY)
-        assertThat(StateEventType.ROOM_JOIN_RULES.map()).isEqualTo(RustStateEventType.ROOM_JOIN_RULES)
-        assertThat(StateEventType.ROOM_MEMBER_EVENT.map()).isEqualTo(RustStateEventType.ROOM_MEMBER_EVENT)
-        assertThat(StateEventType.ROOM_NAME.map()).isEqualTo(RustStateEventType.ROOM_NAME)
-        assertThat(StateEventType.ROOM_PINNED_EVENTS.map()).isEqualTo(RustStateEventType.ROOM_PINNED_EVENTS)
-        assertThat(StateEventType.ROOM_POWER_LEVELS.map()).isEqualTo(RustStateEventType.ROOM_POWER_LEVELS)
-        assertThat(StateEventType.ROOM_SERVER_ACL.map()).isEqualTo(RustStateEventType.ROOM_SERVER_ACL)
-        assertThat(StateEventType.ROOM_THIRD_PARTY_INVITE.map()).isEqualTo(RustStateEventType.ROOM_THIRD_PARTY_INVITE)
-        assertThat(StateEventType.ROOM_TOMBSTONE.map()).isEqualTo(RustStateEventType.ROOM_TOMBSTONE)
-        assertThat(StateEventType.ROOM_TOPIC.map()).isEqualTo(RustStateEventType.ROOM_TOPIC)
-        assertThat(StateEventType.SPACE_CHILD.map()).isEqualTo(RustStateEventType.SPACE_CHILD)
-        assertThat(StateEventType.SPACE_PARENT.map()).isEqualTo(RustStateEventType.SPACE_PARENT)
+        assertThat(StateEventType.CallMember.map()).isEqualTo(RustStateEventType.CallMember)
+        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)
+        assertThat(StateEventType.RoomEncryption.map()).isEqualTo(RustStateEventType.RoomEncryption)
+        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.RoomName.map()).isEqualTo(RustStateEventType.RoomName)
+        assertThat(StateEventType.RoomPinnedEvents.map()).isEqualTo(RustStateEventType.RoomPinnedEvents)
+        assertThat(StateEventType.RoomPowerLevels.map()).isEqualTo(RustStateEventType.RoomPowerLevels)
+        assertThat(StateEventType.RoomServerAcl.map()).isEqualTo(RustStateEventType.RoomServerAcl)
+        assertThat(StateEventType.RoomThirdPartyInvite.map()).isEqualTo(RustStateEventType.RoomThirdPartyInvite)
+        assertThat(StateEventType.RoomTombstone.map()).isEqualTo(RustStateEventType.RoomTombstone)
+        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"))
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
index d33148931e..52aaa62b97 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetTypeKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetTypeKtTest.kt
index 9fce31142b..9b12d12a04 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetTypeKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/AssetTypeKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt
index b11a3a6cd5..c1c436c405 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapperTest.kt
index 6c469c6eb8..09bfafdaae 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a2c6fca7a1..f298da8b42 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,6 +29,7 @@ class RoomPowerLevelsValuesMapperTest {
                     roomName = 8,
                     roomAvatar = 9,
                     roomTopic = 10,
+                    spaceChild = 11,
                 )
             )
         ).isEqualTo(
@@ -35,11 +37,13 @@ class RoomPowerLevelsValuesMapperTest {
                 ban = 1,
                 invite = 2,
                 kick = 3,
-                sendEvents = 5,
                 redactEvents = 4,
+                eventsDefault = 5,
+                stateDefault = 6,
                 roomName = 8,
                 roomAvatar = 9,
                 roomTopic = 10,
+                spaceChild = 11,
             )
         )
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapperTest.kt
index 4b832799cc..f32e018abe 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewInfoMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapperTest.kt
index 74fc0c8565..cf9223b416 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDescriptionMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessorTest.kt
index eddb53361c..c59d15618d 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RoomDirectorySearchProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
index 460ef37e99..cf3c746ec0 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,7 +43,7 @@ class RustBaseRoomDirectoryListTest {
             )
             val initialItem = awaitItem()
             assertThat(initialItem).isEqualTo(
-                RoomDirectoryList.State(
+                RoomDirectoryList.SearchResult(
                     hasMoreToLoad = true,
                     items = listOf(mapper.map(aRustRoomDescription()))
                 )
@@ -57,7 +58,7 @@ class RustBaseRoomDirectoryListTest {
             )
             val nextItem = awaitItem()
             assertThat(nextItem).isEqualTo(
-                RoomDirectoryList.State(
+                RoomDirectoryList.SearchResult(
                     hasMoreToLoad = false,
                     items = listOf(
                         mapper.map(aRustRoomDescription()),
@@ -66,7 +67,7 @@ class RustBaseRoomDirectoryListTest {
             )
             val finalItem = awaitItem()
             assertThat(finalItem).isEqualTo(
-                RoomDirectoryList.State(
+                RoomDirectoryList.SearchResult(
                     hasMoreToLoad = false,
                     items = listOf(
                         mapper.map(aRustRoomDescription()),
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt
index cc39e00c9f..ed97152311 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactoryTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactoryTest.kt
index 2d97f2c589..ba45b310ef 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactoryTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.libraries.matrix.impl.roomlist
 
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoomList
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoomListService
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import kotlin.coroutines.EmptyCoroutineContext
@@ -19,6 +21,7 @@ class RoomListFactoryTest {
         val sut = RoomListFactory(
             innerRoomListService = FakeFfiRoomListService(),
             sessionCoroutineScope = backgroundScope,
+            analyticsService = FakeAnalyticsService(),
         )
         sut.createRoomList(
             pageSize = 10,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt
index 932f9ba6be..9568de33e4 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2b54463dea..022aa19ee7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,6 +22,7 @@ import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
+import org.matrix.rustcomponents.sdk.LatestEventValue
 import org.matrix.rustcomponents.sdk.RoomListEntriesUpdate
 
 class RoomSummaryListProcessorTest {
@@ -172,13 +174,13 @@ class RoomSummaryListProcessorTest {
 
     private fun aRustRoom(roomId: RoomId = A_ROOM_ID) = FakeFfiRoom(
         roomId = roomId,
-        latestEventLambda = { null },
+        latestEventLambda = { LatestEventValue.None }
     )
 
     private fun TestScope.createProcessor() = RoomSummaryListProcessor(
         summaries,
         FakeFfiRoomListService(),
         coroutineContext = StandardTestDispatcher(testScheduler),
-        roomSummaryDetailsFactory = RoomSummaryFactory(),
+        roomSummaryFactory = RoomSummaryFactory(),
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt
index 561c1f245f..88b57035e8 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.roomlist
@@ -11,6 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiRoomListService
 import io.element.android.libraries.matrix.impl.room.RoomSyncSubscriber
+import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -49,6 +51,7 @@ private fun TestScope.createRustRoomListService(
     roomListFactory = RoomListFactory(
         innerRoomListService = roomListService,
         sessionCoroutineScope = backgroundScope,
+        analyticsService = FakeAnalyticsService(),
     ),
     roomSyncSubscriber = RoomSyncSubscriber(
         roomListService = roomListService,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolverTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolverTest.kt
index 73eeb9e81f..152475a0e7 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolverTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/server/DefaultUserServerResolverTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt
index ae05c7b4e9..d21e259d42 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RoomSummaryListProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt
index 7a494ae8c3..e966309c87 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/spaces/RustSpaceRoomListTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..2f12587f5a
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilder.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.storage
+
+import org.matrix.rustcomponents.sdk.ClientBuilder
+
+class FakeSqliteStoreBuilder : SqliteStoreBuilder {
+    override fun passphrase(passphrase: String?): 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
new file mode 100644
index 0000000000..b196604ca4
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilderProvider.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.storage
+
+import io.element.android.libraries.matrix.impl.paths.SessionPaths
+
+class FakeSqliteStoreBuilderProvider : SqliteStoreBuilderProvider {
+    override fun provide(sessionPaths: SessionPaths): SqliteStoreBuilder {
+        return FakeSqliteStoreBuilder()
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapperKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapperKtTest.kt
index 7310b98e2f..38462ca3aa 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapperKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapperKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessorTest.kt
index b82c8dfbfb..308d2f66a6 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -156,10 +157,12 @@ class MatrixTimelineDiffProcessorTest {
 }
 
 internal fun TestScope.createMatrixTimelineDiffProcessor(
-    timelineItems: MutableSharedFlow<List<MatrixTimelineItem>>,
-): MatrixTimelineDiffProcessor {
+    timelineItems: MutableSharedFlow<List<MatrixTimelineItem>> = MutableSharedFlow(),
+    membershipChangeEventReceivedFlow: MutableSharedFlow<Unit> = MutableSharedFlow(),
+    syncedEventReceivedFlow: MutableSharedFlow<Unit> = MutableSharedFlow(),
+    ): MatrixTimelineDiffProcessor {
     val timelineEventContentMapper = TimelineEventContentMapper()
-    val timelineItemMapper = MatrixTimelineItemMapper(
+    val timelineItemFactory = MatrixTimelineItemMapper(
         fetchDetailsForEvent = { _ -> Result.success(Unit) },
         coroutineScope = this,
         virtualTimelineItemMapper = VirtualTimelineItemMapper(),
@@ -169,6 +172,8 @@ internal fun TestScope.createMatrixTimelineDiffProcessor(
     )
     return MatrixTimelineDiffProcessor(
         timelineItems = timelineItems,
-        timelineItemFactory = timelineItemMapper,
+        membershipChangeEventReceivedFlow = membershipChangeEventReceivedFlow,
+        syncedEventReceivedFlow = syncedEventReceivedFlow,
+        timelineItemMapper = timelineItemFactory,
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapperKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapperKtTest.kt
index 79e4f149bc..792a52b253 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapperKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/ReceiptTypeMapperKtTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt
index 8bcd56978e..ab46e8aa5f 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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)
@@ -96,7 +97,6 @@ private fun TestScope.createRustTimeline(
     coroutineScope: CoroutineScope = backgroundScope,
     dispatcher: CoroutineDispatcher = testCoroutineDispatchers().io,
     roomContentForwarder: RoomContentForwarder = RoomContentForwarder(FakeFfiRoomListService()),
-    onNewSyncedEvent: () -> Unit = {},
 ): RustTimeline {
     return RustTimeline(
         inner = inner,
@@ -106,6 +106,5 @@ private fun TestScope.createRustTimeline(
         coroutineScope = coroutineScope,
         dispatcher = dispatcher,
         roomContentForwarder = roomContentForwarder,
-        onNewSyncedEvent = onNewSyncedEvent,
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriberTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriberTest.kt
index 1df51dc5c2..9a03374d7e 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriberTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/TimelineItemsSubscriberTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,8 +14,6 @@ import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustEventTimelineItem
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimeline
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineItem
-import io.element.android.tests.testutils.lambda.lambdaError
-import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -33,9 +32,12 @@ class TimelineItemsSubscriberTest {
         val timelineItems: MutableSharedFlow<List<MatrixTimelineItem>> =
             MutableSharedFlow(replay = 1, extraBufferCapacity = Int.MAX_VALUE)
         val timeline = FakeFfiTimeline()
+        val diffProcessor = createMatrixTimelineDiffProcessor(
+            timelineItems = timelineItems,
+        )
         val timelineItemsSubscriber = createTimelineItemsSubscriber(
             timeline = timeline,
-            timelineItems = timelineItems,
+            timelineDiffProcessor = diffProcessor,
         )
         timelineItems.test {
             timelineItemsSubscriber.subscribeIfNeeded()
@@ -53,9 +55,12 @@ class TimelineItemsSubscriberTest {
         val timelineItems: MutableSharedFlow<List<MatrixTimelineItem>> =
             MutableSharedFlow(replay = 1, extraBufferCapacity = Int.MAX_VALUE)
         val timeline = FakeFfiTimeline()
+        val diffProcessor = createMatrixTimelineDiffProcessor(
+            timelineItems = timelineItems,
+        )
         val timelineItemsSubscriber = createTimelineItemsSubscriber(
             timeline = timeline,
-            timelineItems = timelineItems,
+            timelineDiffProcessor = diffProcessor,
         )
         timelineItems.test {
             timelineItemsSubscriber.subscribeIfNeeded()
@@ -69,15 +74,16 @@ class TimelineItemsSubscriberTest {
     }
 
     @Test
-    fun `when timeline emits an item with SYNC origin, the callback onNewSyncedEvent is invoked`() = runTest {
+    fun `when timeline emits an item with SYNC origin`() = runTest {
         val timelineItems: MutableSharedFlow<List<MatrixTimelineItem>> =
             MutableSharedFlow(replay = 1, extraBufferCapacity = Int.MAX_VALUE)
         val timeline = FakeFfiTimeline()
-        val onNewSyncedEventRecorder = lambdaRecorder<Unit> { }
+        val diffProcessor = createMatrixTimelineDiffProcessor(
+            timelineItems = timelineItems,
+        )
         val timelineItemsSubscriber = createTimelineItemsSubscriber(
             timeline = timeline,
-            timelineItems = timelineItems,
-            onNewSyncedEvent = onNewSyncedEventRecorder,
+            timelineDiffProcessor = diffProcessor,
         )
         timelineItems.test {
             timelineItemsSubscriber.subscribeIfNeeded()
@@ -96,7 +102,6 @@ class TimelineItemsSubscriberTest {
             assertThat(final).isNotEmpty()
             timelineItemsSubscriber.unsubscribeIfNeeded()
         }
-        onNewSyncedEventRecorder.assertions().isCalledOnce()
     }
 
     @Test
@@ -111,14 +116,12 @@ class TimelineItemsSubscriberTest {
 
 private fun TestScope.createTimelineItemsSubscriber(
     timeline: Timeline = FakeFfiTimeline(),
-    timelineItems: MutableSharedFlow<List<MatrixTimelineItem>> = MutableSharedFlow(replay = 1, extraBufferCapacity = Int.MAX_VALUE),
-    onNewSyncedEvent: () -> Unit = { lambdaError() },
+    timelineDiffProcessor: MatrixTimelineDiffProcessor = createMatrixTimelineDiffProcessor(),
 ): TimelineItemsSubscriber {
     return TimelineItemsSubscriber(
         timelineCoroutineScope = backgroundScope,
         dispatcher = StandardTestDispatcher(testScheduler),
         timeline = timeline,
-        timelineDiffProcessor = createMatrixTimelineDiffProcessor(timelineItems),
-        onNewSyncedEvent = onNewSyncedEvent,
+        timelineDiffProcessor = timelineDiffProcessor,
     )
 }
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 63deb34530..50f8637096 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessorTest.kt
index 0d2dd743f5..3d68210ea4 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LastForwardIndicatorsPostProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt
index 881d718392..371d936975 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/LoadingIndicatorsPostProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bfb3660fc6..dbeba39973 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapperTest.kt
index 390b318f65..3926b93d12 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/usersearch/UserSearchResultMapperTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 43e5a98e50..8edc95cdc6 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/build.gradle.kts b/libraries/matrix/test/build.gradle.kts
index 962277cca5..ccb1a37a25 100644
--- a/libraries/matrix/test/build.gradle.kts
+++ b/libraries/matrix/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,6 +19,7 @@ dependencies {
     api(projects.libraries.matrix.api)
     api(libs.coroutines.core)
     implementation(libs.coroutines.test)
+    implementation(projects.libraries.matrix.impl)
     implementation(projects.services.analytics.api)
     implementation(projects.tests.testutils)
     implementation(libs.kotlinx.collections.immutable)
diff --git a/libraries/matrix/test/src/main/AndroidManifest.xml b/libraries/matrix/test/src/main/AndroidManifest.xml
index 5c0a832239..608f16cc36 100644
--- a/libraries/matrix/test/src/main/AndroidManifest.xml
+++ b/libraries/matrix/test/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
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 f0e296ea5d..a740e71b0c 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
@@ -1,14 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.MatrixClient
+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.EventId
 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
@@ -16,6 +19,8 @@ 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.createroom.CreateRoomParameters
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
+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.media.MediaPreviewService
 import io.element.android.libraries.matrix.api.notification.NotificationService
@@ -93,6 +98,9 @@ class FakeMatrixClient(
     private val deactivateAccountResult: (String, Boolean) -> Result<Unit> = { _, _ -> lambdaError() },
     private val currentSlidingSyncVersionLambda: () -> Result<SlidingSyncVersion> = { lambdaError() },
     private val ignoreUserResult: (UserId) -> Result<Unit> = { lambdaError() },
+    private val canLinkNewDeviceResult: () -> Result<Boolean> = { lambdaError() },
+    private val createLinkMobileHandlerResult: () -> Result<LinkMobileHandler> = { lambdaError() },
+    private val createLinkDesktopHandlerResult: () -> Result<LinkDesktopHandler> = { lambdaError() },
     private var unIgnoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
     private val canReportRoomLambda: () -> Boolean = { false },
     private val isLivekitRtcSupportedLambda: () -> Boolean = { false },
@@ -101,6 +109,9 @@ class FakeMatrixClient(
     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 performDatabaseVacuumLambda: () -> Result<Unit> = { lambdaError() },
+    private val getDatabaseSizesLambda: () -> Result<SdkStoreSizes> = { lambdaError() },
 ) : MatrixClient {
     var setDisplayNameCalled: Boolean = false
         private set
@@ -180,6 +191,10 @@ class FakeMatrixClient(
         return 0
     }
 
+    override suspend fun getDatabaseSizes(): Result<SdkStoreSizes> {
+        return getDatabaseSizesLambda()
+    }
+
     override suspend fun clearCache() = simulateLongTask {
         clearCacheLambda()
     }
@@ -344,4 +359,24 @@ class FakeMatrixClient(
     override suspend fun getRecentEmojis(): Result<List<String>> {
         return getRecentEmojisLambda()
     }
+
+    override suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result<Unit> {
+        return markRoomAsFullyReadResult(roomId, eventId)
+    }
+
+    override suspend fun performDatabaseVacuum(): Result<Unit> {
+        return performDatabaseVacuumLambda()
+    }
+
+    override suspend fun canLinkNewDevice(): Result<Boolean> = simulateLongTask {
+        return canLinkNewDeviceResult()
+    }
+
+    override fun createLinkDesktopHandler(): Result<LinkDesktopHandler> {
+        return createLinkDesktopHandlerResult()
+    }
+
+    override fun createLinkMobileHandler(): Result<LinkMobileHandler> {
+        return createLinkMobileHandlerResult()
+    }
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClientProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClientProvider.kt
index 700653e506..228ae94088 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClientProvider.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClientProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeSdkMetadata.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeSdkMetadata.kt
index c94708caf3..d10e96745d 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeSdkMetadata.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeSdkMetadata.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt
index f05f6958c0..dcacadd975 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.auth.MatrixHomeServerDetails
+import androidx.annotation.ColorInt
 import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -78,8 +79,6 @@ const val AN_ACCOUNT_PROVIDER = "matrix.org"
 const val AN_ACCOUNT_PROVIDER_2 = "element.io"
 const val AN_ACCOUNT_PROVIDER_3 = "other.io"
 
-val A_HOMESERVER = MatrixHomeServerDetails(A_HOMESERVER_URL, supportsPasswordLogin = true, supportsOidcLogin = false)
-val A_HOMESERVER_OIDC = MatrixHomeServerDetails(A_HOMESERVER_URL, supportsPasswordLogin = false, supportsOidcLogin = true)
 val A_ROOM_NOTIFICATION_MODE = RoomNotificationMode.MUTE
 
 const val AN_AVATAR_URL = "mxc://data"
@@ -98,3 +97,34 @@ const val A_TIMESTAMP = 567L
 const val A_FORMATTED_DATE = "April 6, 1980 at 6:35 PM"
 
 const val A_LOGIN_HINT = "mxid:@alice:example.org"
+
+@ColorInt
+const val A_COLOR_INT: Int = 0xFFFF0000.toInt()
+
+// From https://github.com/matrix-org/matrix-rust-sdk/blob/3a63838cdb50cde3d74da920186fbae0a2e6db37/crates/matrix-sdk-crypto/src/types/qr_login.rs#L275
+// Test vector for the QR code data, copied from the MSC.
+@Suppress("ktlint:standard:argument-list-wrapping")
+val QR_CODE_DATA = listOf(
+    0x4D, 0x41, 0x54, 0x52, 0x49, 0x58, 0x02, 0x03, 0xd8, 0x86, 0x68, 0x6a, 0xb2, 0x19, 0x7b,
+    0x78, 0x0e, 0x30, 0x0a, 0x9d, 0x4a, 0x21, 0x47, 0x48, 0x07, 0x00, 0xd7, 0x92, 0x9f, 0x39,
+    0xab, 0x31, 0xb9, 0xe5, 0x14, 0x37, 0x02, 0x48, 0xed, 0x6b, 0x00, 0x47, 0x68, 0x74, 0x74,
+    0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x7a, 0x76, 0x6f, 0x75, 0x73,
+    0x2e, 0x6c, 0x61, 0x62, 0x2e, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x64, 0x65,
+    0x76, 0x2f, 0x65, 0x38, 0x64, 0x61, 0x36, 0x33, 0x35, 0x35, 0x2d, 0x35, 0x35, 0x30, 0x62,
+    0x2d, 0x34, 0x61, 0x33, 0x32, 0x2d, 0x61, 0x31, 0x39, 0x33, 0x2d, 0x31, 0x36, 0x31, 0x39,
+    0x64, 0x39, 0x38, 0x33, 0x30, 0x36, 0x36, 0x38,
+).map { it.toByte() }.toByteArray()
+
+// Test vector for the QR code data, copied from the MSC, with the mode set to reciprocate.
+@Suppress("ktlint:standard:argument-list-wrapping")
+val QR_CODE_DATA_RECIPROCATE = listOf(
+    0x4D, 0x41, 0x54, 0x52, 0x49, 0x58, 0x02, 0x04, 0xd8, 0x86, 0x68, 0x6a, 0xb2, 0x19, 0x7b,
+    0x78, 0x0e, 0x30, 0x0a, 0x9d, 0x4a, 0x21, 0x47, 0x48, 0x07, 0x00, 0xd7, 0x92, 0x9f, 0x39,
+    0xab, 0x31, 0xb9, 0xe5, 0x14, 0x37, 0x02, 0x48, 0xed, 0x6b, 0x00, 0x47, 0x68, 0x74, 0x74,
+    0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x7a, 0x76, 0x6f, 0x75, 0x73,
+    0x2e, 0x6c, 0x61, 0x62, 0x2e, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x64, 0x65,
+    0x76, 0x2f, 0x65, 0x38, 0x64, 0x61, 0x36, 0x33, 0x35, 0x35, 0x2d, 0x35, 0x35, 0x30, 0x62,
+    0x2d, 0x34, 0x61, 0x33, 0x32, 0x2d, 0x61, 0x31, 0x39, 0x33, 0x2d, 0x31, 0x36, 0x31, 0x39,
+    0x64, 0x39, 0x38, 0x33, 0x30, 0x36, 0x36, 0x38, 0x00, 0x0A, 0x6d, 0x61, 0x74, 0x72, 0x69,
+    0x78, 0x2e, 0x6f, 0x72, 0x67,
+).map { it.toByte() }.toByteArray()
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/analytics/FakeAnalyticsSdkManager.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/analytics/FakeAnalyticsSdkManager.kt
new file mode 100644
index 0000000000..ab4fd48477
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/analytics/FakeAnalyticsSdkManager.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.test.analytics
+
+import io.element.android.services.analytics.api.AnalyticsSdkManager
+import io.element.android.services.analytics.api.AnalyticsSdkSpan
+import io.element.android.services.analytics.api.NoopAnalyticsSdkSpan
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeAnalyticsSdkManager(
+    private val enableSdkAnalyticsLambda: ((Boolean) -> Unit) = { lambdaError() },
+) : AnalyticsSdkManager {
+    override fun enableSdkAnalytics(enabled: Boolean) {
+        enableSdkAnalyticsLambda(enabled)
+    }
+
+    override fun startSpan(name: String, parentTraceId: String?): AnalyticsSdkSpan = NoopAnalyticsSdkSpan
+    override fun bridge(parentTraceId: String?): AnalyticsSdkSpan = NoopAnalyticsSdkSpan
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeHomeServerLoginCompatibilityChecker.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeHomeServerLoginCompatibilityChecker.kt
new file mode 100644
index 0000000000..83c83e3012
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeHomeServerLoginCompatibilityChecker.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.matrix.test.auth
+
+import io.element.android.libraries.matrix.api.auth.HomeServerLoginCompatibilityChecker
+
+class FakeHomeServerLoginCompatibilityChecker(
+    private val checkResult: (String) -> Result<Boolean>,
+) : HomeServerLoginCompatibilityChecker {
+    override suspend fun check(url: String): Result<Boolean> {
+        return checkResult(url)
+    }
+}
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 f1554df1d0..c4acccb55c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,8 +23,6 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.simulateLongTask
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 
 val A_OIDC_DATA = OidcDetails(url = "a-url")
 
@@ -31,13 +30,12 @@ class FakeMatrixAuthenticationService(
     var matrixClientResult: ((SessionId) -> Result<MatrixClient>)? = null,
     var loginWithQrCodeResult: (qrCodeData: MatrixQrCodeLoginData, progress: (QrCodeLoginStep) -> Unit) -> Result<SessionId> =
         lambdaRecorder<MatrixQrCodeLoginData, (QrCodeLoginStep) -> Unit, Result<SessionId>> { _, _ -> Result.success(A_SESSION_ID) },
-    private val importCreatedSessionLambda: (ExternalSession) -> Result<SessionId> = { lambdaError() }
+    private val importCreatedSessionLambda: (ExternalSession) -> Result<SessionId> = { lambdaError() },
+    private val setHomeserverResult: (String) -> Result<MatrixHomeServerDetails> = { lambdaError() },
 ) : MatrixAuthenticationService {
-    private val homeserver = MutableStateFlow<MatrixHomeServerDetails?>(null)
     private var oidcError: Throwable? = null
     private var oidcCancelError: Throwable? = null
     private var loginError: Throwable? = null
-    private var changeServerError: Throwable? = null
     private var matrixClient: MatrixClient? = null
     private var onAuthenticationListener: ((MatrixClient) -> Unit)? = null
 
@@ -53,16 +51,8 @@ class FakeMatrixAuthenticationService(
         }
     }
 
-    override fun getHomeserverDetails(): StateFlow<MatrixHomeServerDetails?> {
-        return homeserver
-    }
-
-    fun givenHomeserver(homeserver: MatrixHomeServerDetails) {
-        this.homeserver.value = homeserver
-    }
-
-    override suspend fun setHomeserver(homeserver: String): Result<Unit> = simulateLongTask {
-        changeServerError?.let { Result.failure(it) } ?: Result.success(Unit)
+    override suspend fun setHomeserver(homeserver: String): Result<MatrixHomeServerDetails> = simulateLongTask {
+        setHomeserverResult(homeserver)
     }
 
     override suspend fun login(username: String, password: String): Result<SessionId> = simulateLongTask {
@@ -115,10 +105,6 @@ class FakeMatrixAuthenticationService(
         loginError = throwable
     }
 
-    fun givenChangeServerError(throwable: Throwable?) {
-        changeServerError = throwable
-    }
-
     fun givenMatrixClient(matrixClient: MatrixClient) {
         this.matrixClient = matrixClient
     }
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/FakeOidcRedirectUrlProvider.kt
index e8226009d4..47c9b0951d 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/FakeOidcRedirectUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..3b9573bcfc
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/MatrixHomeServerDetails.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.matrix.test.auth
+
+import io.element.android.libraries.matrix.api.auth.MatrixHomeServerDetails
+import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
+
+fun aMatrixHomeServerDetails(
+    url: String = A_HOMESERVER_URL,
+    supportsPasswordLogin: Boolean = false,
+    supportsOidcLogin: Boolean = false,
+) = MatrixHomeServerDetails(
+    url = url,
+    supportsPasswordLogin = supportsPasswordLogin,
+    supportsOidcLogin = supportsOidcLogin,
+)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/qrlogin/FakeMatrixQrCodeLoginDataFactory.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/qrlogin/FakeMatrixQrCodeLoginDataFactory.kt
index 344b567589..c601337ca3 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/qrlogin/FakeMatrixQrCodeLoginDataFactory.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/qrlogin/FakeMatrixQrCodeLoginDataFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
index 73fd83889b..510e2bc535 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/FakeSendHandle.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/FakeSendHandle.kt
index dcb148f77a..abbf5d360a 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/FakeSendHandle.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/FakeSendHandle.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b4199ff8e4..04e3779298 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
@@ -1,12 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.BackupState
 import io.element.android.libraries.matrix.api.encryption.BackupUploadState
@@ -24,7 +26,6 @@ import kotlinx.coroutines.flow.flowOf
 class FakeEncryptionService(
     var startIdentityResetLambda: () -> Result<IdentityResetHandle?> = { lambdaError() },
     private val pinUserIdentityResult: (UserId) -> Result<Unit> = { lambdaError() },
-    private val isUserVerifiedResult: (UserId) -> Result<Boolean> = { lambdaError() },
     private val withdrawVerificationResult: (UserId) -> Result<Unit> = { lambdaError() },
     private val getUserIdentityResult: (UserId) -> Result<IdentityState?> = { lambdaError() },
     private val enableRecoveryLambda: (Boolean) -> Result<Unit> = { lambdaError() },
@@ -34,7 +35,7 @@ class FakeEncryptionService(
     override val recoveryStateStateFlow: MutableStateFlow<RecoveryState> = MutableStateFlow(RecoveryState.UNKNOWN)
     override val enableRecoveryProgressStateFlow: MutableStateFlow<EnableRecoveryProgress> = MutableStateFlow(EnableRecoveryProgress.Starting)
     override val isLastDevice: MutableStateFlow<Boolean> = MutableStateFlow(false)
-    override val hasDevicesToVerifyAgainst: MutableStateFlow<Boolean> = MutableStateFlow(true)
+    override val hasDevicesToVerifyAgainst: MutableStateFlow<AsyncData<Boolean>> = MutableStateFlow(AsyncData.Uninitialized)
     private var waitForBackupUploadSteadyStateFlow: Flow<BackupUploadState> = flowOf()
 
     private var recoverFailure: Exception? = null
@@ -84,7 +85,7 @@ class FakeEncryptionService(
         this.isLastDevice.value = isLastDevice
     }
 
-    fun emitHasDevicesToVerifyAgainst(hasDevicesToVerifyAgainst: Boolean) {
+    fun emitHasDevicesToVerifyAgainst(hasDevicesToVerifyAgainst: AsyncData<Boolean>) {
         this.hasDevicesToVerifyAgainst.value = hasDevicesToVerifyAgainst
     }
 
@@ -137,11 +138,7 @@ class FakeEncryptionService(
         return withdrawVerificationResult(userId)
     }
 
-    override suspend fun isUserVerified(userId: UserId): Result<Boolean> = simulateLongTask {
-        isUserVerifiedResult(userId)
-    }
-
-    override suspend fun getUserIdentity(userId: UserId): Result<IdentityState?> = simulateLongTask {
+    override suspend fun getUserIdentity(userId: UserId, fallbackToServer: Boolean): Result<IdentityState?> = simulateLongTask {
         return getUserIdentityResult(userId)
     }
 
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 e3579adda9..06ffeb547c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeCheckCodeSender.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeCheckCodeSender.kt
new file mode 100644
index 0000000000..a0692b6f5c
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeCheckCodeSender.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.test.linknewdevice
+
+import io.element.android.libraries.matrix.api.linknewdevice.CheckCodeSender
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+
+class FakeCheckCodeSender(
+    private val validateResult: (UByte) -> Boolean = { lambdaError() },
+    private val sendResult: (UByte) -> Result<Unit> = { lambdaError() },
+) : CheckCodeSender {
+    override suspend fun validate(code: UByte): Boolean = simulateLongTask {
+        validateResult(code)
+    }
+
+    override suspend fun send(code: UByte): Result<Unit> = simulateLongTask {
+        sendResult(code)
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeLinkDesktopHandler.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeLinkDesktopHandler.kt
new file mode 100644
index 0000000000..0bf9dafd01
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeLinkDesktopHandler.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.test.linknewdevice
+
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import io.element.android.tests.testutils.lambda.lambdaError
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class FakeLinkDesktopHandler(
+    private val handleScannedQrCodeResult: (ByteArray) -> Unit = { lambdaError() },
+) : LinkDesktopHandler {
+    private val mutableLinkDesktopStep: MutableStateFlow<LinkDesktopStep> = MutableStateFlow(LinkDesktopStep.Uninitialized)
+    override val linkDesktopStep: StateFlow<LinkDesktopStep>
+        get() = mutableLinkDesktopStep.asStateFlow()
+
+    override suspend fun handleScannedQrCode(data: ByteArray) {
+        handleScannedQrCodeResult(data)
+    }
+
+    suspend fun emitStep(step: LinkDesktopStep) {
+        mutableLinkDesktopStep.emit(step)
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeLinkMobileHandler.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeLinkMobileHandler.kt
new file mode 100644
index 0000000000..de704ea2dd
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/linknewdevice/FakeLinkMobileHandler.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.test.linknewdevice
+
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+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.asStateFlow
+
+class FakeLinkMobileHandler(
+    private val startResult: () -> Unit = { lambdaError() },
+) : LinkMobileHandler {
+    private val mutableLinkMobileStep: MutableStateFlow<LinkMobileStep> = MutableStateFlow(LinkMobileStep.Uninitialized)
+    override val linkMobileStep: StateFlow<LinkMobileStep>
+        get() = mutableLinkMobileStep.asStateFlow()
+
+    override suspend fun start() = simulateLongTask {
+        startResult()
+    }
+
+    suspend fun emitStep(step: LinkMobileStep) {
+        mutableLinkMobileStep.emit(step)
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
index 4e915432a5..3b2dc36603 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaFile.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaFile.kt
index c2049862ed..88572c8e4c 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaFile.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaFile.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaPreviewService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaPreviewService.kt
index d8e9114817..47ddb82357 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaPreviewService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaPreviewService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaUploadHandler.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaUploadHandler.kt
index 5df91dd41f..63b184a81f 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaUploadHandler.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaUploadHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/MediaSource.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/MediaSource.kt
index d7324e8b42..501749e5f4 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/MediaSource.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/MediaSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..c348cd351c
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/mxc/FakeMxcTools.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.test.mxc
+
+import io.element.android.libraries.matrix.api.mxc.MxcTools
+import io.element.android.libraries.matrix.impl.mxc.DefaultMxcTools
+
+class FakeMxcTools(
+    private val delegate: MxcTools = DefaultMxcTools()
+) : MxcTools by delegate
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt
index 4e17265f7a..e09d71b069 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/NotificationData.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/NotificationData.kt
index 2bfd54954b..b6b6cb66e9 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/NotificationData.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/NotificationData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,6 +21,7 @@ import io.element.android.libraries.matrix.test.A_USER_NAME_2
 fun aNotificationData(
     content: NotificationContent = NotificationContent.MessageLike.RoomEncrypted,
     isDirect: Boolean = false,
+    isSpace: Boolean = false,
     hasMention: Boolean = false,
     threadId: ThreadId? = null,
     timestamp: Long = A_TIMESTAMP,
@@ -39,6 +41,7 @@ fun aNotificationData(
         roomDisplayName = roomDisplayName,
         isDirect = isDirect,
         isDm = false,
+        isSpace = isSpace,
         isEncrypted = false,
         isNoisy = false,
         timestamp = timestamp,
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 c5c09981fc..564cd231b2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,8 +12,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
-import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NOTIFICATION_MODE
+import io.element.android.tests.testutils.lambda.lambdaError
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 
@@ -23,6 +24,8 @@ class FakeNotificationSettingsService(
     initialEncryptedGroupDefaultMode: RoomNotificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
     initialOneToOneDefaultMode: RoomNotificationMode = RoomNotificationMode.ALL_MESSAGES,
     initialEncryptedOneToOneDefaultMode: RoomNotificationMode = RoomNotificationMode.ALL_MESSAGES,
+    private val getRawPushRulesResult: () -> Result<String> = { lambdaError() },
+    private val getRoomsWithUserDefinedRulesResult: () -> Result<List<RoomId>> = { lambdaError() },
 ) : NotificationSettingsService {
     private val notificationSettingsStateFlow = MutableStateFlow(Unit)
     private var defaultGroupRoomNotificationMode: RoomNotificationMode = initialGroupDefaultMode
@@ -151,8 +154,8 @@ class FakeNotificationSettingsService(
         return Result.success(Unit)
     }
 
-    override suspend fun getRoomsWithUserDefinedRules(): Result<List<String>> {
-        return Result.success(if (roomNotificationModeIsDefault) listOf() else listOf(A_ROOM_ID.value))
+    override suspend fun getRoomsWithUserDefinedRules(): Result<List<RoomId>> {
+        return getRoomsWithUserDefinedRulesResult()
     }
 
     override suspend fun canHomeServerPushEncryptedEventsToDevice(): Result<Boolean> {
@@ -178,4 +181,8 @@ class FakeNotificationSettingsService(
     fun givenCanHomeServerPushEncryptedEventsToDeviceResult(result: Result<Boolean>) {
         canHomeServerPushEncryptedEventsToDeviceResult = result
     }
+
+    override suspend fun getRawPushRules(): Result<String?> {
+        return getRawPushRulesResult()
+    }
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkBuilder.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkBuilder.kt
index 598243ed70..461d59cf1d 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkBuilder.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkBuilder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkParser.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkParser.kt
index c00ab8f113..65aa7f9333 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkParser.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/permalink/FakePermalinkParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/pushers/FakePushersService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/pushers/FakePushersService.kt
index fafc1e9b6d..ec1efee542 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/pushers/FakePushersService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/pushers/FakePushersService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 31309beecf..78765d1ec4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,18 +15,18 @@ 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.core.UserId
 import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
 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.room.RoomMembersState
-import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+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
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 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.room.powerlevels.FakeRoomPermissions
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
 import kotlinx.coroutines.CoroutineScope
@@ -39,6 +40,7 @@ class FakeBaseRoom(
     override val sessionId: SessionId = A_SESSION_ID,
     override val roomId: RoomId = A_ROOM_ID,
     initialRoomInfo: RoomInfo = aRoomInfo(),
+    private val roomPermissions: RoomPermissions = FakeRoomPermissions(),
     override val roomCoroutineScope: CoroutineScope = TestScope(),
     private var roomPermalinkResult: () -> Result<String> = { lambdaError() },
     private var eventPermalinkResult: (EventId) -> Result<String> = { lambdaError() },
@@ -47,16 +49,6 @@ class FakeBaseRoom(
     private val userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
     private val getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
     private val joinRoomResult: () -> Result<Unit> = { lambdaError() },
-    private val canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canKickResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canBanResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canRedactOwnResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canRedactOtherResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
-    private val canUserSendMessageResult: (UserId, MessageEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
-    private val canUserTriggerRoomNotificationResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canUserJoinCallResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canUserPinUnpinResult: (UserId) -> Result<Boolean> = { lambdaError() },
     private val setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
     private val markAsReadResult: (ReceiptType) -> Result<Unit> = { Result.success(Unit) },
     private val powerLevelsResult: () -> Result<RoomPowerLevelsValues> = { lambdaError() },
@@ -128,6 +120,10 @@ class FakeBaseRoom(
         return userRoleResult()
     }
 
+    override suspend fun roomPermissions(): Result<RoomPermissions> {
+        return Result.success(roomPermissions)
+    }
+
     override suspend fun getPermalink(): Result<String> {
         return roomPermalinkResult()
     }
@@ -152,46 +148,6 @@ class FakeBaseRoom(
         return forgetResult()
     }
 
-    override suspend fun canUserBan(userId: UserId): Result<Boolean> {
-        return canBanResult(userId)
-    }
-
-    override suspend fun canUserKick(userId: UserId): Result<Boolean> {
-        return canKickResult(userId)
-    }
-
-    override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
-        return canInviteResult(userId)
-    }
-
-    override suspend fun canUserRedactOwn(userId: UserId): Result<Boolean> {
-        return canRedactOwnResult(userId)
-    }
-
-    override suspend fun canUserRedactOther(userId: UserId): Result<Boolean> {
-        return canRedactOtherResult(userId)
-    }
-
-    override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
-        return canSendStateResult(userId, type)
-    }
-
-    override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> {
-        return canUserSendMessageResult(userId, type)
-    }
-
-    override suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean> {
-        return canUserTriggerRoomNotificationResult(userId)
-    }
-
-    override suspend fun canUserJoinCall(userId: UserId): Result<Boolean> {
-        return canUserJoinCallResult(userId)
-    }
-
-    override suspend fun canUserPinUnpin(userId: UserId): Result<Boolean> {
-        return canUserPinUnpinResult(userId)
-    }
-
     override suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit> {
         return setIsFavoriteResult(isFavorite)
     }
@@ -255,9 +211,11 @@ fun defaultRoomPowerLevelValues() = RoomPowerLevelsValues(
     ban = 50,
     invite = 0,
     kick = 50,
-    sendEvents = 0,
+    eventsDefault = 0,
+    stateDefault = 50,
     redactEvents = 50,
-    roomName = 100,
-    roomAvatar = 100,
-    roomTopic = 100
+    roomName = 50,
+    roomAvatar = 50,
+    roomTopic = 50,
+    spaceChild = 50,
 )
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 4681937b42..2d9694c909 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt
index 7691aa58c6..6c1c7c2ea9 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt
@@ -1,13 +1,13 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.NotJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
@@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
 
-@Immutable
 class FakeNotJoinedRoom(
     override val localRoom: BaseRoom? = null,
     override val previewInfo: RoomPreviewInfo = aRoomPreviewInfo(),
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt
new file mode 100644
index 0000000000..32d6cc927c
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/LatestEventValueFixture.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.test.room
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.timeline.aMessageContent
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
+
+fun aRemoteLatestEvent(
+    content: EventContent = aMessageContent(),
+    timestamp: Long = 0L,
+    isOwn: Boolean = false,
+    senderId: UserId = A_USER_ID,
+    senderProfile: ProfileDetails = aProfileDetails(),
+): LatestEventValue.Remote {
+    return LatestEventValue.Remote(
+        timestamp = timestamp,
+        content = content,
+        senderId = senderId,
+        senderProfile = senderProfile,
+        isOwn = isOwn,
+    )
+}
+
+fun aLocalLatestEvent(
+    content: EventContent = aMessageContent(),
+    timestamp: Long = 0L,
+    isSending: Boolean = false,
+    senderId: UserId = A_USER_ID,
+    senderProfile: ProfileDetails = aProfileDetails(),
+): LatestEventValue.Local {
+    return LatestEventValue.Local(
+        timestamp = timestamp,
+        content = content,
+        senderId = senderId,
+        senderProfile = senderProfile,
+        isSending = isSending,
+    )
+}
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 6955942146..71ed8b83be 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -52,7 +53,7 @@ fun aRoomInfo(
     notificationCount: Long = 0,
     userDefinedNotificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,
-    roomPowerLevels: RoomPowerLevels = RoomPowerLevels(
+    roomPowerLevels: RoomPowerLevels? = RoomPowerLevels(
         values = defaultRoomPowerLevelValues(),
         users = persistentMapOf(),
     ),
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 9dc72247f0..f6bc0c5ec2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt
index 74a58354a5..6d1f6da928 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c15d29eff8..8568e3c916 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,28 +18,24 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 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.message.RoomMessage
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
+import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.user.MatrixUser
-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_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_RAW_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
-import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 
 fun aRoomSummary(
     info: RoomInfo = aRoomInfo(),
-    lastMessage: RoomMessage? = aRoomMessage(),
+    latestEventValue: LatestEventValue = aRemoteLatestEvent(),
 ) = RoomSummary(
     info = info,
-    lastMessage = lastMessage,
+    latestEvent = latestEventValue,
 )
 
 fun aRoomSummary(
@@ -78,7 +75,7 @@ fun aRoomSummary(
     numUnreadNotifications: Long = 0,
     numUnreadMentions: Long = 0,
     historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
-    lastMessage: RoomMessage? = aRoomMessage(),
+    latestEvent: LatestEventValue = aRemoteLatestEvent(),
     roomVersion: String? = "11",
     privilegedCreatorRole: Boolean = false,
 ) = RoomSummary(
@@ -119,17 +116,5 @@ fun aRoomSummary(
         roomVersion = roomVersion,
         privilegedCreatorRole = privilegedCreatorRole,
     ),
-    lastMessage = lastMessage,
-)
-
-fun aRoomMessage(
-    eventId: EventId = AN_EVENT_ID,
-    event: EventTimelineItem = anEventTimelineItem(),
-    userId: UserId = A_USER_ID,
-    timestamp: Long = 0L,
-) = RoomMessage(
-    eventId = eventId,
-    event = event,
-    sender = userId,
-    originServerTs = timestamp,
+    latestEvent = latestEvent,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/alias/FakeRoomAliasHelper.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/alias/FakeRoomAliasHelper.kt
index 7d31f7b03f..d2ba6afced 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/alias/FakeRoomAliasHelper.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/alias/FakeRoomAliasHelper.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/join/FakeJoinRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/join/FakeJoinRoom.kt
index 05438d1ef5..e2689304f4 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/join/FakeJoinRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/join/FakeJoinRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/knock/FakeKnockRequest.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/knock/FakeKnockRequest.kt
index 617804092c..9fd77063ae 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/knock/FakeKnockRequest.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/knock/FakeKnockRequest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/powerlevels/FakeRoomPermissions.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/powerlevels/FakeRoomPermissions.kt
new file mode 100644
index 0000000000..b78dc9ba1b
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/powerlevels/FakeRoomPermissions.kt
@@ -0,0 +1,58 @@
+/*
+ * 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.test.room.powerlevels
+
+import io.element.android.libraries.matrix.api.core.UserId
+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
+
+data class FakeRoomPermissions(
+    private val canBan: Boolean = false,
+    private val canInvite: Boolean = false,
+    private val canKick: Boolean = false,
+    private val canPinUnpin: Boolean = false,
+    private val canRedactOther: Boolean = false,
+    private val canRedactOwn: Boolean = false,
+    private val canTriggerRoomNotification: Boolean = false,
+    private val canSendMessage: (MessageEventType) -> Boolean = { false },
+    private val canSendState: (StateEventType) -> Boolean = { false },
+    private val canUserBan: (UserId) -> Boolean = { false },
+    private val canUserInvite: (UserId) -> Boolean = { false },
+    private val canUserKick: (UserId) -> Boolean = { false },
+    private val canUserPinUnpin: (UserId) -> Boolean = { false },
+    private val canUserRedactOther: (UserId) -> Boolean = { false },
+    private val canUserRedactOwn: (UserId) -> Boolean = { false },
+    private val canUserTriggerRoomNotification: (UserId) -> Boolean = { false },
+    private val canUserSendMessage: (UserId, MessageEventType) -> Boolean = { _, _ -> false },
+    private val canUserSendState: (UserId, StateEventType) -> Boolean = { _, _ -> false },
+) : RoomPermissions {
+    override fun canOwnUserBan(): Boolean = canBan
+    override fun canOwnUserInvite(): Boolean = canInvite
+    override fun canOwnUserKick(): Boolean = canKick
+    override fun canOwnUserPinUnpin(): Boolean = canPinUnpin
+    override fun canOwnUserRedactOther(): Boolean = canRedactOther
+    override fun canOwnUserRedactOwn(): Boolean = canRedactOwn
+    override fun canOwnUserSendMessage(message: MessageEventType): Boolean = canSendMessage(message)
+    override fun canOwnUserSendState(stateEvent: StateEventType): Boolean = canSendState(stateEvent)
+
+    override fun canOwnUserTriggerRoomNotification(): Boolean = canTriggerRoomNotification
+    override fun canUserBan(userId: UserId): Boolean = canUserBan(userId)
+    override fun canUserInvite(userId: UserId): Boolean = canUserInvite(userId)
+    override fun canUserKick(userId: UserId): Boolean = canUserKick(userId)
+    override fun canUserPinUnpin(userId: UserId): Boolean = canUserPinUnpin(userId)
+    override fun canUserRedactOther(userId: UserId): Boolean = canUserRedactOther(userId)
+    override fun canUserRedactOwn(userId: UserId): Boolean = canUserRedactOwn(userId)
+    override fun canUserSendMessage(userId: UserId, message: MessageEventType): Boolean = canUserSendMessage(userId, message)
+    override fun canUserSendState(userId: UserId, stateEvent: StateEventType): Boolean = canUserSendState(userId, stateEvent)
+    override fun canUserTriggerRoomNotification(userId: UserId): Boolean = canUserTriggerRoomNotification(userId)
+
+    override fun close() {
+        // no-op for the fake
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryList.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryList.kt
index 33c8bc83b5..78a664454f 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryList.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 
 class FakeRoomDirectoryList(
-    override val state: Flow<RoomDirectoryList.State> = emptyFlow(),
+    override val state: Flow<RoomDirectoryList.SearchResult> = emptyFlow(),
     val filterLambda: (String?, Int, String?) -> Result<Unit> = { _, _, _ -> Result.success(Unit) },
     val loadMoreLambda: () -> Result<Unit> = { Result.success(Unit) }
 ) : RoomDirectoryList {
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryService.kt
index bc73dc4d0f..17634a2565 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
index 4ea3465279..df52be34cf 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/RoomDescriptionFixture.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/FakeRoomListService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/FakeRoomListService.kt
index dd1fcfe1ba..b184438c4e 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/FakeRoomListService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/FakeRoomListService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/SimplePagedRoomList.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/SimplePagedRoomList.kt
index 6b5beca964..a63212c005 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/SimplePagedRoomList.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/SimplePagedRoomList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeLeaveSpaceHandle.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeLeaveSpaceHandle.kt
index b19d3f1344..83017d9d48 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeLeaveSpaceHandle.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeLeaveSpaceHandle.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt
index 6eac3dd0f4..70d919dc21 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceRoomList.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt
index d768b175d0..eaa36ee750 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/spaces/FakeSpaceService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt
index 5469e5b4aa..5bb85fa488 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/sync/FakeSyncService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6ebd9f9f50..4451de6276 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -47,8 +48,17 @@ class FakeTimeline(
         )
     ),
     override val membershipChangeEventReceived: Flow<Unit> = MutableSharedFlow(),
+    override val onSyncedEventReceived: Flow<Unit> = MutableSharedFlow(),
     private val cancelSendResult: (TransactionId) -> Result<Unit> = { lambdaError() },
     override val mode: Timeline.Mode = Timeline.Mode.Live,
+    private val markAsReadResult: (ReceiptType) -> Result<Unit> = { lambdaError() },
+    private val getLatestEventIdResult: () -> Result<EventId?> = { lambdaError() },
+    var sendReadReceiptLambda: (
+        eventId: EventId,
+        receiptType: ReceiptType,
+    ) -> Result<Unit> = { _, _ ->
+        lambdaError()
+    }
 ) : Timeline {
     var sendMessageLambda: (
         body: String,
@@ -148,7 +158,7 @@ class FakeTimeline(
         imageInfo: ImageInfo,
         body: String?,
         formattedBody: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ) -> Result<MediaUploadHandler> = { _, _, _, _, _, _ ->
         Result.success(FakeMediaUploadHandler())
     }
@@ -159,7 +169,7 @@ class FakeTimeline(
         imageInfo: ImageInfo,
         caption: String?,
         formattedCaption: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> = simulateLongTask {
         sendImageLambda(
             file,
@@ -177,7 +187,7 @@ class FakeTimeline(
         videoInfo: VideoInfo,
         body: String?,
         formattedBody: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ) -> Result<MediaUploadHandler> = { _, _, _, _, _, _ ->
         Result.success(FakeMediaUploadHandler())
     }
@@ -188,7 +198,7 @@ class FakeTimeline(
         videoInfo: VideoInfo,
         caption: String?,
         formattedCaption: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> = simulateLongTask {
         sendVideoLambda(
             file,
@@ -205,7 +215,7 @@ class FakeTimeline(
         audioInfo: AudioInfo,
         caption: String?,
         formattedCaption: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ) -> Result<MediaUploadHandler> = { _, _, _, _, _ ->
         Result.success(FakeMediaUploadHandler())
     }
@@ -215,7 +225,7 @@ class FakeTimeline(
         audioInfo: AudioInfo,
         caption: String?,
         formattedCaption: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> = simulateLongTask {
         sendAudioLambda(
             file,
@@ -231,7 +241,7 @@ class FakeTimeline(
         fileInfo: FileInfo,
         caption: String?,
         formattedCaption: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ) -> Result<MediaUploadHandler> = { _, _, _, _, _ ->
         Result.success(FakeMediaUploadHandler())
     }
@@ -241,7 +251,7 @@ class FakeTimeline(
         fileInfo: FileInfo,
         caption: String?,
         formattedCaption: String?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> = simulateLongTask {
         sendFileLambda(
             file,
@@ -256,7 +266,7 @@ class FakeTimeline(
         file: File,
         audioInfo: AudioInfo,
         waveform: List<Float>,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ) -> Result<MediaUploadHandler> = { _, _, _, _ ->
         Result.success(FakeMediaUploadHandler())
     }
@@ -265,7 +275,7 @@ class FakeTimeline(
         file: File,
         audioInfo: AudioInfo,
         waveform: List<Float>,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> = simulateLongTask {
         sendVoiceMessageLambda(
             file,
@@ -281,7 +291,7 @@ class FakeTimeline(
         description: String?,
         zoomLevel: Int?,
         assetType: AssetType?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ) -> Result<Unit> = { _, _, _, _, _, _ ->
         lambdaError()
     }
@@ -292,7 +302,7 @@ class FakeTimeline(
         description: String?,
         zoomLevel: Int?,
         assetType: AssetType?,
-        inReplyToEventId: EventId??,
+        inReplyToEventId: EventId?,
     ): Result<Unit> = simulateLongTask {
         sendLocationLambda(
             body,
@@ -397,18 +407,15 @@ class FakeTimeline(
         )
     }
 
-    var sendReadReceiptLambda: (
-        eventId: EventId,
-        receiptType: ReceiptType,
-    ) -> Result<Unit> = { _, _ ->
-        lambdaError()
-    }
-
     override suspend fun sendReadReceipt(
         eventId: EventId,
         receiptType: ReceiptType,
     ): Result<Unit> = sendReadReceiptLambda(eventId, receiptType)
 
+    override suspend fun markAsRead(receiptType: ReceiptType): Result<Unit> {
+        return markAsReadResult(receiptType)
+    }
+
     var paginateLambda: (direction: Timeline.PaginationDirection) -> Result<Boolean> = {
         Result.success(false)
     }
@@ -431,6 +438,10 @@ class FakeTimeline(
         return unpinEventLambda(eventId)
     }
 
+    override suspend fun getLatestEventId(): Result<EventId?> {
+        return getLatestEventIdResult()
+    }
+
     var closeCounter = 0
         private set
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimelineProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimelineProvider.kt
new file mode 100644
index 0000000000..b1632554d7
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimelineProvider.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.matrix.test.timeline
+
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.api.timeline.TimelineProvider
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class FakeTimelineProvider(
+    initialTimeline: Timeline? = null,
+) : TimelineProvider {
+    private val timelineFlow = MutableStateFlow(initialTimeline)
+
+    override fun activeTimelineFlow(): StateFlow<Timeline?> {
+        return timelineFlow.asStateFlow()
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt
index 1723b56490..60cee84ea9 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b564c21b30..24c26a6734 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,7 +27,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.Receipt
 import io.element.android.libraries.matrix.api.timeline.item.event.SendHandleProvider
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
@@ -52,7 +53,7 @@ fun anEventTimelineItem(
     reactions: ImmutableList<EventReaction> = persistentListOf(),
     receipts: ImmutableList<Receipt> = persistentListOf(),
     sender: UserId = A_USER_ID,
-    senderProfile: ProfileTimelineDetails = aProfileTimelineDetails(),
+    senderProfile: ProfileDetails = aProfileDetails(),
     timestamp: Long = 0L,
     content: EventContent = aProfileChangeMessageContent(),
     debugInfoProvider: TimelineItemDebugInfoProvider = TimelineItemDebugInfoProvider { aTimelineItemDebugInfo() },
@@ -78,11 +79,11 @@ fun anEventTimelineItem(
     sendHandleProvider = sendHandleProvider,
 )
 
-fun aProfileTimelineDetails(
+fun aProfileDetails(
     displayName: String? = A_USER_NAME,
     displayNameAmbiguous: Boolean = false,
     avatarUrl: String? = null
-): ProfileTimelineDetails = ProfileTimelineDetails.Ready(
+): ProfileDetails = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
@@ -122,11 +123,13 @@ fun aStickerContent(
     info: ImageInfo,
     mediaSource: MediaSource,
     body: String? = null,
+    threadInfo: EventThreadInfo? = null,
 ) = StickerContent(
     filename = filename,
     body = body,
     info = info,
     source = mediaSource,
+    threadInfo = threadInfo,
 )
 
 fun aTimelineItemDebugInfo(
@@ -147,6 +150,7 @@ fun aPollContent(
     votes: ImmutableMap<String, ImmutableList<UserId>> = persistentMapOf(),
     endTime: ULong? = null,
     isEdited: Boolean = false,
+    threadInfo: EventThreadInfo? = null,
 ) = PollContent(
     question = question,
     kind = kind,
@@ -155,4 +159,5 @@ fun aPollContent(
     votes = votes,
     endTime = endTime,
     isEdited = isEdited,
+    threadInfo = threadInfo,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt
index c9e7c304d5..5e659d3c5c 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/tracing/FakeTracingService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/tracing/FakeTracingService.kt
index 52ffe8f32d..0b57c0a0b1 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/tracing/FakeTracingService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/tracing/FakeTracingService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d8788e4026..f4f12a435e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt
index 6caa6e1570..a91868c4b6 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeCallWidgetSettingsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt
index 9262858252..5540ba83e8 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixmedia/api/build.gradle.kts b/libraries/matrixmedia/api/build.gradle.kts
new file mode 100644
index 0000000000..90c7ee635e
--- /dev/null
+++ b/libraries/matrixmedia/api/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.matrix.ui.media.api"
+}
+
+dependencies {
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
+    implementation(libs.coil.compose)
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatatarDataExt.kt b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/Avatar.kt
similarity index 60%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatatarDataExt.kt
rename to libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/Avatar.kt
index 5426b7d505..4d4dd402d6 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatatarDataExt.kt
+++ b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/Avatar.kt
@@ -1,15 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.matrix.api.media.MediaSource
-
 /**
  * The size in pixel of the thumbnail to generate for the avatar.
  * This is not the size of the avatar displayed in the UI but the size to get from the servers.
@@ -24,10 +22,3 @@ import io.element.android.libraries.matrix.api.media.MediaSource
  * Let's always use the same size so coil caching works properly.
  */
 const val AVATAR_THUMBNAIL_SIZE_IN_PIXEL = 240L
-
-internal fun AvatarData.toMediaRequestData(): MediaRequestData {
-    return MediaRequestData(
-        source = url?.let { MediaSource(it) },
-        kind = MediaRequestData.Kind.Thumbnail(AVATAR_THUMBNAIL_SIZE_IN_PIXEL)
-    )
-}
diff --git a/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt
new file mode 100644
index 0000000000..62b169744b
--- /dev/null
+++ b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.ui.media
+
+import coil3.ImageLoader
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.SessionId
+
+interface ImageLoaderHolder {
+    fun get(): ImageLoader
+    fun get(client: MatrixClient): ImageLoader
+    fun remove(sessionId: SessionId)
+}
diff --git a/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/InitialsAvatarBitmapGenerator.kt b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/InitialsAvatarBitmapGenerator.kt
new file mode 100644
index 0000000000..e6ff5d762d
--- /dev/null
+++ b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/InitialsAvatarBitmapGenerator.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.ui.media
+
+import android.graphics.Bitmap
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+
+/**
+ * Generates a bitmap for an initials avatar based on the provided [io.element.android.libraries.designsystem.components.avatar.AvatarData].
+ */
+interface InitialsAvatarBitmapGenerator {
+    fun generateBitmap(
+        size: Int,
+        avatarData: AvatarData,
+        useDarkTheme: Boolean,
+        fontSizePercentage: Float = 0.5f,
+    ): Bitmap?
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt
similarity index 89%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt
rename to libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt
index 5bca419a84..47841a573b 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt
+++ b/libraries/matrixmedia/api/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ import io.element.android.libraries.matrix.api.media.MediaSource
 
 /**
  * Can be use with [coil3.compose.AsyncImage] to load a [MediaSource].
- * This will go internally through our [CoilMediaFetcher].
+ * This will go internally through our CoilMediaFetcher.
  *
  * Example of usage:
  *  AsyncImage(
diff --git a/libraries/matrixmedia/impl/build.gradle.kts b/libraries/matrixmedia/impl/build.gradle.kts
new file mode 100644
index 0000000000..82afc2f62c
--- /dev/null
+++ b/libraries/matrixmedia/impl/build.gradle.kts
@@ -0,0 +1,33 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.matrix.ui.media.impl"
+}
+
+setupDependencyInjection()
+
+dependencies {
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.designsystem)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.gif)
+    implementation(libs.coil.network.okhttp)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.dateformatter.test)
+    testImplementation(projects.libraries.sessionStorage.test)
+}
diff --git a/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt
new file mode 100644
index 0000000000..0b1a09bdf9
--- /dev/null
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.ui.media
+
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.matrix.api.media.MediaSource
+
+internal fun AvatarData.toMediaRequestData(): MediaRequestData {
+    return MediaRequestData(
+        source = url?.let { MediaSource(it) },
+        kind = MediaRequestData.Kind.Thumbnail(AVATAR_THUMBNAIL_SIZE_IN_PIXEL)
+    )
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataFetcherFactory.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataFetcherFactory.kt
similarity index 89%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataFetcherFactory.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataFetcherFactory.kt
index c852be62f5..b6093cd327 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataFetcherFactory.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataFetcherFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/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
similarity index 89%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt
index 9bcae48a6a..06321f64a9 100644
--- a/libraries/matrixui/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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,14 +27,15 @@ internal class CoilMediaFetcher(
     private val mediaData: MediaRequestData,
 ) : Fetcher {
     override suspend fun fetch(): FetchResult? {
-        if (mediaData.source == null) {
+        val source = mediaData.source
+        if (source == null) {
             Timber.e("MediaData source is null")
             return null
         }
-        return when (mediaData.kind) {
-            is MediaRequestData.Kind.Content -> fetchContent(mediaData.source)
-            is MediaRequestData.Kind.Thumbnail -> fetchThumbnail(mediaData.source, mediaData.kind)
-            is MediaRequestData.Kind.File -> fetchFile(mediaData.source, mediaData.kind)
+        return when (val kind = mediaData.kind) {
+            is MediaRequestData.Kind.Content -> fetchContent(source)
+            is MediaRequestData.Kind.Thumbnail -> fetchThumbnail(source, kind)
+            is MediaRequestData.Kind.File -> fetchFile(source, kind)
         }
     }
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolder.kt
similarity index 78%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolder.kt
index 6720eaae0f..a0957a3b13 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderHolder.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,26 +11,22 @@ package io.element.android.libraries.matrix.ui.media
 import coil3.ImageLoader
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.sessionstorage.api.observer.SessionListener
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
 
-interface ImageLoaderHolder {
-    fun get(client: MatrixClient): ImageLoader
-    fun remove(sessionId: SessionId)
-}
-
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultImageLoaderHolder(
-    private val loggedInImageLoaderFactory: LoggedInImageLoaderFactory,
+    private val imageLoaderFactory: ImageLoaderFactory,
     private val sessionObserver: SessionObserver,
 ) : ImageLoaderHolder {
     private val map = mutableMapOf<SessionId, ImageLoader>()
+    private val notLoggedInImageLoader by lazy {
+        imageLoaderFactory.newImageLoader()
+    }
 
     init {
         observeSessions()
@@ -37,18 +34,20 @@ class DefaultImageLoaderHolder(
 
     private fun observeSessions() {
         sessionObserver.addListener(object : SessionListener {
-            override suspend fun onSessionCreated(userId: String) = Unit
-
-            override suspend fun onSessionDeleted(userId: String) {
+            override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
                 remove(SessionId(userId))
             }
         })
     }
 
+    override fun get(): ImageLoader {
+        return notLoggedInImageLoader
+    }
+
     override fun get(client: MatrixClient): ImageLoader {
         return synchronized(map) {
             map.getOrPut(client.sessionId) {
-                loggedInImageLoaderFactory
+                imageLoaderFactory
                     .newImageLoader(client.matrixMediaLoader)
             }
         }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/InitialsAvatarBitmapGenerator.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/DefaultInitialsAvatarBitmapGenerator.kt
similarity index 67%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/InitialsAvatarBitmapGenerator.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/DefaultInitialsAvatarBitmapGenerator.kt
index e0e09a07e7..71c894f305 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/InitialsAvatarBitmapGenerator.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/DefaultInitialsAvatarBitmapGenerator.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,6 +24,8 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
 import androidx.core.graphics.createBitmap
 import coil3.Bitmap
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
 import io.element.android.compound.theme.AvatarColors
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.SemanticColors
@@ -34,60 +37,35 @@ 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
 
-/**
- * Generates a bitmap for an initials avatar based on the provided [AvatarData].
- */
-class InitialsAvatarBitmapGenerator(
-    useDarkTheme: Boolean = false,
-    private val fontSizePercentage: Float = 0.5f,
-) {
-    private val compoundColors: SemanticColors = if (useDarkTheme) {
-        compoundColorsDark
-    } else {
-        compoundColorsLight
-    }
-
+@ContributesBinding(AppScope::class)
+class DefaultInitialsAvatarBitmapGenerator : InitialsAvatarBitmapGenerator {
     // List of predefined avatar colors to use for initials avatars, in light mode
-    private val allAvatarColors: List<AvatarColors> = listOf(
-        AvatarColors(
-            background = compoundColors.bgDecorative1,
-            foreground = compoundColors.textDecorative1,
-        ),
-        AvatarColors(
-            background = compoundColors.bgDecorative2,
-            foreground = compoundColors.textDecorative2,
-        ),
-        AvatarColors(
-            background = compoundColors.bgDecorative3,
-            foreground = compoundColors.textDecorative3,
-        ),
-        AvatarColors(
-            background = compoundColors.bgDecorative4,
-            foreground = compoundColors.textDecorative4,
-        ),
-        AvatarColors(
-            background = compoundColors.bgDecorative5,
-            foreground = compoundColors.textDecorative5,
-        ),
-        AvatarColors(
-            background = compoundColors.bgDecorative6,
-            foreground = compoundColors.textDecorative6,
-        ),
-    )
+    private val lightAvatarColors: List<AvatarColors> = compoundColorsLight.buildAvatarColors()
+
+    // List of predefined avatar colors to use for initials avatars, in dark mode
+    private val darkAvatarColors: List<AvatarColors> = compoundColorsDark.buildAvatarColors()
 
     /**
      * Generates a bitmap for an avatar with no URL, using the initials from the [AvatarData].
      * @param size The size of the bitmap to generate, in pixels.
      * @param avatarData The [AvatarData] containing the initials and other information.
+     * @param useDarkTheme Whether the theme is dark.
+     * @param fontSizePercentage The percentage of the avatar size to use for the font size.
      */
-    fun generateBitmap(size: Int, avatarData: AvatarData): Bitmap? {
+    override fun generateBitmap(
+        size: Int,
+        avatarData: AvatarData,
+        useDarkTheme: Boolean,
+        fontSizePercentage: Float,
+    ): Bitmap? {
         if (avatarData.url != null) {
             // This generator is only for initials avatars, not for avatars with URLs
             return null
         }
 
         // Get the color pair to use for the initials avatar
-        val avatarColors = allAvatarColors[avatarData.id.sumOf { it.code } % allAvatarColors.size]
+        val colors = if (useDarkTheme) darkAvatarColors else lightAvatarColors
+        val avatarColors = colors[avatarData.id.sumOf { it.code } % colors.size]
 
         val bitmap = createBitmap(size, size)
         Canvas(bitmap).run {
@@ -115,20 +93,32 @@ class InitialsAvatarBitmapGenerator(
     }
 }
 
+private fun SemanticColors.buildAvatarColors(): List<AvatarColors> = listOf(
+    AvatarColors(background = bgDecorative1, foreground = textDecorative1),
+    AvatarColors(background = bgDecorative2, foreground = textDecorative2),
+    AvatarColors(background = bgDecorative3, foreground = textDecorative3),
+    AvatarColors(background = bgDecorative4, foreground = textDecorative4),
+    AvatarColors(background = bgDecorative5, foreground = textDecorative5),
+    AvatarColors(background = bgDecorative6, foreground = textDecorative6),
+)
+
 @Composable
 @PreviewsDayNight
 internal fun InitialsAvatarBitmapGeneratorPreview() = ElementPreview {
     Column(
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
+        val generator = remember { DefaultInitialsAvatarBitmapGenerator() }
         repeat(6) { index ->
             val avatarData = remember { AvatarData(id = index.toString(), name = Char('0'.code + index).toString(), size = AvatarSize.IncomingCall) }
             val isLightTheme = ElementTheme.isLightTheme
             val bitmap = remember(isLightTheme) {
-                val generator = InitialsAvatarBitmapGenerator(useDarkTheme = !isLightTheme)
-                generator.generateBitmap(512, avatarData)?.asImageBitmap()
+                generator.generateBitmap(
+                    size = 512,
+                    avatarData = avatarData,
+                    useDarkTheme = !isLightTheme,
+                )?.asImageBitmap()
             }
-
             bitmap?.let {
                 Image(bitmap = it, contentDescription = null, modifier = Modifier.size(48.dp))
             } ?: Text("No avatar generated")
diff --git a/libraries/matrixui/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
similarity index 60%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
index 54a1a21e22..e67e630e97 100644
--- a/libraries/matrixui/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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,33 +16,40 @@ import coil3.gif.GifDecoder
 import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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
 
-interface LoggedInImageLoaderFactory {
+interface ImageLoaderFactory {
+    fun newImageLoader(): ImageLoader
     fun newImageLoader(matrixMediaLoader: MatrixMediaLoader): ImageLoader
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
-class DefaultLoggedInImageLoaderFactory(
+class DefaultImageLoaderFactory(
     @ApplicationContext private val context: Context,
     private val okHttpClient: Provider<OkHttpClient>,
-) : LoggedInImageLoaderFactory {
+) : ImageLoaderFactory {
+    private val okHttpNetworkFetcherFactory = OkHttpNetworkFetcherFactory(
+        callFactory = {
+            // Use newBuilder, see https://coil-kt.github.io/coil/network/#using-a-custom-okhttpclient
+            okHttpClient().newBuilder().build()
+        }
+    )
+
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(context)
+            .components {
+                add(okHttpNetworkFetcherFactory)
+            }
+            .build()
+    }
+
     override fun newImageLoader(matrixMediaLoader: MatrixMediaLoader): ImageLoader {
         return ImageLoader.Builder(context)
             .components {
-                add(
-                    OkHttpNetworkFetcherFactory(
-                        callFactory = {
-                            // Use newBuilder, see https://coil-kt.github.io/coil/network/#using-a-custom-okhttpclient
-                            okHttpClient().newBuilder().build()
-                        }
-                    )
-                )
+                add(okHttpNetworkFetcherFactory)
                 // Add gif support
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                     add(AnimatedImageDecoder.Factory())
@@ -56,24 +64,3 @@ class DefaultLoggedInImageLoaderFactory(
             .build()
     }
 }
-
-@Inject
-class NotLoggedInImageLoaderFactory(
-    @ApplicationContext private val context: Context,
-    private val okHttpClient: Provider<OkHttpClient>,
-) {
-    fun newImageLoader(): ImageLoader {
-        return ImageLoader.Builder(context)
-            .components {
-                add(
-                    OkHttpNetworkFetcherFactory(
-                        callFactory = {
-                            // Use newBuilder, see https://coil-kt.github.io/coil/network/#using-a-custom-okhttpclient
-                            okHttpClient().newBuilder().build()
-                        }
-                    )
-                )
-            }
-            .build()
-    }
-}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataFetcherFactory.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataFetcherFactory.kt
similarity index 88%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataFetcherFactory.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataFetcherFactory.kt
index bc6cb7663c..f0cfd2047b 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataFetcherFactory.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataFetcherFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt
similarity index 83%
rename from libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt
rename to libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt
index c6423cfb0f..488803e933 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestDataKeyer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,6 +25,5 @@ internal class MediaRequestDataKeyer : Keyer<MediaRequestData> {
 }
 
 private fun MediaRequestData.toKey(): String? {
-    if (source == null) return null
-    return "${source.url}_$kind"
+    return source?.let { "${it.url}_$kind" }
 }
diff --git a/libraries/matrixui/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
similarity index 73%
rename from libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolderTest.kt
rename to libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolderTest.kt
index a30305176b..dd9127a4ae 100644
--- a/libraries/matrixui/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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
 import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
 import io.element.android.libraries.sessionstorage.test.observer.NoOpSessionObserver
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -29,9 +31,10 @@ class DefaultImageLoaderHolderTest {
         val context = InstrumentationRegistry.getInstrumentation().context
         val lambda = lambdaRecorder<MatrixMediaLoader, ImageLoader> { ImageLoader.Builder(context).build() }
 
-        val holder = DefaultImageLoaderHolder(
-            loggedInImageLoaderFactory = FakeLoggedInImageLoaderFactory(lambda),
-            sessionObserver = NoOpSessionObserver()
+        val holder = createDefaultImageLoaderHolder(
+            imageLoaderFactory = FakeImageLoaderFactory(
+                newMatrixImageLoaderLambda = lambda,
+            ),
         )
         val client = FakeMatrixClient()
         val imageLoader1 = holder.get(client)
@@ -49,8 +52,10 @@ class DefaultImageLoaderHolderTest {
             lambdaRecorder<MatrixMediaLoader, ImageLoader> { ImageLoader.Builder(context).build() }
         val sessionObserver = FakeSessionObserver()
         val holder = DefaultImageLoaderHolder(
-            loggedInImageLoaderFactory = FakeLoggedInImageLoaderFactory(lambda),
-            sessionObserver = sessionObserver
+            imageLoaderFactory = FakeImageLoaderFactory(
+                newMatrixImageLoaderLambda = lambda,
+            ),
+            sessionObserver = sessionObserver,
         )
         assertThat(sessionObserver.listeners.size).isEqualTo(1)
         val client = FakeMatrixClient()
@@ -68,10 +73,20 @@ class DefaultImageLoaderHolderTest {
             lambdaRecorder<MatrixMediaLoader, ImageLoader> { ImageLoader.Builder(context).build() }
         val sessionObserver = FakeSessionObserver()
         DefaultImageLoaderHolder(
-            loggedInImageLoaderFactory = FakeLoggedInImageLoaderFactory(lambda),
-            sessionObserver = sessionObserver
+            imageLoaderFactory = FakeImageLoaderFactory(
+                newMatrixImageLoaderLambda = lambda,
+            ),
+            sessionObserver = sessionObserver,
         )
         assertThat(sessionObserver.listeners.size).isEqualTo(1)
         sessionObserver.onSessionCreated(A_SESSION_ID.value)
     }
 }
+
+private fun createDefaultImageLoaderHolder(
+    imageLoaderFactory: ImageLoaderFactory = FakeImageLoaderFactory(),
+    sessionObserver: SessionObserver = NoOpSessionObserver(),
+) = DefaultImageLoaderHolder(
+    imageLoaderFactory = imageLoaderFactory,
+    sessionObserver = sessionObserver,
+)
diff --git a/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/FakeImageLoaderFactory.kt b/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/FakeImageLoaderFactory.kt
new file mode 100644
index 0000000000..bcafad0737
--- /dev/null
+++ b/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/FakeImageLoaderFactory.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.ui.media
+
+import coil3.ImageLoader
+import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeImageLoaderFactory(
+    private val newImageLoaderLambda: () -> ImageLoader = { lambdaError() },
+    private val newMatrixImageLoaderLambda: (MatrixMediaLoader) -> ImageLoader = { lambdaError() },
+) : ImageLoaderFactory {
+    override fun newImageLoader(): ImageLoader {
+        return newImageLoaderLambda()
+    }
+
+    override fun newImageLoader(matrixMediaLoader: MatrixMediaLoader): ImageLoader {
+        return newMatrixImageLoaderLambda(matrixMediaLoader)
+    }
+}
diff --git a/libraries/matrixmedia/test/build.gradle.kts b/libraries/matrixmedia/test/build.gradle.kts
new file mode 100644
index 0000000000..5b8e966d08
--- /dev/null
+++ b/libraries/matrixmedia/test/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.matrix.ui.media.test"
+}
+
+dependencies {
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.tests.testutils)
+    implementation(libs.coil.compose)
+}
diff --git a/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeImageLoader.kt b/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeImageLoader.kt
new file mode 100644
index 0000000000..d3cd7388e5
--- /dev/null
+++ b/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeImageLoader.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.matrix.ui.media.test
+
+import coil3.ComponentRegistry
+import coil3.ImageLoader
+import coil3.disk.DiskCache
+import coil3.memory.MemoryCache
+import coil3.request.Disposable
+import coil3.request.ImageRequest
+import coil3.request.ImageResult
+
+class FakeImageLoader : ImageLoader {
+    private val executedRequests = mutableListOf<ImageRequest>()
+
+    override val defaults: ImageRequest.Defaults
+        get() = error("Not implemented")
+    override val components: ComponentRegistry
+        get() = error("Not implemented")
+    override val memoryCache: MemoryCache?
+        get() = error("Not implemented")
+    override val diskCache: DiskCache?
+        get() = error("Not implemented")
+
+    override fun enqueue(request: ImageRequest): Disposable {
+        error("Not implemented")
+    }
+
+    override suspend fun execute(request: ImageRequest): ImageResult {
+        executedRequests.add(request)
+        error("Not implemented")
+    }
+
+    override fun shutdown() {
+        error("Not implemented")
+    }
+
+    override fun newBuilder(): ImageLoader.Builder {
+        error("Not implemented")
+    }
+
+    fun getExecutedRequestsData(): List<Any> {
+        return executedRequests.map { it.data }
+    }
+}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoaderHolder.kt b/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeImageLoaderHolder.kt
similarity index 57%
rename from libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoaderHolder.kt
rename to libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeImageLoaderHolder.kt
index 4c92dc8c18..59b9efda7d 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoaderHolder.kt
+++ b/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeImageLoaderHolder.kt
@@ -1,21 +1,27 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
+package io.element.android.libraries.matrix.ui.media.test
 
 import coil3.ImageLoader
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 
-class FakeImageLoaderHolder : ImageLoaderHolder {
-    private val fakeImageLoader = FakeImageLoader()
+class FakeImageLoaderHolder(
+    val fakeImageLoader: ImageLoader = FakeImageLoader(),
+) : ImageLoaderHolder {
+    override fun get(): ImageLoader {
+        return fakeImageLoader
+    }
+
     override fun get(client: MatrixClient): ImageLoader {
-        return fakeImageLoader.getImageLoader()
+        return fakeImageLoader
     }
 
     override fun remove(sessionId: SessionId) {
diff --git a/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeInitialsAvatarBitmapGenerator.kt b/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeInitialsAvatarBitmapGenerator.kt
new file mode 100644
index 0000000000..2d0df756ac
--- /dev/null
+++ b/libraries/matrixmedia/test/src/main/kotlin/io/element/android/libraries/matrix/ui/media/test/FakeInitialsAvatarBitmapGenerator.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.ui.media.test
+
+import coil3.Bitmap
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.matrix.ui.media.InitialsAvatarBitmapGenerator
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeInitialsAvatarBitmapGenerator(
+    private val generateBitmapResult: (Int, AvatarData, Boolean, Float) -> Bitmap? = { _, _, _, _ -> lambdaError() }
+) : InitialsAvatarBitmapGenerator {
+    override fun generateBitmap(
+        size: Int,
+        avatarData: AvatarData,
+        useDarkTheme: Boolean,
+        fontSizePercentage: Float,
+    ): Bitmap? {
+        return generateBitmapResult(size, avatarData, useDarkTheme, fontSizePercentage)
+    }
+}
diff --git a/libraries/matrixui/build.gradle.kts b/libraries/matrixui/build.gradle.kts
index 96045f3a93..5513dc240e 100644
--- a/libraries/matrixui/build.gradle.kts
+++ b/libraries/matrixui/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,14 +30,13 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.core)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.testtags)
     implementation(libs.coil.compose)
-    implementation(libs.coil.gif)
-    implementation(libs.coil.network.okhttp)
-    implementation(libs.jsoup)
+    implementation(libs.matrix.richtexteditor)
     implementation(projects.libraries.previewutils)
 
     testCommonDependencies(libs, true)
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt
index 7e105a8af7..8ffdc1b003 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnailInfoProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnailInfoProvider.kt
index 42d2f65b59..ea38a979ae 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnailInfoProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnailInfoProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fa9cf5156c..4628833bb4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 17d5243972..917b03f309 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,8 +11,9 @@ 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.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Alignment
@@ -19,10 +21,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import io.element.android.libraries.designsystem.atomic.atoms.SelectedIndicatorAtom
 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.ElementThemedPreview
+import io.element.android.libraries.designsystem.theme.components.Checkbox
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 
@@ -62,11 +64,12 @@ fun CheckableUserRow(
                 )
             }
         }
-        SelectedIndicatorAtom(
-            modifier = Modifier.padding(end = 24.dp),
+        Checkbox(
+            onCheckedChange = onCheckedChange,
             checked = checked,
             enabled = enabled,
         )
+        Spacer(modifier = Modifier.width(4.dp))
     }
 }
 
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 b0a19924b3..95935947db 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
index ad06985ab7..284ffcbab1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
@@ -1,34 +1,38 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 android.net.Uri
-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.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.CircleShape
 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.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.res.stringResource
 import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import androidx.core.net.toUri
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.components.avatar.Avatar
@@ -47,37 +51,58 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun EditableAvatarView(
     matrixId: String,
     displayName: String?,
-    avatarUrl: Uri?,
+    avatarUrl: String?,
     avatarSize: AvatarSize,
     avatarType: AvatarType,
     onAvatarClick: () -> Unit,
     modifier: Modifier = Modifier,
+    enabled: Boolean = true,
 ) {
-    Column(
-        modifier = modifier.fillMaxWidth(),
-        horizontalAlignment = Alignment.CenterHorizontally,
+    val a11yAvatar = stringResource(CommonStrings.a11y_avatar)
+    val editIconRadius = 15.dp
+    val parentHeight = avatarSize.dp
+    val parentWidth = avatarSize.dp + editIconRadius / 2f
+    Box(
+        modifier = modifier
+            .wrapContentSize()
+            .size(height = parentHeight, width = parentWidth)
+            .clickable(
+                enabled = enabled,
+                interactionSource = remember { MutableInteractionSource() },
+                onClickLabel = stringResource(CommonStrings.a11y_edit_avatar),
+                onClick = onAvatarClick,
+                indication = ripple(bounded = false),
+            )
+            .testTag(TestTags.editAvatar)
+            .clearAndSetSemantics {
+                contentDescription = a11yAvatar
+            },
     ) {
-        val a11yAvatar = stringResource(CommonStrings.a11y_avatar)
         Box(
             modifier = Modifier
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    onClickLabel = stringResource(CommonStrings.a11y_edit_avatar),
-                    onClick = onAvatarClick,
-                    indication = ripple(bounded = false),
-                )
-                .testTag(TestTags.editAvatar)
-                .clearAndSetSemantics {
-                    contentDescription = a11yAvatar
-                },
+                .graphicsLayer {
+                    compositingStrategy = CompositingStrategy.Offscreen
+                }
+                .drawWithContent {
+                    drawContent()
+                    drawCircle(
+                        color = Color.Black,
+                        center = Offset(
+                            x = parentWidth.toPx() - editIconRadius.toPx(),
+                            y = size.height - editIconRadius.toPx(),
+                        ),
+                        radius = (editIconRadius + 4.dp).toPx(),
+                        blendMode = BlendMode.Clear,
+                    )
+                }
         ) {
-            when (avatarUrl?.scheme) {
-                null, "mxc" -> {
+            when {
+                avatarUrl == null || avatarUrl.startsWith("mxc://") -> {
                     Avatar(
                         avatarData = AvatarData(
                             id = matrixId,
                             name = displayName,
-                            url = avatarUrl?.toString(),
+                            url = avatarUrl,
                             size = avatarSize,
                         ),
                         avatarType = avatarType,
@@ -91,48 +116,42 @@ fun EditableAvatarView(
                     )
                 }
             }
-
-            Box(
-                modifier = Modifier
-                    .align(Alignment.BottomEnd)
-                    .clip(CircleShape)
-                    .background(ElementTheme.colors.iconPrimary)
-                    .size(24.dp),
-                contentAlignment = Alignment.Center,
-            ) {
-                Icon(
-                    modifier = Modifier.size(16.dp),
-                    imageVector = CompoundIcons.EditSolid(),
-                    contentDescription = null,
-                    tint = ElementTheme.colors.iconOnSolidPrimary,
-                )
-            }
         }
+        Icon(
+            modifier = Modifier
+                .align(Alignment.BottomEnd)
+                .size(editIconRadius * 2)
+                .border(1.dp, ElementTheme.colors.borderInteractiveSecondary, CircleShape)
+                .padding(6.dp),
+            imageVector = CompoundIcons.Edit(),
+            contentDescription = null,
+            tint = ElementTheme.colors.iconPrimary,
+        )
     }
 }
 
 @PreviewsDayNight
 @Composable
 internal fun EditableAvatarViewPreview(
-    @PreviewParameter(EditableAvatarViewUriProvider::class) uri: Uri?
+    @PreviewParameter(EditableAvatarViewUriProvider::class) uri: String?
 ) = ElementPreview(
     drawableFallbackForImages = CommonDrawables.sample_avatar,
 ) {
     EditableAvatarView(
         matrixId = "id",
-        displayName = "A room",
+        displayName = "Room",
         avatarUrl = uri,
-        avatarSize = AvatarSize.EditRoomDetails,
+        avatarSize = AvatarSize.RoomDetailsHeader,
         avatarType = AvatarType.User,
         onAvatarClick = {},
     )
 }
 
-open class EditableAvatarViewUriProvider : PreviewParameterProvider<Uri?> {
-    override val values: Sequence<Uri?>
+open class EditableAvatarViewUriProvider : PreviewParameterProvider<String?> {
+    override val values: Sequence<String?>
         get() = sequenceOf(
             null,
-            "mxc://matrix.org/123456".toUri(),
-            "https://example.com/avatar.jpg".toUri(),
+            "mxc://matrix.org/123456",
+            "https://example.com/avatar.jpg",
         )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt
index 433e036d97..81c3e05263 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableOrgAvatar.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 960bdb9098..13747a1a3d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/JoinButton.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/JoinButton.kt
index 0d5b94dc64..e162feb6cd 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/JoinButton.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/JoinButton.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 cb97c1e9f4..5b44b50ce9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index cdf6e1098c..08f8a37cc1 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ce0d8b2eec..4d5a1cd222 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 70d22bc644..cf89074737 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ebd5b5969c..374ebd7a1a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectRoomInfoProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectRoomInfoProvider.kt
index 04562eb13c..731d499445 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectRoomInfoProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectRoomInfoProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedItem.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedItem.kt
index d72d786b8d..29d2f469a0 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedItem.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedItem.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
index 59542a5338..b7484903da 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d8648c903e..b118dbcbe3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt
index 1f2d1ac12a..ecb86a52f8 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt
index 9f41171dd9..1e8fb864a7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -41,7 +42,7 @@ fun SpaceHeaderRootView(
         verticalArrangement = Arrangement.spacedBy(16.dp)
     ) {
         BigIcon(
-            style = BigIcon.Style.Default(CompoundIcons.WorkspaceSolid())
+            style = BigIcon.Style.Default(CompoundIcons.SpaceSolid())
         )
         Text(
             text = stringResource(CommonStrings.screen_space_list_title),
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 e9e151f027..ae185d2225 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt
index d0d14bcdd4..052d9862a6 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -107,7 +108,7 @@ internal fun SpaceInfoRowPreview() = ElementPreview {
         SpaceInfoRow(
             leftText = "Element space",
             rightText = numberOfRooms(16),
-            iconVector = CompoundIcons.Workspace(),
+            iconVector = CompoundIcons.Space(),
         )
         SpaceInfoRow(
             visibility = SpaceRoomVisibility.Private,
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 0c7bc9a37d..202ea79d87 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 5a9c49ceb9..61cb3f9839 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,7 @@ package io.element.android.libraries.matrix.ui.components
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.IntrinsicSize
@@ -56,6 +58,9 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
+/**
+ * Figma reference: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=3643-2079&m=dev
+ */
 @Composable
 fun SpaceRoomItemView(
     spaceRoom: SpaceRoom,
@@ -67,42 +72,58 @@ fun SpaceRoomItemView(
     trailingAction: @Composable (() -> Unit)? = null,
     bottomAction: @Composable (() -> Unit)? = null,
 ) {
-    SpaceRoomItemScaffold(
-        modifier = modifier,
-        avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),
-        isSpace = spaceRoom.isSpace,
-        hideAvatars = hideAvatars,
-        heroes = spaceRoom.heroes
-            .map { hero -> hero.getAvatarData(AvatarSize.SpaceListItem) }
-            .toImmutableList(),
-        onClick = onClick,
-        onLongClick = onLongClick,
-        trailingAction = trailingAction,
+    val clickModifier = Modifier
+        .combinedClickable(
+            onClick = onClick,
+            onLongClick = onLongClick,
+            onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+            indication = ripple(),
+            interactionSource = remember { MutableInteractionSource() }
+        )
+        .onKeyboardContextMenuAction { onLongClick }
+    Column(
+        modifier = modifier
+            .then(clickModifier)
+            .padding(horizontal = 16.dp, vertical = 12.dp),
     ) {
-        NameAndIndicatorRow(
-            name = spaceRoom.displayName,
-            showIndicator = showUnreadIndicator
-        )
-        Spacer(modifier = Modifier.height(1.dp))
-        SubtitleRow(
-            visibilityIcon = spaceRoom.visibilityIcon(),
-            subtitle = spaceRoom.subtitle()
-        )
-        Spacer(modifier = Modifier.height(1.dp))
-        val info = spaceRoom.info()
-        if (info.isNotBlank()) {
-            Text(
-                modifier = Modifier.weight(1f),
-                style = ElementTheme.typography.fontBodyMdRegular,
-                text = info,
-                color = ElementTheme.colors.textSecondary,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+        SpaceRoomItemScaffold(
+            avatarData = spaceRoom.getAvatarData(AvatarSize.SpaceListItem),
+            isSpace = spaceRoom.isSpace,
+            hideAvatars = hideAvatars,
+            heroes = spaceRoom.heroes
+                .map { hero -> hero.getAvatarData(AvatarSize.SpaceListItem) }
+                .toImmutableList(),
+            trailingAction = trailingAction,
+        ) {
+            NameAndIndicatorRow(
+                name = spaceRoom.displayName,
+                showIndicator = showUnreadIndicator
             )
+            Spacer(modifier = Modifier.height(1.dp))
+            SubtitleRow(
+                visibilityIcon = spaceRoom.visibilityIcon(),
+                subtitle = spaceRoom.subtitle()
+            )
+            Spacer(modifier = Modifier.height(1.dp))
+            val info = spaceRoom.info()
+            if (info.isNotBlank()) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    text = info,
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
         }
         if (bottomAction != null) {
             Spacer(modifier = Modifier.height(12.dp))
-            bottomAction()
+            // Match the padding of the text content (avatar + spacer)
+            Box(modifier = Modifier.padding(start = AvatarSize.SpaceListItem.dp + 16.dp)) {
+                bottomAction()
+            }
+            Spacer(modifier = Modifier.height(4.dp))
         }
     }
 }
@@ -170,28 +191,16 @@ private fun SpaceRoomItemScaffold(
     avatarData: AvatarData,
     isSpace: Boolean,
     heroes: ImmutableList<AvatarData>,
-    onClick: () -> Unit,
-    onLongClick: () -> Unit,
     hideAvatars: Boolean,
     modifier: Modifier = Modifier,
     trailingAction: @Composable (() -> Unit)? = null,
     content: @Composable ColumnScope.() -> Unit,
 ) {
-    val clickModifier = Modifier
-        .combinedClickable(
-            onClick = onClick,
-            onLongClick = onLongClick,
-            onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
-            indication = ripple(),
-            interactionSource = remember { MutableInteractionSource() }
-        )
-        .onKeyboardContextMenuAction { onLongClick }
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .then(clickModifier)
-            .padding(horizontal = 16.dp, vertical = 8.dp)
             .height(IntrinsicSize.Min),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Avatar(
             avatarData = avatarData,
@@ -249,7 +258,6 @@ internal fun SpaceRoomItemViewPreview(@PreviewParameter(SpaceRoomProvider::class
         hideAvatars = false,
         onClick = {},
         onLongClick = {},
-        modifier = Modifier.fillMaxWidth(),
         bottomAction = if (spaceRoom.state == CurrentUserMembership.INVITED) {
             { InviteButtonsRowMolecule({}, {}) }
         } else {
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 4ffda58239..db63bba779 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
index c36c188165..32fa641a63 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnresolvedUserRow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.compose.foundation.layout.Arrangement
 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.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
@@ -44,8 +44,7 @@ fun UnresolvedUserRow(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .heightIn(min = 56.dp)
-            .padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp),
+            .padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 12.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Avatar(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
index 1e041a69fe..104a418360 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
@@ -1,13 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -43,7 +43,7 @@ import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
  */
 @Composable
 fun UnsavedAvatar(
-    avatarUri: Uri?,
+    avatarUri: String?,
     avatarSize: AvatarSize,
     avatarType: AvatarType,
     modifier: Modifier = Modifier,
@@ -86,8 +86,8 @@ internal fun UnsavedAvatarPreview() = ElementPreview {
         horizontalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         UnsavedAvatar(null, AvatarSize.EditRoomDetails, AvatarType.User)
-        UnsavedAvatar(Uri.EMPTY, AvatarSize.EditRoomDetails, AvatarType.User)
+        UnsavedAvatar("", AvatarSize.EditRoomDetails, AvatarType.User)
         UnsavedAvatar(null, AvatarSize.EditRoomDetails, AvatarType.Space())
-        UnsavedAvatar(Uri.EMPTY, AvatarSize.EditRoomDetails, AvatarType.Space())
+        UnsavedAvatar("", AvatarSize.EditRoomDetails, AvatarType.Space())
     }
 }
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 628fee7cb2..9bcf0b323f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ 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.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -36,8 +36,7 @@ internal fun UserRow(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .heightIn(min = 56.dp)
-            .padding(start = 16.dp, top = 4.dp, end = 16.dp, bottom = 4.dp),
+            .padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 12.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Avatar(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarAction.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarAction.kt
index c17a7eaa69..c9fad122cc 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarAction.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 58dac492dc..4a9f4f98a4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomNamesCache.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomNamesCache.kt
index f9253d351f..f8d3402850 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomNamesCache.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomNamesCache.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1950d68aa6..ee9de51681 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ 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 org.jsoup.Jsoup
+import io.element.android.wysiwyg.utils.HtmlToDomParser
 import org.jsoup.nodes.Document
 
 /**
@@ -33,9 +34,9 @@ fun FormattedBody.toHtmlDocument(
         ?.trimEnd()
         ?.let { formattedBody ->
             val dom = if (prefix != null) {
-                Jsoup.parse("$prefix $formattedBody")
+                HtmlToDomParser.document("$prefix $formattedBody")
             } else {
-                Jsoup.parse(formattedBody)
+                HtmlToDomParser.document(formattedBody)
             }
 
             // Prepend `@` to mentions
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 7e37be8614..d58d12b785 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -54,8 +55,15 @@ private class PlainTextNodeVisitor : NodeVisitor {
     private val builder = StringBuilder()
 
     override fun head(node: Node, depth: Int) {
-        if (node is TextNode && node.text().isNotBlank()) {
-            builder.append(node.text())
+        if (node is TextNode) {
+            // If the text node is blank, only add a single whitespace char if there wasn't already one
+            if (node.text().isBlank()) {
+                if (builder.lastOrNull()?.isWhitespace() == false) {
+                    builder.append(" ")
+                }
+            } else {
+                builder.append(node.text())
+            }
         } else if (node is Element && node.tagName() == "li") {
             val index = node.elementSiblingIndex() + 1
             val isOrdered = node.parent()?.nodeName()?.lowercase() == "ol"
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 dadb48e63c..3179c748ea 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,7 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 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.ui.messages.toPlainText
@@ -24,7 +25,7 @@ sealed interface InReplyToDetails {
     data class Ready(
         val eventId: EventId,
         val senderId: UserId,
-        val senderProfile: ProfileTimelineDetails,
+        val senderProfile: ProfileDetails,
         val eventContent: EventContent?,
         val textContent: String?,
     ) : InReplyToDetails
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 f43c409f0e..0727b0b7ec 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -23,7 +24,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageConten
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
@@ -88,6 +89,7 @@ open class InReplyToDetailsProvider : PreviewParameterProvider<InReplyToDetails>
                 votes = persistentMapOf(),
                 endTime = null,
                 isEdited = false,
+                threadInfo = null,
             ),
         ).map {
             aInReplyToDetails(
@@ -115,7 +117,7 @@ class InReplyToDetailsInformativeProvider : InReplyToDetailsProvider() {
     override val values: Sequence<InReplyToDetails>
         get() = sequenceOf(
             RedactedContent,
-            UnableToDecryptContent(UnableToDecryptContent.Data.Unknown),
+            UnableToDecryptContent(data = UnableToDecryptContent.Data.Unknown, threadInfo = null),
         ).map {
             aInReplyToDetails(
                 eventContent = it,
@@ -160,7 +162,7 @@ fun aProfileTimelineDetailsReady(
     displayName: String? = "Sender",
     displayNameAmbiguous: Boolean = false,
     avatarUrl: String? = null,
-) = ProfileTimelineDetails.Ready(
+) = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
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 6c5e0d675a..4d0a0f045b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1b8e8bfd26..fc5d6577c7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -41,7 +42,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.Text
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+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.messages.sender.SenderName
@@ -73,7 +74,7 @@ fun InReplyToView(
 @Composable
 private fun ReplyToReadyContent(
     senderId: UserId,
-    senderProfile: ProfileTimelineDetails,
+    senderProfile: ProfileDetails,
     metadata: InReplyToMetadata?,
     modifier: Modifier = Modifier,
 ) {
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 d59e9cf24f..cdca0937c1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,13 +23,13 @@ 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.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 
 // https://www.figma.com/file/Ni6Ii8YKtmXCKYNE90cC67/Timeline-(new)?type=design&node-id=917-80169&mode=design&t=A0CJCBbMqR8NOwUQ-0
 @Composable
 fun SenderName(
     senderId: UserId,
-    senderProfile: ProfileTimelineDetails,
+    senderProfile: ProfileDetails,
     senderNameMode: SenderNameMode,
     modifier: Modifier = Modifier,
 ) {
@@ -38,12 +39,12 @@ fun SenderName(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         when (senderProfile) {
-            is ProfileTimelineDetails.Error,
-            ProfileTimelineDetails.Pending,
-            ProfileTimelineDetails.Unavailable -> {
+            is ProfileDetails.Error,
+            ProfileDetails.Pending,
+            ProfileDetails.Unavailable -> {
                 MainText(text = senderId.value, mode = senderNameMode)
             }
-            is ProfileTimelineDetails.Ready -> {
+            is ProfileDetails.Ready -> {
                 val displayName = senderProfile.displayName
                 if (displayName.isNullOrEmpty()) {
                     MainText(text = senderId.value, mode = senderNameMode)
@@ -120,7 +121,7 @@ internal fun SenderNamePreview(
 ) = ElementPreview {
     SenderName(
         senderId = senderNameData.userId,
-        senderProfile = senderNameData.profileTimelineDetails,
+        senderProfile = senderNameData.profileDetails,
         senderNameMode = senderNameData.senderNameMode,
     )
 }
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 b791ae2ca1..96ad91b869 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,11 +11,11 @@ package io.element.android.libraries.matrix.ui.messages.sender
 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.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 
 data class SenderNameData(
     val userId: UserId,
-    val profileTimelineDetails: ProfileTimelineDetails,
+    val profileDetails: ProfileDetails,
     val senderNameMode: SenderNameMode,
 )
 
@@ -37,7 +38,7 @@ open class SenderNameDataProvider : PreviewParameterProvider<SenderNameData> {
                     SenderNameData(
                         senderNameMode = senderNameMode,
                         userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
-                        profileTimelineDetails = ProfileTimelineDetails.Unavailable,
+                        profileDetails = ProfileDetails.Unavailable,
                     ),
                 )
             }
@@ -48,7 +49,7 @@ private fun aSenderNameData(
     displayNameAmbiguous: Boolean = false,
 ) = SenderNameData(
     userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
-    profileTimelineDetails = ProfileTimelineDetails.Ready(
+    profileDetails = ProfileDetails.Ready(
         displayName = "Alice ${senderNameMode.javaClass.simpleName}",
         displayNameAmbiguous = displayNameAmbiguous,
         avatarUrl = null
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameMode.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameMode.kt
index 0f1a6bb551..503c152553 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameMode.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameMode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt
index 778d535fc6..dd8655af26 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt
@@ -1,15 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.runtime.Immutable
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
@@ -21,7 +20,6 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.ui.R
 
-@Immutable
 data class InviteSender(
     val userId: UserId,
     val displayName: String,
@@ -31,7 +29,7 @@ data class InviteSender(
     @Composable
     fun annotatedString(): AnnotatedString {
         return stringResource(R.string.screen_invites_invited_you, displayName, userId.value).let { text ->
-            val senderNameStart = LocalContext.current.getString(R.string.screen_invites_invited_you).indexOf("%1\$s")
+            val senderNameStart = stringResource(R.string.screen_invites_invited_you).indexOf($$"%1$s")
             AnnotatedString(
                 text = text,
                 spanStyles = listOf(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensions.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensions.kt
index 72f69932aa..83a707347d 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensions.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a6520d5580..3a03d8329b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,16 +21,27 @@ fun RoomInfo.getAvatarData(size: AvatarSize) = AvatarData(
     size = size,
 )
 
+/**
+ * Returns the power level of the user in the room.
+ * If the user is a creator and [RoomInfo.privilegedCreatorRole] is true, returns the power level of [RoomMember.Role.Owner].
+ * Otherwise, checks the room's power levels for the user's power level.
+ * If no specific power level is set for the user, defaults to 0.
+ */
+fun RoomInfo.powerLevelOf(userId: UserId): Long {
+    return if (privilegedCreatorRole && creators.contains(userId)) {
+        RoomMember.Role.Owner(isCreator = true).powerLevel
+    } else {
+        roomPowerLevels?.powerLevelOf(userId = userId) ?: 0L
+    }
+}
+
 /**
  * Returns the role of the user in the room.
- * If the user is a creator, returns [RoomMember.Role.Owner].
+ * If the user is a creator and [RoomInfo.privilegedCreatorRole] is true, returns [RoomMember.Role.Owner].
  * Otherwise, checks the power levels and returns the corresponding role.
  * If no specific power level is set for the user, defaults to [RoomMember.Role.User].
  */
 fun RoomInfo.roleOf(userId: UserId): RoomMember.Role {
-    return if (creators.contains(userId)) {
-        RoomMember.Role.Owner(isCreator = true)
-    } else {
-        roomPowerLevels?.roleOf(userId) ?: RoomMember.Role.User
-    }
+    val powerLevel = powerLevelOf(userId = userId)
+    return RoomMember.Role.forPowerLevel(powerLevel)
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomMemberExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomMemberExtension.kt
index beba22507c..9ed27acc01 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomMemberExtension.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomMemberExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SelectRoomInfo.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SelectRoomInfo.kt
index 63a0b1cc77..49c8415fc7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SelectRoomInfo.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SelectRoomInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt
index 1c3111a2a2..195dfdb40e 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,7 +32,7 @@ val SpaceRoomVisibility.icon: ImageVector
         return when (this) {
             SpaceRoomVisibility.Private -> CompoundIcons.LockSolid()
             SpaceRoomVisibility.Public -> CompoundIcons.Public()
-            SpaceRoomVisibility.Restricted -> CompoundIcons.Workspace()
+            SpaceRoomVisibility.Restricted -> CompoundIcons.Space()
         }
     }
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
index ef266f44f2..cbbe79b480 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asFlow
@@ -38,16 +40,21 @@ open class LoadingRoomStateProvider : PreviewParameterProvider<LoadingRoomState>
 
 @Inject
 class LoadingRoomStateFlowFactory(private val matrixClient: MatrixClient) {
-    fun create(lifecycleScope: CoroutineScope, roomId: RoomId): StateFlow<LoadingRoomState> =
-        getJoinedRoomFlow(roomId)
-            .map { room ->
-                if (room != null) {
-                    LoadingRoomState.Loaded(room)
-                } else {
-                    LoadingRoomState.Error
+    fun create(lifecycleScope: CoroutineScope, roomId: RoomId, joinedRoom: JoinedRoom?): StateFlow<LoadingRoomState> {
+        return if (joinedRoom != null) {
+            MutableStateFlow<LoadingRoomState>(LoadingRoomState.Loaded(joinedRoom))
+        } else {
+            getJoinedRoomFlow(roomId)
+                .map { room ->
+                    if (room != null) {
+                        LoadingRoomState.Loaded(room)
+                    } else {
+                        LoadingRoomState.Error
+                    }
                 }
-            }
-            .stateIn(lifecycleScope, SharingStarted.Eagerly, LoadingRoomState.Loading)
+                .stateIn(lifecycleScope, SharingStarted.Eagerly, LoadingRoomState.Loading)
+        }
+    }
 
     private fun getJoinedRoomFlow(roomId: RoomId): Flow<JoinedRoom?> = suspend {
         matrixClient.getJoinedRoom(roomId = roomId)
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 445fa156a1..098117af74 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt
deleted file mode 100644
index ad97d30cfe..0000000000
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.matrix.ui.room
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.produceState
-import io.element.android.libraries.matrix.api.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
-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.canBan
-import io.element.android.libraries.matrix.api.room.powerlevels.canHandleKnockRequests
-import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
-import io.element.android.libraries.matrix.api.room.powerlevels.canKick
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
-import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage
-import io.element.android.libraries.matrix.ui.model.roleOf
-
-@Composable
-fun BaseRoom.canSendMessageAsState(type: MessageEventType, updateKey: Long): State<Boolean> {
-    return produceState(initialValue = true, key1 = updateKey) {
-        value = canSendMessage(type).getOrElse { true }
-    }
-}
-
-@Composable
-fun BaseRoom.canInviteAsState(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canInvite().getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.canRedactOwnAsState(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canRedactOwn().getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.canRedactOtherAsState(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canRedactOther().getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.canCall(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canUserJoinCall(sessionId).getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.canPinUnpin(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canUserPinUnpin(sessionId).getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.isDmAsState(): State<Boolean> {
-    return produceState(initialValue = false) {
-        roomInfoFlow.collect { value = it.isDm }
-    }
-}
-
-@Composable
-fun BaseRoom.canKickAsState(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canKick().getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.canBanAsState(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canBan().getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.canHandleKnockRequestsAsState(updateKey: Long): State<Boolean> {
-    return produceState(initialValue = false, key1 = updateKey) {
-        value = canHandleKnockRequests().getOrElse { false }
-    }
-}
-
-@Composable
-fun BaseRoom.userPowerLevelAsState(updateKey: Long): State<Long> {
-    return produceState(initialValue = 0, key1 = updateKey) {
-        value = userRole(sessionId)
-            .getOrDefault(RoomMember.Role.User)
-            .powerLevel
-    }
-}
-
-@Composable
-fun BaseRoom.isOwnUserAdmin(): Boolean {
-    val roomInfo by roomInfoFlow.collectAsState()
-    val role = roomInfo.roleOf(sessionId)
-    return role == RoomMember.Role.Admin || role is RoomMember.Role.Owner
-}
-
-@Composable
-fun BaseRoom.rawName(): String? {
-    val roomInfo by roomInfoFlow.collectAsState()
-    return roomInfo.rawName
-}
-
-@Composable
-fun BaseRoom.topic(): String? {
-    val roomInfo by roomInfoFlow.collectAsState()
-    return roomInfo.topic
-}
-
-@Composable
-fun BaseRoom.avatarUrl(): String? {
-    val roomInfo by roomInfoFlow.collectAsState()
-    return roomInfo.avatarUrl
-}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt
index 0e46463807..980c31bfa1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparator.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparator.kt
index cd0f8ad591..d5a7cfaa65 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparator.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparator.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/RoomMemberExtensions.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/RoomMemberExtensions.kt
index 9bf9e15d1f..9e5d70dc5f 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/RoomMemberExtensions.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/RoomMemberExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressField.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressField.kt
index f97e2ff766..4166f37cd7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressField.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressField.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidity.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidity.kt
index fef36ccd20..005f5f8097 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidity.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidity.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidityEffect.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidityEffect.kt
index e6ef9de2d3..d8b9b90c1d 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidityEffect.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressValidityEffect.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt
index 7e8573a34c..5d36b308c7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/safety/Avatars.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/main/res/values-hr/translations.xml b/libraries/matrixui/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..333d8fd7b7
--- /dev/null
+++ b/libraries/matrixui/src/main/res/values-hr/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">"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_invites_invited_you">"Pozvao vas je korisnik %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 069f0b8372..63add2d3c0 100644
--- a/libraries/matrixui/src/main/res/values-uz/translations.xml
+++ b/libraries/matrixui/src/main/res/values-uz/translations.xml
@@ -1,4 +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">"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_invites_invited_you">"%1$s(%2$s ) sizni taklif qildi"</string>
 </resources>
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/media/FakeLoggedInImageLoaderFactory.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/media/FakeLoggedInImageLoaderFactory.kt
deleted file mode 100644
index 56ee9ee653..0000000000
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/media/FakeLoggedInImageLoaderFactory.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.libraries.matrix.ui.media
-
-import coil3.ImageLoader
-import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
-
-class FakeLoggedInImageLoaderFactory(
-    private val newImageLoaderLambda: (MatrixMediaLoader) -> ImageLoader
-) : LoggedInImageLoaderFactory {
-    override fun newImageLoader(matrixMediaLoader: MatrixMediaLoader): ImageLoader {
-        return newImageLoaderLambda(matrixMediaLoader)
-    }
-}
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 ede520c15c..ad427999e2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9444081f7f..607f825401 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -44,7 +45,7 @@ class ToPlainTextTest {
         val formattedBody = FormattedBody(
             format = MessageFormat.HTML,
             body = """
-                Hello world
+                Hello <strong>formatted</strong> <em>world</em>
                 <ul><li>This is an unordered list.</li></ul>
                 <ol><li>This is an ordered list.</li></ol>
                 <br />
@@ -52,7 +53,7 @@ class ToPlainTextTest {
         )
         assertThat(formattedBody.toPlainText(permalinkParser = FakePermalinkParser())).isEqualTo(
             """
-            Hello world 
+            Hello formatted world 
             • This is an unordered list.
             1. This is an ordered list.
             """.trimIndent()
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
index 6b9683b0e0..9507a30763 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageTy
 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.permalink.FakePermalinkParser
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import org.junit.Test
 
@@ -46,7 +47,7 @@ class InReplyToDetailTest {
         val inReplyTo = InReplyTo.Ready(
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
-            senderProfile = aProfileTimelineDetails(),
+            senderProfile = aProfileDetails(),
             content = aRoomMembershipContent(
                 userId = A_USER_ID,
                 change = MembershipChange.INVITED,
@@ -64,7 +65,7 @@ class InReplyToDetailTest {
         val inReplyTo = InReplyTo.Ready(
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
-            senderProfile = aProfileTimelineDetails(),
+            senderProfile = aProfileDetails(),
             content = MessageContent(
                 body = "**Hello!**",
                 inReplyTo = null,
@@ -89,7 +90,7 @@ class InReplyToDetailTest {
         val inReplyTo = InReplyTo.Ready(
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
-            senderProfile = aProfileTimelineDetails(),
+            senderProfile = aProfileDetails(),
             content = MessageContent(
                 body = "**Hello!**",
                 inReplyTo = null,
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 c96e55c6fa..004e622211 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,7 +29,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
-import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
@@ -41,7 +42,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.aPollContent
-import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
@@ -133,7 +134,8 @@ class InReplyToMetadataKtTest {
                     filename = "filename",
                     body = "body",
                     info = anImageInfo(),
-                    source = aMediaSource(url = "url")
+                    source = aMediaSource(url = "url"),
+                    threadInfo = null,
                 )
             ).metadata(hideImage = false)
         }.test {
@@ -160,7 +162,8 @@ class InReplyToMetadataKtTest {
                     filename = "filename",
                     body = "body",
                     info = anImageInfo(),
-                    source = aMediaSource(url = "url")
+                    source = aMediaSource(url = "url"),
+                    threadInfo = null,
                 )
             ).metadata(hideImage = true)
         }.test {
@@ -444,7 +447,10 @@ class InReplyToMetadataKtTest {
     fun `unable to decrypt content`() = runTest {
         moleculeFlow(RecompositionMode.Immediate) {
             anInReplyToDetailsReady(
-                eventContent = UnableToDecryptContent(UnableToDecryptContent.Data.Unknown)
+                eventContent = UnableToDecryptContent(
+                    data = UnableToDecryptContent.Data.Unknown,
+                    threadInfo = null,
+                ),
             ).metadata(hideImage = false)
         }.test {
             awaitItem().let {
@@ -509,7 +515,7 @@ class InReplyToMetadataKtTest {
     fun `state content`() = runTest {
         moleculeFlow(RecompositionMode.Immediate) {
             anInReplyToDetailsReady(
-                eventContent = StateContent("", OtherState.RoomJoinRules)
+                eventContent = StateContent("", OtherState.RoomJoinRules(null))
             ).metadata(hideImage = false)
         }.test {
             awaitItem().let {
@@ -548,7 +554,7 @@ class InReplyToMetadataKtTest {
 private fun anInReplyToDetailsReady(
     eventId: EventId = AN_EVENT_ID,
     senderId: UserId = A_USER_ID,
-    senderProfile: ProfileTimelineDetails = aProfileTimelineDetails(),
+    senderProfile: ProfileDetails = aProfileDetails(),
     eventContent: EventContent? = aMessageContent(),
     textContent: String? = "textContent",
 ) = InReplyToDetails.Ready(
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 611616cdd7..dd9d801210 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt
new file mode 100644
index 0000000000..c6dcc27bba
--- /dev/null
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtensionTest.kt
@@ -0,0 +1,79 @@
+/*
+ * 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.ui.model
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+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_ID_3
+import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevelValues
+import kotlinx.collections.immutable.toImmutableMap
+import org.junit.Test
+
+class RoomInfoExtensionTest {
+    @Test
+    fun `roleOf returns Owner for creator with privilegedCreatorRole true`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = true,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.Owner(isCreator = true))
+    }
+
+    @Test
+    fun `roleOf returns User for not creator with privilegedCreatorRole true`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = true,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID_2)).isEqualTo(RoomMember.Role.User)
+    }
+
+    @Test
+    fun `roleOf returns User for creator with privilegedCreatorRole false`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = false,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.User)
+    }
+
+    @Test
+    fun `roleOf returns role from the power level`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = false,
+            roomPowerLevels = RoomPowerLevels(
+                values = defaultRoomPowerLevelValues(),
+                users = mapOf(
+                    A_USER_ID to 100L, // Admin
+                    A_USER_ID_2 to 50L, // Moderator
+                    A_USER_ID_3 to 0L, // User
+                ).toImmutableMap(),
+            ),
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.Admin)
+        assertThat(roomInfo.roleOf(A_USER_ID_2)).isEqualTo(RoomMember.Role.Moderator)
+        assertThat(roomInfo.roleOf(A_USER_ID_3)).isEqualTo(RoomMember.Role.User)
+    }
+
+    @Test
+    fun `roleOf returns User when the power level is null`() {
+        val roomInfo = aRoomInfo(
+            privilegedCreatorRole = false,
+            roomPowerLevels = null,
+            roomCreators = listOf(A_USER_ID),
+        )
+        assertThat(roomInfo.roleOf(A_USER_ID)).isEqualTo(RoomMember.Role.User)
+        assertThat(roomInfo.roleOf(A_USER_ID_2)).isEqualTo(RoomMember.Role.User)
+        assertThat(roomInfo.roleOf(A_USER_ID_3)).isEqualTo(RoomMember.Role.User)
+    }
+}
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChangeTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChangeTest.kt
index 8abf5092e6..d8ea1575ba 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChangeTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChangeTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelBaseRoomMemberComparatorTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparatorTest.kt
similarity index 92%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelBaseRoomMemberComparatorTest.kt
rename to libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparatorTest.kt
index 80ada2e7b6..d8240715b7 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelBaseRoomMemberComparatorTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/PowerLevelRoomMemberComparatorTest.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.members
+package io.element.android.libraries.matrix.ui.room
 
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.test.A_USER_ID
@@ -13,9 +14,10 @@ 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.A_USER_ID_4
 import io.element.android.libraries.matrix.test.A_USER_ID_5
+import io.element.android.libraries.matrix.test.room.aRoomMember
 import org.junit.Test
 
-class PowerLevelBaseRoomMemberComparatorTest {
+class PowerLevelRoomMemberComparatorTest {
     @Test
     fun `order is Admin, then Moderator, then User`() {
         val memberList = listOf(
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 6bf081cf1f..816ac0967e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediapickers/api/build.gradle.kts b/libraries/mediapickers/api/build.gradle.kts
index c130cd7900..5e3d78dbc4 100644
--- a/libraries/mediapickers/api/build.gradle.kts
+++ b/libraries/mediapickers/api/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,12 +14,12 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.mediapickers.api"
-
-    dependencies {
-        implementation(projects.libraries.uiStrings)
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.di)
-
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.di)
+
+    testCommonDependencies(libs)
 }
diff --git a/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerLauncher.kt b/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerLauncher.kt
index 2fdcd1ef40..7a9b393a2c 100644
--- a/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerLauncher.kt
+++ b/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerLauncher.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4a2f26a4b3..7ae35e8218 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4059aa0840..9c69e6448b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9f15041f91..6c7dbb7db7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediapickers/impl/build.gradle.kts b/libraries/mediapickers/impl/build.gradle.kts
index 6a90b95306..6ed9cd97dc 100644
--- a/libraries/mediapickers/impl/build.gradle.kts
+++ b/libraries/mediapickers/impl/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.setupDependencyInjection
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 878c9ea865..1b3df9c426 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,6 @@ import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.core.content.FileProvider
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.mediapickers.api.ComposePickerLauncher
 import io.element.android.libraries.mediapickers.api.NoOpPickerLauncher
@@ -27,7 +27,6 @@ import io.element.android.libraries.mediapickers.api.PickerType
 import java.io.File
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPickerProvider(
     @ApplicationContext private val context: Context,
 ) : PickerProvider {
diff --git a/libraries/mediapickers/test/build.gradle.kts b/libraries/mediapickers/test/build.gradle.kts
index ee743bb63d..d7c2989871 100644
--- a/libraries/mediapickers/test/build.gradle.kts
+++ b/libraries/mediapickers/test/build.gradle.kts
@@ -1,9 +1,8 @@
-import extension.setupDependencyInjection
-
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +10,12 @@ plugins {
     id("io.element.android-compose-library")
 }
 
-setupDependencyInjection()
-
 android {
     namespace = "io.element.android.libraries.mediapickers.test"
-
-    dependencies {
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.di)
-        api(projects.libraries.mediapickers.api)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.di)
+    api(projects.libraries.mediapickers.api)
 }
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 3a279868bf..98cbcec1ea 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaplayer/api/build.gradle.kts b/libraries/mediaplayer/api/build.gradle.kts
index f096738c6f..eb4a6cfaaf 100644
--- a/libraries/mediaplayer/api/build.gradle.kts
+++ b/libraries/mediaplayer/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/mediaplayer/api/src/main/kotlin/io/element/android/libraries/mediaplayer/api/MediaPlayer.kt b/libraries/mediaplayer/api/src/main/kotlin/io/element/android/libraries/mediaplayer/api/MediaPlayer.kt
index b10dd44b7f..7087235fec 100644
--- a/libraries/mediaplayer/api/src/main/kotlin/io/element/android/libraries/mediaplayer/api/MediaPlayer.kt
+++ b/libraries/mediaplayer/api/src/main/kotlin/io/element/android/libraries/mediaplayer/api/MediaPlayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaplayer/impl/build.gradle.kts b/libraries/mediaplayer/impl/build.gradle.kts
index bd6382f86f..aa9140df35 100644
--- a/libraries/mediaplayer/impl/build.gradle.kts
+++ b/libraries/mediaplayer/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayer.kt b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayer.kt
index 0767aea3ef..12b36207a6 100644
--- a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayer.kt
+++ b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.audio.api.AudioFocus
 import io.element.android.libraries.audio.api.AudioFocusRequester
@@ -36,7 +36,6 @@ import kotlin.time.Duration.Companion.seconds
  */
 @ContributesBinding(RoomScope::class)
 @SingleIn(RoomScope::class)
-@Inject
 class DefaultMediaPlayer(
     private val player: SimplePlayer,
     @SessionCoroutineScope
diff --git a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/SimplePlayer.kt b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/SimplePlayer.kt
index b6aff2570a..17bfe682e3 100644
--- a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/SimplePlayer.kt
+++ b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/SimplePlayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayerTest.kt b/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayerTest.kt
index a91a204378..f7a748b636 100644
--- a/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayerTest.kt
+++ b/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/DefaultMediaPlayerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/FakeSimplePlayer.kt b/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/FakeSimplePlayer.kt
index 34078ab4e8..c1e2dc9763 100644
--- a/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/FakeSimplePlayer.kt
+++ b/libraries/mediaplayer/impl/src/test/kotlin/io/element/android/libraries/mediaplayer/impl/FakeSimplePlayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaplayer/test/build.gradle.kts b/libraries/mediaplayer/test/build.gradle.kts
index c58a8bf106..e2f1c8ac29 100644
--- a/libraries/mediaplayer/test/build.gradle.kts
+++ b/libraries/mediaplayer/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaplayer/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeMediaPlayer.kt b/libraries/mediaplayer/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeMediaPlayer.kt
index 0dcd655424..1d1fd07ebd 100644
--- a/libraries/mediaplayer/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeMediaPlayer.kt
+++ b/libraries/mediaplayer/test/src/main/kotlin/io/element/android/libraries/mediaplayer/test/FakeMediaPlayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/api/build.gradle.kts b/libraries/mediaupload/api/build.gradle.kts
index bea5398372..a9f876c67f 100644
--- a/libraries/mediaupload/api/build.gradle.kts
+++ b/libraries/mediaupload/api/build.gradle.kts
@@ -1,10 +1,8 @@
-import extension.setupDependencyInjection
-import extension.testCommonDependencies
-
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +10,6 @@ plugins {
     id("io.element.android-library")
 }
 
-setupDependencyInjection()
-
 android {
     namespace = "io.element.android.libraries.mediaupload.api"
 }
@@ -26,9 +22,4 @@ dependencies {
     api(projects.libraries.matrix.api)
     api(projects.libraries.preferences.api)
     implementation(libs.coroutines.core)
-
-    testCommonDependencies(libs)
-    testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.preferences.test)
-    testImplementation(projects.libraries.mediaupload.test)
 }
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MaxUploadSizeProvider.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MaxUploadSizeProvider.kt
index 743a684b11..a5462a6caf 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MaxUploadSizeProvider.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MaxUploadSizeProvider.kt
@@ -1,23 +1,16 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api
 
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.matrix.api.MatrixClient
-
 /**
  * Provides the maximum upload size allowed by the Matrix server.
  */
-@Inject
-class MaxUploadSizeProvider(
-    private val matrixClient: MatrixClient,
-) {
-    suspend fun getMaxUploadSize(): Result<Long> {
-        return matrixClient.getMaxFileUploadSize()
-    }
+fun interface MaxUploadSizeProvider {
+    suspend fun getMaxUploadSize(): Result<Long>
 }
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfig.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfig.kt
index bfa6e427c9..561a5af79d 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfig.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfig.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfigProvider.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfigProvider.kt
index eb13022ae3..976a7057f2 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfigProvider.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaOptimizationConfigProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt
index 9f2f91f8c9..c2bf1e5f5d 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaPreProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7592f46fa6..628e760c1e 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
@@ -1,80 +1,49 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api
 
 import android.net.Uri
-import dev.zacsweers.metro.Assisted
-import dev.zacsweers.metro.AssistedFactory
-import dev.zacsweers.metro.AssistedInject
-import io.element.android.libraries.androidutils.hash.hash
-import io.element.android.libraries.core.extensions.flatMap
-import io.element.android.libraries.core.extensions.flatMapCatching
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.media.MediaUploadHandler
-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.timeline.Timeline
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Job
-import timber.log.Timber
-import java.io.File
-import java.util.concurrent.ConcurrentHashMap
 
-@AssistedInject
-class MediaSender(
-    private val preProcessor: MediaPreProcessor,
-    private val room: JoinedRoom,
-    @Assisted private val timelineMode: Timeline.Mode,
-    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
-) {
-    @AssistedFactory
-    interface Factory {
-        fun create(
-            timelineMode: Timeline.Mode,
-        ): MediaSender
-    }
+fun interface MediaSenderFactory {
+    /**
+     * Create a [MediaSender] for the given [Timeline.Mode], in the Room Scope.
+     */
+    fun create(
+        timelineMode: Timeline.Mode,
+    ): MediaSender
+}
 
-    private val ongoingUploadJobs = ConcurrentHashMap<Job.Key, MediaUploadHandler>()
-    val hasOngoingMediaUploads get() = ongoingUploadJobs.isNotEmpty()
+fun interface MediaSenderRoomFactory {
+    /**
+     * Create a [MediaSender] for the given [JoinedRoom], with timeline mode Live.
+     */
+    fun create(
+        room: JoinedRoom,
+    ): MediaSender
+}
 
+interface MediaSender {
     suspend fun preProcessMedia(
         uri: Uri,
         mimeType: String,
         mediaOptimizationConfig: MediaOptimizationConfig,
-    ): Result<MediaUploadInfo> {
-        Timber.d("Pre-processing media | uri: ${mediaId(uri)} | mimeType: $mimeType")
-        return preProcessor
-            .process(
-                uri = uri,
-                mimeType = mimeType,
-                deleteOriginal = false,
-                mediaOptimizationConfig = mediaOptimizationConfig,
-            )
-    }
+    ): Result<MediaUploadInfo>
 
     suspend fun sendPreProcessedMedia(
         mediaUploadInfo: MediaUploadInfo,
         caption: String?,
         formattedCaption: String?,
         inReplyToEventId: EventId?,
-    ): Result<Unit> {
-        val mediaLogId = mediaId(mediaUploadInfo.file)
-        return getTimeline().flatMap {
-            Timber.d("Started sending media $mediaLogId using timeline: ${it.mode}")
-            it.sendMedia(
-                uploadInfo = mediaUploadInfo,
-                caption = caption,
-                formattedCaption = formattedCaption,
-                inReplyToEventId = inReplyToEventId,
-            )
-        }
-            .handleSendResult(mediaLogId)
-    }
+    ): Result<Unit>
 
     suspend fun sendMedia(
         uri: Uri,
@@ -83,147 +52,14 @@ class MediaSender(
         formattedCaption: String? = null,
         inReplyToEventId: EventId? = null,
         mediaOptimizationConfig: MediaOptimizationConfig,
-    ): Result<Unit> {
-        return preProcessor
-            .process(
-                uri = uri,
-                mimeType = mimeType,
-                deleteOriginal = false,
-                mediaOptimizationConfig = mediaOptimizationConfig,
-            )
-            .flatMapCatching { info ->
-                getTimeline().getOrThrow().sendMedia(
-                    uploadInfo = info,
-                    caption = caption,
-                    formattedCaption = formattedCaption,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-            .handleSendResult(mediaId(uri))
-    }
+    ): Result<Unit>
 
     suspend fun sendVoiceMessage(
         uri: Uri,
         mimeType: String,
         waveForm: List<Float>,
         inReplyToEventId: EventId? = null,
-    ): Result<Unit> {
-        return preProcessor
-            .process(
-                uri = uri,
-                mimeType = mimeType,
-                deleteOriginal = true,
-                mediaOptimizationConfig = mediaOptimizationConfigProvider.get(),
-            )
-            .flatMapCatching { info ->
-                val audioInfo = (info as MediaUploadInfo.Audio).audioInfo
-                val newInfo = MediaUploadInfo.VoiceMessage(
-                    file = info.file,
-                    audioInfo = audioInfo,
-                    waveform = waveForm,
-                )
-                getTimeline().getOrThrow().sendMedia(
-                    uploadInfo = newInfo,
-                    caption = null,
-                    formattedCaption = null,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-            .handleSendResult(mediaId(uri))
-    }
+    ): Result<Unit>
 
-    private fun Result<Unit>.handleSendResult(mediaId: String) = this
-        .onFailure { error ->
-            val job = ongoingUploadJobs.remove(Job)
-            Timber.e(error, "Sending media $mediaId failed. Removing ongoing upload job. Total: ${ongoingUploadJobs.size}")
-            if (error !is CancellationException) {
-                job?.cancel()
-            }
-        }
-        .onSuccess {
-            Timber.d("Sent media $mediaId successfully. Removing ongoing upload job. Total: ${ongoingUploadJobs.size}")
-            ongoingUploadJobs.remove(Job)
-        }
-
-    private suspend fun Timeline.sendMedia(
-        uploadInfo: MediaUploadInfo,
-        caption: String?,
-        formattedCaption: String?,
-        inReplyToEventId: EventId?,
-    ): Result<Unit> {
-        val handler = when (uploadInfo) {
-            is MediaUploadInfo.Image -> {
-                sendImage(
-                    file = uploadInfo.file,
-                    thumbnailFile = uploadInfo.thumbnailFile,
-                    imageInfo = uploadInfo.imageInfo,
-                    caption = caption,
-                    formattedCaption = formattedCaption,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-            is MediaUploadInfo.Video -> {
-                sendVideo(
-                    file = uploadInfo.file,
-                    thumbnailFile = uploadInfo.thumbnailFile,
-                    videoInfo = uploadInfo.videoInfo,
-                    caption = caption,
-                    formattedCaption = formattedCaption,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-            is MediaUploadInfo.Audio -> {
-                sendAudio(
-                    file = uploadInfo.file,
-                    audioInfo = uploadInfo.audioInfo,
-                    caption = caption,
-                    formattedCaption = formattedCaption,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-            is MediaUploadInfo.VoiceMessage -> {
-                sendVoiceMessage(
-                    file = uploadInfo.file,
-                    audioInfo = uploadInfo.audioInfo,
-                    waveform = uploadInfo.waveform,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-            is MediaUploadInfo.AnyFile -> {
-                sendFile(
-                    file = uploadInfo.file,
-                    fileInfo = uploadInfo.fileInfo,
-                    caption = caption,
-                    formattedCaption = formattedCaption,
-                    inReplyToEventId = inReplyToEventId,
-                )
-            }
-        }
-
-        // We handle the cancellations here manually, so we suppress the warning
-        @Suppress("RunCatchingNotAllowed")
-        return handler
-            .mapCatching { uploadHandler ->
-                Timber.d("Added ongoing upload job, total: ${ongoingUploadJobs.size + 1}")
-                ongoingUploadJobs[Job] = uploadHandler
-                uploadHandler.await()
-            }
-    }
-
-    private suspend fun getTimeline(): Result<Timeline> {
-        return when (timelineMode) {
-            is Timeline.Mode.Thread -> {
-                room.createTimeline(CreateTimelineParams.Threaded(threadRootEventId = timelineMode.threadRootId))
-            }
-            else -> Result.success(room.liveTimeline)
-        }
-    }
-
-    /**
-     * Clean up any temporary files or resources used during the media processing.
-     */
-    fun cleanUp() = preProcessor.cleanUp()
+    fun cleanUp()
 }
-
-private fun mediaId(uri: Uri?): String = uri?.path.orEmpty().hash()
-private fun mediaId(file: File): String = file.path.orEmpty().hash()
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 4a656ce5d3..f0082a4d1b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/impl/build.gradle.kts b/libraries/mediaupload/impl/build.gradle.kts
index ffd01aac2f..827366f556 100644
--- a/libraries/mediaupload/impl/build.gradle.kts
+++ b/libraries/mediaupload/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -30,6 +31,7 @@ dependencies {
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
+    implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.matrix.api)
     implementation(projects.services.toolbox.api)
     implementation(libs.androidx.exifinterface)
@@ -41,4 +43,7 @@ dependencies {
 
     testCommonDependencies(libs)
     testImplementation(projects.services.toolbox.test)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.mediaupload.test)
 }
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 73c6e9c64a..2b1883619e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import android.net.Uri
 import androidx.exifinterface.media.ExifInterface
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.androidutils.file.createTmpFile
 import io.element.android.libraries.androidutils.file.getFileName
@@ -50,7 +50,6 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidMediaPreProcessor(
     @ApplicationContext private val context: Context,
     private val thumbnailFactory: ThumbnailFactory,
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMaxUploadSizeProvider.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMaxUploadSizeProvider.kt
new file mode 100644
index 0000000000..0cd43bca01
--- /dev/null
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMaxUploadSizeProvider.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.mediaupload.impl
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.mediaupload.api.MaxUploadSizeProvider
+
+/**
+ * Provides the maximum upload size allowed by the Matrix server.
+ */
+@ContributesBinding(SessionScope::class)
+class DefaultMaxUploadSizeProvider(
+    private val matrixClient: MatrixClient,
+) : MaxUploadSizeProvider {
+    override suspend fun getMaxUploadSize(): Result<Long> {
+        return matrixClient.getMaxFileUploadSize()
+    }
+}
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaOptimizationConfigProvider.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaOptimizationConfigProvider.kt
index f3e89730bd..363263e5bf 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaOptimizationConfigProvider.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaOptimizationConfigProvider.kt
@@ -1,27 +1,37 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import kotlinx.coroutines.flow.first
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultMediaOptimizationConfigProvider(
     private val sessionPreferencesStore: SessionPreferencesStore,
+    private val featureFlagsService: FeatureFlagService,
 ) : MediaOptimizationConfigProvider {
-    override suspend fun get(): MediaOptimizationConfig = MediaOptimizationConfig(
-        compressImages = sessionPreferencesStore.doesOptimizeImages().first(),
-        videoCompressionPreset = sessionPreferencesStore.getVideoCompressionPreset().first(),
-    )
+    override suspend fun get(): MediaOptimizationConfig {
+        val compressImages = sessionPreferencesStore.doesOptimizeImages().first()
+        return MediaOptimizationConfig(
+            compressImages = compressImages,
+            videoCompressionPreset = if (featureFlagsService.isFeatureEnabled(FeatureFlags.SelectableMediaQuality)) {
+                sessionPreferencesStore.getVideoCompressionPreset().first()
+            } else {
+                if (compressImages) VideoCompressionPreset.STANDARD else VideoCompressionPreset.HIGH
+            },
+        )
+    }
 }
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
new file mode 100644
index 0000000000..ea2cac2951
--- /dev/null
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSender.kt
@@ -0,0 +1,264 @@
+/*
+ * 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.mediaupload.impl
+
+import android.net.Uri
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.androidutils.hash.hash
+import io.element.android.libraries.core.extensions.flatMap
+import io.element.android.libraries.core.extensions.flatMapCatching
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.media.MediaUploadHandler
+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.timeline.Timeline
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
+import io.element.android.libraries.mediaupload.api.MediaPreProcessor
+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 kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Job
+import timber.log.Timber
+import java.io.File
+import java.util.concurrent.ConcurrentHashMap
+
+@ContributesBinding(RoomScope::class)
+class DefaultMediaSenderFactory(
+    private val preProcessor: MediaPreProcessor,
+    private val room: JoinedRoom,
+    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
+) : MediaSenderFactory {
+    override fun create(
+        timelineMode: Timeline.Mode,
+    ): MediaSender {
+        return DefaultMediaSender(
+            preProcessor = preProcessor,
+            room = room,
+            timelineMode = timelineMode,
+            mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
+        )
+    }
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultMediaSenderRoomFactory(
+    private val preProcessor: MediaPreProcessor,
+    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
+) : MediaSenderRoomFactory {
+    override fun create(
+        room: JoinedRoom,
+    ): MediaSender {
+        return DefaultMediaSender(
+            preProcessor = preProcessor,
+            room = room,
+            timelineMode = Timeline.Mode.Live,
+            mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
+        )
+    }
+}
+
+class DefaultMediaSender(
+    private val preProcessor: MediaPreProcessor,
+    private val room: JoinedRoom,
+    private val timelineMode: Timeline.Mode,
+    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
+) : MediaSender {
+    private val ongoingUploadJobs = ConcurrentHashMap<Job.Key, MediaUploadHandler>()
+    val hasOngoingMediaUploads get() = ongoingUploadJobs.isNotEmpty()
+
+    override suspend fun preProcessMedia(
+        uri: Uri,
+        mimeType: String,
+        mediaOptimizationConfig: MediaOptimizationConfig,
+    ): Result<MediaUploadInfo> {
+        Timber.d("Pre-processing media | uri: ${mediaId(uri)} | mimeType: $mimeType")
+        return preProcessor
+            .process(
+                uri = uri,
+                mimeType = mimeType,
+                deleteOriginal = false,
+                mediaOptimizationConfig = mediaOptimizationConfig,
+            )
+    }
+
+    override suspend fun sendPreProcessedMedia(
+        mediaUploadInfo: MediaUploadInfo,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        val mediaLogId = mediaId(mediaUploadInfo.file)
+        return getTimeline().flatMap {
+            Timber.d("Started sending media $mediaLogId using timeline: ${it.mode}")
+            it.sendMedia(
+                uploadInfo = mediaUploadInfo,
+                caption = caption,
+                formattedCaption = formattedCaption,
+                inReplyToEventId = inReplyToEventId,
+            )
+        }
+            .handleSendResult(mediaLogId)
+    }
+
+    override suspend fun sendMedia(
+        uri: Uri,
+        mimeType: String,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+        mediaOptimizationConfig: MediaOptimizationConfig,
+    ): Result<Unit> {
+        return preProcessor
+            .process(
+                uri = uri,
+                mimeType = mimeType,
+                deleteOriginal = false,
+                mediaOptimizationConfig = mediaOptimizationConfig,
+            )
+            .flatMapCatching { info ->
+                getTimeline().getOrThrow().sendMedia(
+                    uploadInfo = info,
+                    caption = caption,
+                    formattedCaption = formattedCaption,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+            .handleSendResult(mediaId(uri))
+    }
+
+    override suspend fun sendVoiceMessage(
+        uri: Uri,
+        mimeType: String,
+        waveForm: List<Float>,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        return preProcessor
+            .process(
+                uri = uri,
+                mimeType = mimeType,
+                deleteOriginal = true,
+                mediaOptimizationConfig = mediaOptimizationConfigProvider.get(),
+            )
+            .flatMapCatching { info ->
+                val audioInfo = (info as MediaUploadInfo.Audio).audioInfo
+                val newInfo = MediaUploadInfo.VoiceMessage(
+                    file = info.file,
+                    audioInfo = audioInfo,
+                    waveform = waveForm,
+                )
+                getTimeline().getOrThrow().sendMedia(
+                    uploadInfo = newInfo,
+                    caption = null,
+                    formattedCaption = null,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+            .handleSendResult(mediaId(uri))
+    }
+
+    private fun Result<Unit>.handleSendResult(mediaId: String) = this
+        .onFailure { error ->
+            val job = ongoingUploadJobs.remove(Job)
+            Timber.e(error, "Sending media $mediaId failed. Removing ongoing upload job. Total: ${ongoingUploadJobs.size}")
+            if (error !is CancellationException) {
+                job?.cancel()
+            }
+        }
+        .onSuccess {
+            Timber.d("Sent media $mediaId successfully. Removing ongoing upload job. Total: ${ongoingUploadJobs.size}")
+            ongoingUploadJobs.remove(Job)
+        }
+
+    private suspend fun Timeline.sendMedia(
+        uploadInfo: MediaUploadInfo,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        val handler = when (uploadInfo) {
+            is MediaUploadInfo.Image -> {
+                sendImage(
+                    file = uploadInfo.file,
+                    thumbnailFile = uploadInfo.thumbnailFile,
+                    imageInfo = uploadInfo.imageInfo,
+                    caption = caption,
+                    formattedCaption = formattedCaption,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+            is MediaUploadInfo.Video -> {
+                sendVideo(
+                    file = uploadInfo.file,
+                    thumbnailFile = uploadInfo.thumbnailFile,
+                    videoInfo = uploadInfo.videoInfo,
+                    caption = caption,
+                    formattedCaption = formattedCaption,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+            is MediaUploadInfo.Audio -> {
+                sendAudio(
+                    file = uploadInfo.file,
+                    audioInfo = uploadInfo.audioInfo,
+                    caption = caption,
+                    formattedCaption = formattedCaption,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+            is MediaUploadInfo.VoiceMessage -> {
+                sendVoiceMessage(
+                    file = uploadInfo.file,
+                    audioInfo = uploadInfo.audioInfo,
+                    waveform = uploadInfo.waveform,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+            is MediaUploadInfo.AnyFile -> {
+                sendFile(
+                    file = uploadInfo.file,
+                    fileInfo = uploadInfo.fileInfo,
+                    caption = caption,
+                    formattedCaption = formattedCaption,
+                    inReplyToEventId = inReplyToEventId,
+                )
+            }
+        }
+
+        // We handle the cancellations here manually, so we suppress the warning
+        @Suppress("RunCatchingNotAllowed")
+        return handler
+            .mapCatching { uploadHandler ->
+                Timber.d("Added ongoing upload job, total: ${ongoingUploadJobs.size + 1}")
+                ongoingUploadJobs[Job] = uploadHandler
+                uploadHandler.await()
+            }
+    }
+
+    private suspend fun getTimeline(): Result<Timeline> {
+        return when (timelineMode) {
+            is Timeline.Mode.Thread -> {
+                room.createTimeline(CreateTimelineParams.Threaded(threadRootEventId = timelineMode.threadRootId))
+            }
+            else -> Result.success(room.liveTimeline)
+        }
+    }
+
+    /**
+     * Clean up any temporary files or resources used during the media processing.
+     */
+    override fun cleanUp() = preProcessor.cleanUp()
+}
+
+private fun mediaId(uri: Uri?): String = uri?.path.orEmpty().hash()
+private fun mediaId(file: File): String = file.path.orEmpty().hash()
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt
index 3bcb367575..ab32afcf4c 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ImageCompressor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/MimeTypeUtil.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/MimeTypeUtil.kt
index e6437e5668..9d4c11cbea 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/MimeTypeUtil.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/MimeTypeUtil.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ThumbnailFactory.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ThumbnailFactory.kt
index c1c90302ba..6c6c711226 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ThumbnailFactory.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ThumbnailFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressor.kt
index 3c289ad942..11cb193aeb 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfig.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfig.kt
index 0337713f2a..152678261c 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfig.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfig.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3327a28e82..f4b4e7d4a5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4c4aaae02e..4dad31a784 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt
similarity index 89%
rename from libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt
rename to libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt
index e73bff4d7f..139042804f 100644
--- a/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt
+++ b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api
+package io.element.android.libraries.mediaupload.impl
 
 import android.net.Uri
 import com.google.common.truth.Truth.assertThat
@@ -18,6 +19,9 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 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
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
+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
@@ -32,7 +36,7 @@ import org.robolectric.RobolectricTestRunner
 import java.io.File
 
 @RunWith(RobolectricTestRunner::class)
-class MediaSenderTest {
+class DefaultMediaSenderTest {
     private val mediaOptimizationConfig = MediaOptimizationConfig(
         compressImages = true,
         videoCompressionPreset = VideoCompressionPreset.STANDARD,
@@ -41,7 +45,7 @@ class MediaSenderTest {
     @Test
     fun `given an attachment when sending it the preprocessor always runs`() = runTest {
         val preProcessor = FakeMediaPreProcessor()
-        val sender = createMediaSender(
+        val sender = createDefaultMediaSender(
             preProcessor = preProcessor,
             room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline().apply {
@@ -76,7 +80,7 @@ class MediaSenderTest {
                 sendImageLambda = sendImageResult
             },
         )
-        val sender = createMediaSender(room = room)
+        val sender = createDefaultMediaSender(room = room)
 
         val uri = Uri.parse("content://image.jpg")
         sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, mediaOptimizationConfig = mediaOptimizationConfig)
@@ -87,7 +91,7 @@ class MediaSenderTest {
         val preProcessor = FakeMediaPreProcessor().apply {
             givenResult(Result.failure(Exception()))
         }
-        val sender = createMediaSender(preProcessor)
+        val sender = createDefaultMediaSender(preProcessor)
 
         val uri = Uri.parse("content://image.jpg")
         val result = sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, mediaOptimizationConfig = mediaOptimizationConfig)
@@ -109,7 +113,7 @@ class MediaSenderTest {
                 sendImageLambda = sendImageResult
             },
         )
-        val sender = createMediaSender(
+        val sender = createDefaultMediaSender(
             preProcessor = preProcessor,
             room = room,
         )
@@ -132,7 +136,7 @@ class MediaSenderTest {
                 sendFileLambda = sendFileResult
             },
         )
-        val sender = createMediaSender(room = room)
+        val sender = createDefaultMediaSender(room = room)
         val sendJob = launch {
             val uri = Uri.parse("content://image.jpg")
             sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, mediaOptimizationConfig = mediaOptimizationConfig)
@@ -154,11 +158,11 @@ class MediaSenderTest {
         sendFileResult.assertions().isCalledOnce()
     }
 
-    private fun createMediaSender(
+    private fun createDefaultMediaSender(
         preProcessor: MediaPreProcessor = FakeMediaPreProcessor(),
         room: JoinedRoom = FakeJoinedRoom(),
         mediaOptimizationConfigProvider: MediaOptimizationConfigProvider = MediaOptimizationConfigProvider { mediaOptimizationConfig },
-    ) = MediaSender(
+    ) = DefaultMediaSender(
         preProcessor = preProcessor,
         room = room,
         timelineMode = Timeline.Mode.Live,
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 943e89011f..041d05ae1e 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/test/build.gradle.kts b/libraries/mediaupload/test/build.gradle.kts
index 23a5f9a20f..7e729089c7 100644
--- a/libraries/mediaupload/test/build.gradle.kts
+++ b/libraries/mediaupload/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaOptimizationConfigProvider.kt b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaOptimizationConfigProvider.kt
index 6e5d73d305..f22129e5fa 100644
--- a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaOptimizationConfigProvider.kt
+++ b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaOptimizationConfigProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 cda951ff50..c07ebb6ec9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..1713f7b5ea
--- /dev/null
+++ b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaSender.kt
@@ -0,0 +1,64 @@
+/*
+ * 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.mediaupload.test
+
+import android.net.Uri
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
+import io.element.android.libraries.mediaupload.api.MediaSender
+import io.element.android.libraries.mediaupload.api.MediaUploadInfo
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeMediaSender(
+    private val preProcessMediaResult: () -> Result<MediaUploadInfo> = { lambdaError() },
+    private val sendPreProcessedMediaResult: () -> Result<Unit> = { lambdaError() },
+    private val sendMediaResult: () -> Result<Unit> = { lambdaError() },
+    private val sendVoiceMessageResult: () -> Result<Unit> = { lambdaError() },
+    private val cleanUpResult: () -> Unit = { lambdaError() },
+) : MediaSender {
+    override suspend fun preProcessMedia(
+        uri: Uri,
+        mimeType: String,
+        mediaOptimizationConfig: MediaOptimizationConfig,
+    ): Result<MediaUploadInfo> {
+        return preProcessMediaResult()
+    }
+
+    override suspend fun sendPreProcessedMedia(
+        mediaUploadInfo: MediaUploadInfo,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        return sendPreProcessedMediaResult()
+    }
+
+    override suspend fun sendMedia(
+        uri: Uri,
+        mimeType: String,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+        mediaOptimizationConfig: MediaOptimizationConfig,
+    ): Result<Unit> {
+        return sendMediaResult()
+    }
+
+    override suspend fun sendVoiceMessage(
+        uri: Uri,
+        mimeType: String,
+        waveForm: List<Float>,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        return sendVoiceMessageResult()
+    }
+
+    override fun cleanUp() {
+        cleanUpResult()
+    }
+}
diff --git a/libraries/mediaviewer/api/build.gradle.kts b/libraries/mediaviewer/api/build.gradle.kts
index 0f8aad9561..59760d2652 100644
--- a/libraries/mediaviewer/api/build.gradle.kts
+++ b/libraries/mediaviewer/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt
index 841e82f195..906604fd82 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaGalleryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,15 +15,15 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
 
 interface MediaGalleryEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onBackClick()
-        fun onViewInTimeline(eventId: EventId)
+        fun viewInTimeline(eventId: EventId)
+        fun forward(eventId: EventId, fromPinnedEvents: Boolean)
     }
 }
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 da7944e5d1..74b479dc8c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 906283c457..536930b968 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,18 +20,19 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import kotlinx.parcelize.Parcelize
 
 interface MediaViewerEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun params(params: Params): NodeBuilder
-        fun avatar(filename: String, avatarUrl: String): NodeBuilder
-        fun build(): Node
-    }
+    fun createParamsForAvatar(filename: String, avatarUrl: String): Params
 
     interface Callback : Plugin {
         fun onDone()
-        fun onViewInTimeline(eventId: EventId)
+        fun viewInTimeline(eventId: EventId)
+        fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean)
     }
 
     data class Params(
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 a6ead62d27..fc40bca8dd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMedia.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMedia.kt
index 930c7361e8..0041930d93 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMedia.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMedia.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaFactory.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaFactory.kt
index ac10bfecd7..383f985c4f 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaFactory.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaRenderer.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaRenderer.kt
index 0706fb5a0a..fb7f26101e 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaRenderer.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaRenderer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/util/FileExtensionExtractor.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/util/FileExtensionExtractor.kt
index 440381f1d3..094b4513d8 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/util/FileExtensionExtractor.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/util/FileExtensionExtractor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/build.gradle.kts b/libraries/mediaviewer/impl/build.gradle.kts
index 4af1c54f46..9c2342ecd9 100644
--- a/libraries/mediaviewer/impl/build.gradle.kts
+++ b/libraries/mediaviewer/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -32,6 +33,7 @@ dependencies {
     implementation(libs.vanniktech.blurhash)
     implementation(libs.telephoto.flick)
 
+    implementation(projects.features.enterprise.api)
     implementation(projects.features.viewfolder.api)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
@@ -42,7 +44,7 @@ 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.voiceplayer.api)
     implementation(projects.services.toolbox.api)
@@ -54,10 +56,12 @@ dependencies {
     implementation(projects.libraries.matrix.api)
 
     testCommonDependencies(libs, true)
+    testImplementation(projects.features.enterprise.test)
     testImplementation(projects.libraries.audio.test)
     testImplementation(projects.libraries.dateformatter.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.matrixui)
     testImplementation(projects.libraries.mediaviewer.test)
     testImplementation(projects.services.toolbox.test)
     testImplementation(libs.coroutines.core)
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPoint.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPoint.kt
index 0b6c2cc6cb..433a53ae9f 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPoint.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,29 +10,22 @@ package io.element.android.libraries.mediaviewer.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
 import io.element.android.libraries.mediaviewer.impl.gallery.root.MediaGalleryFlowNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMediaGalleryEntryPoint : MediaGalleryEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MediaGalleryEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : MediaGalleryEntryPoint.NodeBuilder {
-            override fun callback(callback: MediaGalleryEntryPoint.Callback): MediaGalleryEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<MediaGalleryFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: MediaGalleryEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<MediaGalleryFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(callback),
+        )
     }
 }
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 d2800ef9b8..e1e112ecfa 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,10 +10,8 @@ package io.element.android.libraries.mediaviewer.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.core.UserId
@@ -22,54 +21,43 @@ import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerNode
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMediaViewerEntryPoint : MediaViewerEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MediaViewerEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
+    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(
+                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,
+        )
+    }
 
-        return object : MediaViewerEntryPoint.NodeBuilder {
-            override fun callback(callback: MediaViewerEntryPoint.Callback): MediaViewerEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun params(params: MediaViewerEntryPoint.Params): MediaViewerEntryPoint.NodeBuilder {
-                plugins += params
-                return this
-            }
-
-            override fun avatar(filename: String, avatarUrl: String): MediaViewerEntryPoint.NodeBuilder {
-                // We need to fake the MimeType here for the viewer to work.
-                val mimeType = MimeTypes.Images
-                return params(
-                    MediaViewerEntryPoint.Params(
-                        mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
-                        eventId = null,
-                        mediaInfo = MediaInfo(
-                            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,
-                    )
-                )
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<MediaViewerNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: MediaViewerEntryPoint.Params,
+        callback: MediaViewerEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<MediaViewerNode>(
+            buildContext = buildContext,
+            plugins = listOf(params, callback),
+        )
     }
 }
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 d6d9128869..edbf9dc51e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt
index 5d998d25fd..5e127b6738 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.datasource
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -23,7 +23,6 @@ fun interface FocusedTimelineMediaGalleryDataSourceFactory {
 }
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultFocusedTimelineMediaGalleryDataSourceFactory(
     private val room: JoinedRoom,
     private val timelineMediaItemsFactory: TimelineMediaItemsFactory,
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 f40bb08a86..722e14a790 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
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.datasource
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.di.RoomScope
@@ -39,7 +39,6 @@ interface MediaGalleryDataSource {
 
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
-@Inject
 class TimelineMediaGalleryDataSource(
     private val room: BaseRoom,
     private val mediaTimeline: MediaTimeline,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt
index 102fc611ef..d95c3b4490 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
index c3543ba129..d20c620f36 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
@@ -1,14 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.datasource
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
@@ -36,7 +36,6 @@ interface MediaTimeline {
  */
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
-@Inject
 class LiveMediaTimeline(
     private val room: JoinedRoom,
 ) : MediaTimeline {
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 a9ee0a89e2..d2f78a7249 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt
index 125981d4f8..1ffc12bb18 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/VirtualItemFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ac2b7b761d..7cd4dee318 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 121f23a79b..3850f3a0f8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 22c29c590b..a6c30796af 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -49,6 +50,7 @@ fun MediaDetailsBottomSheet(
     state: MediaBottomSheetState.MediaDetailsBottomSheetState,
     onViewInTimeline: (EventId) -> Unit,
     onShare: (EventId) -> Unit,
+    onForward: (EventId) -> Unit,
     onDownload: (EventId) -> Unit,
     onDelete: (EventId) -> Unit,
     onDismiss: () -> Unit,
@@ -102,6 +104,14 @@ fun MediaDetailsBottomSheet(
                             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)) },
@@ -216,6 +226,7 @@ internal fun MediaDetailsBottomSheetPreview() = ElementPreview {
         state = aMediaDetailsBottomSheetState(),
         onViewInTimeline = {},
         onShare = {},
+        onForward = {},
         onDownload = {},
         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
index 2d83ff40f3..a152a32091 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/MediaGalleryEvents.kt
index df7d82c7b2..2bf4f6b37d 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/MediaGalleryEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,8 +17,9 @@ 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 SaveOnDisk(val eventId: EventId?) : 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
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt
index 0195e7f39c..3e60b4e804 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNavigator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,4 +12,5 @@ import io.element.android.libraries.matrix.api.core.EventId
 
 interface MediaGalleryNavigator {
     fun onViewInTimelineClick(eventId: EventId)
+    fun onForwardClick(eventId: EventId)
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt
index 06a3c6a58f..ca1fd62b6b 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,10 +14,10 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.EventId
 import io.element.android.libraries.mediaviewer.impl.gallery.di.LocalMediaItemPresenterFactories
@@ -38,26 +39,19 @@ class MediaGalleryNode(
 
     interface Callback : Plugin {
         fun onBackClick()
-        fun onItemClick(item: MediaItem.Event)
-        fun onViewInTimeline(eventId: EventId)
+        fun showItem(item: MediaItem.Event)
+        fun viewInTimeline(eventId: EventId)
+        fun forward(eventId: EventId)
     }
 
-    private fun onBackClick() {
-        plugins<Callback>().forEach {
-            it.onBackClick()
-        }
-    }
+    private val callback: Callback = callback()
 
     override fun onViewInTimelineClick(eventId: EventId) {
-        plugins<Callback>().forEach {
-            it.onViewInTimeline(eventId)
-        }
+        callback.viewInTimeline(eventId)
     }
 
-    private fun onItemClick(item: MediaItem.Event) {
-        plugins<Callback>().forEach {
-            it.onItemClick(item)
-        }
+    override fun onForwardClick(eventId: EventId) {
+        callback.forward(eventId)
     }
 
     @Composable
@@ -68,8 +62,8 @@ class MediaGalleryNode(
             val state = presenter.present()
             MediaGalleryView(
                 state = state,
-                onBackClick = ::onBackClick,
-                onItemClick = ::onItemClick,
+                onBackClick = callback::onBackClick,
+                onItemClick = callback::showItem,
                 modifier = modifier,
             )
         }
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 ba3d4d5e1f..cc26e69c33 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,8 +30,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarM
 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.room.BaseRoom
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
 import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource
@@ -38,8 +38,10 @@ import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetSta
 import io.element.android.libraries.mediaviewer.impl.local.LocalMediaActions
 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.MediaPermissions
 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.ui.strings.CommonStrings
 import kotlinx.coroutines.launch
@@ -79,10 +81,14 @@ class MediaGalleryPresenter(
             mediaGalleryDataSource.start()
         }
 
+        val permissions by room.permissionsAsState(MediaPermissions.DEFAULT) { perms ->
+            perms.mediaPermissions()
+        }
+
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
         localMediaActions.Configure()
 
-        fun handleEvents(event: MediaGalleryEvents) {
+        fun handleEvent(event: MediaGalleryEvents) {
             when (event) {
                 is MediaGalleryEvents.ChangeMode -> {
                     mode = event.mode
@@ -105,6 +111,10 @@ class MediaGalleryPresenter(
                         share(it)
                     }
                 }
+                is MediaGalleryEvents.Forward -> {
+                    mediaBottomSheetState = MediaBottomSheetState.Hidden
+                    navigator.onForwardClick(event.eventId)
+                }
                 is MediaGalleryEvents.ViewInTimeline -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     navigator.onViewInTimelineClick(event.eventId)
@@ -114,8 +124,8 @@ class MediaGalleryPresenter(
                         eventId = event.mediaItem.eventId(),
                         canDelete = when (event.mediaItem.mediaInfo().senderId) {
                             null -> false
-                            room.sessionId -> room.canRedactOwn().getOrElse { false } && event.mediaItem.eventId() != null
-                            else -> room.canRedactOther().getOrElse { false } && event.mediaItem.eventId() != null
+                            room.sessionId -> permissions.canRedactOwn && event.mediaItem.eventId() != null
+                            else -> permissions.canRedactOther && event.mediaItem.eventId() != null
                         },
                         mediaInfo = event.mediaItem.mediaInfo(),
                         thumbnailSource = when (event.mediaItem) {
@@ -146,7 +156,7 @@ class MediaGalleryPresenter(
             groupedMediaItems = groupedMediaItems,
             mediaBottomSheetState = mediaBottomSheetState,
             snackbarMessage = snackbarMessage,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
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 62877368d7..897e5d1e97 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 aedea1eb75..a19f810e45 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@ 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.aWaveForm
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
 import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState
@@ -71,7 +72,7 @@ open class MediaGalleryStateProvider : PreviewParameterProvider<MediaGalleryStat
                             aMediaItemAudio(id = UniqueId("4")),
                             aMediaItemVoice(
                                 id = UniqueId("5"),
-                                waveform = aWaveForm(),
+                                waveform = WaveFormSamples.realisticWaveForm,
                             ),
                             aMediaItemLoadingIndicator(),
                         ).toImmutableList()
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 a48ff93d71..6f7a201fdc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -166,6 +167,9 @@ fun MediaGalleryView(
                 onShare = { eventId ->
                     state.eventSink(MediaGalleryEvents.Share(eventId))
                 },
+                onForward = { eventId ->
+                    state.eventSink(MediaGalleryEvents.Forward(eventId))
+                },
                 onDownload = { eventId ->
                     state.eventSink(MediaGalleryEvents.SaveOnDisk(eventId))
                 },
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt
index fe3a65ff4a..f38262ec4b 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/FakeTimelineItemPresenterFactories.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/LocalMediaItemPresenterFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/LocalMediaItemPresenterFactories.kt
index 1b67559f30..04003d8f9b 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/LocalMediaItemPresenterFactories.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/LocalMediaItemPresenterFactories.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt
index eb04d88787..38ea708471 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemEventContentKey.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt
index eaf0f5a49e..b74debc177 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactories.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt
index 0b3c77eda1..6553a0a361 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/di/MediaItemPresenterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e617829ad0..5d6a48c25b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,13 +14,13 @@ 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 com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.architecture.BackstackWithOverlayBox
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.overlay.Overlay
 import io.element.android.libraries.architecture.overlay.operation.hide
@@ -44,7 +45,7 @@ import kotlinx.parcelize.Parcelize
 class MediaGalleryFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val mediaViewerEntryPoint: MediaViewerEntryPoint
+    private val mediaViewerEntryPoint: MediaViewerEntryPoint,
 ) : BaseFlowNode<MediaGalleryFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Root,
@@ -70,31 +71,25 @@ class MediaGalleryFlowNode(
         ) : NavTarget
     }
 
-    private fun onBackClick() {
-        plugins<MediaGalleryEntryPoint.Callback>().forEach {
-            it.onBackClick()
-        }
-    }
-
-    private fun onViewInTimeline(eventId: EventId) {
-        plugins<MediaGalleryEntryPoint.Callback>().forEach {
-            it.onViewInTimeline(eventId)
-        }
-    }
+    private val callback: MediaGalleryEntryPoint.Callback = callback()
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Root -> {
                 val callback = object : MediaGalleryNode.Callback {
                     override fun onBackClick() {
-                        this@MediaGalleryFlowNode.onBackClick()
+                        callback.onBackClick()
                     }
 
-                    override fun onViewInTimeline(eventId: EventId) {
-                        this@MediaGalleryFlowNode.onViewInTimeline(eventId)
+                    override fun viewInTimeline(eventId: EventId) {
+                        callback.viewInTimeline(eventId)
                     }
 
-                    override fun onItemClick(item: MediaItem.Event) {
+                    override fun forward(eventId: EventId) {
+                        callback.forward(eventId, fromPinnedEvents = false)
+                    }
+
+                    override fun showItem(item: MediaItem.Event) {
                         val mode = when (item) {
                             is MediaItem.Audio,
                             is MediaItem.Voice,
@@ -121,23 +116,28 @@ class MediaGalleryFlowNode(
                         overlay.hide()
                     }
 
-                    override fun onViewInTimeline(eventId: EventId) {
-                        this@MediaGalleryFlowNode.onViewInTimeline(eventId)
+                    override fun viewInTimeline(eventId: EventId) {
+                        callback.viewInTimeline(eventId)
+                    }
+
+                    override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
+                        // Need to go to the parent because of the overlay
+                        callback.forward(eventId, fromPinnedEvents)
                     }
                 }
-                mediaViewerEntryPoint.nodeBuilder(this, buildContext)
-                    .params(
-                        MediaViewerEntryPoint.Params(
-                            mode = navTarget.mode,
-                            eventId = navTarget.eventId,
-                            mediaInfo = navTarget.mediaInfo,
-                            mediaSource = navTarget.mediaSource,
-                            thumbnailSource = navTarget.thumbnailSource,
-                            canShowInfo = true,
-                        )
-                    )
-                    .callback(callback)
-                    .build()
+                mediaViewerEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = MediaViewerEntryPoint.Params(
+                        mode = navTarget.mode,
+                        eventId = navTarget.eventId,
+                        mediaInfo = navTarget.mediaInfo,
+                        mediaSource = navTarget.mediaSource,
+                        thumbnailSource = navTarget.thumbnailSource,
+                        canShowInfo = true,
+                    ),
+                    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 7229bdb9c1..ed4e59d631 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/CaptionView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/CaptionView.kt
index 2c6cf286a9..cb137cf2ed 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/CaptionView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/CaptionView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt
index ff59a67b49..b04b25a53e 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/DateItemView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2b01b734e8..7738e4c1e4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt
index 05e6ccf86a..65256d6110 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/ImageItemView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ccbc9079cd..25e8a88dfe 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt
index 13d49a9919..05705a9251 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemDateSeparatorProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 74042472f9..7419ae3d44 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt
index 34eef52479..c9c4666904 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVideoProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8353e5bfca..4b23d28795 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4bfe58badd..7d9e634687 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bd8daa69e1..878c8ffd3a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt
index 830a405110..4eac5a5ce3 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6e7508a947..c7a01ea494 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,7 +32,6 @@ import androidx.core.content.PermissionChecker
 import androidx.core.net.toFile
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.system.startInstallFromSourceIntent
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -47,7 +47,6 @@ import java.io.FileOutputStream
 import java.io.InputStream
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidLocalMediaActions(
     @ApplicationContext private val context: Context,
     private val coroutineDispatchers: CoroutineDispatchers,
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 4854c1e2f9..05cbe40f36 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import android.net.Uri
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.file.getFileName
 import io.element.android.libraries.androidutils.file.getFileSize
 import io.element.android.libraries.androidutils.file.getMimeType
@@ -28,7 +28,6 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
 import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidLocalMediaFactory(
     @ApplicationContext private val context: Context,
     private val fileSizeFormatter: FileSizeFormatter,
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 1e69abecc1..96450d99bf 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.viewfolder.api.TextFileViewer
 import io.element.android.libraries.audio.api.AudioFocus
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
@@ -22,7 +22,6 @@ import me.saket.telephoto.zoomable.ZoomSpec
 import me.saket.telephoto.zoomable.rememberZoomableState
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultLocalMediaRenderer(
     private val textFileViewer: TextFileViewer,
     private val audioFocus: AudioFocus,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaActions.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaActions.kt
index afef2505ff..8aee16c19a 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaActions.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaActions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1ce9bd33eb..cc276b52c8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaViewState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaViewState.kt
index da03000fd7..08b3ec5eca 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaViewState.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaViewState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 54a6127d9d..1bf952d4a0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaInfoAudioProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaInfoAudioProvider.kt
index fd6e338b5e..02607e3e0e 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaInfoAudioProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaInfoAudioProvider.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.local.audio
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.libraries.designsystem.components.media.aWaveForm
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo
 
@@ -17,7 +18,7 @@ open class MediaInfoAudioProvider : PreviewParameterProvider<MediaInfo> {
         get() = sequenceOf(
             anAudioMediaInfo(),
             anAudioMediaInfo(
-                waveForm = aWaveForm(),
+                waveForm = WaveFormSamples.realisticWaveForm,
             ),
         )
 }
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 7905ae8b15..4c267a54dc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 29e743c7b0..912ea88e99 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 42a693fc77..8e41a4809a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4deae2dddc..306a18b4d6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/MediaPdfView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/MediaPdfView.kt
index 0d090e33f2..82024bde90 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/MediaPdfView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/MediaPdfView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/ParcelFileDescriptorFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/ParcelFileDescriptorFactory.kt
index 9f6d10b6b0..67949c9931 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/ParcelFileDescriptorFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/ParcelFileDescriptorFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfPage.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfPage.kt
index ffa787d0e9..7163ccb290 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfPage.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfPage.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfRendererManager.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfRendererManager.kt
index c7562e98e7..3b2e16960c 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfRendererManager.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfRendererManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewer.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewer.kt
index 3493c277cb..395a4429ab 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewer.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewerState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewerState.kt
index 024184747c..83d111ef67 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewerState.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/pdf/PdfViewerState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerExtensions.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerExtensions.kt
index 115e3ca72b..4e17b77336 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerExtensions.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerExtensions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 83ef2d4ac2..d0043c657a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 19d90bf109..51a44d49fb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,6 +38,8 @@ import androidx.media3.common.VideoSize
 import androidx.media3.common.text.CueGroup
 import androidx.media3.common.util.Clock
 import androidx.media3.common.util.Size
+import androidx.media3.exoplayer.CodecParameters
+import androidx.media3.exoplayer.CodecParametersChangeListener
 import androidx.media3.exoplayer.DecoderCounters
 import androidx.media3.exoplayer.ExoPlaybackException
 import androidx.media3.exoplayer.ExoPlayer
@@ -159,6 +162,8 @@ class ExoPlayerForPreview(
     override fun getAudioAttributes(): AudioAttributes = throw NotImplementedError()
     override fun setVolume(volume: Float) = throw NotImplementedError()
     override fun getVolume(): Float = throw NotImplementedError()
+    override fun mute() {}
+    override fun unmute() {}
     override fun clearVideoSurface() {}
     override fun clearVideoSurface(surface: Surface?) {}
     override fun setVideoSurface(surface: Surface?) {}
@@ -191,6 +196,7 @@ class ExoPlayerForPreview(
     override fun getRendererCount(): Int = throw NotImplementedError()
     override fun getRendererType(index: Int): Int = throw NotImplementedError()
     override fun getRenderer(index: Int): Renderer = throw NotImplementedError()
+    override fun getSecondaryRenderer(index: Int): Renderer? = throw NotImplementedError()
     override fun getTrackSelector(): TrackSelector? = throw NotImplementedError()
     override fun getCurrentTrackGroups(): TrackGroupArray = throw NotImplementedError()
     override fun getCurrentTrackSelections(): TrackSelectionArray = throw NotImplementedError()
@@ -215,6 +221,7 @@ class ExoPlayerForPreview(
     override fun setAuxEffectInfo(auxEffectInfo: AuxEffectInfo) {}
     override fun clearAuxEffectInfo() {}
     override fun setPreferredAudioDevice(audioDeviceInfo: AudioDeviceInfo?) {}
+    override fun setVirtualDeviceId(virtualDeviceId: Int) {}
     override fun setSkipSilenceEnabled(skipSilenceEnabled: Boolean) {}
     override fun getSkipSilenceEnabled(): Boolean = throw NotImplementedError()
     override fun setScrubbingModeEnabled(scrubbingModeEnabled: Boolean) {}
@@ -233,6 +240,9 @@ class ExoPlayerForPreview(
     override fun createMessage(target: PlayerMessage.Target): PlayerMessage = throw NotImplementedError()
     override fun setSeekParameters(seekParameters: SeekParameters?) {}
     override fun getSeekParameters(): SeekParameters = throw NotImplementedError()
+    override fun setSeekBackIncrementMs(seekBackIncrementMs: Long) {}
+    override fun setSeekForwardIncrementMs(seekForwardIncrementMs: Long) {}
+    override fun setMaxSeekToPreviousPositionMs(maxSeekToPreviousPositionMs: Long) {}
     override fun setForegroundMode(foregroundMode: Boolean) {}
     override fun setPauseAtEndOfMediaItems(pauseAtEndOfMediaItems: Boolean) {}
     override fun getPauseAtEndOfMediaItems(): Boolean = throw NotImplementedError()
@@ -248,4 +258,10 @@ class ExoPlayerForPreview(
     override fun isTunnelingEnabled(): Boolean = throw NotImplementedError()
     override fun isReleased(): Boolean = throw NotImplementedError()
     override fun setImageOutput(imageOutput: ImageOutput?) {}
+    override fun setAudioCodecParameters(codecParameters: CodecParameters) {}
+    override fun addAudioCodecParametersChangeListener(listener: CodecParametersChangeListener, keys: List<String>) {}
+    override fun removeAudioCodecParametersChangeListener(listener: CodecParametersChangeListener) {}
+    override fun setVideoCodecParameters(codecParameters: CodecParameters) {}
+    override fun addVideoCodecParametersChangeListener(listener: CodecParametersChangeListener, keys: List<String>) {}
+    override fun removeVideoCodecParametersChangeListener(listener: CodecParametersChangeListener) {}
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerState.kt
index 6160b6758c..b7fe22a27a 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerState.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerStateProvider.kt
index 2ce66a79e3..bcdef4713a 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerStateProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e4add62aab..7c09c02867 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt
index 00480f2d42..d92e400495 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileContentProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt
index 4c4429b775..f4984470dd 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/txt/TextFileView.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0ce19aaa84..65148f37ff 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt
index 448426f374..1662afc624 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItems.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bf89486964..90708db802 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b04973322a..be73787828 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
@@ -1,13 +1,14 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.model
 
-import io.element.android.libraries.designsystem.components.media.aWaveForm
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 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.UserId
@@ -91,7 +92,7 @@ fun aMediaItemVoice(
     filename: String = "filename.ogg",
     caption: String? = null,
     duration: String? = "1:23",
-    waveform: List<Float> = aWaveForm(),
+    waveform: List<Float> = WaveFormSamples.realisticWaveForm,
 ): MediaItem.Voice {
     return MediaItem.Voice(
         id = id,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaPermissions.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaPermissions.kt
new file mode 100644
index 0000000000..4a111965e9
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaPermissions.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.mediaviewer.impl.model
+
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+
+data class MediaPermissions(
+    val canRedactOwn: Boolean,
+    val canRedactOther: Boolean,
+) {
+    companion object {
+        val DEFAULT = MediaPermissions(
+            canRedactOwn = false,
+            canRedactOther = false,
+        )
+    }
+}
+
+fun RoomPermissions.mediaPermissions(): MediaPermissions {
+    return MediaPermissions(
+        canRedactOwn = canOwnUserRedactOwn(),
+        canRedactOther = canOwnUserRedactOther(),
+    )
+}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt
index 5105f1ba9b..4d110b5d5c 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/Colors.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt
index 009218d755..cb390ad717 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,11 +11,9 @@ package io.element.android.libraries.mediaviewer.impl.util
 import android.webkit.MimeTypeMap
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
 
 @ContributesBinding(AppScope::class)
-@Inject
 class FileExtensionExtractorWithValidation : FileExtensionExtractor {
     override fun extractFromName(name: String): String {
         val fileExtension = name.substringAfterLast('.', "")
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 1046a80fe3..ae7b54ccdd 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/MediaViewerEvents.kt
index 708c423d36..3f1436b9b6 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/MediaViewerEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,6 +18,7 @@ sealed interface 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
     data class ConfirmDelete(
         val eventId: EventId,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt
index 43880809d9..b35b638495 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerFlickToDismiss.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,7 +17,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.androidutils.system.areAnimationsEnabled
 import kotlinx.coroutines.delay
 import me.saket.telephoto.ExperimentalTelephotoApi
 import me.saket.telephoto.flick.FlickToDismiss
@@ -34,10 +37,14 @@ fun MediaViewerFlickToDismiss(
     content: @Composable BoxScope.() -> Unit,
 ) {
     val flickState = rememberFlickToDismissState(dismissThresholdRatio = 0.1f, rotateOnDrag = false)
+    val context = LocalContext.current
     DismissFlickEffects(
         flickState = flickState,
         onDismissing = { animationDuration ->
-            delay(animationDuration / 3)
+            // Only add the delay if an animation should be played, otherwise `onDismiss` will never be called
+            if (context.areAnimationsEnabled()) {
+                delay(animationDuration / 3)
+            }
             onDismiss()
         },
         onDragging = onDragging,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt
index c75db00afe..327505d7ac 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNavigator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,5 +12,6 @@ import io.element.android.libraries.matrix.api.core.EventId
 
 interface MediaViewerNavigator {
     fun onViewInTimelineClick(eventId: EventId)
+    fun onForwardClick(eventId: EventId, fromPinnedEvents: Boolean)
     fun onItemDeleted()
 }
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 cb9743bf97..d834534e3e 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
@@ -1,28 +1,35 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+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 com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 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.enterprise.api.EnterpriseService
 import io.element.android.features.viewfolder.api.TextFileViewer
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.audio.api.AudioFocus
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.RoomScope
 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.mediaviewer.api.MediaViewerEntryPoint
@@ -47,24 +54,23 @@ class MediaViewerNode(
     pagerKeysHandler: PagerKeysHandler,
     private val textFileViewer: TextFileViewer,
     private val audioFocus: AudioFocus,
+    private val sessionId: SessionId,
+    private val enterpriseService: EnterpriseService,
 ) : Node(buildContext, plugins = plugins),
     MediaViewerNavigator {
+    private val callback: MediaViewerEntryPoint.Callback = callback()
     private val inputs = inputs<MediaViewerEntryPoint.Params>()
 
-    private fun onDone() {
-        plugins<MediaViewerEntryPoint.Callback>().forEach {
-            it.onDone()
-        }
+    override fun onViewInTimelineClick(eventId: EventId) {
+        callback.viewInTimeline(eventId)
     }
 
-    override fun onViewInTimelineClick(eventId: EventId) {
-        plugins<MediaViewerEntryPoint.Callback>().forEach {
-            it.onViewInTimeline(eventId)
-        }
+    override fun onForwardClick(eventId: EventId, fromPinnedEvents: Boolean) {
+        callback.forwardEvent(eventId, fromPinnedEvents)
     }
 
     override fun onItemDeleted() {
-        onDone()
+        callback.onDone()
     }
 
     private val mediaGallerySource = if (inputs.mode == MediaViewerEntryPoint.MediaViewerMode.SingleMedia) {
@@ -76,11 +82,7 @@ class MediaViewerNode(
             timelineMediaGalleryDataSource
         } else {
             // Can we use a specific timeline?
-            val timelineMode = when (val mode = inputs.mode) {
-                is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> mode.timelineMode
-                is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> mode.timelineMode
-                else -> null
-            }
+            val timelineMode = inputs.mode.getTimelineMode()
             when (timelineMode) {
                 null -> timelineMediaGalleryDataSource
                 Timeline.Mode.Live,
@@ -127,15 +129,28 @@ class MediaViewerNode(
 
     @Composable
     override fun View(modifier: Modifier) {
-        ForcedDarkElementTheme {
+        val colors by remember {
+            enterpriseService.semanticColorsFlow(sessionId = sessionId)
+        }.collectAsState(SemanticColorsLightDark.default)
+        ForcedDarkElementTheme(
+            colors = colors,
+        ) {
             val state = presenter.present()
             MediaViewerView(
                 state = state,
                 textFileViewer = textFileViewer,
                 modifier = modifier,
                 audioFocus = audioFocus,
-                onBackClick = ::onDone,
+                onBackClick = callback::onDone,
             )
         }
     }
 }
+
+internal fun MediaViewerEntryPoint.MediaViewerMode.getTimelineMode(): Timeline.Mode? {
+    return when (this) {
+        is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> timelineMode
+        is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> timelineMode
+        else -> 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 c7b93a227f..dc0feb70cf 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,14 +32,16 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
-import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
+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.toEventOrTransactionId
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 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.local.LocalMediaActions
+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.coroutines.CoroutineScope
@@ -79,6 +82,9 @@ class MediaViewerPresenter(
         NoMoreItemsBackwardSnackBarDisplayer(currentIndex, data)
         NoMoreItemsForwardSnackBarDisplayer(currentIndex, data)
 
+        val permissions by room.permissionsAsState(MediaPermissions.DEFAULT) { perms ->
+            perms.mediaPermissions()
+        }
         var mediaBottomSheetState by remember { mutableStateOf<MediaBottomSheetState>(MediaBottomSheetState.Hidden) }
 
         DisposableEffect(Unit) {
@@ -89,7 +95,7 @@ class MediaViewerPresenter(
         }
         localMediaActions.Configure()
 
-        fun handleEvents(event: MediaViewerEvents) {
+        fun handleEvent(event: MediaViewerEvents) {
             when (event) {
                 is MediaViewerEvents.LoadMedia -> {
                     coroutineScope.downloadMedia(data = event.data)
@@ -117,13 +123,20 @@ class MediaViewerPresenter(
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     navigator.onViewInTimelineClick(event.eventId)
                 }
+                is MediaViewerEvents.Forward -> {
+                    mediaBottomSheetState = MediaBottomSheetState.Hidden
+                    navigator.onForwardClick(
+                        eventId = event.eventId,
+                        fromPinnedEvents = inputs.mode.getTimelineMode() == Timeline.Mode.PinnedEvents,
+                    )
+                }
                 is MediaViewerEvents.OpenInfo -> coroutineScope.launch {
                     mediaBottomSheetState = MediaBottomSheetState.MediaDetailsBottomSheetState(
                         eventId = event.data.eventId,
                         canDelete = when (event.data.mediaInfo.senderId) {
                             null -> false
-                            room.sessionId -> room.canRedactOwn().getOrElse { false } && event.data.eventId != null
-                            else -> room.canRedactOther().getOrElse { false } && event.data.eventId != null
+                            room.sessionId -> permissions.canRedactOwn && event.data.eventId != null
+                            else -> permissions.canRedactOther && event.data.eventId != null
                         },
                         mediaInfo = event.data.mediaInfo,
                         thumbnailSource = event.data.thumbnailSource,
@@ -155,7 +168,7 @@ class MediaViewerPresenter(
             snackbarMessage = snackbarMessage,
             canShowInfo = inputs.canShowInfo,
             mediaBottomSheetState = mediaBottomSheetState,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 
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 5a0c4c2307..ae1a422a6f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 05a55b4e5f..85aecc41a8 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ import android.net.Uri
 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.aWaveForm
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 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
@@ -138,7 +139,7 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
                 mediaBottomSheetState = aMediaDeleteConfirmationState(),
             ),
             anAudioMediaInfo(
-                waveForm = aWaveForm(),
+                waveForm = WaveFormSamples.realisticWaveForm,
             ).let {
                 aMediaViewerState(
                     listOf(
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 110054eb20..7439909330 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -247,6 +248,9 @@ fun MediaViewerView(
                         state.eventSink(MediaViewerEvents.Share(currentData))
                     }
                 },
+                onForward = {
+                    state.eventSink(MediaViewerEvents.Forward(it))
+                },
                 onDownload = {
                     (currentData as? MediaViewerPageData.MediaViewerData)?.let {
                         state.eventSink(MediaViewerEvents.SaveOnDisk(currentData))
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 03d37690ed..a2234143af 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 94ac0fea21..f243ac4fd7 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,6 +28,7 @@ class SingleMediaGalleryDataSource(
     override fun start() = 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
 
diff --git a/libraries/mediaviewer/impl/src/main/res/values-fa/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-fa/translations.xml
index c43bed885c..81f8f4db2d 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-fa/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_media_browser_delete_confirmation_title">"حذف پرونده؟"</string>
-  <string name="screen_media_browser_download_error_message">"بررسی اتّصال اینترنتیتان و تلاش دوباره"</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>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-hr/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..7637fbf350
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-hr/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">"Ova će se datoteka ukloniti iz sobe i članovi joj neće moći pristupiti."</string>
+  <string name="screen_media_browser_delete_confirmation_title">"Želite li izbrisati datoteku?"</string>
+  <string name="screen_media_browser_download_error_message">"Provjerite internetsku vezu i pokušajte ponovno."</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Ovdje će se prikazati dokumenti, audiodatoteke i glasovne poruke prenesene u ovu sobu."</string>
+  <string name="screen_media_browser_files_empty_state_title">"Još nema prenesenih datoteka"</string>
+  <string name="screen_media_browser_list_loading_files">"Učitavanje datoteka…"</string>
+  <string name="screen_media_browser_list_loading_media">"Učitavanje medija…"</string>
+  <string name="screen_media_browser_list_mode_files">"Datoteke"</string>
+  <string name="screen_media_browser_list_mode_media">"Mediji"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Ovdje će se prikazati slike i videozapisi preneseni u ovu sobu."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Još nijedan medij nije prenesen"</string>
+  <string name="screen_media_browser_title">"Mediji i datoteke"</string>
+  <string name="screen_media_details_file_format">"Oblik datoteke"</string>
+  <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_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-uz/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..8f838c0d26
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-uz/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">"Bu fayl xonadan olib tashlanadi va a’zolar unga kira olmaydilar."</string>
+  <string name="screen_media_browser_delete_confirmation_title">"Fayl oʻchirilsinmi?"</string>
+  <string name="screen_media_browser_download_error_message">"Internet aloqangizni tekshiring va qayta urining."</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Ushbu xonaga yuklangan hujjatlar, audio fayllar va ovozli xabarlar shu yerda ko‘rsatiladi."</string>
+  <string name="screen_media_browser_files_empty_state_title">"Hali hech qanday fayl yuklanmagan"</string>
+  <string name="screen_media_browser_list_loading_files">"Fayllar yuklanmoqda…"</string>
+  <string name="screen_media_browser_list_loading_media">"Media yuklanmoqda…"</string>
+  <string name="screen_media_browser_list_mode_files">"Fayllar"</string>
+  <string name="screen_media_browser_list_mode_media">"Media"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Bu xonaga yuklangan rasm va videolar shu yerda chiqadi."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Hali hech qanday media yuklanmagan"</string>
+  <string name="screen_media_browser_title">"Media va fayllar"</string>
+  <string name="screen_media_details_file_format">"Fayl formati"</string>
+  <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_uploaded_by">"Tomonidan yuklangan"</string>
+  <string name="screen_media_details_uploaded_on">"Yuklangan"</string>
+</resources>
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt
index 0f8b0fedfb..8b2f3b561d 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaGalleryEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,13 +10,12 @@ package io.element.android.libraries.mediaviewer.impl
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
-import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.impl.gallery.root.MediaGalleryFlowNode
+import io.element.android.libraries.mediaviewer.test.FakeMediaViewerEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import org.junit.Rule
@@ -35,18 +35,19 @@ class DefaultMediaGalleryEntryPointTest {
             MediaGalleryFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                mediaViewerEntryPoint = object : MediaViewerEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
-                }
+                mediaViewerEntryPoint = FakeMediaViewerEntryPoint(),
             )
         }
         val callback = object : MediaGalleryEntryPoint.Callback {
             override fun onBackClick() = lambdaError()
-            override fun onViewInTimeline(eventId: EventId) = lambdaError()
+            override fun viewInTimeline(eventId: EventId) = lambdaError()
+            override fun forward(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MediaGalleryFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
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 3af2e8cf69..b848ea2a7b 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,10 +12,12 @@ 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.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.mediaplayer.test.FakeAudioFocus
 import io.element.android.libraries.mediaviewer.api.MediaInfo
@@ -63,17 +66,22 @@ class DefaultMediaViewerEntryPointTest {
                 pagerKeysHandler = PagerKeysHandler(),
                 textFileViewer = { _, _ -> lambdaError() },
                 audioFocus = FakeAudioFocus(),
+                sessionId = A_SESSION_ID,
+                enterpriseService = FakeEnterpriseService(),
             )
         }
         val callback = object : MediaViewerEntryPoint.Callback {
             override fun onDone() = lambdaError()
-            override fun onViewInTimeline(eventId: EventId) = lambdaError()
+            override fun viewInTimeline(eventId: EventId) = lambdaError()
+            override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
         }
         val params = createMediaViewerEntryPointParams()
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MediaViewerNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
@@ -104,19 +112,25 @@ class DefaultMediaViewerEntryPointTest {
                 pagerKeysHandler = PagerKeysHandler(),
                 textFileViewer = { _, _ -> lambdaError() },
                 audioFocus = FakeAudioFocus(),
+                sessionId = A_SESSION_ID,
+                enterpriseService = FakeEnterpriseService(),
             )
         }
         val callback = object : MediaViewerEntryPoint.Callback {
             override fun onDone() = lambdaError()
-            override fun onViewInTimeline(eventId: EventId) = lambdaError()
+            override fun viewInTimeline(eventId: EventId) = lambdaError()
+            override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .avatar(
-                filename = "fn",
-                avatarUrl = "avatarUrl",
-            )
-            .callback(callback)
-            .build()
+        val params = entryPoint.createParamsForAvatar(
+            filename = "fn",
+            avatarUrl = "avatarUrl",
+        )
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(MediaViewerNode::class.java)
         assertThat(result.plugins).contains(
             MediaViewerEntryPoint.Params(
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/DefaultEventItemFactoryTest.kt
index 457907793f..c70d658418 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/DefaultEventItemFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -83,7 +84,7 @@ class DefaultEventItemFactoryTest {
                 ),
                 mediaSource = MediaSource("")
             ),
-            UnableToDecryptContent(UnableToDecryptContent.Data.Unknown),
+            UnableToDecryptContent(data = UnableToDecryptContent.Data.Unknown, threadInfo = null),
             UnknownContent,
         )
         contents.forEach {
@@ -396,8 +397,8 @@ class DefaultEventItemFactoryTest {
                                 height = 1L,
                                 width = 2L,
                                 blurhash = null,
-                            )
-                        )
+                            ),
+                        ),
                     )
                 )
             )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt
index 9edc2d0a75..a70c865a86 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ea4bdfbad8..c612bba1bc 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt
index 1f2ab92dfc..4e1a57e037 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt
index 4d59b88c09..fae858d8a6 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt
index a8903394b3..53cc25c2c1 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaItemsPostProcessorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 771c82e4a2..bb8419dde5 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1596104c46..4d8b81a2dd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 bd4373a420..580cd89c72 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -56,6 +57,19 @@ class MediaDetailsBottomSheetTest {
         }
     }
 
+    @Test
+    @Config(qualifiers = "h1024dp")
+    fun `clicking on Forward invokes expected callback`() {
+        val state = aMediaDetailsBottomSheetState()
+        ensureCalledOnceWithParam(state.eventId) { callback ->
+            rule.setMediaDetailsBottomSheet(
+                state = state,
+                onForward = callback,
+            )
+            rule.clickOn(CommonStrings.action_forward)
+        }
+    }
+
     @Test
     @Config(qualifiers = "h1024dp")
     fun `clicking on Save invokes expected callback`() {
@@ -100,6 +114,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMedia
     state: MediaBottomSheetState.MediaDetailsBottomSheetState,
     onViewInTimeline: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onShare: (EventId) -> Unit = EnsureNeverCalledWithParam(),
+    onForward: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDownload: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDelete: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDismiss: () -> Unit = EnsureNeverCalled(),
@@ -109,6 +124,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMedia
             state = state,
             onViewInTimeline = onViewInTimeline,
             onShare = onShare,
+            onForward = onForward,
             onDownload = onDownload,
             onDelete = onDelete,
             onDismiss = onDismiss,
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt
index 2566ef91a4..0d8ff6b411 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/FakeMediaGalleryNavigator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,9 +12,14 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeMediaGalleryNavigator(
-    private val onViewInTimelineClickLambda: (EventId) -> Unit = { lambdaError() }
+    private val onViewInTimelineClickLambda: (EventId) -> Unit = { lambdaError() },
+    private val onForwardClickLambda: (EventId) -> Unit = { lambdaError() },
 ) : MediaGalleryNavigator {
     override fun onViewInTimelineClick(eventId: EventId) {
         onViewInTimelineClickLambda(eventId)
     }
+
+    override fun onForwardClick(eventId: EventId) {
+        onForwardClickLambda(eventId)
+    }
 }
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 f126dab2b5..3069a4fd9d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,6 +25,7 @@ import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
 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.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource
 import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource
@@ -108,7 +110,9 @@ class MediaGalleryPresenterTest {
                 baseRoom = FakeBaseRoom(
                     sessionId = A_USER_ID,
                     initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
-                    canRedactOwnResult = { Result.success(canDeleteOwn) }
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = canDeleteOwn
+                    ),
                 ),
             )
         )
@@ -152,7 +156,9 @@ class MediaGalleryPresenterTest {
                 baseRoom = FakeBaseRoom(
                     sessionId = A_USER_ID,
                     initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
-                    canRedactOtherResult = { Result.success(canDeleteOther) },
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOther = canDeleteOther
+                    ),
                 ),
                 createTimelineResult = { Result.success(FakeTimeline()) }
             )
@@ -345,7 +351,7 @@ class MediaGalleryPresenterTest {
     }
 
     @Test
-    fun `present - view in timeline invokes the navigator`() = runTest {
+    fun `present - view in timeline closes the bottom sheet and invokes the navigator`() = runTest {
         val onViewInTimelineClickLambda = lambdaRecorder<EventId, Unit> { }
         val navigator = FakeMediaGalleryNavigator(
             onViewInTimelineClickLambda = onViewInTimelineClickLambda,
@@ -353,16 +359,63 @@ class MediaGalleryPresenterTest {
         val presenter = createMediaGalleryPresenter(
             room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(FakeTimeline()) },
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
             ),
             navigator = navigator,
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.ViewInTimeline(AN_EVENT_ID))
+            val item = aMediaItemImage(
+                eventId = AN_EVENT_ID,
+                senderId = A_USER_ID,
+            )
+            initialState.eventSink(MediaGalleryEvents.OpenInfo(item))
+            val withBottomSheetState = awaitItem()
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
+            withBottomSheetState.eventSink(MediaGalleryEvents.ViewInTimeline(AN_EVENT_ID))
+            val finalState = awaitItem()
+            assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
             onViewInTimelineClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
         }
     }
 
+    @Test
+    fun `present - forward closes the bottom sheet and invokes the navigator`() = runTest {
+        val onForwardClickLambda = lambdaRecorder<EventId, Unit> { }
+        val navigator = FakeMediaGalleryNavigator(
+            onForwardClickLambda = onForwardClickLambda,
+        )
+        val presenter = createMediaGalleryPresenter(
+            room = FakeJoinedRoom(
+                createTimelineResult = { Result.success(FakeTimeline()) },
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
+            ),
+            navigator = navigator,
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            val item = aMediaItemImage(
+                eventId = AN_EVENT_ID,
+                senderId = A_USER_ID,
+            )
+            initialState.eventSink(MediaGalleryEvents.OpenInfo(item))
+            val withBottomSheetState = awaitItem()
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
+            withBottomSheetState.eventSink(MediaGalleryEvents.Forward(AN_EVENT_ID))
+            val finalState = awaitItem()
+            assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+            onForwardClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
+        }
+    }
+
     @Test
     fun `present - load more`() = runTest {
         val loadMoreLambda = lambdaRecorder<Timeline.PaginationDirection, Unit> { }
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 6c4a8a29b4..cd7b7003af 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e092f5c624..f01ac1d749 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/NoOpActivityResultRegistryOwner.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/NoOpActivityResultRegistryOwner.kt
index 7dd7966c74..e3e2399171 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/NoOpActivityResultRegistryOwner.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/NoOpActivityResultRegistryOwner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt
index 16f0777994..dd36b40659 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/model/GroupedMediaItemsTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e2399eae34..3c5c91589c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt
index 6c0148b124..a116faa250 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/FakeMediaViewerNavigator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,12 +13,17 @@ import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeMediaViewerNavigator(
     private val onViewInTimelineClickLambda: (EventId) -> Unit = { lambdaError() },
+    private val onForwardClickLambda: (EventId, Boolean) -> Unit = { _, _ -> lambdaError() },
     private val onItemDeletedLambda: () -> Unit = { lambdaError() },
 ) : MediaViewerNavigator {
     override fun onViewInTimelineClick(eventId: EventId) {
         onViewInTimelineClickLambda(eventId)
     }
 
+    override fun onForwardClick(eventId: EventId, fromPinnedEvents: Boolean) {
+        onForwardClickLambda(eventId, fromPinnedEvents)
+    }
+
     override fun onItemDeleted() {
         onItemDeletedLambda()
     }
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 43a37e8c4c..44eed2733f 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b9964d8d3d..a9d1704bdc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -26,6 +27,7 @@ import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
 import io.element.android.libraries.matrix.test.media.aMediaSource
 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.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
@@ -82,7 +84,9 @@ class MediaViewerPresenterTest {
             localMediaFactory = localMediaFactory,
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
-                    canRedactOwnResult = { Result.success(true) },
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
                 )
             )
         )
@@ -103,7 +107,9 @@ class MediaViewerPresenterTest {
             canShowInfo = false,
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
-                    canRedactOwnResult = { Result.success(true) },
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
                 )
             )
         )
@@ -124,7 +130,9 @@ class MediaViewerPresenterTest {
             eventId = AN_EVENT_ID,
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
-                    canRedactOwnResult = { Result.success(true) },
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
                 )
             )
         )
@@ -146,7 +154,9 @@ class MediaViewerPresenterTest {
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
                     sessionId = A_SESSION_ID_2,
-                    canRedactOtherResult = { Result.success(false) },
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOther = false
+                    ),
                 )
             )
         )
@@ -235,7 +245,9 @@ class MediaViewerPresenterTest {
             mediaGalleryDataSource = mediaGalleryDataSource,
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
-                    canRedactOwnResult = { Result.success(true) },
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
                 )
             )
         )
@@ -459,7 +471,11 @@ class MediaViewerPresenterTest {
             localMediaFactory = localMediaFactory,
             room = FakeJoinedRoom(
                 liveTimeline = timeline,
-                baseRoom = FakeBaseRoom(canRedactOwnResult = { Result.success(true) }),
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
             ),
             mediaGalleryDataSource = mediaGalleryDataSource,
             mediaViewerNavigator = FakeMediaViewerNavigator(
@@ -759,7 +775,7 @@ class MediaViewerPresenterTest {
     }
 
     @Test
-    fun `present - view in timeline hide the bottom sheet and invokes the navigator`() = runTest {
+    fun `present - view in timeline hides the bottom sheet and invokes the navigator`() = runTest {
         val onViewInTimelineClickLambda = lambdaRecorder<EventId, Unit> { }
         val navigator = FakeMediaViewerNavigator(
             onViewInTimelineClickLambda = onViewInTimelineClickLambda,
@@ -768,7 +784,11 @@ class MediaViewerPresenterTest {
             localMediaFactory = localMediaFactory,
             mediaViewerNavigator = navigator,
             room = FakeJoinedRoom(
-                baseRoom = FakeBaseRoom(canRedactOwnResult = { Result.success(true) }),
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
             )
         )
         presenter.test {
@@ -783,6 +803,67 @@ class MediaViewerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - forward hides the bottom sheet and invokes the navigator`() = runTest {
+        val onForwardClickLambda = lambdaRecorder<EventId, Boolean, Unit> { _, _ -> }
+        val navigator = FakeMediaViewerNavigator(
+            onForwardClickLambda = onForwardClickLambda,
+        )
+        val presenter = createMediaViewerPresenter(
+            localMediaFactory = localMediaFactory,
+            mediaViewerNavigator = navigator,
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
+            ),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))
+            val withBottomSheetState = awaitItem()
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
+            initialState.eventSink(MediaViewerEvents.Forward(AN_EVENT_ID))
+            val finalState = awaitItem()
+            assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+            onForwardClickLambda.assertions().isCalledOnce()
+                .with(value(AN_EVENT_ID), value(false))
+        }
+    }
+
+    @Test
+    fun `present - forward from pinned events hides the bottom sheet and invokes the navigator`() = runTest {
+        val onForwardClickLambda = lambdaRecorder<EventId, Boolean, Unit> { _, _ -> }
+        val navigator = FakeMediaViewerNavigator(
+            onForwardClickLambda = onForwardClickLambda,
+        )
+        val presenter = createMediaViewerPresenter(
+            mode = MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios(timelineMode = Timeline.Mode.PinnedEvents),
+            localMediaFactory = localMediaFactory,
+            mediaViewerNavigator = navigator,
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
+            ),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))
+            val withBottomSheetState = awaitItem()
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
+            initialState.eventSink(MediaViewerEvents.Forward(AN_EVENT_ID))
+            val finalState = awaitItem()
+            assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+            onForwardClickLambda.assertions().isCalledOnce()
+                .with(value(AN_EVENT_ID), value(true))
+        }
+    }
+
     private suspend fun <T> ReceiveTurbine<T>.awaitFirstItem(): T {
         return awaitItem()
     }
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 6423c3f0b7..b1114945c2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt
index 807c7b51cd..8a334b3c6f 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandlerTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c80aa15428..c6460cb70a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,7 @@ 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.designsystem.components.media.createFakeWaveform
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 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
@@ -128,7 +129,7 @@ class SingleMediaGalleryDataSourceTest {
     fun `createFrom should create a SingleMediaGalleryDataSource with a voice item`() {
         testFactory(
             mediaInfo = aVoiceMediaInfo(
-                waveForm = createFakeWaveform(),
+                waveForm = WaveFormSamples.longRealisticWaveForm,
                 duration = "12:34",
             ),
             expectedResult = { params ->
diff --git a/libraries/mediaviewer/test/build.gradle.kts b/libraries/mediaviewer/test/build.gradle.kts
index 45096be999..1918714d7b 100644
--- a/libraries/mediaviewer/test/build.gradle.kts
+++ b/libraries/mediaviewer/test/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 af6e00b05d..875be941db 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a9e962bac4..faa27fd0e3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaGalleryEntryPoint.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaGalleryEntryPoint.kt
new file mode 100644
index 0000000000..be5d1b972e
--- /dev/null
+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaGalleryEntryPoint.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.mediaviewer.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeMediaGalleryEntryPoint : MediaGalleryEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: MediaGalleryEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaViewerEntryPoint.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaViewerEntryPoint.kt
new file mode 100644
index 0000000000..8867f9c170
--- /dev/null
+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeMediaViewerEntryPoint.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.mediaviewer.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeMediaViewerEntryPoint : MediaViewerEntryPoint {
+    override fun createParamsForAvatar(filename: String, avatarUrl: String) = lambdaError()
+
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: MediaViewerEntryPoint.Params,
+        callback: MediaViewerEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidation.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidation.kt
index c29274fea4..09a74f2bfb 100644
--- a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidation.kt
+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidation.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt
index 3927d8a981..a7bb30d732 100644
--- a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt
+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/viewer/LocalMedia.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt b/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt
index d3f1b647d2..fad7a1d14f 100644
--- a/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt
+++ b/libraries/mediaviewer/test/src/test/kotlin/io/element/android/libraries/mediaviewer/test/util/FileExtensionExtractorWithoutValidationTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/network/build.gradle.kts b/libraries/network/build.gradle.kts
index b702ff7881..72e7eb05f2 100644
--- a/libraries/network/build.gradle.kts
+++ b/libraries/network/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.setupDependencyInjection
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -23,9 +24,11 @@ android {
 setupDependencyInjection()
 
 dependencies {
+    implementation(projects.libraries.androidutils)
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.preferences.api)
     implementation(platform(libs.network.okhttp.bom))
     implementation(libs.network.okhttp)
     implementation(libs.network.okhttp.logging)
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 6ede5a0c48..d8809e042c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,10 +13,9 @@ 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.core.meta.BuildMeta
+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 kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import java.util.concurrent.TimeUnit
@@ -26,27 +26,20 @@ object NetworkModule {
     @Provides
     @SingleIn(AppScope::class)
     fun providesOkHttpClient(
-        buildMeta: BuildMeta,
         userAgentInterceptor: UserAgentInterceptor,
+        dynamicHttpLoggingInterceptor: DynamicHttpLoggingInterceptor,
     ): OkHttpClient = OkHttpClient.Builder().apply {
         connectTimeout(30, TimeUnit.SECONDS)
         readTimeout(60, TimeUnit.SECONDS)
         writeTimeout(60, TimeUnit.SECONDS)
         addInterceptor(userAgentInterceptor)
-        if (buildMeta.isDebuggable) addInterceptor(providesHttpLoggingInterceptor())
+        addInterceptor(dynamicHttpLoggingInterceptor)
     }.build()
 
     @Provides
     @SingleIn(AppScope::class)
-    fun providesJson(): Json = Json {
-        ignoreUnknownKeys = true
+    fun providesHttpLoggingInterceptor(): HttpLoggingInterceptor {
+        val logger = FormattedJsonHttpLogger(HttpLoggingInterceptor.Level.BODY)
+        return HttpLoggingInterceptor(logger)
     }
 }
-
-private fun providesHttpLoggingInterceptor(): HttpLoggingInterceptor {
-    val loggingLevel = HttpLoggingInterceptor.Level.BODY
-    val logger = FormattedJsonHttpLogger(loggingLevel)
-    val interceptor = HttpLoggingInterceptor(logger)
-    interceptor.level = loggingLevel
-    return interceptor
-}
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 261d7d02ba..88240c3d65 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,8 +10,8 @@ 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 kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -19,11 +20,11 @@ import retrofit2.converter.kotlinx.serialization.asConverterFactory
 @Inject
 class RetrofitFactory(
     private val okHttpClient: Provider<OkHttpClient>,
-    private val json: Provider<Json>,
+    private val json: Provider<JsonProvider>,
 ) {
     fun create(baseUrl: String): Retrofit = Retrofit.Builder()
         .baseUrl(baseUrl.ensureTrailingSlash())
-        .addConverterFactory(json().asConverterFactory("application/json".toMediaType()))
+        .addConverterFactory(json()().asConverterFactory("application/json".toMediaType()))
         .callFactory { request -> okHttpClient().newCall(request) }
         .build()
 }
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/headers/HttpHeaders.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/headers/HttpHeaders.kt
index 85abddee17..259e6b8c44 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/headers/HttpHeaders.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/headers/HttpHeaders.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/DynamicHttpLoggingInterceptor.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/DynamicHttpLoggingInterceptor.kt
new file mode 100644
index 0000000000..daaf922ce7
--- /dev/null
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/DynamicHttpLoggingInterceptor.kt
@@ -0,0 +1,37 @@
+/*
+ * 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.network.interceptors
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.matrix.api.tracing.LogLevel
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import okhttp3.Interceptor
+import okhttp3.Response
+import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.logging.HttpLoggingInterceptor.Level
+
+/**
+ * HTTP logging interceptor that decides whether to display the HTTP logs or not based on the current log level.
+ */
+@Inject
+@SingleIn(AppScope::class)
+class DynamicHttpLoggingInterceptor(
+    private val appPreferencesStore: AppPreferencesStore,
+    private val loggingInterceptor: HttpLoggingInterceptor,
+) : Interceptor by loggingInterceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        // This is called in a separate thread, so calling `runBlocking` here should be fine, it should be also instant after the value is cached
+        val logLevel = runBlocking { appPreferencesStore.getTracingLogLevelFlow().first() }
+        loggingInterceptor.level = if (logLevel >= LogLevel.DEBUG) Level.BODY else Level.NONE
+        return loggingInterceptor.intercept(chain)
+    }
+}
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt
index e2fad575f4..11aa0a5cce 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,7 +30,7 @@ internal class FormattedJsonHttpLogger(
      */
     @Synchronized
     override fun log(message: String) {
-        Timber.v(message.ellipsize(200_000))
+        Timber.d(message.ellipsize(200_000))
 
         // Try to log formatted Json only if there is a chance that [message] contains Json.
         // It can be only the case if we log the bodies of Http requests.
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/UserAgentInterceptor.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/UserAgentInterceptor.kt
index 0242774bdd..eb1d621330 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/UserAgentInterceptor.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/UserAgentInterceptor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt
index bf1d2a93c9..3ecd091e0d 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,14 +11,12 @@ package io.element.android.libraries.network.useragent
 import android.os.Build
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.SdkMetadata
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUserAgentProvider(
     private val buildMeta: BuildMeta,
     private val sdkMeta: SdkMetadata,
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/SimpleUserAgentProvider.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/SimpleUserAgentProvider.kt
index f3b1be5674..9d8e71a2e6 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/SimpleUserAgentProvider.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/SimpleUserAgentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/UserAgentProvider.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/UserAgentProvider.kt
index 2025264f10..dc552f47a7 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/UserAgentProvider.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/UserAgentProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/api/build.gradle.kts b/libraries/oidc/api/build.gradle.kts
index 28b26d4e9e..8cc0125142 100644
--- a/libraries/oidc/api/build.gradle.kts
+++ b/libraries/oidc/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt
index fc464e9ee2..d7c061ab25 100644
--- a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt
+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt
index 139317e37b..17340eb5ec 100644
--- a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt
+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt
index 75b67ef03a..97fa1baa27 100644
--- a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt
+++ b/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/impl/build.gradle.kts b/libraries/oidc/impl/build.gradle.kts
index f3c50ed9ab..e11ce11c70 100644
--- a/libraries/oidc/impl/build.gradle.kts
+++ b/libraries/oidc/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt
index c49128543a..6096ef7eef 100644
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt
+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.oidc.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcActionFlow
@@ -18,7 +18,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultOidcActionFlow : OidcActionFlow {
     private val mutableStateFlow = MutableStateFlow<OidcAction?>(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
index 42cdb14851..2a16030b3b 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,12 +11,10 @@ package io.element.android.libraries.oidc.impl
 import android.content.Intent
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcIntentResolver
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOidcIntentResolver(
     private val oidcUrlParser: OidcUrlParser,
 ) : OidcIntentResolver {
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
index 1e9b6953a8..8933873dc2 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.oidc.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
 import io.element.android.libraries.oidc.api.OidcAction
 
@@ -22,7 +22,6 @@ fun interface OidcUrlParser {
  * TODO Find documentation about the format.
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOidcUrlParser(
     private val oidcRedirectUrlProvider: OidcRedirectUrlProvider,
 ) : OidcUrlParser {
diff --git a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt
index 51017f0af0..387b9aceb0 100644
--- a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt
+++ b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt
index 48595452d2..64068030d7 100644
--- a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt
+++ b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index 7ec03a258e..7f145c053d 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/test/build.gradle.kts b/libraries/oidc/test/build.gradle.kts
index ac9d4cfda8..efe32d404a 100644
--- a/libraries/oidc/test/build.gradle.kts
+++ b/libraries/oidc/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt b/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt
index 1fa5947c3f..45b400868b 100644
--- a/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt
+++ b/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
index d1673d8bc8..5362aefa7c 100644
--- 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/api/build.gradle.kts b/libraries/permissions/api/build.gradle.kts
index ad11bd214c..0b7edd9fdb 100644
--- a/libraries/permissions/api/build.gradle.kts
+++ b/libraries/permissions/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionStateProvider.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionStateProvider.kt
index be9e38c4fb..beeef0b234 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionStateProvider.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt
similarity index 52%
rename from libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt
rename to libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt
index bc58e3bcb3..fd01e12134 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt
@@ -1,14 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
-sealed interface PermissionsEvents {
-    data object RequestPermissions : PermissionsEvents
-    data object CloseDialog : PermissionsEvents
-    data object OpenSystemSettingAndCloseDialog : PermissionsEvents
+sealed interface PermissionsEvent {
+    data object RequestPermissions : PermissionsEvent
+    data object CloseDialog : PermissionsEvent
+    data object OpenSystemSettingAndCloseDialog : PermissionsEvent
 }
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsPresenter.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsPresenter.kt
index e775714f6b..f2ccb2bfc3 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsPresenter.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsState.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsState.kt
index 367d48c499..3cbdfea50d 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsState.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,5 +17,5 @@ data class PermissionsState(
     val permissionAlreadyAsked: Boolean,
     // If true, there is no need to ask again, the system dialog will not be displayed
     val permissionAlreadyDenied: Boolean,
-    val eventSink: (PermissionsEvents) -> Unit
+    val eventSink: (PermissionsEvent) -> Unit
 )
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStateProvider.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStateProvider.kt
index 7a48bd64b4..a330333d17 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStateProvider.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStore.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStore.kt
index 37f986e57a..3bb7d2c679 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStore.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
index 1748a02db4..af0f3dd5e8 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,9 +35,9 @@ fun PermissionsView(
         content = content ?: state.permission.toDialogContent(),
         submitText = stringResource(id = CommonStrings.action_open_settings),
         onSubmitClick = {
-            state.eventSink.invoke(PermissionsEvents.OpenSystemSettingAndCloseDialog)
+            state.eventSink.invoke(PermissionsEvent.OpenSystemSettingAndCloseDialog)
         },
-        onDismiss = { state.eventSink.invoke(PermissionsEvents.CloseDialog) },
+        onDismiss = { state.eventSink.invoke(PermissionsEvent.CloseDialog) },
         icon = icon,
     )
 }
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/Util.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/Util.kt
index 89f9e558ae..5a0e9b2e21 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/Util.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/Util.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/api/src/main/res/values-hr/translations.xml b/libraries/permissions/api/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..e300660d59
--- /dev/null
+++ b/libraries/permissions/api/src/main/res/values-hr/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">"Kako biste aplikaciji omogućili korištenje kamere, dajte dopuštenje u postavkama sustava."</string>
+  <string name="dialog_permission_generic">"Dajte dopuštenje u postavkama sustava."</string>
+  <string name="dialog_permission_microphone">"Kako biste aplikaciji omogućili korištenje mikrofona, dajte dopuštenje u postavkama sustava."</string>
+  <string name="dialog_permission_notification">"Kako biste aplikaciji omogućili prikaz obavijesti, dajte dopuštenje u postavkama sustava."</string>
+</resources>
diff --git a/libraries/permissions/impl/build.gradle.kts b/libraries/permissions/impl/build.gradle.kts
index a4fafda599..70e27db7f0 100644
--- a/libraries/permissions/impl/build.gradle.kts
+++ b/libraries/permissions/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/AccompanistPermissionStateProvider.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/AccompanistPermissionStateProvider.kt
index f2f83e86e5..be5ce1a998 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/AccompanistPermissionStateProvider.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/AccompanistPermissionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,6 @@ import com.google.accompanist.permissions.PermissionState
 import com.google.accompanist.permissions.rememberPermissionState
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 
 interface ComposablePermissionStateProvider {
     @Composable
@@ -23,7 +23,6 @@ interface ComposablePermissionStateProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AccompanistPermissionStateProvider : ComposablePermissionStateProvider {
     @Composable
     override fun provide(permission: String, onPermissionResult: (Boolean) -> Unit): PermissionState {
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionStateProvider.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionStateProvider.kt
index 6902247970..fadde406b7 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionStateProvider.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.permissions.api.PermissionStateProvider
@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.Flow
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPermissionStateProvider(
     @ApplicationContext private val context: Context,
     private val permissionsStore: PermissionsStore,
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 f12d92a50d..42331e001a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,7 +28,7 @@ import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.core.log.logger.LoggerTag
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import io.element.android.libraries.permissions.api.PermissionsState
 import io.element.android.libraries.permissions.api.PermissionsStore
@@ -99,20 +100,20 @@ class DefaultPermissionsPresenter(
 
         val showDialog = rememberSaveable { mutableStateOf(false) }
 
-        fun handleEvents(event: PermissionsEvents) {
+        fun handleEvent(event: PermissionsEvent) {
             when (event) {
-                PermissionsEvents.CloseDialog -> {
+                PermissionsEvent.CloseDialog -> {
                     showDialog.value = false
                 }
-                PermissionsEvents.RequestPermissions -> {
+                PermissionsEvent.RequestPermissions -> {
                     if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) {
                         showDialog.value = true
                     } else {
                         permissionState.launchPermissionRequest()
                     }
                 }
-                PermissionsEvents.OpenSystemSettingAndCloseDialog -> {
-                    permissionActions.openSettings()
+                PermissionsEvent.OpenSystemSettingAndCloseDialog -> {
+                    permissionActions.openSettings(permission)
                     showDialog.value = false
                 }
             }
@@ -125,7 +126,7 @@ class DefaultPermissionsPresenter(
             showDialog = showDialog.value,
             permissionAlreadyAsked = isAlreadyAsked,
             permissionAlreadyDenied = isAlreadyDenied,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsStore.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsStore.kt
index bd495b1d4b..facc633b57 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsStore.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.permissions.api.PermissionsStore
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPermissionsStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : PermissionsStore {
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/AndroidPermissionActions.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/AndroidPermissionActions.kt
index e2a3701774..1be8428890 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/AndroidPermissionActions.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/AndroidPermissionActions.kt
@@ -1,25 +1,29 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.action
 
+import android.Manifest
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.system.openAppSettingsPage
 import io.element.android.libraries.androidutils.system.startNotificationSettingsIntent
 import io.element.android.libraries.di.annotations.ApplicationContext
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidPermissionActions(
     @ApplicationContext private val context: Context
 ) : PermissionActions {
-    override fun openSettings() {
-        context.startNotificationSettingsIntent()
+    override fun openSettings(permission: String) {
+        when (permission) {
+            Manifest.permission.POST_NOTIFICATIONS -> context.startNotificationSettingsIntent()
+            else -> context.openAppSettingsPage()
+        }
     }
 }
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/PermissionActions.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/PermissionActions.kt
index 05fc404284..2b1249b823 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/PermissionActions.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/action/PermissionActions.kt
@@ -1,12 +1,13 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.action
 
 interface PermissionActions {
-    fun openSettings()
+    fun openSettings(permission: String)
 }
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTest.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTest.kt
index eeadb5598c..eff20fabec 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTest.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -60,6 +61,6 @@ class NotificationTroubleshootCheckPermissionTest(
         navigator: NotificationTroubleshootNavigator,
     ) {
         // Do not bother about asking the permission inline, just lead the user to the settings
-        permissionActions.openSettings()
+        permissionActions.openSettings(Manifest.permission.POST_NOTIFICATIONS)
     }
 }
diff --git a/libraries/permissions/impl/src/main/res/values-hr/translations.xml b/libraries/permissions/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..e0efeca8b2
--- /dev/null
+++ b/libraries/permissions/impl/src/main/res/values-hr/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">"Provjerite može li aplikacija prikazivati ​​obavijesti."</string>
+  <string name="troubleshoot_notifications_test_check_permission_title">"Provjeri dopuštenja"</string>
+</resources>
diff --git a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt
index 601ef5cbbb..c7a10ca8d1 100644
--- a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt
+++ b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,21 +10,23 @@
 
 package io.element.android.libraries.permissions.impl
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionStatus
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
+import io.element.android.libraries.permissions.api.PermissionsStore
 import io.element.android.libraries.permissions.impl.action.FakePermissionActions
+import io.element.android.libraries.permissions.impl.action.PermissionActions
 import io.element.android.libraries.permissions.test.InMemoryPermissionsStore
 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.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-const val A_PERMISSION = "A_PERMISSION"
+private const val A_PERMISSION = "A_PERMISSION"
 
 class DefaultPermissionsPresenterTest {
     @get:Rule
@@ -31,24 +34,8 @@ class DefaultPermissionsPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
-        val permissionsStore = InMemoryPermissionsStore()
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Granted
-        )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            FakePermissionActions(),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter()
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.permission).isEqualTo(A_PERMISSION)
             assertThat(initialState.permissionGranted).isTrue()
@@ -65,29 +52,22 @@ class DefaultPermissionsPresenterTest {
             permissionDenied = true,
             permissionAsked = true
         )
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Denied(shouldShowRationale = false)
+        val permissionStateProvider = FakeComposablePermissionStateProvider(
+            permissionState = aFakePermissionState(
+                initialStatus = PermissionStatus.Denied(shouldShowRationale = false)
+            ),
         )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            FakePermissionActions(),
+        val presenter = createPresenter(
+            permissionsStore = permissionsStore,
+            permissionStateProvider = permissionStateProvider,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
-            initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
+            initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
             val withDialogState = awaitItem()
             assertThat(withDialogState.showDialog).isTrue()
-            withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog)
+            withDialogState.eventSink.invoke(PermissionsEvent.CloseDialog)
             assertThat(awaitItem().showDialog).isFalse()
         }
     }
@@ -98,59 +78,48 @@ class DefaultPermissionsPresenterTest {
             permissionDenied = true,
             permissionAsked = true
         )
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Denied(shouldShowRationale = false)
+        val permissionStateProvider = FakeComposablePermissionStateProvider(
+            permissionState = aFakePermissionState(
+                initialStatus = PermissionStatus.Denied(shouldShowRationale = false),
+            ),
         )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val permissionActions = FakePermissionActions()
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            permissionActions,
+        val openSettingsAction = lambdaRecorder<String, Unit> { }
+        val permissionActions = FakePermissionActions(
+            openSettingsAction = openSettingsAction,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter(
+            permissionsStore = permissionsStore,
+            permissionStateProvider = permissionStateProvider,
+            permissionActions = permissionActions,
+        )
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
-            initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
+            initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
             val withDialogState = awaitItem()
             assertThat(withDialogState.showDialog).isTrue()
-            assertThat(permissionActions.openSettingsCalled).isFalse()
-            withDialogState.eventSink.invoke(PermissionsEvents.OpenSystemSettingAndCloseDialog)
+            openSettingsAction.assertions().isNeverCalled()
+            withDialogState.eventSink.invoke(PermissionsEvent.OpenSystemSettingAndCloseDialog)
             assertThat(awaitItem().showDialog).isFalse()
-            assertThat(permissionActions.openSettingsCalled).isTrue()
+            openSettingsAction.assertions().isCalledOnce().with(value(A_PERMISSION))
         }
     }
 
     @Test
     fun `present - user does not grant permission`() = runTest {
-        val permissionsStore = InMemoryPermissionsStore()
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Denied(shouldShowRationale = false)
+        val permissionState = aFakePermissionState(
+            initialStatus = PermissionStatus.Denied(shouldShowRationale = false)
         )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            FakePermissionActions(),
+        val permissionStateProvider = FakeComposablePermissionStateProvider(
+            permissionState = permissionState,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter(
+            permissionStateProvider = permissionStateProvider,
+        )
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.showDialog).isFalse()
-            initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
+            initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
             assertThat(permissionState.launchPermissionRequestCalled).isTrue()
             // User does not grant permission
             permissionStateProvider.userGiveAnswer(answer = false, firstTime = true)
@@ -165,27 +134,19 @@ class DefaultPermissionsPresenterTest {
 
     @Test
     fun `present - user does not grant permission second time`() = runTest {
-        val permissionsStore = InMemoryPermissionsStore()
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Denied(shouldShowRationale = true)
+        val permissionState = aFakePermissionState(
+            initialStatus = PermissionStatus.Denied(shouldShowRationale = true)
         )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            FakePermissionActions(),
+        val permissionStateProvider = FakeComposablePermissionStateProvider(
+            permissionState = permissionState,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter(
+            permissionStateProvider = permissionStateProvider,
+        )
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.showDialog).isFalse()
-            initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
+            initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
             assertThat(permissionState.launchPermissionRequestCalled).isTrue()
             // User does not grant permission
             permissionStateProvider.userGiveAnswer(answer = false, firstTime = false)
@@ -200,31 +161,24 @@ class DefaultPermissionsPresenterTest {
 
     @Test
     fun `present - user does not grant permission third time`() = runTest {
-        val permissionsStore =
-            InMemoryPermissionsStore(
-                permissionDenied = true,
-                permissionAsked = true
-            )
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Denied(shouldShowRationale = false)
+        val permissionsStore = InMemoryPermissionsStore(
+            permissionDenied = true,
+            permissionAsked = true,
         )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            FakePermissionActions(),
+        val permissionState = aFakePermissionState(
+            initialStatus = PermissionStatus.Denied(shouldShowRationale = false),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val permissionStateProvider = FakeComposablePermissionStateProvider(
+            permissionState = permissionState,
+        )
+        val presenter = createPresenter(
+            permissionsStore = permissionsStore,
+            permissionStateProvider = permissionStateProvider,
+        )
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem()
-            initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
+            initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
             val withDialogState = awaitItem()
             assertThat(withDialogState.showDialog).isTrue()
             assertThat(withDialogState.permissionGranted).isFalse()
@@ -235,27 +189,19 @@ class DefaultPermissionsPresenterTest {
 
     @Test
     fun `present - user grants permission`() = runTest {
-        val permissionsStore = InMemoryPermissionsStore()
-        val permissionState = FakePermissionState(
-            A_PERMISSION,
-            PermissionStatus.Denied(shouldShowRationale = false)
+        val permissionState = aFakePermissionState(
+            initialStatus = PermissionStatus.Denied(shouldShowRationale = false)
         )
-        val permissionStateProvider =
-            FakeComposablePermissionStateProvider(
-                permissionState
-            )
-        val presenter = DefaultPermissionsPresenter(
-            A_PERMISSION,
-            permissionsStore,
-            permissionStateProvider,
-            FakePermissionActions(),
+        val permissionStateProvider = FakeComposablePermissionStateProvider(
+            permissionState = permissionState,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        val presenter = createPresenter(
+            permissionStateProvider = permissionStateProvider,
+        )
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.showDialog).isFalse()
-            initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
+            initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
             assertThat(permissionState.launchPermissionRequestCalled).isTrue()
             // User grants permission
             permissionStateProvider.userGiveAnswer(answer = true, firstTime = true)
@@ -268,3 +214,25 @@ class DefaultPermissionsPresenterTest {
         }
     }
 }
+
+private fun createPresenter(
+    permission: String = A_PERMISSION,
+    permissionsStore: PermissionsStore = InMemoryPermissionsStore(),
+    permissionStateProvider: ComposablePermissionStateProvider = FakeComposablePermissionStateProvider(
+        permissionState = aFakePermissionState(),
+    ),
+    permissionActions: PermissionActions = FakePermissionActions(),
+) = DefaultPermissionsPresenter(
+    permission = permission,
+    permissionsStore = permissionsStore,
+    composablePermissionStateProvider = permissionStateProvider,
+    permissionActions = permissionActions,
+)
+
+private fun aFakePermissionState(
+    permission: String = A_PERMISSION,
+    initialStatus: PermissionStatus = PermissionStatus.Granted,
+) = FakePermissionState(
+    permission = permission,
+    initialStatus = initialStatus,
+)
diff --git a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/FakeComposablePermissionStateProvider.kt b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/FakeComposablePermissionStateProvider.kt
index 95f45078a7..eca61c67ba 100644
--- a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/FakeComposablePermissionStateProvider.kt
+++ b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/FakeComposablePermissionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/action/FakePermissionActions.kt b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/action/FakePermissionActions.kt
index 33504c24a8..df66dee377 100644
--- a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/action/FakePermissionActions.kt
+++ b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/action/FakePermissionActions.kt
@@ -1,20 +1,19 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.action
 
-class FakePermissionActions(
-    val openSettingsAction: () -> Unit = {}
-) : PermissionActions {
-    var openSettingsCalled = false
-        private set
+import io.element.android.tests.testutils.lambda.lambdaError
 
-    override fun openSettings() {
-        openSettingsAction()
-        openSettingsCalled = true
+class FakePermissionActions(
+    val openSettingsAction: (String) -> Unit = { lambdaError() }
+) : PermissionActions {
+    override fun openSettings(permission: String) {
+        openSettingsAction(permission)
     }
 }
diff --git a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTestTest.kt b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTestTest.kt
index 41a7260ca2..03a9027f74 100644
--- a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTestTest.kt
+++ b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/troubleshoot/NotificationTroubleshootCheckPermissionTestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/noop/build.gradle.kts b/libraries/permissions/noop/build.gradle.kts
index 343e913b60..d9aad63530 100644
--- a/libraries/permissions/noop/build.gradle.kts
+++ b/libraries/permissions/noop/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/noop/src/main/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenter.kt b/libraries/permissions/noop/src/main/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenter.kt
index ed3d5b35e1..fb18fa6fed 100644
--- a/libraries/permissions/noop/src/main/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenter.kt
+++ b/libraries/permissions/noop/src/main/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/noop/src/test/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenterTest.kt b/libraries/permissions/noop/src/test/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenterTest.kt
index fc9c6b0f98..aff3c87452 100644
--- a/libraries/permissions/noop/src/test/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenterTest.kt
+++ b/libraries/permissions/noop/src/test/kotlin/io/element/android/libraries/permissions/noop/NoopPermissionsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/test/build.gradle.kts b/libraries/permissions/test/build.gradle.kts
index 3615ff38a6..1601143f46 100644
--- a/libraries/permissions/test/build.gradle.kts
+++ b/libraries/permissions/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionStateProvider.kt b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionStateProvider.kt
index 0365ebfbbe..b7fa096a86 100644
--- a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionStateProvider.kt
+++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2aa1d103db..efd584585f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@ package io.element.android.libraries.permissions.test
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
-import io.element.android.libraries.permissions.api.PermissionsEvents
+import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import io.element.android.libraries.permissions.api.PermissionsState
 import io.element.android.libraries.permissions.api.aPermissionsState
@@ -17,15 +18,15 @@ import io.element.android.libraries.permissions.api.aPermissionsState
 class FakePermissionsPresenter(
     private val initialState: PermissionsState = aPermissionsState(showDialog = false),
 ) : PermissionsPresenter {
-    private fun eventSink(events: PermissionsEvents) {
-        when (events) {
-            PermissionsEvents.RequestPermissions -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true)
-            PermissionsEvents.CloseDialog -> state.value = state.value.copy(showDialog = false)
-            PermissionsEvents.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false)
+    private fun handleEvent(event: PermissionsEvent) {
+        when (event) {
+            PermissionsEvent.RequestPermissions -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true)
+            PermissionsEvent.CloseDialog -> state.value = state.value.copy(showDialog = false)
+            PermissionsEvent.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false)
         }
     }
 
-    private val state = mutableStateOf(initialState.copy(eventSink = ::eventSink))
+    private val state = mutableStateOf(initialState.copy(eventSink = ::handleEvent))
 
     fun setPermissionGranted() {
         state.value = state.value.copy(permissionGranted = true)
diff --git a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenterFactory.kt b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenterFactory.kt
index 31d030bae4..49c258af02 100644
--- a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenterFactory.kt
+++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/InMemoryPermissionsStore.kt b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/InMemoryPermissionsStore.kt
index d34db961c6..38aff2ff39 100644
--- a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/InMemoryPermissionsStore.kt
+++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/InMemoryPermissionsStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/api/build.gradle.kts b/libraries/preferences/api/build.gradle.kts
index 0e86cfc083..a441616657 100644
--- a/libraries/preferences/api/build.gradle.kts
+++ b/libraries/preferences/api/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7e47785088..476658946a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/PreferenceDataStoreFactory.kt b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/PreferenceDataStoreFactory.kt
index fefe658752..50f6eb2431 100644
--- a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/PreferenceDataStoreFactory.kt
+++ b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/PreferenceDataStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStore.kt b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStore.kt
index 4cc16b3056..d3f3fb4e28 100644
--- a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStore.kt
+++ b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStoreFactory.kt b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStoreFactory.kt
index e7d0f6d7bd..2c0038d06e 100644
--- a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStoreFactory.kt
+++ b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/SessionPreferencesStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/VideoCompressionPreset.kt b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/VideoCompressionPreset.kt
index d68a53a1a5..22e0da1480 100644
--- a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/VideoCompressionPreset.kt
+++ b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/VideoCompressionPreset.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/impl/build.gradle.kts b/libraries/preferences/impl/build.gradle.kts
index f63c057183..c567471da4 100644
--- a/libraries/preferences/impl/build.gradle.kts
+++ b/libraries/preferences/impl/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.setupDependencyInjection
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b3890a8a7d..6856f8bdb6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.matrix.api.media.MediaPreviewValue
@@ -32,7 +32,6 @@ private val logLevelKey = stringPreferencesKey("logLevel")
 private val traceLogPacksKey = stringPreferencesKey("traceLogPacks")
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAppPreferencesStore(
     private val buildMeta: BuildMeta,
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultPreferencesDataStoreFactory.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultPreferencesDataStoreFactory.kt
index 78fccf0e84..267961c11b 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultPreferencesDataStoreFactory.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultPreferencesDataStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.androidutils.preferences.DefaultPreferencesCorruptionHandlerFactory
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPreferencesDataStoreFactory(
     @ApplicationContext private val context: Context,
 ) : PreferenceDataStoreFactory {
diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStore.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStore.kt
index 3d6cd266b1..907d454ada 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStore.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt
index 4f24bec89e..ce76bd9b5c 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultSessionPreferencesStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.preferences.impl.store
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSessionPreferencesStoreFactory(
     @ApplicationContext private val context: Context,
     sessionObserver: SessionObserver,
@@ -32,8 +31,7 @@ class DefaultSessionPreferencesStoreFactory(
 
     init {
         sessionObserver.addListener(object : SessionListener {
-            override suspend fun onSessionCreated(userId: String) = Unit
-            override suspend fun onSessionDeleted(userId: String) {
+            override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
                 val sessionPreferences = cache.remove(SessionId(userId))
                 sessionPreferences?.clear()
             }
diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesModule.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesModule.kt
index 225ea4e3d2..43de0b5a62 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesModule.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesStoreMigration.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesStoreMigration.kt
index b43223b988..a19107dba2 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesStoreMigration.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/SessionPreferencesStoreMigration.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/test/build.gradle.kts b/libraries/preferences/test/build.gradle.kts
index 9db4ab1866..d433490e73 100644
--- a/libraries/preferences/test/build.gradle.kts
+++ b/libraries/preferences/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,12 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.preferences.test"
-
-    dependencies {
-        api(projects.libraries.preferences.api)
-        implementation(projects.libraries.matrix.api)
-        implementation(projects.tests.testutils)
-        implementation(libs.coroutines.core)
-        implementation(libs.androidx.datastore.preferences)
-    }
+}
+
+dependencies {
+    api(projects.libraries.preferences.api)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+    implementation(libs.coroutines.core)
+    implementation(libs.androidx.datastore.preferences)
 }
diff --git a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakePreferenceDataStoreFactory.kt b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakePreferenceDataStoreFactory.kt
index 7dff109202..dc9bbc26d1 100644
--- a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakePreferenceDataStoreFactory.kt
+++ b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakePreferenceDataStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt
index fbef1a05b6..2fc3d66eed 100644
--- a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt
+++ b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d0ee298a66..6e7d22a568 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemorySessionPreferencesStore.kt b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemorySessionPreferencesStore.kt
index e5e1923f7b..7e2027d58f 100644
--- a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemorySessionPreferencesStore.kt
+++ b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemorySessionPreferencesStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/previewutils/build.gradle.kts b/libraries/previewutils/build.gradle.kts
index 92218e9286..3fca91acf6 100644
--- a/libraries/previewutils/build.gradle.kts
+++ b/libraries/previewutils/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,11 +12,11 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.previewutils"
-
-    dependencies {
-        implementation(projects.libraries.designsystem)
-        implementation(projects.libraries.matrix.api)
-
-        implementation(libs.kotlinx.collections.immutable)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
+
+    implementation(libs.kotlinx.collections.immutable)
 }
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 e699f3c4b2..1b73ccea31 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 aae6bbfb76..4bf1d2501b 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/build.gradle.kts b/libraries/push/api/build.gradle.kts
index 48df34053a..df6ac6120a 100644
--- a/libraries/push/api/build.gradle.kts
+++ b/libraries/push/api/build.gradle.kts
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
@@ -16,7 +17,8 @@ dependencies {
     implementation(libs.androidx.corektx)
     implementation(libs.coroutines.core)
     implementation(libs.coil.compose)
+    implementation(projects.libraries.designsystem)
     implementation(projects.libraries.matrix.api)
-    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.pushproviders.api)
 }
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/GetCurrentPushProvider.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/GetCurrentPushProvider.kt
index f7a3dc1638..a6fbb47173 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/GetCurrentPushProvider.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/GetCurrentPushProvider.kt
@@ -1,12 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
+import io.element.android.libraries.matrix.api.core.SessionId
+
 interface GetCurrentPushProvider {
-    suspend fun getCurrentPushProvider(): String?
+    suspend fun getCurrentPushProvider(sessionId: SessionId): String?
 }
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PushService.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PushService.kt
index fb1bd14404..a43ee36403 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PushService.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PushService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.libraries.push.api
 
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
@@ -18,7 +20,7 @@ interface PushService {
     /**
      * Return the current push provider, or null if none.
      */
-    suspend fun getCurrentPushProvider(): PushProvider?
+    suspend fun getCurrentPushProvider(sessionId: SessionId): PushProvider?
 
     /**
      * Return the list of push providers, available at compile time, sorted by index.
@@ -36,6 +38,15 @@ interface PushService {
         distributor: Distributor,
     ): Result<Unit>
 
+    /**
+     * Ensure that the pusher with the current push provider and distributor is registered.
+     * If there is no current config, the default push provider with the default distributor will be used.
+     * Error can be [PusherRegistrationFailure].
+     */
+    suspend fun ensurePusherIsRegistered(
+        matrixClient: MatrixClient,
+    ): Result<Unit>
+
     /**
      * Store the given push provider as the current one, but do not register.
      * To be used when there is no distributor available.
@@ -51,7 +62,7 @@ interface PushService {
     /**
      * Return false in case of early error.
      */
-    suspend fun testPush(): Boolean
+    suspend fun testPush(sessionId: SessionId): Boolean
 
     /**
      * Get a flow of total number of received Push.
@@ -72,4 +83,9 @@ interface PushService {
      * Reset the battery optimization state.
      */
     suspend fun resetBatteryOptimizationState()
+
+    /**
+     * Notify the user that the service is un-registered.
+     */
+    suspend fun onServiceUnregistered(userId: UserId)
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/PusherRegistrationFailure.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PusherRegistrationFailure.kt
similarity index 84%
rename from appnav/src/main/kotlin/io/element/android/appnav/loggedin/PusherRegistrationFailure.kt
rename to libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PusherRegistrationFailure.kt
index 477d8357ca..b8ae677aab 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/PusherRegistrationFailure.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/PusherRegistrationFailure.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.appnav.loggedin
+package io.element.android.libraries.push.api
 
 import io.element.android.libraries.matrix.api.exception.ClientException
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt
index ab8d9e92e5..b7a01cc61f 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt
index 7e7c2b2bd6..6732f7c17d 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt
index d6d4e5774b..684185f40a 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/gateway/PushGatewayFailure.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/gateway/PushGatewayFailure.kt
index ea32694932..975e10e134 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/gateway/PushGatewayFailure.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/gateway/PushGatewayFailure.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/history/PushHistoryItem.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/history/PushHistoryItem.kt
index 9606e7e6dc..e3a8a494ef 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/history/PushHistoryItem.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/history/PushHistoryItem.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationBitmapLoader.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationBitmapLoader.kt
index d0fa4c418a..bded69991b 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationBitmapLoader.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationBitmapLoader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,17 +11,18 @@ package io.element.android.libraries.push.api.notifications
 import android.graphics.Bitmap
 import androidx.core.graphics.drawable.IconCompat
 import coil3.ImageLoader
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL
 
 interface NotificationBitmapLoader {
     /**
      * Get icon of a room.
-     * @param path mxc url
+     * @param avatarData the data related to the Avatar
      * @param imageLoader Coil image loader
      * @param targetSize The size we want the bitmap to be resized to
      */
     suspend fun getRoomBitmap(
-        path: String?,
+        avatarData: AvatarData,
         imageLoader: ImageLoader,
         targetSize: Long = AVATAR_THUMBNAIL_SIZE_IN_PIXEL,
     ): Bitmap?
@@ -28,8 +30,11 @@ interface NotificationBitmapLoader {
     /**
      * Get icon of a user.
      * Before Android P, this does nothing because the icon won't be used
-     * @param path mxc url
+     * @param avatarData the data related to the Avatar
      * @param imageLoader Coil image loader
      */
-    suspend fun getUserIcon(path: String?, imageLoader: ImageLoader): IconCompat?
+    suspend fun getUserIcon(
+        avatarData: AvatarData,
+        imageLoader: ImageLoader,
+    ): IconCompat?
 }
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationCleaner.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationCleaner.kt
index 4d6850a18f..0a4e35c697 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationCleaner.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationCleaner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,10 +11,12 @@ package io.element.android.libraries.push.api.notifications
 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.core.ThreadId
 
 interface NotificationCleaner {
     fun clearAllMessagesEvents(sessionId: SessionId)
     fun clearMessagesForRoom(sessionId: SessionId, roomId: RoomId)
+    fun clearMessagesForThread(sessionId: SessionId, roomId: RoomId, threadId: ThreadId)
     fun clearEvent(sessionId: SessionId, eventId: EventId)
 
     fun clearMembershipNotificationForSession(sessionId: SessionId)
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 83ab37682b..ff7119b647 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -31,12 +32,8 @@ object NotificationIdProvider {
         return getOffset(sessionId) + FALLBACK_NOTIFICATION_ID
     }
 
-    fun getCallNotificationId(sessionId: SessionId): Int {
-        return getOffset(sessionId) + ROOM_CALL_NOTIFICATION_ID
-    }
-
     fun getForegroundServiceNotificationId(type: ForegroundServiceType): Int {
-        return type.id * 10 + FOREGROUND_SERVICE_NOTIFICATION_ID
+        return type.ordinal * 10 + FOREGROUND_SERVICE_NOTIFICATION_ID
     }
 
     private fun getOffset(sessionId: SessionId): Int {
@@ -49,12 +46,11 @@ object NotificationIdProvider {
     private const val ROOM_MESSAGES_NOTIFICATION_ID = 1
     private const val ROOM_EVENT_NOTIFICATION_ID = 2
     private const val ROOM_INVITATION_NOTIFICATION_ID = 3
-    private const val ROOM_CALL_NOTIFICATION_ID = 3
 
     private const val FOREGROUND_SERVICE_NOTIFICATION_ID = 4
 }
 
-enum class ForegroundServiceType(val id: Int) {
-    INCOMING_CALL(1),
-    ONGOING_CALL(2),
+enum class ForegroundServiceType {
+    INCOMING_CALL,
+    ONGOING_CALL,
 }
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/OnMissedCallNotificationHandler.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/OnMissedCallNotificationHandler.kt
index 5de4dc1838..2ba61925c5 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/OnMissedCallNotificationHandler.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/OnMissedCallNotificationHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 586aea0fae..504adacdb6 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/NotificationEventRequest.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/NotificationEventRequest.kt
new file mode 100644
index 0000000000..ff38c7a726
--- /dev/null
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/NotificationEventRequest.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.push.api.push
+
+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
+
+data class NotificationEventRequest(
+    val sessionId: SessionId,
+    val roomId: RoomId,
+    val eventId: EventId,
+    val providerInfo: String,
+)
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/SyncOnNotifiableEvent.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/SyncOnNotifiableEvent.kt
new file mode 100644
index 0000000000..bc7bf44ae2
--- /dev/null
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/SyncOnNotifiableEvent.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.push.api.push
+
+fun interface SyncOnNotifiableEvent {
+    suspend operator fun invoke(requests: List<NotificationEventRequest>)
+}
diff --git a/libraries/push/impl/build.gradle.kts b/libraries/push/impl/build.gradle.kts
index fa0f65cb8f..68d32dbd23 100644
--- a/libraries/push/impl/build.gradle.kts
+++ b/libraries/push/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -49,11 +50,15 @@ dependencies {
     implementation(projects.libraries.network)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.features.networkmonitor.api)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.troubleshoot.api)
+    implementation(projects.libraries.workmanager.api)
     implementation(projects.features.call.api)
+    implementation(projects.features.enterprise.api)
     implementation(projects.features.lockscreen.api)
     implementation(projects.libraries.featureflag.api)
     api(projects.libraries.pushproviders.api)
@@ -67,14 +72,19 @@ dependencies {
     testCommonDependencies(libs)
     testImplementation(libs.coil.test)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.matrixmedia.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.libraries.pushproviders.test)
     testImplementation(projects.libraries.pushstore.test)
     testImplementation(projects.libraries.troubleshoot.test)
+    testImplementation(projects.libraries.workmanager.test)
     testImplementation(projects.features.call.test)
+    testImplementation(projects.features.enterprise.test)
     testImplementation(projects.features.lockscreen.test)
+    testImplementation(projects.features.networkmonitor.test)
+    testImplementation(projects.services.appnavstate.impl)
     testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.services.toolbox.impl)
     testImplementation(projects.services.toolbox.test)
diff --git a/libraries/push/impl/src/debug/res/raw/message.mp3 b/libraries/push/impl/src/debug/res/raw/message.mp3
new file mode 100644
index 0000000000..abc056786c
Binary files /dev/null and b/libraries/push/impl/src/debug/res/raw/message.mp3 differ
diff --git a/libraries/push/impl/src/main/AndroidManifest.xml b/libraries/push/impl/src/main/AndroidManifest.xml
index c08c16ed5f..a15bb34715 100644
--- a/libraries/push/impl/src/main/AndroidManifest.xml
+++ b/libraries/push/impl/src/main/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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.POST_NOTIFICATIONS" />
-
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <application>
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultGetCurrentPushProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultGetCurrentPushProvider.kt
index 9e7ec0d651..a3e6cf2111 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultGetCurrentPushProvider.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultGetCurrentPushProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,25 +10,15 @@ package io.element.android.libraries.push.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.GetCurrentPushProvider
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
-import io.element.android.services.appnavstate.api.AppNavigationStateService
-import io.element.android.services.appnavstate.api.currentSessionId
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultGetCurrentPushProvider(
     private val pushStoreFactory: UserPushStoreFactory,
-    private val appNavigationStateService: AppNavigationStateService,
 ) : GetCurrentPushProvider {
-    override suspend fun getCurrentPushProvider(): String? {
-        return appNavigationStateService
-            .appNavigationState
-            .value
-            .navigationState
-            .currentSessionId()
-            ?.let { pushStoreFactory.getOrCreate(it) }
-            ?.getPushProviderName()
+    override suspend fun getCurrentPushProvider(sessionId: SessionId): String? {
+        return pushStoreFactory.getOrCreate(sessionId).getPushProviderName()
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt
index 45a0e5b4cd..3f3a8d05b4 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPushService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,29 +10,33 @@ package io.element.android.libraries.push.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import dev.zacsweers.metro.binding
 import io.element.android.libraries.matrix.api.MatrixClient
 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.verification.SessionVerifiedStatus
 import io.element.android.libraries.push.api.GetCurrentPushProvider
 import io.element.android.libraries.push.api.PushService
+import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore
 import io.element.android.libraries.push.impl.store.PushDataStore
 import io.element.android.libraries.push.impl.test.TestPush
+import io.element.android.libraries.push.impl.unregistration.ServiceUnregisteredHandler
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
+import io.element.android.libraries.pushproviders.api.RegistrationFailure
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecretStore
 import io.element.android.libraries.sessionstorage.api.observer.SessionListener
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class, binding = binding<PushService>())
 @SingleIn(AppScope::class)
-@Inject
 class DefaultPushService(
     private val testPush: TestPush,
     private val userPushStoreFactory: UserPushStoreFactory,
@@ -41,13 +46,14 @@ class DefaultPushService(
     private val pushClientSecretStore: PushClientSecretStore,
     private val pushDataStore: PushDataStore,
     private val mutableBatteryOptimizationStore: MutableBatteryOptimizationStore,
+    private val serviceUnregisteredHandler: ServiceUnregisteredHandler,
 ) : PushService, SessionListener {
     init {
         observeSessions()
     }
 
-    override suspend fun getCurrentPushProvider(): PushProvider? {
-        val currentPushProvider = getCurrentPushProvider.getCurrentPushProvider()
+    override suspend fun getCurrentPushProvider(sessionId: SessionId): PushProvider? {
+        val currentPushProvider = getCurrentPushProvider.getCurrentPushProvider(sessionId)
         return pushProviders.find { it.name == currentPushProvider }
     }
 
@@ -82,6 +88,59 @@ class DefaultPushService(
         return pushProvider.registerWith(matrixClient, distributor)
     }
 
+    override suspend fun ensurePusherIsRegistered(matrixClient: MatrixClient): Result<Unit> {
+        val verificationStatus = matrixClient.sessionVerificationService.sessionVerifiedStatus.first()
+        if (verificationStatus != SessionVerifiedStatus.Verified) {
+            return Result.failure<Unit>(PusherRegistrationFailure.AccountNotVerified())
+                .also { Timber.w("Account is not verified") }
+        }
+        Timber.d("Ensure pusher is registered")
+        val currentPushProvider = getCurrentPushProvider(matrixClient.sessionId)
+        val result = if (currentPushProvider == null) {
+            Timber.d("Register with the first available push provider with at least one distributor")
+            val pushProvider = getAvailablePushProviders()
+                .firstOrNull { it.getDistributors().isNotEmpty() }
+            // Else fallback to the first available push provider (the list should never be empty)
+                ?: getAvailablePushProviders().firstOrNull()
+                ?: return Result.failure<Unit>(PusherRegistrationFailure.NoProvidersAvailable())
+                    .also { Timber.w("No push providers available") }
+            val distributor = pushProvider.getDistributors().firstOrNull()
+                ?: return Result.failure<Unit>(PusherRegistrationFailure.NoDistributorsAvailable())
+                    .also { Timber.w("No distributors available") }
+                    .also {
+                        // In this case, consider the push provider is chosen.
+                        selectPushProvider(matrixClient.sessionId, pushProvider)
+                    }
+            registerWith(matrixClient, pushProvider, distributor)
+        } else {
+            val currentPushDistributor = currentPushProvider.getCurrentDistributor(matrixClient.sessionId)
+            if (currentPushDistributor == null) {
+                Timber.d("Register with the first available distributor")
+                val distributor = currentPushProvider.getDistributors().firstOrNull()
+                    ?: return Result.failure<Unit>(PusherRegistrationFailure.NoDistributorsAvailable())
+                        .also { Timber.w("No distributors available") }
+                registerWith(matrixClient, currentPushProvider, distributor)
+            } else {
+                Timber.d("Re-register with the current distributor")
+                registerWith(matrixClient, currentPushProvider, currentPushDistributor)
+            }
+        }
+        return result.fold(
+            onSuccess = {
+                Timber.d("Pusher registered")
+                Result.success(Unit)
+            },
+            onFailure = {
+                Timber.e(it, "Failed to register pusher")
+                if (it is RegistrationFailure) {
+                    Result.failure(PusherRegistrationFailure.RegistrationFailure(it.clientException, it.isRegisteringAgain))
+                } else {
+                    Result.failure(it)
+                }
+            }
+        )
+    }
+
     override suspend fun selectPushProvider(
         sessionId: SessionId,
         pushProvider: PushProvider,
@@ -99,9 +158,9 @@ class DefaultPushService(
         userPushStoreFactory.getOrCreate(sessionId).setIgnoreRegistrationError(ignore)
     }
 
-    override suspend fun testPush(): Boolean {
-        val pushProvider = getCurrentPushProvider() ?: return false
-        val config = pushProvider.getCurrentUserPushConfig() ?: return false
+    override suspend fun testPush(sessionId: SessionId): Boolean {
+        val pushProvider = getCurrentPushProvider(sessionId) ?: return false
+        val config = pushProvider.getPushConfig(sessionId) ?: return false
         testPush.execute(config)
         return true
     }
@@ -110,10 +169,6 @@ class DefaultPushService(
         sessionObserver.addListener(this)
     }
 
-    override suspend fun onSessionCreated(userId: String) {
-        // Nothing to do
-    }
-
     /**
      * The session has been deleted.
      * In this case, this is not necessary to unregister the pusher from the homeserver,
@@ -121,7 +176,7 @@ class DefaultPushService(
      * The current push provider may want to take action, and we need to
      * cleanup the stores.
      */
-    override suspend fun onSessionDeleted(userId: String) {
+    override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
         val sessionId = SessionId(userId)
         val userPushStore = userPushStoreFactory.getOrCreate(sessionId)
         val currentPushProviderName = userPushStore.getPushProviderName()
@@ -146,4 +201,8 @@ class DefaultPushService(
     override suspend fun resetBatteryOptimizationState() {
         mutableBatteryOptimizationStore.reset()
     }
+
+    override suspend fun onServiceUnregistered(userId: UserId) {
+        serviceUnregisteredHandler.handle(userId)
+    }
 }
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 7dbe4e795e..39f9d3acd6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.PushConfig
 import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.core.log.logger.LoggerTag
@@ -30,7 +30,6 @@ internal const val DEFAULT_PUSHER_FILE_TAG = "mobile"
 private val loggerTag = LoggerTag("DefaultPusherSubscriber", LoggerTag.PushLoggerTag)
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPusherSubscriber(
     private val buildMeta: BuildMeta,
     private val pushClientSecret: PushClientSecret,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimization.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimization.kt
index 8379289f88..0912987477 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimization.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimization.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -17,7 +18,6 @@ import androidx.core.content.getSystemService
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.services.toolbox.api.intent.ExternalIntentLauncher
 import timber.log.Timber
@@ -45,7 +45,6 @@ interface BatteryOptimization {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidBatteryOptimization(
     @ApplicationContext
     private val context: Context,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt
index 3c876ece1d..e9af494686 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -47,7 +48,7 @@ class BatteryOptimizationPresenter(
             onPauseOrDispose {}
         }
 
-        fun handleEvents(event: BatteryOptimizationEvents) {
+        fun handleEvent(event: BatteryOptimizationEvents) {
             when (event) {
                 BatteryOptimizationEvents.Dismiss -> coroutineScope.launch {
                     mutableBatteryOptimizationStore.onOptimizationBannerDismissed()
@@ -66,7 +67,7 @@ class BatteryOptimizationPresenter(
 
         return BatteryOptimizationState(
             shouldDisplayBanner = localShouldDisplayBanner && storeShouldDisplayBanner && !isSystemIgnoringBatteryOptimizations,
-            eventSink = ::handleEvents,
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt
index bdd1dc6d7c..b7e807523c 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/DefaultPushHistoryService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/DefaultPushHistoryService.kt
index c69a09b31f..2c8dc5480a 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/DefaultPushHistoryService.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/DefaultPushHistoryService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import android.os.PowerManager
 import androidx.core.content.getSystemService
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -23,7 +23,6 @@ import io.element.android.libraries.push.impl.db.PushHistory
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushHistoryService(
     private val pushDatabase: PushDatabase,
     private val systemClock: SystemClock,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/PushHistoryService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/PushHistoryService.kt
index 31d431bb2c..8096ad222e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/PushHistoryService.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/PushHistoryService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b1eb45e433..6472883d4d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt
index f98b10674c..82ee730d17 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/intent/IntentProvider.kt
@@ -1,13 +1,16 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.intent
 
 import android.content.Intent
+import android.os.Bundle
+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.core.ThreadId
@@ -20,5 +23,7 @@ interface IntentProvider {
         sessionId: SessionId,
         roomId: RoomId?,
         threadId: ThreadId?,
+        eventId: EventId?,
+        extras: Bundle? = null,
     ): Intent
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
index 11717c081a..4cc279b8bb 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,15 +12,24 @@ import android.service.notification.StatusBarNotification
 import androidx.core.app.NotificationManagerCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 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.ThreadId
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
+import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import timber.log.Timber
 
 interface ActiveNotificationsProvider {
-    fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification>
+    /**
+     * Gets the displayed notifications for the combination of [sessionId], [roomId] and [threadId].
+     */
+    fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId, threadId: ThreadId?): List<StatusBarNotification>
+
+    /**
+     * Gets all displayed notifications associated to [sessionId] and [roomId]. These will include all thread notifications as well.
+     */
+    fun getAllMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification>
     fun getNotificationsForSession(sessionId: SessionId): List<StatusBarNotification>
     fun getMembershipNotificationForSession(sessionId: SessionId): List<StatusBarNotification>
     fun getMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification>
@@ -28,7 +38,6 @@ interface ActiveNotificationsProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultActiveNotificationsProvider(
     private val notificationManager: NotificationManagerCompat,
 ) : ActiveNotificationsProvider {
@@ -46,9 +55,15 @@ class DefaultActiveNotificationsProvider(
         return getNotificationsForSession(sessionId).filter { it.id == notificationId }
     }
 
-    override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
+    override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId, threadId: ThreadId?): List<StatusBarNotification> {
         val notificationId = NotificationIdProvider.getRoomMessagesNotificationId(sessionId)
-        return getNotificationsForSession(sessionId).filter { it.id == notificationId && it.tag == roomId.value }
+        val expectedTag = NotificationCreator.messageTag(roomId, threadId)
+        return getNotificationsForSession(sessionId).filter { it.id == notificationId && it.tag == expectedTag }
+    }
+
+    override fun getAllMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
+        val notificationId = NotificationIdProvider.getRoomMessagesNotificationId(sessionId)
+        return getNotificationsForSession(sessionId).filter { it.id == notificationId && it.tag.startsWith(roomId.value) }
     }
 
     override fun getMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/CallNotificationEventResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/CallNotificationEventResolver.kt
index 689cc8a2ea..444d0c725a 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/CallNotificationEventResolver.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/CallNotificationEventResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl.notifications
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -47,7 +47,6 @@ interface CallNotificationEventResolver {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultCallNotificationEventResolver(
     private val stringProvider: StringProvider,
     private val appForegroundStateService: AppForegroundStateService,
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 868c7e767a..e3d0f21d03 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
@@ -1,23 +1,28 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.graphics.ImageDecoder
 import android.net.Uri
+import android.os.Build
+import androidx.core.app.NotificationCompat
 import androidx.core.content.FileProvider
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.annotations.ApplicationContext
+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.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
@@ -44,6 +49,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageTy
 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.ui.messages.toPlainText
+import io.element.android.libraries.push.api.push.NotificationEventRequest
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
@@ -77,7 +83,6 @@ interface NotifiableEventResolver {
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultNotifiableEventResolver(
     private val stringProvider: StringProvider,
     private val matrixClientProvider: MatrixClientProvider,
@@ -86,6 +91,7 @@ class DefaultNotifiableEventResolver(
     private val permalinkParser: PermalinkParser,
     private val callNotificationEventResolver: CallNotificationEventResolver,
     private val fallbackNotificationFactory: FallbackNotificationFactory,
+    private val featureFlagService: FeatureFlagService,
 ) : NotifiableEventResolver {
     override suspend fun resolveEvents(
         sessionId: SessionId,
@@ -93,9 +99,12 @@ class DefaultNotifiableEventResolver(
     ): ResolvePushEventsResult {
         Timber.d("Queueing notifications: $notificationEventRequests")
         val client = matrixClientProvider.getOrRestore(sessionId).getOrElse {
-            return Result.failure(IllegalStateException("Couldn't get or restore client for session $sessionId"))
+            return Result.failure(it)
         }
-        val ids = notificationEventRequests.groupBy { it.roomId }.mapValues { (_, value) -> value.map { it.eventId } }
+        val ids = notificationEventRequests.groupBy { it.roomId }
+            .mapValues { (_, requests) ->
+                requests.map { it.eventId }
+            }
 
         // TODO this notificationData is not always valid at the moment, sometimes the Rust SDK can't fetch the matching event
         val notificationsResult = client.notificationService.getNotifications(ids)
@@ -133,19 +142,25 @@ class DefaultNotifiableEventResolver(
             is NotificationContent.MessageLike.RoomMessage -> {
                 val showMediaPreview = client.mediaPreviewService.getMediaPreviewValue() == MediaPreviewValue.On
                 val senderDisambiguatedDisplayName = getDisambiguatedDisplayName(content.senderId)
-                val messageBody = descriptionFromMessageContent(content, senderDisambiguatedDisplayName)
+                val imageMimeType = if (showMediaPreview) content.getImageMimetype() else null
+                val imageUriString = imageMimeType?.let { content.fetchImageIfPresent(client, imageMimeType)?.toString() }
+                val messageBody = descriptionFromMessageContent(
+                    content = content,
+                    senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
+                    hasImageUri = imageUriString != null,
+                )
                 val notifiableMessageEvent = buildNotifiableMessageEvent(
                     sessionId = userId,
                     senderId = content.senderId,
                     roomId = roomId,
                     eventId = eventId,
-                    threadId = threadId,
+                    threadId = threadId.takeIf { featureFlagService.isFeatureEnabled(FeatureFlags.Threads) },
                     noisy = isNoisy,
                     timestamp = this.timestamp,
                     senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
                     body = messageBody,
-                    imageUriString = if (showMediaPreview) content.fetchImageIfPresent(client)?.toString() else null,
-                    imageMimeType = if (showMediaPreview) content.getImageMimetype() else null,
+                    imageUriString = imageUriString,
+                    imageMimeType = imageMimeType.takeIf { imageUriString != null },
                     roomName = roomDisplayName,
                     roomIsDm = isDm,
                     roomAvatarPath = roomAvatarUrl,
@@ -168,7 +183,11 @@ class DefaultNotifiableEventResolver(
                     soundName = null,
                     isRedacted = false,
                     isUpdated = false,
-                    description = descriptionFromRoomMembershipInvite(senderDisambiguatedDisplayName, isDirect),
+                    description = descriptionFromRoomMembershipInvite(
+                        senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
+                        isDirectRoom = isDirect,
+                        isSpace = isSpace
+                    ),
                     // TODO check if type is needed anymore
                     type = null,
                     // TODO check if title is needed anymore
@@ -294,13 +313,18 @@ class DefaultNotifiableEventResolver(
     private fun descriptionFromMessageContent(
         content: NotificationContent.MessageLike.RoomMessage,
         senderDisambiguatedDisplayName: String,
-    ): String {
+        hasImageUri: Boolean,
+    ): String? {
         return when (val messageType = content.messageType) {
             is AudioMessageType -> messageType.bestDescription
             is VoiceMessageType -> stringProvider.getString(CommonStrings.common_voice_message)
             is EmoteMessageType -> "* $senderDisambiguatedDisplayName ${messageType.body}"
             is FileMessageType -> messageType.bestDescription
-            is ImageMessageType -> messageType.bestDescription
+            is ImageMessageType -> if (hasImageUri) {
+                messageType.caption
+            } else {
+                messageType.bestDescription
+            }
             is StickerMessageType -> messageType.bestDescription
             is NoticeMessageType -> messageType.body
             is TextMessageType -> messageType.toPlainText(permalinkParser = permalinkParser)
@@ -312,23 +336,50 @@ class DefaultNotifiableEventResolver(
 
     private fun descriptionFromRoomMembershipInvite(
         senderDisambiguatedDisplayName: String,
-        isDirectRoom: Boolean
+        isDirectRoom: Boolean,
+        isSpace: Boolean,
     ): String {
-        return if (isDirectRoom) {
-            stringProvider.getString(R.string.notification_invite_body_with_sender, senderDisambiguatedDisplayName)
-        } else {
-            stringProvider.getString(R.string.notification_room_invite_body_with_sender, senderDisambiguatedDisplayName)
+        return when {
+            isDirectRoom -> {
+                stringProvider.getString(R.string.notification_invite_body_with_sender, senderDisambiguatedDisplayName)
+            }
+            isSpace -> {
+                stringProvider.getString(R.string.notification_space_invite_body_with_sender, senderDisambiguatedDisplayName)
+            }
+            else -> {
+                stringProvider.getString(R.string.notification_room_invite_body_with_sender, senderDisambiguatedDisplayName)
+            }
         }
     }
 
-    private suspend fun NotificationContent.MessageLike.RoomMessage.fetchImageIfPresent(client: MatrixClient): Uri? {
+    /**
+     * Fetch the image for message type, only if the mime type is supported, as recommended
+     * per [NotificationCompat.MessagingStyle.Message.setData] documentation.
+     * Then convert to a [Uri] accessible to the Notification Service.
+     */
+    private suspend fun NotificationContent.MessageLike.RoomMessage.fetchImageIfPresent(
+        client: MatrixClient,
+        mimeType: String,
+    ): Uri? {
         val fileResult = when (val messageType = messageType) {
-            is ImageMessageType -> notificationMediaRepoFactory.create(client)
-                .getMediaFile(
-                    mediaSource = messageType.source,
-                    mimeType = messageType.info?.mimetype,
-                    filename = messageType.filename,
-                )
+            is ImageMessageType -> {
+                val isMimeTypeSupported = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    ImageDecoder.isMimeTypeSupported(mimeType)
+                } else {
+                    // Assume it's supported on old systems...
+                    true
+                }
+                if (isMimeTypeSupported) {
+                    notificationMediaRepoFactory.create(client).getMediaFile(
+                        mediaSource = messageType.source,
+                        mimeType = messageType.info?.mimetype,
+                        filename = messageType.filename,
+                    )
+                } else {
+                    Timber.tag(loggerTag.value).d("Mime type $mimeType not supported by the system")
+                    null
+                }
+            }
             is VideoMessageType -> null // Use the thumbnail here?
             else -> null
         }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationBitmapLoader.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationBitmapLoader.kt
index 545ef59c6d..086914ecf5 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationBitmapLoader.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationBitmapLoader.kt
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.content.res.Configuration
 import android.graphics.Bitmap
 import android.os.Build
 import androidx.core.graphics.drawable.IconCompat
@@ -18,62 +20,85 @@ import coil3.toBitmap
 import coil3.transform.CircleCropTransformation
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL
+import io.element.android.libraries.matrix.ui.media.InitialsAvatarBitmapGenerator
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
 import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationBitmapLoader(
     @ApplicationContext private val context: Context,
     private val sdkIntProvider: BuildVersionSdkIntProvider,
+    private val initialsAvatarBitmapGenerator: InitialsAvatarBitmapGenerator,
 ) : NotificationBitmapLoader {
-    override suspend fun getRoomBitmap(path: String?, imageLoader: ImageLoader, targetSize: Long): Bitmap? {
-        if (path == null) {
-            return null
-        }
-        return loadRoomBitmap(path, imageLoader, targetSize)
-    }
-
-    private suspend fun loadRoomBitmap(path: String, imageLoader: ImageLoader, targetSize: Long): Bitmap? {
+    override suspend fun getRoomBitmap(
+        avatarData: AvatarData,
+        imageLoader: ImageLoader,
+        targetSize: Long,
+    ): Bitmap? {
         return try {
-            val imageRequest = ImageRequest.Builder(context)
-                .data(MediaRequestData(MediaSource(path), MediaRequestData.Kind.Thumbnail(targetSize)))
-                .transformations(CircleCropTransformation())
-                .build()
-            val result = imageLoader.execute(imageRequest)
-            result.image?.toBitmap()
+            loadBitmap(
+                avatarData = avatarData,
+                imageLoader = imageLoader,
+                targetSize = targetSize,
+            )
         } catch (e: Throwable) {
             Timber.e(e, "Unable to load room bitmap")
             null
         }
     }
 
-    override suspend fun getUserIcon(path: String?, imageLoader: ImageLoader): IconCompat? {
-        if (path == null || sdkIntProvider.get() < Build.VERSION_CODES.P) {
+    override suspend fun getUserIcon(
+        avatarData: AvatarData,
+        imageLoader: ImageLoader,
+    ): IconCompat? {
+        if (sdkIntProvider.get() < Build.VERSION_CODES.P) {
             return null
         }
-
-        return loadUserIcon(path, imageLoader)
-    }
-
-    private suspend fun loadUserIcon(path: String, imageLoader: ImageLoader): IconCompat? {
         return try {
-            val imageRequest = ImageRequest.Builder(context)
-                .data(MediaRequestData(MediaSource(path), MediaRequestData.Kind.Thumbnail(AVATAR_THUMBNAIL_SIZE_IN_PIXEL)))
-                .transformations(CircleCropTransformation())
-                .build()
-            val result = imageLoader.execute(imageRequest)
-            val bitmap = result.image?.toBitmap()
-            return bitmap?.let { IconCompat.createWithBitmap(it) }
+            loadBitmap(
+                avatarData = avatarData,
+                imageLoader = imageLoader,
+                targetSize = AVATAR_THUMBNAIL_SIZE_IN_PIXEL,
+            )
+                ?.let { IconCompat.createWithBitmap(it) }
         } catch (e: Throwable) {
             Timber.e(e, "Unable to load user bitmap")
             null
         }
     }
+
+    private fun isDarkTheme(): Boolean {
+        return context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+    }
+
+    private suspend fun loadBitmap(
+        avatarData: AvatarData,
+        imageLoader: ImageLoader,
+        targetSize: Long
+    ): Bitmap? {
+        val path = avatarData.url
+        val data = if (path != null) {
+            MediaRequestData(
+                source = MediaSource(path),
+                kind = MediaRequestData.Kind.Thumbnail(targetSize),
+            )
+        } else {
+            initialsAvatarBitmapGenerator.generateBitmap(
+                size = targetSize.toInt(),
+                avatarData = avatarData,
+                useDarkTheme = isDarkTheme(),
+            )
+        }
+        val imageRequest = ImageRequest.Builder(context)
+            .data(data)
+            .transformations(CircleCropTransformation())
+            .build()
+        return imageLoader.execute(imageRequest).image?.toBitmap()
+    }
 }
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 41b9f66f38..ee72c34b9e 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
@@ -1,22 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.annotation.VisibleForTesting
-import androidx.core.app.NotificationManagerCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
-import io.element.android.libraries.core.data.tryOrNull
-import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -26,17 +21,14 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
+import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.shouldIgnoreEventInRoom
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import io.element.android.services.appnavstate.api.NavigationState
 import io.element.android.services.appnavstate.api.currentSessionId
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import timber.log.Timber
-
-private val loggerTag = LoggerTag("DefaultNotificationDrawerManager", LoggerTag.NotificationLoggerTag)
 
 /**
  * This class receives notification events as they arrive from the PushHandler calling [onNotifiableEventReceived] and
@@ -45,9 +37,8 @@ private val loggerTag = LoggerTag("DefaultNotificationDrawerManager", LoggerTag.
  */
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationDrawerManager(
-    private val notificationManager: NotificationManagerCompat,
+    private val notificationDisplayer: NotificationDisplayer,
     private val notificationRenderer: NotificationRenderer,
     private val appNavigationStateService: AppNavigationStateService,
     @AppCoroutineScope
@@ -56,25 +47,17 @@ class DefaultNotificationDrawerManager(
     private val imageLoaderHolder: ImageLoaderHolder,
     private val activeNotificationsProvider: ActiveNotificationsProvider,
 ) : NotificationCleaner {
-    private var appNavigationStateObserver: Job? = null
-
     // TODO EAx add a setting per user for this
     private var useCompleteNotificationFormat = true
 
     init {
         // Observe application state
-        appNavigationStateObserver = coroutineScope.launch {
+        coroutineScope.launch {
             appNavigationStateService.appNavigationState
                 .collect { onAppNavigationStateChange(it.navigationState) }
         }
     }
 
-    // For test only
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    internal fun destroy() {
-        appNavigationStateObserver?.cancel()
-    }
-
     private var currentAppNavigationState: NavigationState? = null
 
     private fun onAppNavigationStateChange(navigationState: NavigationState) {
@@ -95,10 +78,10 @@ class DefaultNotificationDrawerManager(
                 )
             }
             is NavigationState.Thread -> {
-                onEnteringThread(
-                    navigationState.parentRoom.parentSpace.parentSession.sessionId,
-                    navigationState.parentRoom.roomId,
-                    navigationState.threadId
+                clearMessagesForThread(
+                    sessionId = navigationState.parentRoom.parentSpace.parentSession.sessionId,
+                    roomId = navigationState.parentRoom.roomId,
+                    threadId = navigationState.threadId,
                 )
             }
         }
@@ -125,7 +108,7 @@ class DefaultNotificationDrawerManager(
      * Clear all known message events for a [sessionId].
      */
     override fun clearAllMessagesEvents(sessionId: SessionId) {
-        notificationManager.cancel(null, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
+        notificationDisplayer.cancelNotification(null, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -134,7 +117,7 @@ class DefaultNotificationDrawerManager(
      */
     fun clearAllEvents(sessionId: SessionId) {
         activeNotificationsProvider.getNotificationsForSession(sessionId)
-            .forEach { notificationManager.cancel(it.tag, it.id) }
+            .forEach { notificationDisplayer.cancelNotification(it.tag, it.id) }
     }
 
     /**
@@ -143,13 +126,23 @@ class DefaultNotificationDrawerManager(
      * Can also be called when a notification for this room is dismissed by the user.
      */
     override fun clearMessagesForRoom(sessionId: SessionId, roomId: RoomId) {
-        notificationManager.cancel(roomId.value, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
+        notificationDisplayer.cancelNotification(roomId.value, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
+        clearSummaryNotificationIfNeeded(sessionId)
+    }
+
+    /**
+     * Should be called when the application is currently opened and showing timeline for the given threadId.
+     * Used to ignore events related to that thread (no need to display notification) and clean any existing notification on this room.
+     */
+    override fun clearMessagesForThread(sessionId: SessionId, roomId: RoomId, threadId: ThreadId) {
+        val tag = NotificationCreator.messageTag(roomId, threadId)
+        notificationDisplayer.cancelNotification(tag, NotificationIdProvider.getRoomMessagesNotificationId(sessionId))
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
     override fun clearMembershipNotificationForSession(sessionId: SessionId) {
         activeNotificationsProvider.getMembershipNotificationForSession(sessionId)
-            .forEach { notificationManager.cancel(it.tag, it.id) }
+            .forEach { notificationDisplayer.cancelNotification(it.tag, it.id) }
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -158,7 +151,7 @@ class DefaultNotificationDrawerManager(
      */
     override fun clearMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId) {
         activeNotificationsProvider.getMembershipNotificationForRoom(sessionId, roomId)
-            .forEach { notificationManager.cancel(it.tag, it.id) }
+            .forEach { notificationDisplayer.cancelNotification(it.tag, it.id) }
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
@@ -167,27 +160,17 @@ class DefaultNotificationDrawerManager(
      */
     override fun clearEvent(sessionId: SessionId, eventId: EventId) {
         val id = NotificationIdProvider.getRoomEventNotificationId(sessionId)
-        notificationManager.cancel(eventId.value, id)
+        notificationDisplayer.cancelNotification(eventId.value, id)
         clearSummaryNotificationIfNeeded(sessionId)
     }
 
     private fun clearSummaryNotificationIfNeeded(sessionId: SessionId) {
         val summaryNotification = activeNotificationsProvider.getSummaryNotification(sessionId)
         if (summaryNotification != null && activeNotificationsProvider.count(sessionId) == 1) {
-            notificationManager.cancel(null, summaryNotification.id)
+            notificationDisplayer.cancelNotification(null, summaryNotification.id)
         }
     }
 
-    /**
-     * Should be called when the application is currently opened and showing timeline for the given threadId.
-     * Used to ignore events related to that thread (no need to display notification) and clean any existing notification on this room.
-     */
-    @Suppress("UNUSED_PARAMETER")
-    private fun onEnteringThread(sessionId: SessionId, roomId: RoomId, threadId: ThreadId) {
-        // TODO maybe we'll have to embed more data in the tag to get a threadId
-        // Do nothing for now
-    }
-
     private suspend fun renderEvents(eventsToRender: List<NotifiableEvent>) {
         // Group by sessionId
         val eventsForSessions = eventsToRender.groupBy {
@@ -202,29 +185,9 @@ class DefaultNotificationDrawerManager(
                 // We have an avatar and a display name, use it
                 userFromCache
             } else {
-                client.getSafeUserProfile()
+                client.getUserProfile().getOrNull() ?: MatrixUser(sessionId)
             }
-
             notificationRenderer.render(currentUser, useCompleteNotificationFormat, notifiableEvents, imageLoader)
         }
     }
-
-    private suspend fun MatrixClient.getSafeUserProfile(): MatrixUser {
-        return tryOrNull(
-            onException = { Timber.tag(loggerTag.value).e(it, "Unable to retrieve info for user ${sessionId.value}") },
-            operation = {
-                val profile = getUserProfile().getOrNull()
-                // displayName cannot be empty else NotificationCompat.MessagingStyle() will crash
-                if (profile?.displayName.isNullOrEmpty()) {
-                    profile?.copy(displayName = sessionId.value)
-                } else {
-                    profile
-                }
-            }
-        ) ?: MatrixUser(
-            userId = sessionId,
-            displayName = sessionId.value,
-            avatarUrl = null
-        )
-    }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandler.kt
index 084ad8d832..413425deeb 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl.notifications
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -17,7 +17,6 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.notifications.OnMissedCallNotificationHandler
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOnMissedCallNotificationHandler(
     private val matrixClientProvider: MatrixClientProvider,
     private val defaultNotificationDrawerManager: DefaultNotificationDrawerManager,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt
index 57bd9bcf49..7b06aae39f 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/FallbackNotificationFactory.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationAction.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationAction.kt
index cac583a695..6b2eeaa1f4 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationAction.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationActionIds.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationActionIds.kt
index bd85e71b89..a0306005d9 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationActionIds.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationActionIds.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
index 92029f84e4..7ead2f322b 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverBindings.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverBindings.kt
index 0e5588b7b4..79dc61668d 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverBindings.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverBindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c3df89b4a9..eb08a25c6a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,9 +17,11 @@ 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.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
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.libraries.push.impl.R
@@ -72,8 +75,12 @@ class NotificationBroadcastReceiverHandler(
                 notificationCleaner.clearEvent(sessionId, eventId)
             }
             actionIds.markRoomRead -> if (roomId != null) {
-                notificationCleaner.clearMessagesForRoom(sessionId, roomId)
-                handleMarkAsRead(sessionId, roomId)
+                if (threadId == null) {
+                    notificationCleaner.clearMessagesForRoom(sessionId, roomId)
+                } else {
+                    notificationCleaner.clearMessagesForThread(sessionId, roomId, threadId)
+                }
+                handleMarkAsRead(sessionId, roomId, threadId)
             }
             actionIds.join -> if (roomId != null) {
                 notificationCleaner.clearMembershipNotificationForRoom(sessionId, roomId)
@@ -96,7 +103,8 @@ class NotificationBroadcastReceiverHandler(
         client.getRoom(roomId)?.leave()
     }
 
-    private fun handleMarkAsRead(sessionId: SessionId, roomId: RoomId) = appCoroutineScope.launch {
+    @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 receiptType = if (isSendPublicReadReceiptsEnabled) {
@@ -104,7 +112,26 @@ class NotificationBroadcastReceiverHandler(
         } else {
             ReceiptType.READ_PRIVATE
         }
-        client.getRoom(roomId)?.markAsRead(receiptType = receiptType)
+        val room = client.getJoinedRoom(roomId) ?: return@launch
+        val timeline = if (threadId != null) {
+            room.createTimeline(CreateTimelineParams.Threaded(threadId)).getOrNull()
+        } else {
+            room.liveTimeline
+        }
+        timeline?.markAsRead(receiptType)
+            ?.onSuccess {
+                if (threadId != null) {
+                    Timber.d("Marked thread $threadId in room $roomId as read with receipt type $receiptType")
+                } else {
+                    Timber.d("Marked room $roomId as read with receipt type $receiptType")
+                }
+            }
+            ?.onFailure {
+                Timber.e(it, "Fails to mark as read with receipt type $receiptType")
+            }
+        if (timeline?.mode != Timeline.Mode.Live) {
+            timeline?.close()
+        }
     }
 
     private fun handleSmartReply(
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt
index d5a35b046f..5489fa0894 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,11 +16,11 @@ import androidx.core.text.inSpans
 import coil3.ImageLoader
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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.user.MatrixUser
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.impl.R
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
@@ -30,31 +31,41 @@ import io.element.android.services.toolbox.api.strings.StringProvider
 interface NotificationDataFactory {
     suspend fun toNotifications(
         messages: List<NotifiableMessageEvent>,
-        currentUser: MatrixUser,
         imageLoader: ImageLoader,
+        notificationAccountParams: NotificationAccountParams,
     ): List<RoomNotification>
 
     @JvmName("toNotificationInvites")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    fun toNotifications(invites: List<InviteNotifiableEvent>): List<OneShotNotification>
+    fun toNotifications(
+        invites: List<InviteNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification>
+
     @JvmName("toNotificationSimpleEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    fun toNotifications(simpleEvents: List<SimpleNotifiableEvent>): List<OneShotNotification>
+    fun toNotifications(
+        simpleEvents: List<SimpleNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification>
+
     @JvmName("toNotificationFallbackEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    fun toNotifications(fallback: List<FallbackNotifiableEvent>): List<OneShotNotification>
+    fun toNotifications(
+        fallback: List<FallbackNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification>
 
     fun createSummaryNotification(
-        currentUser: MatrixUser,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
         fallbackNotifications: List<OneShotNotification>,
+        notificationAccountParams: NotificationAccountParams,
     ): SummaryNotification
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationDataFactory(
     private val notificationCreator: NotificationCreator,
     private val roomGroupMessageCreator: RoomGroupMessageCreator,
@@ -64,45 +75,54 @@ class DefaultNotificationDataFactory(
 ) : NotificationDataFactory {
     override suspend fun toNotifications(
         messages: List<NotifiableMessageEvent>,
-        currentUser: MatrixUser,
         imageLoader: ImageLoader,
+        notificationAccountParams: NotificationAccountParams,
     ): List<RoomNotification> {
         val messagesToDisplay = messages.filterNot { it.canNotBeDisplayed() }
             .groupBy { it.roomId }
-        return messagesToDisplay.map { (roomId, events) ->
+        return messagesToDisplay.flatMap { (roomId, events) ->
             val roomName = events.lastOrNull()?.roomName ?: roomId.value
             val isDm = events.lastOrNull()?.roomIsDm ?: false
-            val notification = roomGroupMessageCreator.createRoomMessage(
-                currentUser = currentUser,
-                events = events,
-                roomId = roomId,
-                imageLoader = imageLoader,
-                existingNotification = getExistingNotificationForMessages(currentUser.userId, roomId),
-            )
-            RoomNotification(
-                notification = notification,
-                roomId = roomId,
-                summaryLine = createRoomMessagesGroupSummaryLine(events, roomName, isDm),
-                messageCount = events.size,
-                latestTimestamp = events.maxOf { it.timestamp },
-                shouldBing = events.any { it.noisy }
-            )
+            val eventsByThreadId = events.groupBy { it.threadId }
+
+            eventsByThreadId.map { (threadId, events) ->
+                val notification = roomGroupMessageCreator.createRoomMessage(
+                    events = events,
+                    roomId = roomId,
+                    threadId = threadId,
+                    imageLoader = imageLoader,
+                    existingNotification = getExistingNotificationForMessages(notificationAccountParams.user.userId, roomId, threadId),
+                    notificationAccountParams = notificationAccountParams,
+                )
+                RoomNotification(
+                    notification = notification,
+                    roomId = roomId,
+                    threadId = threadId,
+                    summaryLine = createRoomMessagesGroupSummaryLine(events, roomName, isDm),
+                    messageCount = events.size,
+                    latestTimestamp = events.maxOf { it.timestamp },
+                    shouldBing = events.any { it.noisy }
+                )
+            }
         }
     }
 
     private fun NotifiableMessageEvent.canNotBeDisplayed() = isRedacted
 
-    private fun getExistingNotificationForMessages(sessionId: SessionId, roomId: RoomId): Notification? {
-        return activeNotificationsProvider.getMessageNotificationsForRoom(sessionId, roomId).firstOrNull()?.notification
+    private fun getExistingNotificationForMessages(sessionId: SessionId, roomId: RoomId, threadId: ThreadId?): Notification? {
+        return activeNotificationsProvider.getMessageNotificationsForRoom(sessionId, roomId, threadId).firstOrNull()?.notification
     }
 
     @JvmName("toNotificationInvites")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(invites: List<InviteNotifiableEvent>): List<OneShotNotification> {
+    override fun toNotifications(
+        invites: List<InviteNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification> {
         return invites.map { event ->
             OneShotNotification(
-                key = event.roomId.value,
-                notification = notificationCreator.createRoomInvitationNotification(event),
+                tag = event.roomId.value,
+                notification = notificationCreator.createRoomInvitationNotification(notificationAccountParams, event),
                 summaryLine = event.description,
                 isNoisy = event.noisy,
                 timestamp = event.timestamp
@@ -112,11 +132,14 @@ class DefaultNotificationDataFactory(
 
     @JvmName("toNotificationSimpleEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(simpleEvents: List<SimpleNotifiableEvent>): List<OneShotNotification> {
+    override fun toNotifications(
+        simpleEvents: List<SimpleNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification> {
         return simpleEvents.map { event ->
             OneShotNotification(
-                key = event.eventId.value,
-                notification = notificationCreator.createSimpleEventNotification(event),
+                tag = event.eventId.value,
+                notification = notificationCreator.createSimpleEventNotification(notificationAccountParams, event),
                 summaryLine = event.description,
                 isNoisy = event.noisy,
                 timestamp = event.timestamp
@@ -126,11 +149,14 @@ class DefaultNotificationDataFactory(
 
     @JvmName("toNotificationFallbackEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(fallback: List<FallbackNotifiableEvent>): List<OneShotNotification> {
+    override fun toNotifications(
+        fallback: List<FallbackNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification> {
         return fallback.map { event ->
             OneShotNotification(
-                key = event.eventId.value,
-                notification = notificationCreator.createFallbackNotification(event),
+                tag = event.eventId.value,
+                notification = notificationCreator.createFallbackNotification(notificationAccountParams, event),
                 summaryLine = event.description.orEmpty(),
                 isNoisy = false,
                 timestamp = event.timestamp
@@ -139,21 +165,21 @@ class DefaultNotificationDataFactory(
     }
 
     override fun createSummaryNotification(
-        currentUser: MatrixUser,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
         fallbackNotifications: List<OneShotNotification>,
+        notificationAccountParams: NotificationAccountParams,
     ): SummaryNotification {
         return when {
             roomNotifications.isEmpty() && invitationNotifications.isEmpty() && simpleNotifications.isEmpty() -> SummaryNotification.Removed
             else -> SummaryNotification.Update(
                 summaryGroupMessageCreator.createSummaryNotification(
-                    currentUser = currentUser,
                     roomNotifications = roomNotifications,
                     invitationNotifications = invitationNotifications,
                     simpleNotifications = simpleNotifications,
                     fallbackNotifications = fallbackNotifications,
+                    notificationAccountParams = notificationAccountParams,
                 )
             )
         }
@@ -203,6 +229,7 @@ class DefaultNotificationDataFactory(
 data class RoomNotification(
     val notification: Notification,
     val roomId: RoomId,
+    val threadId: ThreadId?,
     val summaryLine: CharSequence,
     val messageCount: Int,
     val latestTimestamp: Long,
@@ -211,6 +238,7 @@ data class RoomNotification(
     fun isDataEqualTo(other: RoomNotification): Boolean {
         return notification == other.notification &&
             roomId == other.roomId &&
+            threadId == other.threadId &&
             summaryLine.toString() == other.summaryLine.toString() &&
             messageCount == other.messageCount &&
             latestTimestamp == other.latestTimestamp &&
@@ -220,7 +248,7 @@ data class RoomNotification(
 
 data class OneShotNotification(
     val notification: Notification,
-    val key: String,
+    val tag: String,
     val summaryLine: CharSequence,
     val isNoisy: Boolean,
     val timestamp: Long,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDisplayer.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDisplayer.kt
index 34f141c09f..d46bffce73 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDisplayer.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDisplayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,24 +16,23 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationManagerCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import timber.log.Timber
 
 interface NotificationDisplayer {
-    fun showNotificationMessage(tag: String?, id: Int, notification: Notification): Boolean
-    fun cancelNotificationMessage(tag: String?, id: Int)
+    fun showNotification(tag: String?, id: Int, notification: Notification): Boolean
+    fun cancelNotification(tag: String?, id: Int)
     fun displayDiagnosticNotification(notification: Notification): Boolean
     fun dismissDiagnosticNotification()
+    fun displayUnregistrationNotification(notification: Notification): Boolean
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationDisplayer(
     @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat
 ) : NotificationDisplayer {
-    override fun showNotificationMessage(tag: String?, id: Int, notification: Notification): Boolean {
+    override fun showNotification(tag: String?, id: Int, notification: Notification): Boolean {
         if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
             Timber.w("Not allowed to notify.")
             return false
@@ -42,29 +42,40 @@ class DefaultNotificationDisplayer(
         return true
     }
 
-    override fun cancelNotificationMessage(tag: String?, id: Int) {
+    override fun cancelNotification(tag: String?, id: Int) {
         notificationManager.cancel(tag, id)
     }
 
     override fun displayDiagnosticNotification(notification: Notification): Boolean {
-        return showNotificationMessage(
-            tag = "DIAGNOSTIC",
+        return showNotification(
+            tag = TAG_DIAGNOSTIC,
             id = NOTIFICATION_ID_DIAGNOSTIC,
             notification = notification
         )
     }
 
     override fun dismissDiagnosticNotification() {
-        cancelNotificationMessage(
-            tag = "DIAGNOSTIC",
+        cancelNotification(
+            tag = TAG_DIAGNOSTIC,
             id = NOTIFICATION_ID_DIAGNOSTIC
         )
     }
 
+    override fun displayUnregistrationNotification(notification: Notification): Boolean {
+        return showNotification(
+            tag = TAG_DIAGNOSTIC,
+            id = NOTIFICATION_ID_UNREGISTRATION,
+            notification = notification,
+        )
+    }
+
     companion object {
+        private const val TAG_DIAGNOSTIC = "DIAGNOSTIC"
+
         /* ==========================================================================================
          * IDs for notifications
          * ========================================================================================== */
         private const val NOTIFICATION_ID_DIAGNOSTIC = 888
+        private const val NOTIFICATION_ID_UNREGISTRATION = 889
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationMediaRepo.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationMediaRepo.kt
index 2bbc7208be..f309f754c3 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationMediaRepo.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationMediaRepo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt
index 5d901abbc9..26769f09ba 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt
@@ -1,23 +1,31 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.ui.graphics.toArgb
 import coil3.ImageLoader
 import dev.zacsweers.metro.Inject
+import io.element.android.appconfig.NotificationConfig
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
+import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableRingingCallEvent
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import kotlinx.coroutines.flow.first
 import timber.log.Timber
 
 private val loggerTag = LoggerTag("NotificationRenderer", LoggerTag.NotificationLoggerTag)
@@ -26,6 +34,8 @@ private val loggerTag = LoggerTag("NotificationRenderer", LoggerTag.Notification
 class NotificationRenderer(
     private val notificationDisplayer: NotificationDisplayer,
     private val notificationDataFactory: NotificationDataFactory,
+    private val enterpriseService: EnterpriseService,
+    private val sessionStore: SessionStore,
 ) {
     suspend fun render(
         currentUser: MatrixUser,
@@ -33,31 +43,43 @@ class NotificationRenderer(
         eventsToProcess: List<NotifiableEvent>,
         imageLoader: ImageLoader,
     ) {
+        val color = enterpriseService.brandColorsFlow(currentUser.userId).first()?.toArgb()
+            ?: NotificationConfig.NOTIFICATION_ACCENT_COLOR
+        val numberOfAccounts = sessionStore.numberOfSessions()
+        val notificationAccountParams = NotificationAccountParams(
+            user = currentUser,
+            color = color,
+            showSessionId = numberOfAccounts > 1,
+        )
         val groupedEvents = eventsToProcess.groupByType()
-        val roomNotifications = notificationDataFactory.toNotifications(groupedEvents.roomEvents, currentUser, imageLoader)
-        val invitationNotifications = notificationDataFactory.toNotifications(groupedEvents.invitationEvents)
-        val simpleNotifications = notificationDataFactory.toNotifications(groupedEvents.simpleEvents)
-        val fallbackNotifications = notificationDataFactory.toNotifications(groupedEvents.fallbackEvents)
+        val roomNotifications = notificationDataFactory.toNotifications(groupedEvents.roomEvents, imageLoader, notificationAccountParams)
+        val invitationNotifications = notificationDataFactory.toNotifications(groupedEvents.invitationEvents, notificationAccountParams)
+        val simpleNotifications = notificationDataFactory.toNotifications(groupedEvents.simpleEvents, notificationAccountParams)
+        val fallbackNotifications = notificationDataFactory.toNotifications(groupedEvents.fallbackEvents, notificationAccountParams)
         val summaryNotification = notificationDataFactory.createSummaryNotification(
-            currentUser = currentUser,
             roomNotifications = roomNotifications,
             invitationNotifications = invitationNotifications,
             simpleNotifications = simpleNotifications,
             fallbackNotifications = fallbackNotifications,
+            notificationAccountParams = notificationAccountParams,
         )
 
         // Remove summary first to avoid briefly displaying it after dismissing the last notification
         if (summaryNotification == SummaryNotification.Removed) {
             Timber.tag(loggerTag.value).d("Removing summary notification")
-            notificationDisplayer.cancelNotificationMessage(
+            notificationDisplayer.cancelNotification(
                 tag = null,
                 id = NotificationIdProvider.getSummaryNotificationId(currentUser.userId)
             )
         }
 
         roomNotifications.forEach { notificationData ->
-            notificationDisplayer.showNotificationMessage(
-                tag = notificationData.roomId.value,
+            val tag = NotificationCreator.messageTag(
+                roomId = notificationData.roomId,
+                threadId = notificationData.threadId
+            )
+            notificationDisplayer.showNotification(
+                tag = tag,
                 id = NotificationIdProvider.getRoomMessagesNotificationId(currentUser.userId),
                 notification = notificationData.notification
             )
@@ -65,9 +87,9 @@ class NotificationRenderer(
 
         invitationNotifications.forEach { notificationData ->
             if (useCompleteNotificationFormat) {
-                Timber.tag(loggerTag.value).d("Updating invitation notification ${notificationData.key}")
-                notificationDisplayer.showNotificationMessage(
-                    tag = notificationData.key,
+                Timber.tag(loggerTag.value).d("Updating invitation notification ${notificationData.tag}")
+                notificationDisplayer.showNotification(
+                    tag = notificationData.tag,
                     id = NotificationIdProvider.getRoomInvitationNotificationId(currentUser.userId),
                     notification = notificationData.notification
                 )
@@ -76,9 +98,9 @@ class NotificationRenderer(
 
         simpleNotifications.forEach { notificationData ->
             if (useCompleteNotificationFormat) {
-                Timber.tag(loggerTag.value).d("Updating simple notification ${notificationData.key}")
-                notificationDisplayer.showNotificationMessage(
-                    tag = notificationData.key,
+                Timber.tag(loggerTag.value).d("Updating simple notification ${notificationData.tag}")
+                notificationDisplayer.showNotification(
+                    tag = notificationData.tag,
                     id = NotificationIdProvider.getRoomEventNotificationId(currentUser.userId),
                     notification = notificationData.notification
                 )
@@ -88,7 +110,7 @@ class NotificationRenderer(
         // Show only the first fallback notification
         if (fallbackNotifications.isNotEmpty()) {
             Timber.tag(loggerTag.value).d("Showing fallback notification")
-            notificationDisplayer.showNotificationMessage(
+            notificationDisplayer.showNotification(
                 tag = "FALLBACK",
                 id = NotificationIdProvider.getFallbackNotificationId(currentUser.userId),
                 notification = fallbackNotifications.first().notification
@@ -98,7 +120,7 @@ class NotificationRenderer(
         // Update summary last to avoid briefly displaying it before other notifications
         if (summaryNotification is SummaryNotification.Update) {
             Timber.tag(loggerTag.value).d("Updating summary notification")
-            notificationDisplayer.showNotificationMessage(
+            notificationDisplayer.showNotification(
                 tag = null,
                 id = NotificationIdProvider.getSummaryNotificationId(currentUser.userId),
                 notification = summaryNotification.notification
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResolverQueue.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResolverQueue.kt
index f2031bdda6..b40b3fe79f 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResolverQueue.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResolverQueue.kt
@@ -1,20 +1,25 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-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.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.push.api.push.NotificationEventRequest
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
+import io.element.android.libraries.push.impl.workmanager.SyncNotificationWorkManagerRequest
+import io.element.android.libraries.push.impl.workmanager.SyncNotificationsWorkerDataConverter
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
+import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
@@ -27,21 +32,31 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import kotlin.time.Duration.Companion.milliseconds
 
+interface NotificationResolverQueue {
+    val results: SharedFlow<Pair<List<NotificationEventRequest>, Map<NotificationEventRequest, Result<ResolvedPushEvent>>>>
+    suspend fun enqueue(request: NotificationEventRequest)
+}
+
 /**
  * This class is responsible for periodically batching notification requests and resolving them in a single call,
  * so that we can avoid having to resolve each notification individually in the SDK.
  */
 @OptIn(ExperimentalCoroutinesApi::class)
 @SingleIn(AppScope::class)
-@Inject
-class NotificationResolverQueue(
+@ContributesBinding(AppScope::class)
+class DefaultNotificationResolverQueue(
     private val notifiableEventResolver: NotifiableEventResolver,
     @AppCoroutineScope
     private val appCoroutineScope: CoroutineScope,
-) {
+    private val workManagerScheduler: WorkManagerScheduler,
+    private val featureFlagService: FeatureFlagService,
+    private val workerDataConverter: SyncNotificationsWorkerDataConverter,
+    private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
+) : NotificationResolverQueue {
     companion object {
         private const val BATCH_WINDOW_MS = 250L
     }
+
     private val requestQueue = Channel<NotificationEventRequest>(capacity = 100)
 
     private var currentProcessingJob: Job? = null
@@ -50,7 +65,7 @@ class NotificationResolverQueue(
      * A flow that emits pairs of a list of notification event requests and a map of the resolved events.
      * The map contains the original request as the key and the resolved event as the value.
      */
-    val results: SharedFlow<Pair<List<NotificationEventRequest>, Map<NotificationEventRequest, Result<ResolvedPushEvent>>>> = MutableSharedFlow()
+    override val results = MutableSharedFlow<Pair<List<NotificationEventRequest>, Map<NotificationEventRequest, Result<ResolvedPushEvent>>>>()
 
     /**
      * Enqueues a notification event request to be resolved.
@@ -58,7 +73,7 @@ class NotificationResolverQueue(
      *
      * @param request The notification event request to enqueue.
      */
-    suspend fun enqueue(request: NotificationEventRequest) {
+    override suspend fun enqueue(request: NotificationEventRequest) {
         // Cancel previous processing job if it exists, acting as a debounce operation
         Timber.d("Cancelling job: $currentProcessingJob")
         currentProcessingJob?.cancel()
@@ -77,28 +92,34 @@ class NotificationResolverQueue(
         appCoroutineScope.launch {
             val groupedRequestsById = buildList {
                 while (!requestQueue.isEmpty) {
-                    requestQueue.receiveCatching().getOrNull()?.let(this::add)
+                    requestQueue.receiveCatching().getOrNull()?.let(::add)
                 }
             }.groupBy { it.sessionId }
 
-            val sessionIds = groupedRequestsById.keys
-            for (sessionId in sessionIds) {
-                val requests = groupedRequestsById[sessionId].orEmpty()
-                Timber.d("Fetching notifications for $sessionId: $requests. Pending requests: ${!requestQueue.isEmpty}")
-                // Resolving the events in parallel should improve performance since each session id will query a different Client
-                launch {
-                    // No need for a Mutex since the SDK already has one internally
-                    val notifications = notifiableEventResolver.resolveEvents(sessionId, requests).getOrNull().orEmpty()
-                    (results as MutableSharedFlow).emit(requests to notifications)
+            if (featureFlagService.isFeatureEnabled(FeatureFlags.SyncNotificationsWithWorkManager)) {
+                for ((sessionId, requests) in groupedRequestsById) {
+                    workManagerScheduler.submit(
+                        SyncNotificationWorkManagerRequest(
+                            sessionId = sessionId,
+                            notificationEventRequests = requests,
+                            workerDataConverter = workerDataConverter,
+                            buildVersionSdkIntProvider = buildVersionSdkIntProvider,
+                        )
+                    )
+                }
+            } else {
+                val sessionIds = groupedRequestsById.keys
+                for (sessionId in sessionIds) {
+                    val requests = groupedRequestsById[sessionId].orEmpty()
+                    Timber.d("Fetching notifications for $sessionId: $requests. Pending requests: ${!requestQueue.isEmpty}")
+                    // Resolving the events in parallel should improve performance since each session id will query a different Client
+                    launch {
+                        // No need for a Mutex since the SDK already has one internally
+                        val notifications = notifiableEventResolver.resolveEvents(sessionId, requests).getOrNull().orEmpty()
+                        results.emit(requests to notifications)
+                    }
                 }
             }
         }
     }
 }
-
-data class NotificationEventRequest(
-    val sessionId: SessionId,
-    val roomId: RoomId,
-    val eventId: EventId,
-    val providerInfo: String,
-)
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationsFileProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationsFileProvider.kt
index 65da83d148..5a2bd361fe 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationsFileProvider.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationsFileProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ReplyMessageExtractor.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ReplyMessageExtractor.kt
index 323c32f64a..360f3762e1 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ReplyMessageExtractor.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ReplyMessageExtractor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +12,12 @@ import android.content.Intent
 import androidx.core.app.RemoteInput
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 
 interface ReplyMessageExtractor {
     fun getReplyMessage(intent: Intent): String?
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidReplyMessageExtractor : ReplyMessageExtractor {
     override fun getReplyMessage(intent: Intent): String? {
         return RemoteInput.getResultsFromIntent(intent)
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomEventGroupInfo.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomEventGroupInfo.kt
index 705c52dc0a..87234202a5 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomEventGroupInfo.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomEventGroupInfo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0ab6ff27b2..8683b58493 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,13 @@ import android.graphics.Bitmap
 import coil3.ImageLoader
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+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.user.MatrixUser
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
 import io.element.android.libraries.push.impl.R
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import io.element.android.libraries.push.impl.notifications.factories.isSmartReplyError
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
@@ -24,25 +27,26 @@ import io.element.android.services.toolbox.api.strings.StringProvider
 
 interface RoomGroupMessageCreator {
     suspend fun createRoomMessage(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         events: List<NotifiableMessageEvent>,
         roomId: RoomId,
+        threadId: ThreadId?,
         imageLoader: ImageLoader,
         existingNotification: Notification?,
     ): Notification
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRoomGroupMessageCreator(
     private val bitmapLoader: NotificationBitmapLoader,
     private val stringProvider: StringProvider,
     private val notificationCreator: NotificationCreator,
 ) : RoomGroupMessageCreator {
     override suspend fun createRoomMessage(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         events: List<NotifiableMessageEvent>,
         roomId: RoomId,
+        threadId: ThreadId?,
         imageLoader: ImageLoader,
         existingNotification: Notification?,
     ): Notification {
@@ -62,24 +66,24 @@ class DefaultRoomGroupMessageCreator(
         val smartReplyErrors = events.filter { it.isSmartReplyError() }
         val roomIsDm = !roomIsGroup
         return notificationCreator.createMessagesListNotification(
-                RoomEventGroupInfo(
-                    sessionId = currentUser.userId,
-                    roomId = roomId,
-                    roomDisplayName = roomName,
-                    isDm = roomIsDm,
-                    hasSmartReplyError = smartReplyErrors.isNotEmpty(),
-                    shouldBing = events.any { it.noisy },
-                    customSound = events.last().soundName,
-                    isUpdated = events.last().isUpdated,
-                ),
-                threadId = lastKnownRoomEvent.threadId,
-                largeIcon = largeBitmap,
-                lastMessageTimestamp = lastMessageTimestamp,
-                tickerText = tickerText,
-                currentUser = currentUser,
-                existingNotification = existingNotification,
-                imageLoader = imageLoader,
-                events = events,
+            notificationAccountParams = notificationAccountParams,
+            RoomEventGroupInfo(
+                sessionId = notificationAccountParams.user.userId,
+                roomId = roomId,
+                roomDisplayName = roomName,
+                isDm = roomIsDm,
+                hasSmartReplyError = smartReplyErrors.isNotEmpty(),
+                shouldBing = events.any { it.noisy },
+                customSound = events.last().soundName,
+                isUpdated = events.last().isUpdated,
+            ),
+            threadId = threadId,
+            largeIcon = largeBitmap,
+            lastMessageTimestamp = lastMessageTimestamp,
+            tickerText = tickerText,
+            existingNotification = existingNotification,
+            imageLoader = imageLoader,
+            events = events,
         )
     }
 
@@ -88,7 +92,18 @@ class DefaultRoomGroupMessageCreator(
         imageLoader: ImageLoader,
     ): Bitmap? {
         // Use the last event (most recent?)
-        return events.reversed().firstNotNullOfOrNull { it.roomAvatarPath }
-            ?.let { bitmapLoader.getRoomBitmap(it, imageLoader) }
+        val event = events.reversed().firstOrNull { it.roomAvatarPath != null }
+            ?: events.reversed().firstOrNull()
+        return event?.let { event ->
+            bitmapLoader.getRoomBitmap(
+                avatarData = AvatarData(
+                    id = event.roomId.value,
+                    name = event.roomName,
+                    url = event.roomAvatarPath,
+                    size = AvatarSize.RoomDetailsHeader,
+                ),
+                imageLoader = imageLoader,
+            )
+        }
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt
index 5c31f03d5d..f7f0c057c6 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/SummaryGroupMessageCreator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,15 +11,14 @@ package io.element.android.libraries.push.impl.notifications
 import android.app.Notification
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.push.impl.R
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 interface SummaryGroupMessageCreator {
     fun createSummaryNotification(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
@@ -36,13 +36,12 @@ interface SummaryGroupMessageCreator {
  * https://developer.android.com/training/notify-user/group
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSummaryGroupMessageCreator(
     private val stringProvider: StringProvider,
     private val notificationCreator: NotificationCreator,
 ) : SummaryGroupMessageCreator {
     override fun createSummaryNotification(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
@@ -51,19 +50,16 @@ class DefaultSummaryGroupMessageCreator(
         val summaryIsNoisy = roomNotifications.any { it.shouldBing } ||
             invitationNotifications.any { it.isNoisy } ||
             simpleNotifications.any { it.isNoisy }
-
         val lastMessageTimestamp = roomNotifications.lastOrNull()?.latestTimestamp
             ?: invitationNotifications.lastOrNull()?.timestamp
             ?: simpleNotifications.last().timestamp
-
-        // FIXME roomIdToEventMap.size is not correct, this is the number of rooms
-        val nbEvents = roomNotifications.size + simpleNotifications.size
+        val nbEvents = roomNotifications.size + invitationNotifications.size + simpleNotifications.size
         val sumTitle = stringProvider.getQuantityString(R.plurals.notification_compat_summary_title, nbEvents, nbEvents)
         return notificationCreator.createSummaryListNotification(
-            currentUser,
+            notificationAccountParams = notificationAccountParams,
             sumTitle,
             noisy = summaryIsNoisy,
-            lastMessageTimestamp = lastMessageTimestamp
+            lastMessageTimestamp = lastMessageTimestamp,
         )
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiver.kt
index 442562fe2f..5312dc640f 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiver.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiverBinding.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiverBinding.kt
index c4020c575c..331f4f4c3e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiverBinding.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/TestNotificationReceiverBinding.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f5f0ce5cca..9d1452fdae 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,7 +21,6 @@ import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationManagerCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -62,7 +62,6 @@ private fun supportNotificationChannels() = Build.VERSION.SDK_INT >= Build.VERSI
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationChannels(
     private val notificationManager: NotificationManagerCompat,
     private val stringProvider: StringProvider,
@@ -73,10 +72,6 @@ class DefaultNotificationChannels(
         createNotificationChannels()
     }
 
-    /* ==========================================================================================
-     * Channel names
-     * ========================================================================================== */
-
     /**
      * Create notification channels.
      */
@@ -111,10 +106,7 @@ class DefaultNotificationChannels(
             }
         }
 
-        /**
-         * Default notification importance: shows everywhere, makes noise, but does not visually
-         * intrude.
-         */
+        // Default notification importance: shows everywhere, makes noise, but does not visually intrude.
         notificationManager.createNotificationChannel(
             NotificationChannelCompat.Builder(
                 NOISY_NOTIFICATION_CHANNEL_ID,
@@ -139,9 +131,7 @@ class DefaultNotificationChannels(
                 .build()
         )
 
-        /**
-         * Low notification importance: shows everywhere, but is not intrusive.
-         */
+        // Low notification importance: shows everywhere, but is not intrusive.
         notificationManager.createNotificationChannel(
             NotificationChannelCompat.Builder(
                 SILENT_NOTIFICATION_CHANNEL_ID,
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 bda5a593d5..ce20234385 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,12 @@ package io.element.android.libraries.push.impl.notifications.conversations
 
 import android.content.Context
 import android.content.pm.ShortcutInfo
-import android.content.res.Configuration
 import android.os.Build
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.libraries.core.coroutine.withPreviousValue
@@ -29,7 +28,6 @@ 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.ui.media.ImageLoaderHolder
-import io.element.android.libraries.matrix.ui.media.InitialsAvatarBitmapGenerator
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
 import io.element.android.libraries.push.impl.intent.IntentProvider
@@ -46,7 +44,6 @@ import timber.log.Timber
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationConversationService(
     @ApplicationContext private val context: Context,
     private val intentProvider: IntentProvider,
@@ -61,9 +58,7 @@ class DefaultNotificationConversationService(
 
     init {
         sessionObserver.addListener(object : SessionListener {
-            override suspend fun onSessionCreated(userId: String) = Unit
-
-            override suspend fun onSessionDeleted(userId: String) {
+            override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
                 onSessionLogOut(SessionId(userId))
             }
         })
@@ -98,20 +93,21 @@ class DefaultNotificationConversationService(
         val imageLoader = imageLoaderHolder.get(client)
 
         val defaultShortcutIconSize = ShortcutManagerCompat.getIconMaxWidth(context)
-        val useDarkTheme = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
         val icon = bitmapLoader.getRoomBitmap(
-            path = roomAvatarUrl,
+            avatarData = AvatarData(
+                id = roomId.value,
+                name = roomName,
+                url = roomAvatarUrl,
+                size = AvatarSize.RoomDetailsHeader,
+            ),
             imageLoader = imageLoader,
             targetSize = defaultShortcutIconSize.toLong()
         )?.let(IconCompat::createWithBitmap)
-            ?: InitialsAvatarBitmapGenerator(useDarkTheme = useDarkTheme)
-                .generateBitmap(defaultShortcutIconSize, AvatarData(id = roomId.value, name = roomName, size = AvatarSize.RoomDetailsHeader))
-                ?.let(IconCompat::createWithAdaptiveBitmap)
 
         val shortcutInfo = ShortcutInfoCompat.Builder(context, createShortcutId(sessionId, roomId))
             .setShortLabel(roomName)
             .setIcon(icon)
-            .setIntent(intentProvider.getViewRoomIntent(sessionId, roomId, threadId = null))
+            .setIntent(intentProvider.getViewRoomIntent(sessionId, roomId, threadId = null, eventId = null))
             .setCategories(categories)
             .setLongLived(true)
             .let {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/debug/DebugNotification.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/debug/DebugNotification.kt
index 1a2f00f11a..7afe1b99d8 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/debug/DebugNotification.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/debug/DebugNotification.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationAccountParams.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationAccountParams.kt
new file mode 100644
index 0000000000..858f102afd
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationAccountParams.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.push.impl.notifications.factories
+
+import androidx.annotation.ColorInt
+import io.element.android.libraries.matrix.api.user.MatrixUser
+
+data class NotificationAccountParams(
+    val user: MatrixUser,
+    @ColorInt val color: Int,
+    val showSessionId: Boolean,
+)
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
index 3f07e12691..9533f6b0ac 100755
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,24 +11,25 @@ package io.element.android.libraries.push.impl.notifications.factories
 import android.app.Notification
 import android.content.Context
 import android.graphics.Bitmap
-import android.graphics.Canvas
-import androidx.annotation.DrawableRes
+import androidx.annotation.ColorInt
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.MessagingStyle
 import androidx.core.app.Person
-import androidx.core.content.res.ResourcesCompat
+import androidx.core.os.bundleOf
 import coil3.ImageLoader
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
-import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.core.meta.BuildMeta
+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.CommonDrawables
 import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.matrix.api.core.SessionId
+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.timeline.item.event.EventType
 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.push.api.notifications.NotificationBitmapLoader
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.RoomEventGroupInfo
@@ -42,6 +44,8 @@ import io.element.android.libraries.push.impl.notifications.model.InviteNotifiab
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.services.appnavstate.api.ROOM_OPENED_FROM_NOTIFICATION
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 interface NotificationCreator {
@@ -49,26 +53,29 @@ interface NotificationCreator {
      * Create a notification for a Room.
      */
     suspend fun createMessagesListNotification(
+        notificationAccountParams: NotificationAccountParams,
         roomInfo: RoomEventGroupInfo,
         threadId: ThreadId?,
         largeIcon: Bitmap?,
         lastMessageTimestamp: Long,
         tickerText: String,
-        currentUser: MatrixUser,
         existingNotification: Notification?,
         imageLoader: ImageLoader,
         events: List<NotifiableMessageEvent>,
     ): Notification
 
     fun createRoomInvitationNotification(
-        inviteNotifiableEvent: InviteNotifiableEvent
+        notificationAccountParams: NotificationAccountParams,
+        inviteNotifiableEvent: InviteNotifiableEvent,
     ): Notification
 
     fun createSimpleEventNotification(
+        notificationAccountParams: NotificationAccountParams,
         simpleNotifiableEvent: SimpleNotifiableEvent,
     ): Notification
 
     fun createFallbackNotification(
+        notificationAccountParams: NotificationAccountParams,
         fallbackNotifiableEvent: FallbackNotifiableEvent,
     ): Notification
 
@@ -76,17 +83,33 @@ interface NotificationCreator {
      * Create the summary notification.
      */
     fun createSummaryListNotification(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         compatSummary: String,
         noisy: Boolean,
-        lastMessageTimestamp: Long
+        lastMessageTimestamp: Long,
     ): Notification
 
-    fun createDiagnosticNotification(): Notification
+    fun createDiagnosticNotification(
+        @ColorInt color: Int,
+    ): Notification
+
+    fun createUnregistrationNotification(
+        notificationAccountParams: NotificationAccountParams,
+    ): Notification
+
+    companion object {
+        /**
+         * Creates a tag for a message notification given its [roomId] and optional [threadId].
+         */
+        fun messageTag(roomId: RoomId, threadId: ThreadId?): String = if (threadId != null) {
+            "$roomId|$threadId"
+        } else {
+            roomId.value
+        }
+    }
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationCreator(
     @ApplicationContext private val context: Context,
     private val notificationChannels: NotificationChannels,
@@ -97,199 +120,173 @@ class DefaultNotificationCreator(
     private val quickReplyActionFactory: QuickReplyActionFactory,
     private val bitmapLoader: NotificationBitmapLoader,
     private val acceptInvitationActionFactory: AcceptInvitationActionFactory,
-    private val rejectInvitationActionFactory: RejectInvitationActionFactory
+    private val rejectInvitationActionFactory: RejectInvitationActionFactory,
 ) : NotificationCreator {
-    private val accentColor = NotificationConfig.NOTIFICATION_ACCENT_COLOR
-
     /**
      * Create a notification for a Room.
      */
     override suspend fun createMessagesListNotification(
+        notificationAccountParams: NotificationAccountParams,
         roomInfo: RoomEventGroupInfo,
         threadId: ThreadId?,
         largeIcon: Bitmap?,
         lastMessageTimestamp: Long,
         tickerText: String,
-        currentUser: MatrixUser,
         existingNotification: Notification?,
         imageLoader: ImageLoader,
         events: List<NotifiableMessageEvent>,
     ): Notification {
         // Build the pending intent for when the notification is clicked
+        val eventId = events.firstOrNull()?.eventId
         val openIntent = when {
-            threadId != null -> pendingIntentFactory.createOpenThreadPendingIntent(roomInfo, threadId)
-            else -> pendingIntentFactory.createOpenRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId)
+            threadId != null -> pendingIntentFactory.createOpenThreadPendingIntent(roomInfo.sessionId, roomInfo.roomId, eventId, threadId)
+            else -> pendingIntentFactory.createOpenRoomPendingIntent(
+                sessionId = roomInfo.sessionId,
+                roomId = roomInfo.roomId,
+                eventId = eventId,
+                extras = bundleOf(ROOM_OPENED_FROM_NOTIFICATION to true),
+            )
         }
-
-        val smallIcon = CommonDrawables.ic_notification
-
         val containsMissedCall = events.any { it.type == EventType.RTC_NOTIFICATION }
         val channelId = if (containsMissedCall) {
             notificationChannels.getChannelForIncomingCall(false)
         } else {
             notificationChannels.getChannelIdForMessage(noisy = roomInfo.shouldBing)
         }
+        // A category allows groups of notifications to be ranked and filtered – per user or system settings.
+        // For example, alarm notifications should display before promo notifications, or message from known contact
+        // that can be displayed in not disturb mode if white listed (the later will need compat28.x)
+        // If any of the events are of rtc notification type it means a missed call, set the category to the right value
+        val category = if (containsMissedCall) {
+            NotificationCompat.CATEGORY_MISSED_CALL
+        } else {
+            NotificationCompat.CATEGORY_MESSAGE
+        }
         val builder = if (existingNotification != null) {
             NotificationCompat.Builder(context, existingNotification)
+                // Clear existing actions
+                .clearActions()
         } else {
             NotificationCompat.Builder(context, channelId)
-                // A category allows groups of notifications to be ranked and filtered – per user or system settings.
-                // For example, alarm notifications should display before promo notifications, or message from known contact
-                // that can be displayed in not disturb mode if white listed (the later will need compat28.x)
-                .setCategory(NotificationCompat.CATEGORY_MESSAGE)
                 // ID of the corresponding shortcut, for conversation features under API 30+
                 // Must match those created in the ShortcutInfoCompat.Builder()
                 // for the notification to appear as a "Conversation":
                 // https://developer.android.com/develop/ui/views/notifications/conversations
-                .setShortcutId(createShortcutId(roomInfo.sessionId, roomInfo.roomId))
-                // Auto-bundling is enabled for 4 or more notifications on API 24+ (N+)
-                // devices and all Wear devices. But we want a custom grouping, so we specify the groupID
-                .setGroup(roomInfo.sessionId.value)
+                .apply {
+                    if (threadId == null) {
+                        setShortcutId(createShortcutId(roomInfo.sessionId, roomInfo.roomId))
+                    }
+                }
+                .setGroupSummary(false)
                 // In order to avoid notification making sound twice (due to the summary notification)
-                .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
+                .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
                 // Remove notification after opening it or using an action
                 .setAutoCancel(true)
         }
-
         val messagingStyle = existingNotification?.let {
             MessagingStyle.extractMessagingStyleFromNotification(it)
-        } ?: messagingStyleFromCurrentUser(roomInfo.sessionId, currentUser, imageLoader, roomInfo.roomDisplayName, !roomInfo.isDm)
-
+        } ?: createMessagingStyleFromCurrentUser(
+            user = notificationAccountParams.user,
+            imageLoader = imageLoader,
+            roomName = roomInfo.roomDisplayName,
+            isThread = threadId != null,
+            roomIsGroup = !roomInfo.isDm,
+        )
         messagingStyle.addMessagesFromEvents(events, imageLoader)
-
         return builder
+            .setCategory(category)
             .setNumber(events.size)
             .setOnlyAlertOnce(roomInfo.isUpdated)
             .setWhen(lastMessageTimestamp)
             // MESSAGING_STYLE sets title and content for API 16 and above devices.
             .setStyle(messagingStyle)
-            // Not needed anymore?
-            // Title for API < 16 devices.
-            .setContentTitle(roomInfo.roomDisplayName.annotateForDebug(1))
-            // Content for API < 16 devices.
-            .setContentText(stringProvider.getString(R.string.notification_new_messages).annotateForDebug(2))
-            // Number of new notifications for API <24 (M and below) devices.
-            .setSubText(
-                stringProvider.getQuantityString(
-                    R.plurals.notification_new_messages_for_room,
-                    messagingStyle.messages.size,
-                    messagingStyle.messages.size
-                ).annotateForDebug(3)
-            )
-            .setSmallIcon(smallIcon)
-            // Set primary color (important for Wear 2.0 Notifications).
-            .setColor(accentColor)
-            // Sets priority for 25 and below. For 26 and above, 'priority' is deprecated for
-            // 'importance' which is set in the NotificationChannel. The integers representing
-            // 'priority' are different from 'importance', so make sure you don't mix them.
+            .configureWith(notificationAccountParams)
+            // Mark room/thread as read
+            .addAction(markAsReadActionFactory.create(roomInfo, threadId))
+            .setContentIntent(openIntent)
+            .setLargeIcon(largeIcon)
+            .setDeleteIntent(pendingIntentFactory.createDismissRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId))
             .apply {
+                // Sets priority for 25 and below. For 26 and above, 'priority' is deprecated for
+                // 'importance' which is set in the NotificationChannel. The integers representing
+                // 'priority' are different from 'importance', so make sure you don't mix them.
                 if (roomInfo.shouldBing) {
-                    // Compat
                     priority = NotificationCompat.PRIORITY_DEFAULT
-                    /*
-                    vectorPreferences.getNotificationRingTone()?.let {
-                        setSound(it)
-                    }
-                     */
-                    setLights(accentColor, 500, 500)
+                    setLights(notificationAccountParams.color, 500, 500)
                 } else {
                     priority = NotificationCompat.PRIORITY_LOW
                 }
-                // Clear existing actions since we might be updating an existing notification
-                clearActions()
-                // Add actions and notification intents
-                // Mark room as read
-                addAction(markAsReadActionFactory.create(roomInfo))
                 // Quick reply
                 if (!roomInfo.hasSmartReplyError) {
                     val latestEventId = events.lastOrNull()?.eventId
                     addAction(quickReplyActionFactory.create(roomInfo, latestEventId, threadId))
                 }
-                if (openIntent != null) {
-                    setContentIntent(openIntent)
-                }
-                if (largeIcon != null) {
-                    setLargeIcon(largeIcon)
-                }
-                setDeleteIntent(pendingIntentFactory.createDismissRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId))
-
-                // If any of the events are of rtc notification type it means a missed call, set the category to the right value
-                if (events.any { it.type == EventType.RTC_NOTIFICATION }) {
-                    setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
-                }
             }
             .setTicker(tickerText)
             .build()
     }
 
     override fun createRoomInvitationNotification(
-        inviteNotifiableEvent: InviteNotifiableEvent
+        notificationAccountParams: NotificationAccountParams,
+        inviteNotifiableEvent: InviteNotifiableEvent,
     ): Notification {
-        val smallIcon = CommonDrawables.ic_notification
         val channelId = notificationChannels.getChannelIdForMessage(inviteNotifiableEvent.noisy)
         return NotificationCompat.Builder(context, channelId)
             .setOnlyAlertOnce(true)
             .setContentTitle((inviteNotifiableEvent.roomName ?: buildMeta.applicationName).annotateForDebug(5))
             .setContentText(inviteNotifiableEvent.description.annotateForDebug(6))
-            .setGroup(inviteNotifiableEvent.sessionId.value)
             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
-            .setSmallIcon(smallIcon)
-            .setColor(accentColor)
+            .configureWith(notificationAccountParams)
+            .addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))
+            .addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))
+            // Build the pending intent for when the notification is clicked
+            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(
+                sessionId = inviteNotifiableEvent.sessionId,
+                roomId = inviteNotifiableEvent.roomId,
+                eventId = null,
+            ))
             .apply {
-                addAction(rejectInvitationActionFactory.create(inviteNotifiableEvent))
-                addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))
-                // Build the pending intent for when the notification is clicked
-                setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(inviteNotifiableEvent.sessionId, inviteNotifiableEvent.roomId))
-
                 if (inviteNotifiableEvent.noisy) {
                     // Compat
                     priority = NotificationCompat.PRIORITY_DEFAULT
-                    /*
-                    vectorPreferences.getNotificationRingTone()?.let {
-                        setSound(it)
-                    }
-                     */
-                    setLights(accentColor, 500, 500)
+                    setLights(notificationAccountParams.color, 500, 500)
                 } else {
                     priority = NotificationCompat.PRIORITY_LOW
                 }
-                setDeleteIntent(
-                    pendingIntentFactory.createDismissInvitePendingIntent(
-                        inviteNotifiableEvent.sessionId,
-                        inviteNotifiableEvent.roomId,
-                    )
-                )
-                setAutoCancel(true)
             }
+            .setDeleteIntent(
+                pendingIntentFactory.createDismissInvitePendingIntent(
+                    inviteNotifiableEvent.sessionId,
+                    inviteNotifiableEvent.roomId,
+                )
+            )
+            .setAutoCancel(true)
             .build()
     }
 
     override fun createSimpleEventNotification(
+        notificationAccountParams: NotificationAccountParams,
         simpleNotifiableEvent: SimpleNotifiableEvent,
     ): Notification {
-        val smallIcon = CommonDrawables.ic_notification
-
         val channelId = notificationChannels.getChannelIdForMessage(simpleNotifiableEvent.noisy)
         return NotificationCompat.Builder(context, channelId)
             .setOnlyAlertOnce(true)
             .setContentTitle(buildMeta.applicationName.annotateForDebug(7))
             .setContentText(simpleNotifiableEvent.description.annotateForDebug(8))
-            .setGroup(simpleNotifiableEvent.sessionId.value)
             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
-            .setSmallIcon(smallIcon)
-            .setColor(accentColor)
+            .configureWith(notificationAccountParams)
             .setAutoCancel(true)
-            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(simpleNotifiableEvent.sessionId, simpleNotifiableEvent.roomId))
+            .setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(
+                sessionId = simpleNotifiableEvent.sessionId,
+                roomId = simpleNotifiableEvent.roomId,
+                eventId = null,
+                extras = bundleOf(ROOM_OPENED_FROM_NOTIFICATION to true),
+            ))
             .apply {
                 if (simpleNotifiableEvent.noisy) {
                     // Compat
                     priority = NotificationCompat.PRIORITY_DEFAULT
-                    /*
-                    vectorPreferences.getNotificationRingTone()?.let {
-                        setSound(it)
-                    }
-                     */
-                    setLights(accentColor, 500, 500)
+                    setLights(notificationAccountParams.color, 500, 500)
                 } else {
                     priority = NotificationCompat.PRIORITY_LOW
                 }
@@ -298,19 +295,16 @@ class DefaultNotificationCreator(
     }
 
     override fun createFallbackNotification(
+        notificationAccountParams: NotificationAccountParams,
         fallbackNotifiableEvent: FallbackNotifiableEvent,
     ): Notification {
-        val smallIcon = CommonDrawables.ic_notification
-
         val channelId = notificationChannels.getChannelIdForMessage(false)
         return NotificationCompat.Builder(context, channelId)
             .setOnlyAlertOnce(true)
             .setContentTitle(buildMeta.applicationName.annotateForDebug(7))
             .setContentText(fallbackNotifiableEvent.description.orEmpty().annotateForDebug(8))
-            .setGroup(fallbackNotifiableEvent.sessionId.value)
             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
-            .setSmallIcon(smallIcon)
-            .setColor(accentColor)
+            .configureWith(notificationAccountParams)
             .setAutoCancel(true)
             .setWhen(fallbackNotifiableEvent.timestamp)
             // Ideally we'd use `createOpenRoomPendingIntent` here, but the broken notification might apply to an invite
@@ -331,51 +325,45 @@ class DefaultNotificationCreator(
      * Create the summary notification.
      */
     override fun createSummaryListNotification(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         compatSummary: String,
         noisy: Boolean,
-        lastMessageTimestamp: Long
+        lastMessageTimestamp: Long,
     ): Notification {
-        val smallIcon = CommonDrawables.ic_notification
         val channelId = notificationChannels.getChannelIdForMessage(noisy)
+        val userId = notificationAccountParams.user.userId
         return NotificationCompat.Builder(context, channelId)
             .setOnlyAlertOnce(true)
             // used in compat < N, after summary is built based on child notifications
             .setWhen(lastMessageTimestamp)
             .setCategory(NotificationCompat.CATEGORY_MESSAGE)
-            .setSmallIcon(smallIcon)
-            .setGroup(currentUser.userId.value)
             // set this notification as the summary for the group
             .setGroupSummary(true)
-            .setColor(accentColor)
+            .configureWith(notificationAccountParams)
             .apply {
                 if (noisy) {
                     // Compat
                     priority = NotificationCompat.PRIORITY_DEFAULT
-                    /*
-                    vectorPreferences.getNotificationRingTone()?.let {
-                        setSound(it)
-                    }
-                     */
-                    setLights(accentColor, 500, 500)
+                    setLights(notificationAccountParams.color, 500, 500)
                 } else {
                     // compat
                     priority = NotificationCompat.PRIORITY_LOW
                 }
             }
-            .setContentIntent(pendingIntentFactory.createOpenSessionPendingIntent(currentUser.userId))
-            .setDeleteIntent(pendingIntentFactory.createDismissSummaryPendingIntent(currentUser.userId))
+            .setContentIntent(pendingIntentFactory.createOpenSessionPendingIntent(userId))
+            .setDeleteIntent(pendingIntentFactory.createDismissSummaryPendingIntent(userId))
             .build()
     }
 
-    override fun createDiagnosticNotification(): Notification {
+    override fun createDiagnosticNotification(
+        @ColorInt color: Int,
+    ): Notification {
         val intent = pendingIntentFactory.createTestPendingIntent()
         return NotificationCompat.Builder(context, notificationChannels.getChannelIdForTest())
             .setContentTitle(buildMeta.applicationName)
             .setContentText(stringProvider.getString(R.string.notification_test_push_notification_content))
             .setSmallIcon(CommonDrawables.ic_notification)
-            .setLargeIcon(getBitmap(R.drawable.element_logo_green))
-            .setColor(accentColor)
+            .setColor(color)
             .setPriority(NotificationCompat.PRIORITY_MAX)
             .setCategory(NotificationCompat.CATEGORY_STATUS)
             .setAutoCancel(true)
@@ -384,6 +372,25 @@ class DefaultNotificationCreator(
             .build()
     }
 
+    override fun createUnregistrationNotification(
+        notificationAccountParams: NotificationAccountParams,
+    ): Notification {
+        val userId = notificationAccountParams.user.userId
+        val text = stringProvider.getString(R.string.notification_error_unified_push_unregistered_android)
+        return NotificationCompat.Builder(context, notificationChannels.getChannelIdForTest())
+            .setSubText(userId.value)
+            // The text is long and can be truncated so use BigTextStyle.
+            .setStyle(NotificationCompat.BigTextStyle().bigText(text))
+            .setContentTitle(stringProvider.getString(CommonStrings.dialog_title_warning))
+            .setContentText(text)
+            .configureWith(notificationAccountParams)
+            .setPriority(NotificationCompat.PRIORITY_MAX)
+            .setCategory(NotificationCompat.CATEGORY_ERROR)
+            .setAutoCancel(true)
+            .setContentIntent(pendingIntentFactory.createOpenSessionPendingIntent(userId))
+            .build()
+    }
+
     private suspend fun MessagingStyle.addMessagesFromEvents(
         events: List<NotifiableMessageEvent>,
         imageLoader: ImageLoader,
@@ -406,7 +413,17 @@ class DefaultNotificationCreator(
                 }
                 Person.Builder()
                     .setName(displayName.annotateForDebug(70))
-                    .setIcon(bitmapLoader.getUserIcon(event.senderAvatarPath, imageLoader))
+                    .setIcon(
+                        bitmapLoader.getUserIcon(
+                            avatarData = AvatarData(
+                                id = event.senderId.value,
+                                name = senderName,
+                                url = event.senderAvatarPath,
+                                size = AvatarSize.UserHeader,
+                            ),
+                            imageLoader = imageLoader,
+                        )
+                    )
                     .setKey(key)
                     .build()
             }
@@ -417,65 +434,85 @@ class DefaultNotificationCreator(
                     senderPerson
                 )
                 else -> {
-                    val message = MessagingStyle.Message(
-                        event.body?.annotateForDebug(71),
-                        event.timestamp,
-                        senderPerson
-                    ).also { message ->
-                        event.imageUri?.let {
-                            message.setData(event.imageMimeType ?: "image/", it)
-                        }
-                        message.extras.putString(MESSAGE_EVENT_ID, event.eventId.value)
-                    }
-                    addMessage(message)
-
-                    // Add additional message for captions
-                    if (event.imageUri != null && event.body != null) {
-                        addMessage(
-                            MessagingStyle.Message(
-                                event.body,
-                                event.timestamp,
-                                senderPerson,
-                            )
+                    if (event.imageMimeType != null && event.imageUri != null) {
+                        // Image case
+                        val message = MessagingStyle.Message(
+                            // This text will not be rendered, but some systems does not render the image
+                            // if the text is null
+                            stringProvider.getString(CommonStrings.common_image),
+                            event.timestamp,
+                            senderPerson,
                         )
+                            .setData(event.imageMimeType, event.imageUri)
+                        message.extras.putString(MESSAGE_EVENT_ID, event.eventId.value)
+                        addMessage(message)
+                        // Add additional message for captions
+                        if (event.body != null) {
+                            addMessage(
+                                MessagingStyle.Message(
+                                    event.body.annotateForDebug(72),
+                                    event.timestamp,
+                                    senderPerson,
+                                )
+                            )
+                        }
+                    } else {
+                        // Text case
+                        val message = MessagingStyle.Message(
+                            event.body?.annotateForDebug(71),
+                            event.timestamp,
+                            senderPerson
+                        )
+                        message.extras.putString(MESSAGE_EVENT_ID, event.eventId.value)
+                        addMessage(message)
                     }
                 }
             }
         }
     }
 
-    private suspend fun messagingStyleFromCurrentUser(
-        sessionId: SessionId,
+    private suspend fun createMessagingStyleFromCurrentUser(
         user: MatrixUser,
         imageLoader: ImageLoader,
         roomName: String,
+        isThread: Boolean,
         roomIsGroup: Boolean
     ): MessagingStyle {
         return MessagingStyle(
             Person.Builder()
-                .setName(user.displayName?.annotateForDebug(50))
-                .setIcon(bitmapLoader.getUserIcon(user.avatarUrl, imageLoader))
-                .setKey(sessionId.value)
+                // Note: name cannot be empty else NotificationCompat.MessagingStyle() will crash
+                .setName(user.getBestName().annotateForDebug(50))
+                .setIcon(
+                    bitmapLoader.getUserIcon(
+                        avatarData = user.getAvatarData(AvatarSize.UserHeader),
+                        imageLoader = imageLoader,
+                    )
+                )
+                .setKey(user.userId.value)
                 .build()
         ).also {
-            it.conversationTitle = roomName.takeIf { roomIsGroup }
-            it.isGroupConversation = roomIsGroup
+            it.conversationTitle = if (isThread) {
+                stringProvider.getString(R.string.notification_thread_in_room, roomName)
+            } else {
+                roomName
+            }
+            // So the avatar is displayed even if they're part of a conversation
+            it.isGroupConversation = roomIsGroup || isThread
         }
     }
 
-    private fun getBitmap(@DrawableRes drawableRes: Int): Bitmap? {
-        val drawable = ResourcesCompat.getDrawable(context.resources, drawableRes, null) ?: return null
-        val canvas = Canvas()
-        val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
-        canvas.setBitmap(bitmap)
-        drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
-        drawable.draw(canvas)
-        return bitmap
-    }
-
     companion object {
         const val MESSAGE_EVENT_ID = "message_event_id"
     }
 }
 
+private fun NotificationCompat.Builder.configureWith(notificationAccountParams: NotificationAccountParams) = apply {
+    setSmallIcon(CommonDrawables.ic_notification)
+    setColor(notificationAccountParams.color)
+    setGroup(notificationAccountParams.user.userId.value)
+    if (notificationAccountParams.showSessionId) {
+        setSubText(notificationAccountParams.user.userId.value)
+    }
+}
+
 fun NotifiableMessageEvent.isSmartReplyError() = outGoingMessage && outGoingMessageFailed
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt
index 9b36b0d370..07fa70a6c8 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/PendingIntentFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,7 @@ package io.element.android.libraries.push.impl.notifications.factories
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -20,7 +22,6 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.impl.intent.IntentProvider
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
 import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver
-import io.element.android.libraries.push.impl.notifications.RoomEventGroupInfo
 import io.element.android.libraries.push.impl.notifications.TestNotificationReceiver
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 
@@ -31,20 +32,20 @@ class PendingIntentFactory(
     private val clock: SystemClock,
     private val actionIds: NotificationActionIds,
 ) {
-    fun createOpenSessionPendingIntent(sessionId: SessionId): PendingIntent? {
-        return createRoomPendingIntent(sessionId = sessionId, roomId = null, threadId = null)
+    fun createOpenSessionPendingIntent(sessionId: SessionId, extras: Bundle? = null): PendingIntent? {
+        return createRoomPendingIntent(sessionId = sessionId, roomId = null, eventId = null, threadId = null, extras = extras)
     }
 
-    fun createOpenRoomPendingIntent(sessionId: SessionId, roomId: RoomId): PendingIntent? {
-        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, threadId = null)
+    fun createOpenRoomPendingIntent(sessionId: SessionId, roomId: RoomId, eventId: EventId?, extras: Bundle? = null): PendingIntent? {
+        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = null, extras = extras)
     }
 
-    fun createOpenThreadPendingIntent(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): PendingIntent? {
-        return createRoomPendingIntent(sessionId = roomInfo.sessionId, roomId = roomInfo.roomId, threadId = threadId)
+    fun createOpenThreadPendingIntent(sessionId: SessionId, roomId: RoomId, eventId: EventId?, threadId: ThreadId, extras: Bundle? = null): PendingIntent? {
+        return createRoomPendingIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = threadId, extras = extras)
     }
 
-    private fun createRoomPendingIntent(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): PendingIntent? {
-        val intent = intentProvider.getViewRoomIntent(sessionId = sessionId, roomId = roomId, threadId = threadId)
+    private fun createRoomPendingIntent(sessionId: SessionId, roomId: RoomId?, eventId: EventId?, threadId: ThreadId?, extras: Bundle? = null): PendingIntent? {
+        val intent = intentProvider.getViewRoomIntent(sessionId = sessionId, roomId = roomId, eventId = eventId, threadId = threadId, extras = extras)
         return PendingIntent.getActivity(
             context,
             clock.epochMillis().toInt(),
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt
index 6e3fe95742..c951bbdb14 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/AcceptInvitationActionFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,8 +15,8 @@ import androidx.core.app.NotificationCompat
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
+import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
 import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
@@ -46,7 +47,7 @@ class AcceptInvitationActionFactory(
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
         return NotificationCompat.Action.Builder(
-            R.drawable.vector_notification_accept_invitation,
+            CompoundDrawables.ic_compound_check,
             stringProvider.getString(CommonStrings.action_accept),
             pendingIntent
         ).build()
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt
index 1feaee7954..599fcb5ce3 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,9 @@ import androidx.core.app.NotificationCompat
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
+import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
 import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver
@@ -29,15 +32,16 @@ class MarkAsReadActionFactory(
     private val stringProvider: StringProvider,
     private val clock: SystemClock,
 ) {
-    fun create(roomInfo: RoomEventGroupInfo): NotificationCompat.Action? {
+    fun create(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): NotificationCompat.Action? {
         if (!NotificationConfig.SHOW_MARK_AS_READ_ACTION) return null
         val sessionId = roomInfo.sessionId.value
         val roomId = roomInfo.roomId.value
         val intent = Intent(context, NotificationBroadcastReceiver::class.java)
         intent.action = actionIds.markRoomRead
-        intent.data = createIgnoredUri("markRead/$sessionId/$roomId")
+        intent.data = createIgnoredUri("markRead/$sessionId/$roomId" + threadId?.let { "/$it" }.orEmpty())
         intent.putExtra(NotificationBroadcastReceiver.KEY_SESSION_ID, sessionId)
         intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
+        threadId?.let { intent.putExtra(NotificationBroadcastReceiver.KEY_THREAD_ID, threadId.value) }
         val pendingIntent = PendingIntent.getBroadcast(
             context,
             clock.epochMillis().toInt(),
@@ -46,7 +50,7 @@ class MarkAsReadActionFactory(
         )
 
         return NotificationCompat.Action.Builder(
-            R.drawable.ic_material_done_all_white,
+            CompoundDrawables.ic_compound_mark_as_read,
             stringProvider.getString(R.string.notification_room_action_mark_as_read),
             pendingIntent
         )
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt
index eb54bf9b36..c037adfb78 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ import androidx.core.app.RemoteInput
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
+import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -45,7 +47,7 @@ class QuickReplyActionFactory(
             .build()
 
         return NotificationCompat.Action.Builder(
-            R.drawable.vector_notification_quick_reply,
+            CompoundDrawables.ic_compound_reply,
             stringProvider.getString(R.string.notification_room_action_quick_reply),
             replyPendingIntent
         )
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt
index 73b3fc2fd9..94ff565ad9 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/RejectInvitationActionFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,8 +15,8 @@ import androidx.core.app.NotificationCompat
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
+import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
 import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
@@ -46,7 +47,7 @@ class RejectInvitationActionFactory(
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
         return NotificationCompat.Action.Builder(
-            R.drawable.vector_notification_reject_invitation,
+            CompoundDrawables.ic_compound_close,
             stringProvider.getString(CommonStrings.action_reject),
             pendingIntent
         ).build()
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/FallbackNotifiableEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/FallbackNotifiableEvent.kt
index f9a08de195..97f66face0 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/FallbackNotifiableEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/FallbackNotifiableEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/InviteNotifiableEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/InviteNotifiableEvent.kt
index 37aaeeda47..91d5230c2e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/InviteNotifiableEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/InviteNotifiableEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.model
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableEvent.kt
index 3fc5871f32..4a26b9f8cc 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt
index ba7cd2f78b..07f7f8b3c7 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.model
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableRingingCallEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableRingingCallEvent.kt
index 7d92ad3a8b..35432e972d 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableRingingCallEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableRingingCallEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/ResolvedPushEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/ResolvedPushEvent.kt
index 2363e38e1d..3c79896c6e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/ResolvedPushEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/ResolvedPushEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/SimpleNotifiableEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/SimpleNotifiableEvent.kt
index f77bf855ba..c1c2ce9187 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/SimpleNotifiableEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/SimpleNotifiableEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.model
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/shortcut/Utils.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/shortcut/Utils.kt
index 6176886dbc..4a09c28f24 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/shortcut/Utils.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/shortcut/Utils.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3a4cf4d6aa..7aec719084 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,17 @@ package io.element.android.libraries.push.impl.push
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.core.meta.BuildMeta
 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.exception.NotificationResolverException
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.push.api.push.SyncOnNotifiableEvent
 import io.element.android.libraries.push.impl.history.PushHistoryService
 import io.element.android.libraries.push.impl.history.onDiagnosticPush
 import io.element.android.libraries.push.impl.history.onInvalidPushReceived
@@ -24,7 +28,6 @@ import io.element.android.libraries.push.impl.history.onSuccess
 import io.element.android.libraries.push.impl.history.onUnableToResolveEvent
 import io.element.android.libraries.push.impl.history.onUnableToRetrieveSession
 import io.element.android.libraries.push.impl.notifications.FallbackNotificationFactory
-import io.element.android.libraries.push.impl.notifications.NotificationEventRequest
 import io.element.android.libraries.push.impl.notifications.NotificationResolverQueue
 import io.element.android.libraries.push.impl.notifications.channels.NotificationChannels
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
@@ -48,7 +51,6 @@ private val loggerTag = LoggerTag("PushHandler", LoggerTag.PushLoggerTag)
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushHandler(
     private val onNotifiableEventReceived: OnNotifiableEventReceived,
     private val onRedactedEventReceived: OnRedactedEventReceived,
@@ -65,6 +67,8 @@ class DefaultPushHandler(
     @AppCoroutineScope
     private val appCoroutineScope: CoroutineScope,
     private val fallbackNotificationFactory: FallbackNotificationFactory,
+    private val syncOnNotifiableEvent: SyncOnNotifiableEvent,
+    private val featureFlagService: FeatureFlagService,
 ) : PushHandler {
     init {
         processPushEventResults()
@@ -180,9 +184,9 @@ class DefaultPushHandler(
                     }
                 }
 
-                // Process redactions of messages
+                // Process redactions of messages in background to not block operations with higher priority
                 if (redactions.isNotEmpty()) {
-                    onRedactedEventReceived.onRedactedEventsReceived(redactions)
+                    appCoroutineScope.launch { onRedactedEventReceived.onRedactedEventsReceived(redactions) }
                 }
 
                 // Find and process ringing call notifications separately
@@ -196,6 +200,10 @@ class DefaultPushHandler(
                 if (nonRingingCallEvents.isNotEmpty()) {
                     onNotifiableEventReceived.onNotifiableEventsReceived(nonRingingCallEvents)
                 }
+
+                if (!featureFlagService.isFeatureEnabled(FeatureFlags.SyncNotificationsWithWorkManager)) {
+                    syncOnNotifiableEvent(requests)
+                }
             }
             .launchIn(appCoroutineScope)
     }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultSyncOnNotifiableEvent.kt
similarity index 70%
rename from libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt
rename to libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultSyncOnNotifiableEvent.kt
index e3384a9b9b..8b8e671fcc 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultSyncOnNotifiableEvent.kt
@@ -1,47 +1,50 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
 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.matrix.api.MatrixClientProvider
-import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.push.api.push.SyncOnNotifiableEvent
 import io.element.android.services.appnavstate.api.AppForegroundStateService
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 
-@Inject
-class SyncOnNotifiableEvent(
+@ContributesBinding(AppScope::class)
+class DefaultSyncOnNotifiableEvent(
     private val matrixClientProvider: MatrixClientProvider,
     private val featureFlagService: FeatureFlagService,
     private val appForegroundStateService: AppForegroundStateService,
     private val dispatchers: CoroutineDispatchers,
-) {
-    suspend operator fun invoke(notifiableEvents: List<NotifiableEvent>) = withContext(dispatchers.io) {
+) : SyncOnNotifiableEvent {
+    override suspend operator fun invoke(requests: List<NotificationEventRequest>) = withContext(dispatchers.io) {
         if (!featureFlagService.isFeatureEnabled(FeatureFlags.SyncOnPush)) {
             return@withContext
         }
 
         try {
-            val eventsBySession = notifiableEvents.groupBy { it.sessionId }
+            val eventsBySession = requests.groupBy { it.sessionId }
 
             appForegroundStateService.updateIsSyncingNotificationEvent(true)
             Timber.d("Starting opportunistic room list sync | In foreground: ${appForegroundStateService.isInForeground.value}")
 
             for ((sessionId, events) in eventsBySession) {
                 val client = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: continue
-                val eventsByRoomId = events.groupBy { it.roomId }
+                val roomIds = events.map { it.roomId }.distinct()
 
-                client.roomListService.subscribeToVisibleRooms(eventsByRoomId.keys.toList())
+                client.roomListService.subscribeToVisibleRooms(roomIds)
 
                 if (!appForegroundStateService.isInForeground.value) {
                     // Give the sync some time to complete in background
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/IncrementPushDataStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/IncrementPushDataStore.kt
index cf7145e3ef..0a6467f884 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/IncrementPushDataStore.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/IncrementPushDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl.push
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.push.impl.store.DefaultPushDataStore
 
 interface IncrementPushDataStore {
@@ -17,7 +17,6 @@ interface IncrementPushDataStore {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultIncrementPushDataStore(
     private val defaultPushDataStore: DefaultPushDataStore
 ) : IncrementPushDataStore {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt
index 3c5efe70ba..0cb0d94d3c 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/MutableBatteryOptimizationStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl.push
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.push.impl.store.DefaultPushDataStore
 
 interface MutableBatteryOptimizationStore {
@@ -19,7 +19,6 @@ interface MutableBatteryOptimizationStore {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultMutableBatteryOptimizationStore(
     private val defaultPushDataStore: DefaultPushDataStore,
 ) : MutableBatteryOptimizationStore {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnNotifiableEventReceived.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnNotifiableEventReceived.kt
index 6daee8f137..2c4339d16a 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnNotifiableEventReceived.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnNotifiableEventReceived.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl.push
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.push.impl.notifications.DefaultNotificationDrawerManager
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
@@ -22,16 +22,13 @@ interface OnNotifiableEventReceived {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOnNotifiableEventReceived(
     private val defaultNotificationDrawerManager: DefaultNotificationDrawerManager,
     @AppCoroutineScope
     private val coroutineScope: CoroutineScope,
-    private val syncOnNotifiableEvent: SyncOnNotifiableEvent,
 ) : OnNotifiableEventReceived {
     override fun onNotifiableEventsReceived(notifiableEvents: List<NotifiableEvent>) {
         coroutineScope.launch {
-            launch { syncOnNotifiableEvent(notifiableEvents) }
             defaultNotificationDrawerManager.onNotifiableEventsReceived(notifiableEvents.filter { it !is NotifiableRingingCallEvent })
         }
     }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnRedactedEventReceived.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnRedactedEventReceived.kt
index dda61f1eb0..18388ba522 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnRedactedEventReceived.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/OnRedactedEventReceived.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,8 +17,6 @@ import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.push.impl.notifications.ActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.NotificationDisplayer
@@ -25,72 +24,63 @@ import io.element.android.libraries.push.impl.notifications.factories.DefaultNot
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import timber.log.Timber
 
 interface OnRedactedEventReceived {
-    fun onRedactedEventsReceived(redactions: List<ResolvedPushEvent.Redaction>)
+    suspend fun onRedactedEventsReceived(redactions: List<ResolvedPushEvent.Redaction>)
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOnRedactedEventReceived(
     private val activeNotificationsProvider: ActiveNotificationsProvider,
     private val notificationDisplayer: NotificationDisplayer,
-    @AppCoroutineScope
-    private val coroutineScope: CoroutineScope,
     @ApplicationContext private val context: Context,
     private val stringProvider: StringProvider,
 ) : OnRedactedEventReceived {
-    override fun onRedactedEventsReceived(redactions: List<ResolvedPushEvent.Redaction>) {
-        coroutineScope.launch {
-            val redactionsBySessionIdAndRoom = redactions.groupBy { redaction ->
-                redaction.sessionId to redaction.roomId
+    override suspend fun onRedactedEventsReceived(redactions: List<ResolvedPushEvent.Redaction>) {
+        val redactionsBySessionIdAndRoom = redactions.groupBy { redaction ->
+            redaction.sessionId to redaction.roomId
+        }
+        for ((keys, roomRedactions) in redactionsBySessionIdAndRoom) {
+            val (sessionId, roomId) = keys
+            // Get all notifications for the room, including those for threads
+            val notifications = activeNotificationsProvider.getAllMessageNotificationsForRoom(sessionId, roomId)
+            if (notifications.isEmpty()) {
+                Timber.d("No notifications found for redacted event")
             }
-            for ((keys, roomRedactions) in redactionsBySessionIdAndRoom) {
-                val (sessionId, roomId) = keys
-                val notifications = activeNotificationsProvider.getMessageNotificationsForRoom(
-                    sessionId,
-                    roomId,
+            notifications.forEach { statusBarNotification ->
+                val notification = statusBarNotification.notification
+                val messagingStyle = MessagingStyle.extractMessagingStyleFromNotification(notification)
+                if (messagingStyle == null) {
+                    Timber.w("Unable to retrieve messaging style from notification")
+                    return@forEach
+                }
+                val messageToRedactIndex = messagingStyle.messages.indexOfFirst { message ->
+                    roomRedactions.any { it.redactedEventId.value == message.extras.getString(DefaultNotificationCreator.MESSAGE_EVENT_ID) }
+                }
+                if (messageToRedactIndex == -1) {
+                    Timber.d("Unable to find the message to remove from notification")
+                    return@forEach
+                }
+                val oldMessage = messagingStyle.messages[messageToRedactIndex]
+                val content = buildSpannedString {
+                    inSpans(StyleSpan(Typeface.ITALIC)) {
+                        append(stringProvider.getString(CommonStrings.common_message_removed))
+                    }
+                }
+                val newMessage = MessagingStyle.Message(
+                    content,
+                    oldMessage.timestamp,
+                    oldMessage.person
+                )
+                messagingStyle.messages[messageToRedactIndex] = newMessage
+                notificationDisplayer.showNotification(
+                    statusBarNotification.tag,
+                    statusBarNotification.id,
+                    NotificationCompat.Builder(context, notification)
+                        .setStyle(messagingStyle)
+                        .build()
                 )
-                if (notifications.isEmpty()) {
-                    Timber.d("No notifications found for redacted event")
-                }
-                notifications.forEach { statusBarNotification ->
-                    val notification = statusBarNotification.notification
-                    val messagingStyle = MessagingStyle.extractMessagingStyleFromNotification(notification)
-                    if (messagingStyle == null) {
-                        Timber.w("Unable to retrieve messaging style from notification")
-                        return@forEach
-                    }
-                    val messageToRedactIndex = messagingStyle.messages.indexOfFirst { message ->
-                        roomRedactions.any { it.redactedEventId.value == message.extras.getString(DefaultNotificationCreator.MESSAGE_EVENT_ID) }
-                    }
-                    if (messageToRedactIndex == -1) {
-                        Timber.d("Unable to find the message to remove from notification")
-                        return@forEach
-                    }
-                    val oldMessage = messagingStyle.messages[messageToRedactIndex]
-                    val content = buildSpannedString {
-                        inSpans(StyleSpan(Typeface.ITALIC)) {
-                            append(stringProvider.getString(CommonStrings.common_message_removed))
-                        }
-                    }
-                    val newMessage = MessagingStyle.Message(
-                        content,
-                        oldMessage.timestamp,
-                        oldMessage.person
-                    )
-                    messagingStyle.messages[messageToRedactIndex] = newMessage
-                    notificationDisplayer.showNotificationMessage(
-                        statusBarNotification.tag,
-                        statusBarNotification.id,
-                        NotificationCompat.Builder(context, notification)
-                            .setStyle(messagingStyle)
-                            .build()
-                    )
-                }
             }
         }
     }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayAPI.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayAPI.kt
index 070074f36b..3458687a9e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayAPI.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayAPI.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.pushgateway
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayApiFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayApiFactory.kt
index e57d98d796..9e1d370f9a 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayApiFactory.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayApiFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.push.impl.pushgateway
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.network.RetrofitFactory
 
 interface PushGatewayApiFactory {
@@ -17,7 +17,6 @@ interface PushGatewayApiFactory {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushGatewayApiFactory(
     private val retrofitFactory: RetrofitFactory,
 ) : PushGatewayApiFactory {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayConfig.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayConfig.kt
index 9b4bb58e83..8cdf0e6137 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayConfig.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayDevice.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayDevice.kt
index 47ebc2754b..20a9e3ebed 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayDevice.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayDevice.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,5 +22,14 @@ data class PushGatewayDevice(
      * Required. The pushkey given when the pusher was created.
      */
     @SerialName("pushkey")
-    val pushKey: String
+    val pushKey: String,
+    /** Optional. Additional pusher data. */
+    @SerialName("data")
+    val data: PusherData? = null,
+)
+
+@Serializable
+data class PusherData(
+    @SerialName("default_payload")
+    val defaultPayload: Map<String, String>,
 )
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotification.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotification.kt
index ebbc305a75..a7e4438866 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotification.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotification.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,5 +21,5 @@ data class PushGatewayNotification(
      * Required. This is an array of devices that the notification should be sent to.
      */
     @SerialName("devices")
-    val devices: List<PushGatewayDevice>
+    val devices: List<PushGatewayDevice>,
 )
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyBody.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyBody.kt
index 2bf4e1c64b..6848ca3493 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyBody.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyBody.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyRequest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyRequest.kt
index 65f5f8a139..6315285559 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyRequest.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyRequest.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.pushgateway
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.push.api.gateway.PushGatewayFailure
@@ -26,7 +26,6 @@ interface PushGatewayNotifyRequest {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushGatewayNotifyRequest(
     private val pushGatewayApiFactory: PushGatewayApiFactory,
 ) : PushGatewayNotifyRequest {
@@ -42,9 +41,12 @@ class DefaultPushGatewayNotifyRequest(
                     devices = listOf(
                         PushGatewayDevice(
                             params.appId,
-                            params.pushKey
+                            params.pushKey,
+                            PusherData(mapOf(
+                                "cs" to "A_FAKE_SECRET",
+                            ))
                         )
-                    )
+                    ),
                 )
             )
         )
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyResponse.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyResponse.kt
index 87dfc44c21..9c2f682da6 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyResponse.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/pushgateway/PushGatewayNotifyResponse.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt
index e84ffaf7f0..170b8e8d8b 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/DefaultPushDataStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
@@ -30,7 +30,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushDataStore(
     private val pushDatabase: PushDatabase,
     private val dateFormatter: DateFormatter,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt
index de8f6dbbc1..a8ea6cc532 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/store/PushDataStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/test/TestPush.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/test/TestPush.kt
index c49bc48b6f..4ed8ca8338 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/test/TestPush.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/test/TestPush.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,23 +10,21 @@ package io.element.android.libraries.push.impl.test
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.PushConfig
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.push.impl.pushgateway.PushGatewayNotifyRequest
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 
 interface TestPush {
-    suspend fun execute(config: CurrentUserPushConfig)
+    suspend fun execute(config: Config)
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultTestPush(
     private val pushGatewayNotifyRequest: PushGatewayNotifyRequest,
 ) : TestPush {
-    override suspend fun execute(config: CurrentUserPushConfig) {
+    override suspend fun execute(config: Config) {
         pushGatewayNotifyRequest.execute(
             PushGatewayNotifyRequest.Params(
                 url = config.url,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTest.kt
index 3eeaae1b2d..347ee3bee4 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTest.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,7 +38,7 @@ class CurrentPushProviderTest(
 
     override suspend fun run(coroutineScope: CoroutineScope) {
         delegate.start()
-        val pushProvider = pushService.getCurrentPushProvider()
+        val pushProvider = pushService.getCurrentPushProvider(sessionId)
         if (pushProvider == null) {
             delegate.updateState(
                 description = stringProvider.getString(R.string.troubleshoot_notifications_test_current_push_provider_failure),
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/DiagnosticPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/DiagnosticPushHandler.kt
index 86cd2f630c..72153fa960 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/DiagnosticPushHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/DiagnosticPushHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTest.kt
index 93e855c94d..59ba1eba0e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTest.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -62,7 +63,7 @@ class IgnoredUsersTest(
         coroutineScope: CoroutineScope,
         navigator: NotificationTroubleshootNavigator,
     ) {
-        navigator.openIgnoredUsers()
+        navigator.navigateToBlockedUsers()
     }
 
     override suspend fun reset() = delegate.reset()
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationClickHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationClickHandler.kt
index e20876198e..c370c043be 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationClickHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationClickHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTest.kt
index da390f85f2..96860bf3e0 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTest.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTest.kt
@@ -1,15 +1,20 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot
 
-import dev.zacsweers.metro.AppScope
+import androidx.compose.ui.graphics.toArgb
 import dev.zacsweers.metro.ContributesIntoSet
 import dev.zacsweers.metro.Inject
+import io.element.android.appconfig.NotificationConfig
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.NotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
@@ -25,13 +30,15 @@ import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 
-@ContributesIntoSet(AppScope::class)
+@ContributesIntoSet(SessionScope::class)
 @Inject
 class NotificationTest(
+    private val sessionId: SessionId,
     private val notificationCreator: NotificationCreator,
     private val notificationDisplayer: NotificationDisplayer,
     private val notificationClickHandler: NotificationClickHandler,
     private val stringProvider: StringProvider,
+    private val enterpriseService: EnterpriseService,
 ) : NotificationTroubleshootTest {
     override val order = 50
     private val delegate = NotificationTroubleshootTestDelegate(
@@ -43,7 +50,9 @@ class NotificationTest(
 
     override suspend fun run(coroutineScope: CoroutineScope) {
         delegate.start()
-        val notification = notificationCreator.createDiagnosticNotification()
+        val color = enterpriseService.brandColorsFlow(sessionId).first()?.toArgb()
+            ?: NotificationConfig.NOTIFICATION_ACCENT_COLOR
+        val notification = notificationCreator.createDiagnosticNotification(color)
         val result = notificationDisplayer.displayDiagnosticNotification(notification)
         if (result) {
             coroutineScope.listenToNotificationClick()
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt
index 5b9a9e2fd1..91ac1ca0ee 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTest.kt
@@ -1,15 +1,17 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot
 
-import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoSet
 import dev.zacsweers.metro.Inject
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.push.api.gateway.PushGatewayFailure
 import io.element.android.libraries.push.impl.R
@@ -28,9 +30,10 @@ import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 
-@ContributesIntoSet(AppScope::class)
+@ContributesIntoSet(SessionScope::class)
 @Inject
 class PushLoopbackTest(
+    private val sessionId: SessionId,
     private val pushService: PushService,
     private val diagnosticPushHandler: DiagnosticPushHandler,
     private val clock: SystemClock,
@@ -52,9 +55,9 @@ class PushLoopbackTest(
             completable.complete(clock.epochMillis() - startTime)
         }
         val testPushResult = try {
-            pushService.testPush()
-        } catch (pusherRejected: PushGatewayFailure.PusherRejected) {
-            val hasQuickFix = pushService.getCurrentPushProvider()?.canRotateToken() == true
+            pushService.testPush(sessionId)
+        } catch (_: PushGatewayFailure.PusherRejected) {
+            val hasQuickFix = pushService.getCurrentPushProvider(sessionId)?.canRotateToken() == true
             delegate.updateState(
                 description = stringProvider.getString(R.string.troubleshoot_notifications_test_push_loop_back_failure_1),
                 status = NotificationTroubleshootTestState.Status.Failure(hasQuickFix = hasQuickFix)
@@ -105,7 +108,7 @@ class PushLoopbackTest(
         navigator: NotificationTroubleshootNavigator,
     ) {
         delegate.start()
-        pushService.getCurrentPushProvider()?.rotateToken()
+        pushService.getCurrentPushProvider(sessionId)?.rotateToken()
         run(coroutineScope)
     }
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt
index 8e4d1db639..1a6368b75f 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/unregistration/ServiceUnregisteredHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/unregistration/ServiceUnregisteredHandler.kt
new file mode 100644
index 0000000000..29052b42ca
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/unregistration/ServiceUnregisteredHandler.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.push.impl.unregistration
+
+import androidx.compose.ui.graphics.toArgb
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.appconfig.NotificationConfig
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.push.impl.notifications.NotificationDisplayer
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
+import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import kotlinx.coroutines.flow.first
+
+interface ServiceUnregisteredHandler {
+    suspend fun handle(userId: UserId)
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultServiceUnregisteredHandler(
+    private val enterpriseService: EnterpriseService,
+    private val notificationCreator: NotificationCreator,
+    private val notificationDisplayer: NotificationDisplayer,
+    private val sessionStore: SessionStore,
+) : ServiceUnregisteredHandler {
+    override suspend fun handle(userId: UserId) {
+        val color = enterpriseService.brandColorsFlow(userId).first()?.toArgb()
+            ?: NotificationConfig.NOTIFICATION_ACCENT_COLOR
+        val hasMultipleAccounts = sessionStore.numberOfSessions() > 1
+        val notification = notificationCreator.createUnregistrationNotification(
+            NotificationAccountParams(
+                user = MatrixUser(userId),
+                color = color,
+                showSessionId = hasMultipleAccounts,
+            )
+        )
+        notificationDisplayer.displayUnregistrationNotification(notification)
+    }
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/DataForWorkManagerIsTooBig.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/DataForWorkManagerIsTooBig.kt
new file mode 100644
index 0000000000..e700a58a7e
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/DataForWorkManagerIsTooBig.kt
@@ -0,0 +1,10 @@
+/*
+ * 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.push.impl.workmanager
+
+class DataForWorkManagerIsTooBig : Exception()
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationsWorker.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationsWorker.kt
new file mode 100644
index 0000000000..eeac5ff66f
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationsWorker.kt
@@ -0,0 +1,130 @@
+/*
+ * 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.push.impl.workmanager
+
+import android.content.Context
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.binding
+import io.element.android.features.networkmonitor.api.NetworkMonitor
+import io.element.android.features.networkmonitor.api.NetworkStatus
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.matrix.api.auth.SessionRestorationException
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.push.api.push.SyncOnNotifiableEvent
+import io.element.android.libraries.push.impl.notifications.NotifiableEventResolver
+import io.element.android.libraries.push.impl.notifications.NotificationResolverQueue
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
+import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
+import io.element.android.libraries.workmanager.api.di.WorkerKey
+import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+import timber.log.Timber
+import kotlin.time.Duration.Companion.seconds
+
+@AssistedInject
+class FetchNotificationsWorker(
+    @Assisted workerParams: WorkerParameters,
+    @ApplicationContext private val context: Context,
+    private val networkMonitor: NetworkMonitor,
+    private val eventResolver: NotifiableEventResolver,
+    private val queue: NotificationResolverQueue,
+    private val workManagerScheduler: WorkManagerScheduler,
+    private val syncOnNotifiableEvent: SyncOnNotifiableEvent,
+    private val coroutineDispatchers: CoroutineDispatchers,
+    private val workerDataConverter: SyncNotificationsWorkerDataConverter,
+    private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
+) : CoroutineWorker(context, workerParams) {
+    override suspend fun doWork(): Result = withContext(coroutineDispatchers.io) {
+        Timber.d("FetchNotificationsWorker started")
+        val requests = workerDataConverter.deserialize(inputData) ?: return@withContext Result.failure()
+        // Wait for network to be available, but not more than 10 seconds
+        val hasNetwork = withTimeoutOrNull(10.seconds) {
+            networkMonitor.connectivity.first { it == NetworkStatus.Connected }
+        } != null
+        if (!hasNetwork) {
+            Timber.w("No network, retrying later")
+            return@withContext Result.retry()
+        }
+
+        val failedSyncForSessions = mutableMapOf<SessionId, Throwable>()
+
+        val groupedRequests = requests.groupBy { it.sessionId }.toMutableMap()
+        for ((sessionId, notificationRequests) in groupedRequests) {
+            Timber.d("Processing notification requests for session $sessionId")
+            eventResolver.resolveEvents(sessionId, notificationRequests)
+                .fold(
+                    onSuccess = { result ->
+                        // Update the resolved results in the queue
+                        (queue.results as MutableSharedFlow).emit(requests to result)
+                    },
+                    onFailure = {
+                        failedSyncForSessions[sessionId] = it
+                        Timber.e(it, "Failed to resolve notification events for session $sessionId")
+                    }
+                )
+        }
+
+        // If there were failures for whole sessions, we retry all their requests
+        if (failedSyncForSessions.isNotEmpty()) {
+            @Suppress("LoopWithTooManyJumpStatements")
+            for ((failedSessionId, exception) in failedSyncForSessions) {
+                if (exception.cause is SessionRestorationException) {
+                    Timber.e(exception, "Session $failedSessionId could not be restored, not retrying notification fetching")
+                    groupedRequests.remove(failedSessionId)
+                    continue
+                }
+                val requestsToRetry = groupedRequests[failedSessionId] ?: continue
+                Timber.d("Re-scheduling ${requestsToRetry.size} failed notification requests for session $failedSessionId")
+                workManagerScheduler.submit(
+                    SyncNotificationWorkManagerRequest(
+                        sessionId = failedSessionId,
+                        notificationEventRequests = requestsToRetry,
+                        workerDataConverter = workerDataConverter,
+                        buildVersionSdkIntProvider = buildVersionSdkIntProvider,
+                    )
+                )
+            }
+        }
+
+        Timber.d("Notifications processed successfully")
+
+        performOpportunisticSyncIfNeeded(groupedRequests)
+
+        Result.success()
+    }
+
+    private suspend fun performOpportunisticSyncIfNeeded(
+        groupedRequests: Map<SessionId, List<NotificationEventRequest>>,
+    ) {
+        for ((sessionId, notificationRequests) in groupedRequests) {
+            runCatchingExceptions {
+                syncOnNotifiableEvent(notificationRequests)
+            }.onFailure {
+                Timber.e(it, "Failed to sync on notifiable events for session $sessionId")
+            }
+        }
+    }
+
+    @ContributesIntoMap(AppScope::class, binding = binding<MetroWorkerFactory.WorkerInstanceFactory<*>>())
+    @WorkerKey(FetchNotificationsWorker::class)
+    @AssistedFactory
+    interface Factory : MetroWorkerFactory.WorkerInstanceFactory<FetchNotificationsWorker>
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationWorkManagerRequest.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationWorkManagerRequest.kt
new file mode 100644
index 0000000000..50ef28903c
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationWorkManagerRequest.kt
@@ -0,0 +1,68 @@
+/*
+ * 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.push.impl.workmanager
+
+import android.os.Build
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.OutOfQuotaPolicy
+import androidx.work.WorkRequest
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.workManagerTag
+import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import timber.log.Timber
+import java.security.InvalidParameterException
+
+class SyncNotificationWorkManagerRequest(
+    private val sessionId: SessionId,
+    private val notificationEventRequests: List<NotificationEventRequest>,
+    private val workerDataConverter: SyncNotificationsWorkerDataConverter,
+    private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
+) : WorkManagerRequest {
+    override fun build(): Result<List<WorkRequest>> {
+        if (notificationEventRequests.isEmpty()) {
+            return Result.failure(InvalidParameterException("notificationEventRequests cannot be empty"))
+        }
+        Timber.d("Scheduling ${notificationEventRequests.size} notification requests with WorkManager for $sessionId")
+        return workerDataConverter.serialize(notificationEventRequests).map { dataList ->
+            dataList.map { data ->
+                OneTimeWorkRequestBuilder<FetchNotificationsWorker>()
+                    .setInputData(data)
+                    .apply {
+                        // Expedited workers aren't needed on Android 12 or lower:
+                        // They force displaying a foreground sync notification for no good reason, since they sync almost immediately anyway
+                        // See https://developer.android.com/develop/background-work/background-tasks/persistent/getting-started/define-work#backwards-compat
+                        if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {
+                            setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                        }
+                    }
+                    .setTraceTag(workManagerTag(sessionId, WorkManagerRequestType.NOTIFICATION_SYNC))
+                    // TODO investigate using this instead of the resolver queue
+                    // .setInputMerger()
+                    .build()
+            }
+        }
+    }
+
+    @Serializable
+    data class Data(
+        @SerialName("session_id")
+        val sessionId: String,
+        @SerialName("room_id")
+        val roomId: String,
+        @SerialName("event_id")
+        val eventId: String,
+        @SerialName("provider_info")
+        val providerInfo: String,
+    )
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationsWorkerDataConverter.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationsWorkerDataConverter.kt
new file mode 100644
index 0000000000..46b7d760c0
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationsWorkerDataConverter.kt
@@ -0,0 +1,129 @@
+/*
+ * 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.push.impl.workmanager
+
+import androidx.work.Data
+import androidx.work.workDataOf
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.json.JsonProvider
+import io.element.android.libraries.core.extensions.mapCatchingExceptions
+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.SessionId
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import timber.log.Timber
+
+@Inject
+class SyncNotificationsWorkerDataConverter(
+    private val json: JsonProvider,
+) {
+    fun serialize(notificationEventRequests: List<NotificationEventRequest>): Result<List<Data>> {
+        // First try to serialize all requests at once. In the vast majority of cases this will work.
+        return serializeRequests(notificationEventRequests)
+            .map { listOf(it) }
+            .recoverCatching { t ->
+                if (t is DataForWorkManagerIsTooBig) {
+                    // Perform serialization on sublists, workDataOf have failed because of size limit
+                    Timber.w(t, "Failed to serialize ${notificationEventRequests.size} notification requests, split the requests per room.")
+                    // Group the requests per rooms
+                    val requestsSortedPerRoom = notificationEventRequests.groupBy { it.roomId }.values
+                    // Build a list of sublist with size at most CHUNK_SIZE, and with all rooms kept together
+                    buildList {
+                        val currentChunk = mutableListOf<NotificationEventRequest>()
+                        for (requests in requestsSortedPerRoom) {
+                            if (currentChunk.size + requests.size <= CHUNK_SIZE) {
+                                // Can add the whole room requests to the current chunk
+                                currentChunk.addAll(requests)
+                            } else {
+                                // Add the current chunk
+                                add(currentChunk.toList())
+                                // Start a new chunk with the current room requests
+                                currentChunk.clear()
+                                // If a room has more requests than CHUNK_SIZE, we need to split them
+                                requests.chunked(CHUNK_SIZE) { chunk ->
+                                    if (chunk.size == CHUNK_SIZE) {
+                                        add(chunk.toList())
+                                    } else {
+                                        currentChunk.addAll(chunk)
+                                    }
+                                }
+                            }
+                        }
+                        // Add any remaining requests
+                        add(currentChunk.toList())
+                    }
+                        .filter { it.isNotEmpty() }
+                        .also {
+                            Timber.d("Split notification requests into ${it.size} chunks for WorkManager serialization")
+                            it.forEach { requests ->
+                                Timber.d(" - Chunk with ${requests.size} requests")
+                            }
+                        }
+                        .mapNotNull { serializeRequests(it).getOrNull() }
+                } else {
+                    throw t
+                }
+            }
+    }
+
+    private fun serializeRequests(notificationEventRequests: List<NotificationEventRequest>): Result<Data> {
+        return runCatchingExceptions { json().encodeToString(notificationEventRequests.map { it.toData() }) }
+            .onFailure {
+                Timber.e(it, "Failed to serialize notification requests")
+            }
+            .mapCatchingExceptions { str ->
+                // Note: workDataOf can fail if the data is too large
+                try {
+                    workDataOf(REQUESTS_KEY to str)
+                } catch (_: IllegalStateException) {
+                    throw DataForWorkManagerIsTooBig()
+                }
+            }
+    }
+
+    fun deserialize(data: Data): List<NotificationEventRequest>? {
+        val rawRequestsJson = data.getString(REQUESTS_KEY) ?: return null
+        return runCatchingExceptions {
+            json().decodeFromString<List<SyncNotificationWorkManagerRequest.Data>>(rawRequestsJson).map { it.toRequest() }
+        }.fold(
+            onSuccess = {
+                Timber.d("Deserialized ${it.size} requests")
+                it
+            },
+            onFailure = {
+                Timber.e(it, "Failed to deserialize notification requests")
+                null
+            }
+        )
+    }
+
+    companion object {
+        private const val REQUESTS_KEY = "requests"
+        internal const val CHUNK_SIZE = 20
+    }
+}
+
+private fun NotificationEventRequest.toData(): SyncNotificationWorkManagerRequest.Data {
+    return SyncNotificationWorkManagerRequest.Data(
+        sessionId = sessionId.value,
+        roomId = roomId.value,
+        eventId = eventId.value,
+        providerInfo = providerInfo,
+    )
+}
+
+private fun SyncNotificationWorkManagerRequest.Data.toRequest(): NotificationEventRequest {
+    return NotificationEventRequest(
+        sessionId = SessionId(sessionId),
+        roomId = RoomId(roomId),
+        eventId = EventId(eventId),
+        providerInfo = providerInfo,
+    )
+}
diff --git a/libraries/push/impl/src/main/res/drawable-xxhdpi/element_logo_green.xml b/libraries/push/impl/src/main/res/drawable-xxhdpi/element_logo_green.xml
deleted file mode 100644
index e9b119c969..0000000000
--- a/libraries/push/impl/src/main/res/drawable-xxhdpi/element_logo_green.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-  <path
-      android:pathData="M23.04,3.84C23.04,1.7192 24.7593,0 26.88,0C41.0185,0 52.48,11.4615 52.48,25.6C52.48,27.7208 50.7608,29.44 48.64,29.44C46.5193,29.44 44.8,27.7208 44.8,25.6C44.8,15.7031 36.777,7.68 26.88,7.68C24.7593,7.68 23.04,5.9608 23.04,3.84Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M40.96,60.16C40.96,62.2808 39.2407,64 37.12,64C22.9815,64 11.52,52.5385 11.52,38.4C11.52,36.2792 13.2392,34.56 15.36,34.56C17.4807,34.56 19.2,36.2792 19.2,38.4C19.2,48.2969 27.223,56.32 37.12,56.32C39.2407,56.32 40.96,58.0392 40.96,60.16Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M3.84,40.96C1.7192,40.96 -0,39.2407 -0,37.12C-0,22.9815 11.4615,11.52 25.6,11.52C27.7208,11.52 29.44,13.2392 29.44,15.36C29.44,17.4807 27.7208,19.2 25.6,19.2C15.7031,19.2 7.68,27.223 7.68,37.12C7.68,39.2407 5.9608,40.96 3.84,40.96Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M60.16,23.04C62.2808,23.04 64,24.7593 64,26.88C64,41.0185 52.5385,52.48 38.4,52.48C36.2792,52.48 34.56,50.7608 34.56,48.64C34.56,46.5193 36.2792,44.8 38.4,44.8C48.2969,44.8 56.32,36.777 56.32,26.88C56.32,24.7593 58.0392,23.04 60.16,23.04Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/libraries/push/impl/src/main/res/drawable-xxhdpi/ic_material_done_all_white.png b/libraries/push/impl/src/main/res/drawable-xxhdpi/ic_material_done_all_white.png
deleted file mode 100755
index 1f3132a3f2..0000000000
Binary files a/libraries/push/impl/src/main/res/drawable-xxhdpi/ic_material_done_all_white.png and /dev/null differ
diff --git a/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_accept_invitation.png b/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_accept_invitation.png
deleted file mode 100755
index eb2be25187..0000000000
Binary files a/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_accept_invitation.png and /dev/null differ
diff --git a/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_quick_reply.png b/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_quick_reply.png
deleted file mode 100755
index 4af4ae634b..0000000000
Binary files a/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_quick_reply.png and /dev/null differ
diff --git a/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_reject_invitation.png b/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_reject_invitation.png
deleted file mode 100755
index 51b4401ca0..0000000000
Binary files a/libraries/push/impl/src/main/res/drawable-xxhdpi/vector_notification_reject_invitation.png and /dev/null differ
diff --git a/libraries/push/impl/src/main/res/raw/message.mp3 b/libraries/push/impl/src/main/res/raw/message.mp3
index 5e9645adaf..abc056786c 100644
Binary files a/libraries/push/impl/src/main/res/raw/message.mp3 and b/libraries/push/impl/src/main/res/raw/message.mp3 differ
diff --git a/libraries/push/impl/src/main/res/values-be/translations.xml b/libraries/push/impl/src/main/res/values-be/translations.xml
index 7a30be6f01..aec22f9910 100644
--- a/libraries/push/impl/src/main/res/values-be/translations.xml
+++ b/libraries/push/impl/src/main/res/values-be/translations.xml
@@ -59,6 +59,7 @@
   <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_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_success">"Бягучы пастаўшчык push-апавяшчэнняў: %1$s."</string>
diff --git a/libraries/push/impl/src/main/res/values-cs/translations.xml b/libraries/push/impl/src/main/res/values-cs/translations.xml
index 002c6d18ac..667f181536 100644
--- a/libraries/push/impl/src/main/res/values-cs/translations.xml
+++ b/libraries/push/impl/src/main/res/values-cs/translations.xml
@@ -15,6 +15,7 @@
     <item quantity="few">"%d oznámení"</item>
     <item quantity="other">"%d oznámení"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Distributor oznámení UnifiedPush se nepodařilo zaregistrovat, takže již nebudete dostávat oznámení. Zkontrolujte nastavení oznámení v aplikaci a stav distributora push oznámění."</string>
   <string name="notification_fallback_content">"Oznámení"</string>
   <string name="notification_incoming_call">"📹 Příchozí hovor"</string>
   <string name="notification_inline_reply_failed">"** Nepodařilo se odeslat - otevřete prosím místnost"</string>
@@ -42,6 +43,7 @@
   <string name="notification_sender_me">"Já"</string>
   <string name="notification_sender_mention_reply">"%1$s zmínil(a) nebo odpověděl(a)"</string>
   <string name="notification_test_push_notification_content">"Prohlížíte si oznámení! Klikněte na mě!"</string>
+  <string name="notification_thread_in_room">"Vlákno v %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">
@@ -71,7 +73,10 @@
   <string name="troubleshoot_notifications_test_blocked_users_title">"Blokovaní uživatelé"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Získat název aktuálního poskytovatele."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nebyli vybráni žádní push poskytovatelé."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Aktuální poskytovatel push oznámení: %1$s a současný distributor: %2$s. Ale distributor %3$s nebyl nalezen. Možná byla aplikace odinstalována?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Aktuální poskytovatel push oznámení: %1$s , ale nebyli nakonfigurováni žádní distributoři."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Aktuální push poskytovatel: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Aktuální poskytovatel push oznámení: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Aktuální push poskytovatel"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Ujistěte se, že aplikace má alespoň jednoho push poskytovatele."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nebyli nalezeni žádní push poskytovatelé."</string>
diff --git a/libraries/push/impl/src/main/res/values-da/translations.xml b/libraries/push/impl/src/main/res/values-da/translations.xml
index 255605953b..5f16a8cf8a 100644
--- a/libraries/push/impl/src/main/res/values-da/translations.xml
+++ b/libraries/push/impl/src/main/res/values-da/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notifikation"</item>
     <item quantity="other">"%d notifikationer"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"UnifiedPush-push notification-distributøren kunne ikke registreres, så du vil ikke længere modtage notifikationer. Kontrollér appens notifikationsindstillinger og push-distributørens status."</string>
   <string name="notification_fallback_content">"Du har nye beskeder."</string>
   <string name="notification_incoming_call">"📹 Indgående opkald"</string>
   <string name="notification_inline_reply_failed">"** Kunne ikke sende - åbn venligst rummet"</string>
@@ -38,6 +39,7 @@
   <string name="notification_sender_me">"Mig"</string>
   <string name="notification_sender_mention_reply">"%1$s nævnt eller besvaret"</string>
   <string name="notification_test_push_notification_content">"Du ser notifikationen! Klik på mig!"</string>
+  <string name="notification_thread_in_room">"Tråd i %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-de/translations.xml b/libraries/push/impl/src/main/res/values-de/translations.xml
index dff6371773..6997c9f160 100644
--- a/libraries/push/impl/src/main/res/values-de/translations.xml
+++ b/libraries/push/impl/src/main/res/values-de/translations.xml
@@ -38,6 +38,7 @@
   <string name="notification_sender_me">"Ich"</string>
   <string name="notification_sender_mention_reply">"%1$s hat Dich erwähnt oder geantwortet"</string>
   <string name="notification_test_push_notification_content">"Du siehst dir die Benachrichtigung an! Klicke hier!"</string>
+  <string name="notification_thread_in_room">"Thread in %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">
@@ -61,7 +62,7 @@
     <item quantity="one">"Du hast %1$d Nutzer gesperrt. Du wirst für diesen Nutzer keine Benachrichtigungen erhalten."</item>
     <item quantity="other">"Du hast %1$d Nutzer gesperrt. Du wirst für diese Nutzer keine Benachrichtigungen erhalten."</item>
   </plurals>
-  <string name="troubleshoot_notifications_test_blocked_users_title">"Gesperrte Nutzer"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Blockierte Nutzer"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Ermittele den Namen des aktuellen Anbieters."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Kein Dienst für Push-Benachrichtigungen ausgewählt."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Aktueller Push-Dienst: %1$s und aktueller UnifiedPush-Distributor: %2$s. Aber der Distributor %3$s kann nicht gefunden werden. Vielleicht wurde die App deinstalliert?"</string>
diff --git a/libraries/push/impl/src/main/res/values-el/translations.xml b/libraries/push/impl/src/main/res/values-el/translations.xml
index da21ccfce7..1229218f09 100644
--- a/libraries/push/impl/src/main/res/values-el/translations.xml
+++ b/libraries/push/impl/src/main/res/values-el/translations.xml
@@ -54,6 +54,7 @@
   <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_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_success">"Τρέχων πάροχος push: %1$s."</string>
diff --git a/libraries/push/impl/src/main/res/values-en-rUS/translations.xml b/libraries/push/impl/src/main/res/values-en-rUS/translations.xml
new file mode 100644
index 0000000000..95c732ea03
--- /dev/null
+++ b/libraries/push/impl/src/main/res/values-en-rUS/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="push_distributor_background_sync_android">"Background synchronization"</string>
+</resources>
diff --git a/libraries/push/impl/src/main/res/values-es/translations.xml b/libraries/push/impl/src/main/res/values-es/translations.xml
index 4200cb9baf..cee68d6072 100644
--- a/libraries/push/impl/src/main/res/values-es/translations.xml
+++ b/libraries/push/impl/src/main/res/values-es/translations.xml
@@ -53,6 +53,7 @@
   <string name="push_distributor_background_sync_android">"Sincronización en segundo plano"</string>
   <string name="push_distributor_firebase_android">"Servicios de Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"No se han encontrado Servicios de Google Play válidos. Es posible que las notificaciones no funcionen correctamente."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Usuarios bloqueados"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Obtener el nombre del proveedor actual."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"No se ha seleccionado ningún proveedor de push."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Proveedor de push actual: %1$s."</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 45d8e3c8c8..980129d748 100644
--- a/libraries/push/impl/src/main/res/values-et/translations.xml
+++ b/libraries/push/impl/src/main/res/values-et/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d teavitus"</item>
     <item quantity="other">"%d teavitust"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"UnifiedPushi levitajas registreerimine ei õnnestunud ja seega sa ei saa enam teavitusi. Palun kontrolli selle rakenduse teavituste seadistusi ja tõuketeenuste levitaja olekut."</string>
   <string name="notification_fallback_content">"Sulle on uusi sõnumeid."</string>
   <string name="notification_incoming_call">"📹 Sissetulev kõne"</string>
   <string name="notification_inline_reply_failed">"** Saatmine ei õnnestunud - palun ava jututoa täisvaade"</string>
@@ -37,7 +38,10 @@
   <string name="notification_room_invite_body_with_sender">"%1$s saatis sulle kutse jututoaga liitumiseks"</string>
   <string name="notification_sender_me">"Mina"</string>
   <string name="notification_sender_mention_reply">"%1$s mainis või vastas"</string>
+  <string name="notification_space_invite_body">"Kutsus sind liituma kogukonnaga"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s kutsus sind liituma kogukonnaga"</string>
   <string name="notification_test_push_notification_content">"See ongi teavitus! Klõpsi mind!"</string>
+  <string name="notification_thread_in_room">"Jutulõng „%1$s“ jututoas"</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-eu/translations.xml b/libraries/push/impl/src/main/res/values-eu/translations.xml
index c72badbb52..826b9a762f 100644
--- a/libraries/push/impl/src/main/res/values-eu/translations.xml
+++ b/libraries/push/impl/src/main/res/values-eu/translations.xml
@@ -53,6 +53,7 @@
   <string name="push_distributor_background_sync_android">"Atzeko planoko sinkronizazioa"</string>
   <string name="push_distributor_firebase_android">"Google Services"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Ez da baliozko Google Play Servicerik aurkitu. Litekeena da jakinarazpenak behar bezala ez ibiltzea."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Blokeatutako erabiltzaileak"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Lortu uneko hornitzailearen izena."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Ez da push hornitzailerik hautatu."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Uneko push hornitzailea: %1$s."</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 f36ff36e98..ef24f09c1e 100644
--- a/libraries/push/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fa/translations.xml
@@ -54,6 +54,7 @@
   <string name="push_distributor_background_sync_android">"همگام سازی پس‌زمینه"</string>
   <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_display_notification_success">"روی آگاهی کلیک شد!"</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>
diff --git a/libraries/push/impl/src/main/res/values-fi/translations.xml b/libraries/push/impl/src/main/res/values-fi/translations.xml
index f3cec970d5..1af69c2da9 100644
--- a/libraries/push/impl/src/main/res/values-fi/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fi/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d ilmoitus"</item>
     <item quantity="other">"%d ilmoitusta"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"UnifiedPush ilmoitusten jakelijaa ei voitu rekisteröidä, joten et enää vastaanota ilmoituksia. Tarkista sovelluksen ilmoitusasetukset ja push-jakelijan tila."</string>
   <string name="notification_fallback_content">"Sinulle on uusia viestejä."</string>
   <string name="notification_incoming_call">"📹 Saapuva puhelu"</string>
   <string name="notification_inline_reply_failed">"** Lähetys epäonnistui - avaa huone"</string>
diff --git a/libraries/push/impl/src/main/res/values-fr/translations.xml b/libraries/push/impl/src/main/res/values-fr/translations.xml
index 5324597f8b..8927f9eccc 100644
--- a/libraries/push/impl/src/main/res/values-fr/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fr/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notification"</item>
     <item quantity="other">"%d notifications"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Le distributeur de notifications UnifiedPush n’a pas pu être enregistré, vous ne recevrez donc plus de notifications. Veuillez vérifier les paramètres de notification de l’application et l’état du distributeur."</string>
   <string name="notification_fallback_content">"Vous avez de nouveau(x) message(s)."</string>
   <string name="notification_incoming_call">"📹 Appel entrant"</string>
   <string name="notification_inline_reply_failed">"** Échec de l’envoi - veuillez ouvrir le salon"</string>
@@ -38,6 +39,7 @@
   <string name="notification_sender_me">"Moi"</string>
   <string name="notification_sender_mention_reply">"%1$s mentionné ou en réponse"</string>
   <string name="notification_test_push_notification_content">"Vous êtes en train de voir la notification ! Cliquez-moi !"</string>
+  <string name="notification_thread_in_room">"Discussion dans %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-hr/translations.xml b/libraries/push/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..86c458dbf9
--- /dev/null
+++ b/libraries/push/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_channel_call">"Poziv"</string>
+  <string name="notification_channel_listening_for_events">"Osluškivanje događaja"</string>
+  <string name="notification_channel_noisy">"Glasne obavijesti"</string>
+  <string name="notification_channel_ringing_calls">"Pozivi (telefon zvoni)"</string>
+  <string name="notification_channel_silent">"Tihe obavijesti"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="one">"%1$s: %2$d poruka"</item>
+    <item quantity="few">"%1$s: %2$d poruke"</item>
+    <item quantity="other">"%1$s: %2$d poruka"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="one">"%d obavijest"</item>
+    <item quantity="few">"%d obavijesti"</item>
+    <item quantity="other">"%d obavijesti"</item>
+  </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>
+  <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>
+  <string name="notification_invitation_action_reject">"Odbij"</string>
+  <plurals name="notification_invitations">
+    <item quantity="one">"%d pozivnica"</item>
+    <item quantity="few">"%d pozivnice"</item>
+    <item quantity="other">"%d pozivnica"</item>
+  </plurals>
+  <string name="notification_invite_body">"Pozvao/la te na razgovor"</string>
+  <string name="notification_invite_body_with_sender">"%1$s pozvao/la te na razgovor"</string>
+  <string name="notification_mentioned_you_body">"Korisnik vas je spomenuo: %1$s"</string>
+  <string name="notification_new_messages">"Nove poruke"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="one">"%d nova poruka"</item>
+    <item quantity="few">"%d nove poruke"</item>
+    <item quantity="other">"%d novih poruka"</item>
+  </plurals>
+  <string name="notification_reaction_body">"Reagirao/la je s %1$s"</string>
+  <string name="notification_room_action_mark_as_read">"Označi kao pročitano"</string>
+  <string name="notification_room_action_quick_reply">"Brzi odgovor"</string>
+  <string name="notification_room_invite_body">"Pozvao/la te je da se pridružiš sobi"</string>
+  <string name="notification_room_invite_body_with_sender">"%1$s pozvao/la te da se pridružiš sobi"</string>
+  <string name="notification_sender_me">"Ja"</string>
+  <string name="notification_sender_mention_reply">"%1$s je spomenuo/la ili odgovorio/la"</string>
+  <string name="notification_space_invite_body">"Pozvao/la vas je da se pridružite prostoru"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s pozvao/la vas je da se pridružite prostoru"</string>
+  <string name="notification_test_push_notification_content">"Gledate obavijest! Kliknite me!"</string>
+  <string name="notification_thread_in_room">"Nit u %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 nepročitana poruka s obavijesti"</item>
+    <item quantity="few">"%d nepročitane poruke s obavijesti"</item>
+    <item quantity="other">"%d nepročitanih poruka s obavijesti"</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 u %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s u %2$s i %3$s"</string>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="one">"%d soba"</item>
+    <item quantity="few">"%d sobe"</item>
+    <item quantity="other">"%d soba"</item>
+  </plurals>
+  <string name="push_distributor_background_sync_android">"Sinkronizacija u pozadini"</string>
+  <string name="push_distributor_firebase_android">"Googleove usluge"</string>
+  <string name="push_no_valid_google_play_services_apk_android">"Nisu pronađene valjane usluge Google Play. Obavijesti možda neće ispravno funkcionirati."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Provjera blokiranih korisnika"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Prikaži blokirane korisnike"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Nijedan korisnik nije blokiran."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Blokirali ste %1$d korisnika. Nećete primati obavijesti za ovog korisnika."</item>
+    <item quantity="few">"Blokirali ste %1$d korisnika. Nećete primati obavijesti za te korisnike."</item>
+    <item quantity="other">"Blokirali ste %1$d korisnika. Nećete primati obavijesti za te korisnike."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Blokirani korisnici"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_description">"Dohvatite naziv trenutačnog pružatelja."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nije odabran nijedan pružatelj push obavijesti."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Trenutačni pružatelj push obavijesti je %1$s i trenutačni distributer je %2$s. Ali distributer %3$s nije pronađen. Možda je aplikacija deinstalirana?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Trenutačni pružatelj push obavijesti je %1$s, ali nijedan distributer nije konfiguriran."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success">"Trenutačni pružatelj push obavijesti: %1$s ."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Trenutačni pružatelj push obavijesti: %1$s (%2$s)"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_title">"Trenutačni pružatelj push obavijesti"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_description">"Provjerite podržava li aplikacija barem jednog pružatelja push obavijesti"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nije pronađena podrška za pružatelja push obavijesti."</string>
+  <plurals name="troubleshoot_notifications_test_detect_push_provider_success">
+    <item quantity="one">"Pronađen je %1$d pružatelj push obavijesti: %2$s"</item>
+    <item quantity="few">"Pronađena su %1$d pružatelja push obavijesti: %2$s"</item>
+    <item quantity="other">"Pronađeno je %1$d pružatelja push obavijesti: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"Aplikacija je razvijena s podrškom za: %1$s"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_title">"Podrška za pružatelja push obavijesti"</string>
+  <string name="troubleshoot_notifications_test_display_notification_description">"Provjerite može li aplikacija prikazivati ​​obavijesti."</string>
+  <string name="troubleshoot_notifications_test_display_notification_failure">"Obavijest nije kliknuta."</string>
+  <string name="troubleshoot_notifications_test_display_notification_permission_failure">"Obavijest nije moguće prikazati."</string>
+  <string name="troubleshoot_notifications_test_display_notification_success">"Obavijest je kliknuta!"</string>
+  <string name="troubleshoot_notifications_test_display_notification_title">"Prikaz obavijesti"</string>
+  <string name="troubleshoot_notifications_test_display_notification_waiting">"Kliknite na obavijest za nastavak testa."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_description">"Provjerite prima li aplikacija push obavijesti."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_1">"Pogreška: sustav za push obavijesti odbio je zahtjev."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"Pogreška: %1$s ."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"Pogreška, nije moguće testirati push obavijesti."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"Pogreška, isteklo je vrijeme čekanja na push obavijest."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_success">"Povratna push obavijest trajala je %1$d ms."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"Testiraj povratnu push obavijest"</string>
+</resources>
diff --git a/libraries/push/impl/src/main/res/values-hu/translations.xml b/libraries/push/impl/src/main/res/values-hu/translations.xml
index fb067af5c4..69d4082871 100644
--- a/libraries/push/impl/src/main/res/values-hu/translations.xml
+++ b/libraries/push/impl/src/main/res/values-hu/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d értesítés"</item>
     <item quantity="other">"%d értesítés"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"A UnifiedPush leküldéses értesítési terjesztő nem regisztrálható, ezért többé nem fog értesítéseket kapni. Ellenőrizze az alkalmazás értesítési beállításait és a leküldés értesítési terjesztő állapotát."</string>
   <string name="notification_fallback_content">"Értesítés"</string>
   <string name="notification_incoming_call">"📹 Bejövő hívás"</string>
   <string name="notification_inline_reply_failed">"** Nem sikerült elküldeni – nyissa meg a szobát"</string>
@@ -38,6 +39,7 @@
   <string name="notification_sender_me">"Én"</string>
   <string name="notification_sender_mention_reply">"%1$s megemlítette vagy válaszolt"</string>
   <string name="notification_test_push_notification_content">"Az értesítést nézi! Kattintson ide!"</string>
+  <string name="notification_thread_in_room">"Üzenetszál itt: %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">
@@ -64,7 +66,10 @@
   <string name="troubleshoot_notifications_test_blocked_users_title">"Letiltott felhasználók"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"A jelenlegi szolgáltató nevének lekérdezése."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nincs kiválasztva leküldéses értesítési szolgáltató."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Jelenlegi leküldéses értesítések szolgáltatója: %1$s és jelenlegi terjesztő: %2$s. De a terjesztő %3$s nem található. Lehet, hogy az alkalmazást eltávolították?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Jelenlegi leküldéses értesítések szolgáltatója: %1$s, de még nem konfiguráltak forgalmazókat."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Jelenlegi leküldéses értesítési szolgáltató: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Jelenlegi leküldéses értesítések szolgáltatója: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Jelenlegi leküldéses értesítési szolgáltató"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Győződjön meg arról, hogy az alkalmazás legalább egy leküldéses értesítési szolgáltatóval rendelkezik."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nem található leküldéses értesítési szolgáltató."</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 760d507e08..4baa46d5a9 100644
--- a/libraries/push/impl/src/main/res/values-in/translations.xml
+++ b/libraries/push/impl/src/main/res/values-in/translations.xml
@@ -48,6 +48,7 @@
   <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_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_success">"Penyedia notifikasi dorongan saat ini: %1$s."</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 07a85e9f42..9e44c2d7f9 100644
--- a/libraries/push/impl/src/main/res/values-it/translations.xml
+++ b/libraries/push/impl/src/main/res/values-it/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notifica"</item>
     <item quantity="other">"%d notifiche"</item>
   </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>
   <string name="notification_incoming_call">"📹 Chiamata in arrivo"</string>
   <string name="notification_inline_reply_failed">"** Invio fallito - si prega di aprire la stanza"</string>
@@ -36,8 +37,9 @@
   <string name="notification_room_invite_body">"Ti ha invitato ad entrare nella stanza"</string>
   <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 è stato menzionato o risposto"</string>
+  <string name="notification_sender_mention_reply">"%1$s ti ha menzionato o risposto"</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>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
@@ -54,9 +56,20 @@
   <string name="push_distributor_background_sync_android">"Sincronizzazione in background"</string>
   <string name="push_distributor_firebase_android">"Servizi Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Google Play Services non trovato. Le notifiche non funzioneranno bene."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Controllo degli utenti bloccati"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Visualizza gli utenti bloccati"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Nessun utente è bloccato."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Hai bloccato%1$d utente. Non riceverai notifiche da questo utente."</item>
+    <item quantity="other">"Hai bloccato%1$d utenti. Non riceverai notifiche da questi utenti."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Utenti bloccati"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Ottieni il nome del fornitore attuale."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nessun provider push selezionato."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Fornitore push attuale: %1$s e attuale distributore: %2$s Ma il distributore %3$s non viene trovato. Forse l\'applicazione è stata disinstallata?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Fornitore push attuale:%1$s , ma non è stato configurato alcun distributore."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Provider push attuale: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Fornitore push attuale: %1$s (%2$s )"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Provider push attuale"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Assicurati che l\'applicazione abbia almeno un fornitore push."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nessun provider push trovato."</string>
diff --git a/libraries/push/impl/src/main/res/values-ka/translations.xml b/libraries/push/impl/src/main/res/values-ka/translations.xml
index 3a0d626016..9cf2ddcab2 100644
--- a/libraries/push/impl/src/main/res/values-ka/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ka/translations.xml
@@ -47,6 +47,7 @@
   <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_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_success">"მიმდინარე push პროვაიდერი: %1$s."</string>
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 9c2aa8c710..c65b6c3388 100644
--- a/libraries/push/impl/src/main/res/values-ko/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ko/translations.xml
@@ -48,6 +48,7 @@
   <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_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>
diff --git a/libraries/push/impl/src/main/res/values-nb/translations.xml b/libraries/push/impl/src/main/res/values-nb/translations.xml
index 7f8cc41413..933b5b886b 100644
--- a/libraries/push/impl/src/main/res/values-nb/translations.xml
+++ b/libraries/push/impl/src/main/res/values-nb/translations.xml
@@ -38,6 +38,7 @@
   <string name="notification_sender_me">"Meg"</string>
   <string name="notification_sender_mention_reply">"%1$s nevnt eller besvart"</string>
   <string name="notification_test_push_notification_content">"Du ser på varselet! Klikk på meg!"</string>
+  <string name="notification_thread_in_room">"Tråd i %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">
@@ -64,6 +65,7 @@
   <string name="troubleshoot_notifications_test_blocked_users_title">"Blokkerte brukere"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Få navnet på den nåværende tilbyderen."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Ingen push-leverandører er valgt."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Nåværende push-leverandør: %1$s og nåværende distributør: %2$s. Men distributøren %3$s blir ikke funnet. Kanskje er applikasjonen  avinstallert?"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Nåværende push-leverandør: %1$s, men ingen distributører er konfigurert."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Gjeldende push-leverandør: %1$s."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Nåværende push-leverandør: %1$s (%2$s)"</string>
diff --git a/libraries/push/impl/src/main/res/values-nl/translations.xml b/libraries/push/impl/src/main/res/values-nl/translations.xml
index 833c6e7107..79244669e6 100644
--- a/libraries/push/impl/src/main/res/values-nl/translations.xml
+++ b/libraries/push/impl/src/main/res/values-nl/translations.xml
@@ -53,6 +53,7 @@
   <string name="push_distributor_background_sync_android">"Achtergrondsynchronisatie"</string>
   <string name="push_distributor_firebase_android">"Google-services"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Geen geldige Google Play-services gevonden. Meldingen werken mogelijk niet goed."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Geblokkeerde gebruikers"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Naam van de huidige provider aan het ophalen."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Er zijn geen push-providers geselecteerd."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Huidige push-provider: %1$s."</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 1525997b12..b9ae289507 100644
--- a/libraries/push/impl/src/main/res/values-pl/translations.xml
+++ b/libraries/push/impl/src/main/res/values-pl/translations.xml
@@ -60,9 +60,21 @@
   <string name="push_distributor_background_sync_android">"Synchronizacja w tle"</string>
   <string name="push_distributor_firebase_android">"Usługi Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Nie znaleziono usług Google Play. Powiadomienia mogą nie działać prawidłowo."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Sprawdzam zablokowanych użytkowników"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Wyświetl zablokowanych użytkowników"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Żaden użytkownik nie jest zablokowany."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Zablokowano %1$d użytkownika. Nie otrzymasz od niego żadnych powiadomień."</item>
+    <item quantity="few">"Zablokowano %1$d użytkowników. Nie otrzymasz od nich żadnych powiadomień."</item>
+    <item quantity="many">"Zablokowano %1$d użytkowników. Nie otrzymasz od nich żadnych powiadomień."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Zablokowani użytkownicy"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Uzyskaj nazwę bieżącego dostawcy."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nie wybrano dostawców push."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Aktualny dostawca usług push: %1$s, dystrybutor: %2$s. Nie znaleziono dystrybutora %3$s. Sprawdź czy aplikacja nie została usunięta."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Aktualny dostawca usługi push: %1$s, nie skonfigurowano żadnych dystrybutorów."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Bieżący dostawca push: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Aktualny dostawca usług push: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Bieżący dostawca push"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Upewnij się, że aplikacja ma co najmniej jednego dostawcę push."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nie znaleziono dostawców push."</string>
diff --git a/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml b/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml
index 6d2e96d82c..0e01d67105 100644
--- a/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/libraries/push/impl/src/main/res/values-pt-rBR/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notificação"</item>
     <item quantity="other">"%d notificações"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"O distribuidor de notificações do UnifiedPush não pôde ser cadastrado, então você não receberá mais notificações. Confira as configurações do app e o estado do distribuidor de push."</string>
   <string name="notification_fallback_content">"Você tem mensagens novas."</string>
   <string name="notification_incoming_call">"📹 Chamada recebida"</string>
   <string name="notification_inline_reply_failed">"** Falha ao enviar - por favor, abra a sala"</string>
@@ -37,7 +38,10 @@
   <string name="notification_room_invite_body_with_sender">"%1$s te convidou para entrar na sala"</string>
   <string name="notification_sender_me">"Eu"</string>
   <string name="notification_sender_mention_reply">"%1$s mencionado ou respondido"</string>
+  <string name="notification_space_invite_body">"Te convidou para entrar no espaço"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s te convidou para entrar no espaço"</string>
   <string name="notification_test_push_notification_content">"Você está visualizando a notificação! Clique em mim!"</string>
+  <string name="notification_thread_in_room">"Tópico em %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">
@@ -54,9 +58,20 @@
   <string name="push_distributor_background_sync_android">"Sincronização em segundo plano"</string>
   <string name="push_distributor_firebase_android">"Serviços do Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"O Google Play Services não foi encontrado. As notificações podem não funcionar corretamente."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Verificando usuários bloqueados"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Ver usuários bloqueados"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Nenhum usuário está bloqueado."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Você bloqueou %1$d usuário. Você não receberá notificações deste usuário."</item>
+    <item quantity="other">"Você bloqueou %1$d usuários. Você não receberá notificações deles."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Usuários bloqueados"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Obtenha o nome do provedor atual."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nenhum provedor de push foi selecionado."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Provedor de push atual: %1$s e distribuidor atual: %2$s. Mas o distribuidor %3$s não foi encontrado. Talvez o aplicativo foi desinstalado?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Provedor de push atual: %1$s, mas nenhum distribuidor foi configurado."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Provedor de push atual: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Provedor de push atual: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Provedor de push atual"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Certifique-se de que o aplicativo tenha suporte a pelo menos um provedor de push."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nenhum provedor de push com suporte foi encontrado."</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 7a5bcf2f06..0a83e6afad 100644
--- a/libraries/push/impl/src/main/res/values-ro/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ro/translations.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notificare"</item>
     <item quantity="other">"%d notificări"</item>
   </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>
   <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>
@@ -37,7 +38,10 @@
   <string name="notification_room_invite_body_with_sender">"%1$s v-a invitat să vă alăturați camerei"</string>
   <string name="notification_sender_me">"Eu"</string>
   <string name="notification_sender_mention_reply">"%1$s v-a menționat sau răspuns"</string>
+  <string name="notification_space_invite_body">"V-a invitat să vă alăturați spațiului"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s v-a invitat să vă alăturați spațiului"</string>
   <string name="notification_test_push_notification_content">"Vizualizați o notificare! Faceți clic pe mine!"</string>
+  <string name="notification_thread_in_room">"Fir în: %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-ru/translations.xml b/libraries/push/impl/src/main/res/values-ru/translations.xml
index 60a9d965f0..b2a79defce 100644
--- a/libraries/push/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ru/translations.xml
@@ -15,6 +15,7 @@
     <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_incoming_call">"📹 Входящий вызов"</string>
   <string name="notification_inline_reply_failed">"** Не удалось отправить - пожалуйста, откройте комнату"</string>
@@ -42,6 +43,7 @@
   <string name="notification_sender_me">"Я"</string>
   <string name="notification_sender_mention_reply">"%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">
diff --git a/libraries/push/impl/src/main/res/values-sk/translations.xml b/libraries/push/impl/src/main/res/values-sk/translations.xml
index 74ba29d78a..764dbefa70 100644
--- a/libraries/push/impl/src/main/res/values-sk/translations.xml
+++ b/libraries/push/impl/src/main/res/values-sk/translations.xml
@@ -15,6 +15,7 @@
     <item quantity="few">"%d oznámenia"</item>
     <item quantity="other">"%d oznámení"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Distribútora oznámení UnifiedPush sa nepodarilo zaregistrovať, takže už nebudete dostávať oznámenia. Skontrolujte nastavenia oznámení v aplikácii a stav distribútora push oznámení."</string>
   <string name="notification_fallback_content">"Máte nové správy."</string>
   <string name="notification_incoming_call">"📹 Prichádzajúci hovor"</string>
   <string name="notification_inline_reply_failed">"** Nepodarilo sa odoslať - prosím otvorte miestnosť"</string>
@@ -42,6 +43,7 @@
   <string name="notification_sender_me">"Ja"</string>
   <string name="notification_sender_mention_reply">"%1$s spomenul/a alebo odpovedal/a"</string>
   <string name="notification_test_push_notification_content">"Prezeráte si oznámenie! Kliknite na mňa!"</string>
+  <string name="notification_thread_in_room">"Vlákno v %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">
@@ -60,9 +62,21 @@
   <string name="push_distributor_background_sync_android">"Synchronizácia na pozadí"</string>
   <string name="push_distributor_firebase_android">"Služby Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Nenašli sa žiadne platné služby Google Play. Oznámenia nemusia fungovať správne."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Kontrola blokovaných používateľov"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Zobraziť blokovaných používateľov"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Žiadni používatelia nie sú blokovaní."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Zablokovali ste %1$d používateľa. Nebudete dostávať oznámenia od tohto používateľa."</item>
+    <item quantity="few">"Zablokovali ste %1$d používateľov. Nebudete dostávať oznámenia od týchto používateľov."</item>
+    <item quantity="other">"Zablokovali ste %1$d používateľov. Nebudete dostávať oznámenia od týchto používateľov."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Blokovaní používatelia"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Získaťe názov aktuálneho poskytovateľa."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Nie sú vybraní žiadni poskytovatelia push."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Aktuálny poskytovateľ push oznámení: %1$s a súčasný distribútor: %2$s. Ale distribútor %3$s sa nenašiel. Možno bola aplikácia odinštalovaná?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Aktuálny poskytovateľ push oznámení: %1$s, ale neboli nakonfigurovaní žiadni distribútori."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Aktuálny poskytovateľ push: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Aktuálny poskytovateľ push oznámení: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Aktuálny poskytovateľ push"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Uistite sa, že aplikácia má aspoň jedného poskytovateľa push."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Nenašli sa žiadni poskytovatelia push."</string>
diff --git a/libraries/push/impl/src/main/res/values-sv/translations.xml b/libraries/push/impl/src/main/res/values-sv/translations.xml
index aff078b2c0..9f978c253f 100644
--- a/libraries/push/impl/src/main/res/values-sv/translations.xml
+++ b/libraries/push/impl/src/main/res/values-sv/translations.xml
@@ -54,6 +54,7 @@
   <string name="push_distributor_background_sync_android">"Bakgrundssynkronisering"</string>
   <string name="push_distributor_firebase_android">"Google-tjänster"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Inga giltiga Google Play-tjänster hittades. Aviseringar kanske inte fungerar korrekt."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Blockerade användare"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Hämta namnet på den nuvarande leverantören."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Inga push-leverantörer valda."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Nuvarande push-leverantör: %1$s."</string>
diff --git a/libraries/push/impl/src/main/res/values-tr/translations.xml b/libraries/push/impl/src/main/res/values-tr/translations.xml
index a3c415a210..558c206749 100644
--- a/libraries/push/impl/src/main/res/values-tr/translations.xml
+++ b/libraries/push/impl/src/main/res/values-tr/translations.xml
@@ -54,6 +54,7 @@
   <string name="push_distributor_background_sync_android">"Arkaplan senkronizasyonu"</string>
   <string name="push_distributor_firebase_android">"Google Hizmetleri"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Geçerli bir Google Play Hizmeti bulunamadı. Bildirimler düzgün çalışmayabilir."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Engellenen kullanıcılar"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Geçerli sağlayıcının adını al."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Hiçbir gönderme sağlayıcısı seçilmedi."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Geçerli gönderme sağlayıcısı: %1$s."</string>
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 1aa535b1e2..43ca0faaca 100644
--- a/libraries/push/impl/src/main/res/values-uk/translations.xml
+++ b/libraries/push/impl/src/main/res/values-uk/translations.xml
@@ -60,6 +60,7 @@
   <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_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_success">"Поточний постачальник: %1$s."</string>
diff --git a/libraries/push/impl/src/main/res/values-ur/translations.xml b/libraries/push/impl/src/main/res/values-ur/translations.xml
index 40a54ab313..8f358b1616 100644
--- a/libraries/push/impl/src/main/res/values-ur/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ur/translations.xml
@@ -54,6 +54,7 @@
   <string name="push_distributor_background_sync_android">"پس منظر مطابقت پذیری"</string>
   <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>
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 4a9e4bffbc..e967b47d34 100644
--- a/libraries/push/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/push/impl/src/main/res/values-uz/translations.xml
@@ -54,6 +54,7 @@
   <string name="push_distributor_background_sync_android">"Orqa Fon sinxronizatsiyasi"</string>
   <string name="push_distributor_firebase_android">"Google xizmatlari"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Yaroqli Google Play xizmatlari topilmadi. Bildirishnomalar to\'g\'ri ishlamasligi mumkin."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Bloklangan foydalanuvchilar"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Joriy provayder nomini oling."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Hech qanday push-provayder tanlanmagan."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Joriy push provider: %1$s."</string>
@@ -64,6 +65,7 @@
     <item quantity="one">"Topildi %1$d push provider: %2$s"</item>
     <item quantity="other">"Topildi %1$d push provayderlar: %2$s"</item>
   </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"Ilova quyidagilar uchun yaratilgan: %1$s"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_title">"Provayderni qoʻllab-quvvatlash"</string>
   <string name="troubleshoot_notifications_test_display_notification_description">"Ilova bildirishnomani koʻrsata olishini tekshiring."</string>
   <string name="troubleshoot_notifications_test_display_notification_failure">"Bildirishnoma bosilmagan."</string>
@@ -76,4 +78,5 @@
   <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"Xato: %1$s."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"Xatolik, push qilishni sinab bo‘lmadi."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"Xatolik, taym aut pushni kutmoqda."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"Test Push loop back"</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 91a73c678f..2d289e9a9e 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
@@ -11,6 +11,7 @@
   <plurals name="notification_compat_summary_title">
     <item quantity="other">"%d 個通知"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Unified Push 通知散佈程式註冊失敗，因此您無法再收到通知。請檢查應用程式的通知設定與推播散佈程式的狀態。"</string>
   <string name="notification_fallback_content">"您有新訊息。"</string>
   <string name="notification_incoming_call">"📹 來電"</string>
   <string name="notification_inline_reply_failed">"** 無法傳送，請開啟聊天室"</string>
@@ -34,6 +35,7 @@
   <string name="notification_sender_me">"我"</string>
   <string name="notification_sender_mention_reply">"%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">
@@ -48,9 +50,19 @@
   <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>
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 2fe8d3e4c7..3f2bd7e836 100644
--- a/libraries/push/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh/translations.xml
@@ -34,6 +34,7 @@
   <string name="notification_sender_me">"我"</string>
   <string name="notification_sender_mention_reply">"%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">
@@ -48,12 +49,19 @@
   <string name="push_distributor_background_sync_android">"后台同步"</string>
   <string name="push_distributor_firebase_android">"谷歌服务"</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>
diff --git a/libraries/push/impl/src/main/res/values/localazy.xml b/libraries/push/impl/src/main/res/values/localazy.xml
index 45a3235ad5..aac5c6c72b 100644
--- a/libraries/push/impl/src/main/res/values/localazy.xml
+++ b/libraries/push/impl/src/main/res/values/localazy.xml
@@ -13,6 +13,7 @@
     <item quantity="one">"%d notification"</item>
     <item quantity="other">"%d notifications"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"The UnifiedPush notification distributor couldn\'t be registered, so you will not receive notifications anymore. Please check the notifications settings of the app and the status of the push distributor."</string>
   <string name="notification_fallback_content">"You have new messages."</string>
   <string name="notification_incoming_call">"📹 Incoming call"</string>
   <string name="notification_inline_reply_failed">"** Failed to send - please open room"</string>
@@ -37,7 +38,10 @@
   <string name="notification_room_invite_body_with_sender">"%1$s invited you to join the room"</string>
   <string name="notification_sender_me">"Me"</string>
   <string name="notification_sender_mention_reply">"%1$s mentioned or replied"</string>
+  <string name="notification_space_invite_body">"Invited you to join the space"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s invited you to join the space"</string>
   <string name="notification_test_push_notification_content">"You are viewing the notification! Click me!"</string>
+  <string name="notification_thread_in_room">"Thread in %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">
@@ -51,7 +55,7 @@
     <item quantity="one">"%d room"</item>
     <item quantity="other">"%d rooms"</item>
   </plurals>
-  <string name="push_distributor_background_sync_android">"Background synchronization"</string>
+  <string name="push_distributor_background_sync_android">"Background synchronisation"</string>
   <string name="push_distributor_firebase_android">"Google Services"</string>
   <string name="push_no_valid_google_play_services_apk_android">"No valid Google Play Services found. Notifications may not work properly."</string>
   <string name="troubleshoot_notifications_test_blocked_users_description">"Checking blocked users"</string>
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPushServiceTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPushServiceTest.kt
index 5ae8ab261e..f48b7ee612 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPushServiceTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPushServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,15 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
 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_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
 import io.element.android.libraries.push.api.GetCurrentPushProvider
+import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import io.element.android.libraries.push.impl.push.FakeMutableBatteryOptimizationStore
 import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore
@@ -24,12 +28,14 @@ import io.element.android.libraries.push.impl.store.InMemoryPushDataStore
 import io.element.android.libraries.push.impl.store.PushDataStore
 import io.element.android.libraries.push.impl.test.FakeTestPush
 import io.element.android.libraries.push.impl.test.TestPush
+import io.element.android.libraries.push.impl.unregistration.FakeServiceUnregisteredHandler
+import io.element.android.libraries.push.impl.unregistration.ServiceUnregisteredHandler
 import io.element.android.libraries.push.test.FakeGetCurrentPushProvider
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 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.pushproviders.test.aCurrentUserPushConfig
+import io.element.android.libraries.pushproviders.test.aSessionPushConfig
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecretStore
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStore
@@ -37,6 +43,7 @@ import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushSto
 import io.element.android.libraries.pushstore.test.userpushstore.clientsecret.InMemoryPushClientSecretStore
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
 import io.element.android.libraries.sessionstorage.test.observer.NoOpSessionObserver
+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 kotlinx.coroutines.flow.first
@@ -47,7 +54,7 @@ class DefaultPushServiceTest {
     @Test
     fun `test push no push provider`() = runTest {
         val defaultPushService = createDefaultPushService()
-        assertThat(defaultPushService.testPush()).isFalse()
+        assertThat(defaultPushService.testPush(A_SESSION_ID)).isFalse()
     }
 
     @Test
@@ -57,22 +64,22 @@ class DefaultPushServiceTest {
             pushProviders = setOf(aPushProvider),
             getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider = aPushProvider.name),
         )
-        assertThat(defaultPushService.testPush()).isFalse()
+        assertThat(defaultPushService.testPush(A_SESSION_ID)).isFalse()
     }
 
     @Test
     fun `test push ok`() = runTest {
-        val aConfig = aCurrentUserPushConfig()
-        val testPushResult = lambdaRecorder<CurrentUserPushConfig, Unit> { }
+        val aConfig = aSessionPushConfig()
+        val testPushResult = lambdaRecorder<Config, Unit> { }
         val aPushProvider = FakePushProvider(
-            currentUserPushConfig = aConfig
+            config = aConfig
         )
         val defaultPushService = createDefaultPushService(
             pushProviders = setOf(aPushProvider),
             getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider = aPushProvider.name),
             testPush = FakeTestPush(executeResult = testPushResult),
         )
-        assertThat(defaultPushService.testPush()).isTrue()
+        assertThat(defaultPushService.testPush(A_SESSION_ID)).isTrue()
         testPushResult.assertions()
             .isCalledOnce()
             .with(value(aConfig))
@@ -81,7 +88,7 @@ class DefaultPushServiceTest {
     @Test
     fun `getCurrentPushProvider null`() = runTest {
         val defaultPushService = createDefaultPushService()
-        val result = defaultPushService.getCurrentPushProvider()
+        val result = defaultPushService.getCurrentPushProvider(A_SESSION_ID)
         assertThat(result).isNull()
     }
 
@@ -92,7 +99,7 @@ class DefaultPushServiceTest {
             pushProviders = setOf(aPushProvider),
             getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider = aPushProvider.name),
         )
-        val result = defaultPushService.getCurrentPushProvider()
+        val result = defaultPushService.getCurrentPushProvider(A_SESSION_ID)
         assertThat(result).isEqualTo(aPushProvider)
     }
 
@@ -248,7 +255,7 @@ class DefaultPushServiceTest {
             ),
             pushClientSecretStore = pushClientSecretStore,
         )
-        defaultPushService.onSessionDeleted(A_SESSION_ID.value)
+        defaultPushService.onSessionDeleted(A_SESSION_ID.value, false)
         assertThat(userPushStore.getPushProviderName()).isNull()
         assertThat(pushClientSecretStore.getSecret(A_SESSION_ID)).isNull()
         onSessionDeletedLambda.assertions().isCalledOnce().with(value(A_SESSION_ID))
@@ -268,7 +275,7 @@ class DefaultPushServiceTest {
             ),
             pushClientSecretStore = pushClientSecretStore,
         )
-        defaultPushService.onSessionDeleted(A_SESSION_ID.value)
+        defaultPushService.onSessionDeleted(A_SESSION_ID.value, false)
         assertThat(userPushStore.getPushProviderName()).isNull()
         assertThat(pushClientSecretStore.getSecret(A_SESSION_ID)).isNull()
     }
@@ -336,6 +343,281 @@ class DefaultPushServiceTest {
         }
     }
 
+    @Test
+    fun `ensurePusher - error when account is not verified`() = runTest {
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.NotVerified
+        )
+        val pushService = createDefaultPushService()
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.exceptionOrNull()!!).isInstanceOf(PusherRegistrationFailure.AccountNotVerified::class.java)
+    }
+
+    @Test
+    fun `ensurePusher - case two push providers but first one does not have distributor - second one will be used`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val pushProvider0 = FakePushProvider(
+            index = 0,
+            name = "aFakePushProvider0",
+            distributors = emptyList(),
+        )
+        val distributor = Distributor("aDistributorValue1", "aDistributorName1")
+        val pushProvider1 = FakePushProvider(
+            index = 1,
+            name = "aFakePushProvider1",
+            distributors = listOf(distributor),
+            registerWithResult = lambda,
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(
+                pushProvider0,
+                pushProvider1,
+            ),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.isSuccess).isTrue()
+        lambda.assertions().isCalledOnce()
+            .with(
+                // MatrixClient
+                any(),
+                // First distributor of second push provider
+                value(distributor),
+            )
+    }
+
+    @Test
+    fun `ensurePusher - case one push provider but no distributor available`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val pushProvider = FakePushProvider(
+            index = 0,
+            name = "aFakePushProvider",
+            distributors = emptyList(),
+            registerWithResult = lambda,
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(pushProvider),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.exceptionOrNull()).isInstanceOf(PusherRegistrationFailure.NoDistributorsAvailable::class.java)
+        lambda.assertions().isNeverCalled()
+    }
+
+    @Test
+    fun `ensurePusher - ensure default pusher is registered with default provider`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(
+                FakePushProvider(
+                    index = 0,
+                    name = "aFakePushProvider",
+                    distributors = listOf(Distributor("aDistributorValue0", "aDistributorName0")),
+                    registerWithResult = lambda,
+                )
+            ),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.isSuccess).isTrue()
+        lambda.assertions()
+            .isCalledOnce()
+            .with(
+                // MatrixClient
+                any(),
+                // First distributor
+                value(pushService.getAvailablePushProviders()[0].getDistributors()[0]),
+            )
+    }
+
+    @Test
+    fun `ensurePusher - ensure default pusher is registered with default provider - fail to register`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.failure(AN_EXCEPTION)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(
+                FakePushProvider(
+                    index = 0,
+                    name = "aFakePushProvider",
+                    distributors = listOf(Distributor("aDistributorValue0", "aDistributorName0")),
+                    registerWithResult = lambda,
+                )
+            ),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.isFailure).isTrue()
+        lambda.assertions()
+            .isCalledOnce()
+            .with(
+                // MatrixClient
+                any(),
+                // First distributor
+                value(pushService.getAvailablePushProviders()[0].getDistributors()[0]),
+            )
+    }
+
+    @Test
+    fun `ensurePusher - if current push provider does not have distributors, nothing happen`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val pushProvider = FakePushProvider(
+            index = 0,
+            name = "aFakePushProvider0",
+            distributors = emptyList(),
+            registerWithResult = lambda,
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(pushProvider),
+            getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider = pushProvider.name),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.exceptionOrNull())
+            .isInstanceOf(PusherRegistrationFailure.NoDistributorsAvailable::class.java)
+        lambda.assertions()
+            .isNeverCalled()
+    }
+
+    @Test
+    fun `ensurePusher - ensure current provider is registered with current distributor`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val distributor = Distributor("aDistributorValue1", "aDistributorName1")
+        val pushProvider = FakePushProvider(
+            index = 0,
+            name = "aFakePushProvider0",
+            distributors = listOf(
+                Distributor("aDistributorValue0", "aDistributorName0"),
+                distributor,
+            ),
+            currentDistributor = { distributor },
+            registerWithResult = lambda,
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(pushProvider),
+            getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider = pushProvider.name),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.isSuccess).isTrue()
+        lambda.assertions()
+            .isCalledOnce()
+            .with(
+                // MatrixClient
+                any(),
+                // Current distributor
+                value(distributor),
+            )
+    }
+
+    @Test
+    fun `ensurePusher - case no push provider available provider`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(SessionVerifiedStatus.Verified)
+        val pushService = createDefaultPushService(
+            pushProviders = emptySet(),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.exceptionOrNull())
+            .isInstanceOf(PusherRegistrationFailure.NoProvidersAvailable::class.java)
+        lambda.assertions()
+            .isNeverCalled()
+    }
+
+    @Test
+    fun `ensurePusher - if current push provider does not have current distributor, the first one is used`() = runTest {
+        val lambda = lambdaRecorder<MatrixClient, Distributor, Result<Unit>> { _, _ ->
+            Result.success(Unit)
+        }
+        val sessionVerificationService = FakeSessionVerificationService(
+            initialSessionVerifiedStatus = SessionVerifiedStatus.Verified
+        )
+        val pushProvider = FakePushProvider(
+            index = 0,
+            name = "aFakePushProvider0",
+            distributors = listOf(
+                Distributor("aDistributorValue0", "aDistributorName0"),
+                Distributor("aDistributorValue1", "aDistributorName1"),
+            ),
+            currentDistributor = { null },
+            registerWithResult = lambda,
+        )
+        val pushService = createDefaultPushService(
+            pushProviders = setOf(pushProvider),
+            getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider = pushProvider.name),
+        )
+        val result = pushService.ensurePusherIsRegistered(
+            FakeMatrixClient(
+                sessionVerificationService = sessionVerificationService,
+            )
+        )
+        assertThat(result.isSuccess).isTrue()
+        lambda.assertions()
+            .isCalledOnce()
+            .with(
+                // MatrixClient
+                any(),
+                // First distributor
+                value(pushService.getAvailablePushProviders()[0].getDistributors()[0]),
+            )
+    }
+
     private fun createDefaultPushService(
         testPush: TestPush = FakeTestPush(),
         userPushStoreFactory: UserPushStoreFactory = FakeUserPushStoreFactory(),
@@ -345,6 +627,7 @@ class DefaultPushServiceTest {
         pushClientSecretStore: PushClientSecretStore = InMemoryPushClientSecretStore(),
         pushDataStore: PushDataStore = InMemoryPushDataStore(),
         mutableBatteryOptimizationStore: MutableBatteryOptimizationStore = FakeMutableBatteryOptimizationStore(),
+        serviceUnregisteredHandler: ServiceUnregisteredHandler = FakeServiceUnregisteredHandler(),
     ): DefaultPushService {
         return DefaultPushService(
             testPush = testPush,
@@ -355,6 +638,7 @@ class DefaultPushServiceTest {
             pushClientSecretStore = pushClientSecretStore,
             pushDataStore = pushDataStore,
             mutableBatteryOptimizationStore = mutableBatteryOptimizationStore,
+            serviceUnregisteredHandler = serviceUnregisteredHandler,
         )
     }
 }
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 63ffdef7f0..dd2cb24841 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e3a28550ca..dd1dd7b74d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt
index d5dd7c48d4..d3b2c8da2b 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt
index 0adb3d2520..ae3bfed638 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/FakeBatteryOptimization.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/history/FakePushHistoryService.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/history/FakePushHistoryService.kt
index 50a06756dc..aac8f8f26d 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/history/FakePushHistoryService.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/history/FakePushHistoryService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0f65047a14..573ec37471 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ 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_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.mockk.every
 import io.mockk.mockk
@@ -43,7 +45,7 @@ class DefaultActiveNotificationsProviderTest {
     @Test
     fun `getMembershipNotificationsForSession returns only membership notifications for that session id`() {
         val activeNotifications = listOf(
-            aStatusBarNotification(id = notificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID), groupId = A_SESSION_ID.value,),
+            aStatusBarNotification(id = notificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID), groupId = A_SESSION_ID.value),
             aStatusBarNotification(id = notificationIdProvider.getSummaryNotificationId(A_SESSION_ID_2), groupId = A_SESSION_ID_2.value),
             aStatusBarNotification(
                 id = notificationIdProvider.getRoomInvitationNotificationId(A_SESSION_ID_2),
@@ -80,8 +82,35 @@ class DefaultActiveNotificationsProviderTest {
         )
         val activeNotificationsProvider = createActiveNotificationsProvider(activeNotifications = activeNotifications)
 
-        assertThat(activeNotificationsProvider.getMessageNotificationsForRoom(A_SESSION_ID, A_ROOM_ID)).hasSize(1)
-        assertThat(activeNotificationsProvider.getMessageNotificationsForRoom(A_SESSION_ID_2, A_ROOM_ID_2)).isEmpty()
+        assertThat(activeNotificationsProvider.getMessageNotificationsForRoom(A_SESSION_ID, A_ROOM_ID, null)).hasSize(1)
+        assertThat(activeNotificationsProvider.getMessageNotificationsForRoom(A_SESSION_ID_2, A_ROOM_ID_2, null)).isEmpty()
+    }
+
+    @Test
+    fun `getMessageNotificationsForRoom with thread id returns only message notifications for a thread using those session and room ids`() {
+        val activeNotifications = listOf(
+            aStatusBarNotification(
+                id = notificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID),
+                groupId = A_SESSION_ID.value,
+                tag = "$A_ROOM_ID|$A_THREAD_ID",
+            ),
+            aStatusBarNotification(id = notificationIdProvider.getSummaryNotificationId(A_SESSION_ID), groupId = A_SESSION_ID.value, tag = A_ROOM_ID.value),
+            aStatusBarNotification(
+                id = notificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID_2),
+                groupId = A_SESSION_ID_2.value,
+                tag = "$A_ROOM_ID|$A_THREAD_ID",
+            ),
+            aStatusBarNotification(id = notificationIdProvider.getSummaryNotificationId(A_SESSION_ID_2), groupId = A_SESSION_ID_2.value, tag = A_ROOM_ID.value),
+            aStatusBarNotification(
+                id = notificationIdProvider.getRoomInvitationNotificationId(A_SESSION_ID_2),
+                groupId = A_SESSION_ID_2.value,
+                tag = "$A_ROOM_ID|$A_THREAD_ID",
+            ),
+        )
+        val activeNotificationsProvider = createActiveNotificationsProvider(activeNotifications = activeNotifications)
+
+        assertThat(activeNotificationsProvider.getMessageNotificationsForRoom(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID)).hasSize(1)
+        assertThat(activeNotificationsProvider.getMessageNotificationsForRoom(A_SESSION_ID_2, A_ROOM_ID_2, A_THREAD_ID)).isEmpty()
     }
 
     @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 ba4e1657a7..542608254a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,11 +19,13 @@ import io.element.android.libraries.matrix.test.A_TIMESTAMP
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.matrix.ui.media.test.FakeImageLoader
+import io.element.android.libraries.matrix.ui.media.test.FakeInitialsAvatarBitmapGenerator
 import io.element.android.libraries.push.impl.notifications.factories.MARK_AS_READ_ACTION_TITLE
 import io.element.android.libraries.push.impl.notifications.factories.QUICK_REPLY_ACTION_TITLE
+import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.factories.createNotificationCreator
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
 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
@@ -43,21 +46,22 @@ class DefaultBaseRoomGroupMessageCreatorTest {
         val sut = createRoomGroupMessageCreator()
         val fakeImageLoader = FakeImageLoader()
         val result = sut.createRoomMessage(
-            currentUser = aMatrixUser(),
+            notificationAccountParams = aNotificationAccountParams(),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP).copy(
                     imageUriString = "aUri",
                 )
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
+            threadId = null,
         )
         assertThat(result.number).isEqualTo(1)
         @Suppress("DEPRECATION")
         assertThat(result.priority).isEqualTo(NotificationCompat.PRIORITY_LOW)
         assertThat(result.`when`).isEqualTo(A_TIMESTAMP)
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -65,19 +69,20 @@ class DefaultBaseRoomGroupMessageCreatorTest {
         val sut = createRoomGroupMessageCreator()
         val fakeImageLoader = FakeImageLoader()
         val result = sut.createRoomMessage(
-            currentUser = aMatrixUser(),
+            notificationAccountParams = aNotificationAccountParams(),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP).copy(
                     noisy = true,
                 )
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
+            threadId = null,
         )
         @Suppress("DEPRECATION")
         assertThat(result.priority).isEqualTo(NotificationCompat.PRIORITY_DEFAULT)
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -125,9 +130,11 @@ class DefaultBaseRoomGroupMessageCreatorTest {
             sdkIntProvider = FakeBuildVersionSdkIntProvider(api)
         )
         val result = sut.createRoomMessage(
-            currentUser = aMatrixUser(
-                // Some user avatar
-                avatarUrl = A_USER_AVATAR_1,
+            notificationAccountParams = aNotificationAccountParams(
+                user = aMatrixUser(
+                    // Some user avatar
+                    avatarUrl = A_USER_AVATAR_1,
+                )
             ),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP).copy(
@@ -136,11 +143,12 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 )
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
+            threadId = null,
         )
         assertThat(result.number).isEqualTo(1)
-        assertThat(fakeImageLoader.getCoilRequests()).containsExactlyElementsIn(expectedCoilRequests)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).containsExactlyElementsIn(expectedCoilRequests)
     }
 
     @Test
@@ -148,14 +156,15 @@ class DefaultBaseRoomGroupMessageCreatorTest {
         val sut = createRoomGroupMessageCreator()
         val fakeImageLoader = FakeImageLoader()
         val result = sut.createRoomMessage(
-            currentUser = aMatrixUser(),
+            notificationAccountParams = aNotificationAccountParams(),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP),
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP + 10),
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
+            threadId = null,
         )
         assertThat(result.number).isEqualTo(2)
         assertThat(result.`when`).isEqualTo(A_TIMESTAMP + 10)
@@ -166,7 +175,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 QUICK_REPLY_ACTION_TITLE.takeIf { NotificationConfig.SHOW_QUICK_REPLY_ACTION },
             )
         )
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -174,7 +183,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
         val sut = createRoomGroupMessageCreator()
         val fakeImageLoader = FakeImageLoader()
         val result = sut.createRoomMessage(
-            currentUser = aMatrixUser(),
+            notificationAccountParams = aNotificationAccountParams(),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP).copy(
                     outGoingMessage = true,
@@ -182,8 +191,9 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 ),
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
+            threadId = null,
         )
         val actionTitles = result.actions?.map { it.title }
         assertThat(actionTitles).isEqualTo(
@@ -191,7 +201,7 @@ class DefaultBaseRoomGroupMessageCreatorTest {
                 MARK_AS_READ_ACTION_TITLE.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION }
             )
         )
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -199,19 +209,20 @@ class DefaultBaseRoomGroupMessageCreatorTest {
         val sut = createRoomGroupMessageCreator()
         val fakeImageLoader = FakeImageLoader()
         val result = sut.createRoomMessage(
-            currentUser = aMatrixUser(),
+            notificationAccountParams = aNotificationAccountParams(),
             events = listOf(
                 aNotifiableMessageEvent(timestamp = A_TIMESTAMP).copy(
                     roomIsDm = true,
                 ),
             ),
             roomId = A_ROOM_ID,
-            imageLoader = fakeImageLoader.getImageLoader(),
+            imageLoader = fakeImageLoader,
             existingNotification = null,
+            threadId = null,
         )
         assertThat(result.number).isEqualTo(1)
         assertThat(result.`when`).isEqualTo(A_TIMESTAMP)
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 }
 
@@ -222,6 +233,7 @@ fun createRoomGroupMessageCreator(
     val bitmapLoader = DefaultNotificationBitmapLoader(
         context = RuntimeEnvironment.getApplication(),
         sdkIntProvider = sdkIntProvider,
+        initialsAvatarBitmapGenerator = FakeInitialsAvatarBitmapGenerator(),
     )
     return DefaultRoomGroupMessageCreator(
         notificationCreator = createNotificationCreator(bitmapLoader = bitmapLoader),
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultCallNotificationEventResolverTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultCallNotificationEventResolverTest.kt
index f9097752f1..f406bccbb4 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultCallNotificationEventResolverTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultCallNotificationEventResolverTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 25e6b92b16..58f97e55cb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.libraries.push.impl.notifications
 
 import android.content.Context
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.exception.NotificationResolverException
 import io.element.android.libraries.matrix.api.media.MediaSource
@@ -36,6 +38,7 @@ import io.element.android.libraries.matrix.test.A_REDACTION_REASON
 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.A_SESSION_ID
+import io.element.android.libraries.matrix.test.A_SPACE_NAME
 import io.element.android.libraries.matrix.test.A_TIMESTAMP
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_NAME_2
@@ -44,6 +47,7 @@ import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.notification.FakeNotificationService
 import io.element.android.libraries.matrix.test.notification.aNotificationData
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
+import io.element.android.libraries.push.api.push.NotificationEventRequest
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationMediaRepo
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
@@ -471,6 +475,45 @@ class DefaultNotifiableEventResolverTest {
         assertThat(result.getEvent(request)).isEqualTo(Result.success(expectedResult))
     }
 
+    @Test
+    fun `resolve invite space`() = runTest {
+        val sut = createDefaultNotifiableEventResolver(
+            notificationResult = Result.success(
+                mapOf(
+                    AN_EVENT_ID to Result.success(aNotificationData(
+                        content = NotificationContent.Invite(
+                            senderId = A_USER_ID_2,
+                        ),
+                        roomDisplayName = A_SPACE_NAME,
+                        isDirect = false,
+                        isSpace = true,
+                    ))
+                )
+            )
+        )
+        val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, "firebase")
+        val result = sut.resolveEvents(A_SESSION_ID, listOf(request))
+        val expectedResult = ResolvedPushEvent.Event(
+            InviteNotifiableEvent(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID,
+                eventId = AN_EVENT_ID,
+                editedEventId = null,
+                canBeReplaced = true,
+                roomName = A_SPACE_NAME,
+                noisy = false,
+                title = null,
+                description = "Bob invited you to join the space",
+                type = null,
+                timestamp = A_TIMESTAMP,
+                soundName = null,
+                isRedacted = false,
+                isUpdated = false,
+            )
+        )
+        assertThat(result.getEvent(request)).isEqualTo(Result.success(expectedResult))
+    }
+
     @Test
     fun `resolve invite direct`() = runTest {
         val sut = createDefaultNotifiableEventResolver(
@@ -853,7 +896,8 @@ class DefaultNotifiableEventResolverTest {
             fallbackNotificationFactory = FallbackNotificationFactory(
                 clock = FakeSystemClock(),
                 stringProvider = FakeStringProvider(defaultResult = "You have new messages.")
-            )
+            ),
+            featureFlagService = FakeFeatureFlagService(),
         )
     }
 }
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 07702602e8..58bb86e683 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
@@ -1,16 +1,18 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.app.Notification
-import androidx.core.app.NotificationManagerCompat
+import androidx.compose.ui.graphics.Color
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.test.AN_AVATAR_URL
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.features.enterprise.test.FakeEnterpriseService
 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
@@ -19,13 +21,17 @@ import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.matrix.ui.media.test.FakeImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
+import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
+import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.fake.FakeRoomGroupMessageCreator
 import io.element.android.libraries.push.impl.notifications.fake.FakeSummaryGroupMessageCreator
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.services.appnavstate.api.AppNavigationState
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import io.element.android.services.appnavstate.api.NavigationState
@@ -37,25 +43,19 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 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.RuntimeEnvironment
 
 @OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(RobolectricTestRunner::class)
 class DefaultNotificationDrawerManagerTest {
     @Test
     fun `clearAllEvents should have no effect when queue is empty`() = runTest {
         val defaultNotificationDrawerManager = createDefaultNotificationDrawerManager()
         defaultNotificationDrawerManager.clearAllEvents(A_SESSION_ID)
-        defaultNotificationDrawerManager.destroy()
     }
 
     @Test
@@ -63,8 +63,8 @@ class DefaultNotificationDrawerManagerTest {
         // For now just call all the API. Later, add more valuable tests.
         val matrixUser = aMatrixUser(id = A_SESSION_ID.value, displayName = "alice", avatarUrl = "mxc://data")
         val mockRoomGroupMessageCreator = FakeRoomGroupMessageCreator(
-            createRoomMessageResult = lambdaRecorder { user, _, roomId, _, existingNotification ->
-                assertThat(user).isEqualTo(matrixUser)
+            createRoomMessageResult = lambdaRecorder { notificationAccountParams, _, roomId, _, _, existingNotification ->
+                assertThat(notificationAccountParams.user).isEqualTo(matrixUser)
                 assertThat(roomId).isEqualTo(A_ROOM_ID)
                 assertThat(existingNotification).isNull()
                 Notification()
@@ -87,7 +87,6 @@ class DefaultNotificationDrawerManagerTest {
         defaultNotificationDrawerManager.onNotifiableEventReceived(aNotifiableMessageEvent())
         // Add the same Event again (will be ignored)
         defaultNotificationDrawerManager.onNotifiableEventReceived(aNotifiableMessageEvent())
-        defaultNotificationDrawerManager.destroy()
     }
 
     @Test
@@ -100,7 +99,7 @@ class DefaultNotificationDrawerManagerTest {
             )
         )
         val appNavigationStateService = FakeAppNavigationStateService(appNavigationState = appNavigationStateFlow)
-        val defaultNotificationDrawerManager = createDefaultNotificationDrawerManager(
+        createDefaultNotificationDrawerManager(
             appNavigationStateService = appNavigationStateService
         )
         appNavigationStateFlow.emit(AppNavigationState(aNavigationState(), isInForeground = true))
@@ -116,17 +115,22 @@ class DefaultNotificationDrawerManagerTest {
         // Like a user sign out
         appNavigationStateFlow.emit(AppNavigationState(aNavigationState(), isInForeground = true))
         runCurrent()
-        defaultNotificationDrawerManager.destroy()
     }
 
     @Test
-    fun `when MatrixClient has no cached user name a fallback one is used to render the notification`() = runTest {
-        val matrixClient = FakeMatrixClient(userDisplayName = null)
+    fun `when MatrixClient has no cached user name and avatar, the profile is loaded to render the notification`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            userDisplayName = null,
+            userAvatarUrl = null,
+        )
         val matrixClientProvider = FakeMatrixClientProvider(getClient = { Result.success(matrixClient) })
         val messageCreator = FakeRoomGroupMessageCreator()
         val defaultNotificationDrawerManager = createDefaultNotificationDrawerManager(
             matrixClientProvider = matrixClientProvider,
             roomGroupMessageCreator = messageCreator,
+            enterpriseService = FakeEnterpriseService(
+                initialBrandColor = Color.Red,
+            )
         )
         // Gets a display name from MatrixClient.getUserProfile
         matrixClient.givenGetProfileResult(A_SESSION_ID, Result.success(aMatrixUser(id = A_SESSION_ID.value, displayName = "alice")))
@@ -143,20 +147,41 @@ class DefaultNotificationDrawerManagerTest {
         messageCreator.createRoomMessageResult.assertions()
             .isCalledExactly(3)
             .withSequence(
-                listOf(value(aMatrixUser(id = A_SESSION_ID.value, displayName = "alice")), any(), any(), any(), any()),
-                listOf(value(aMatrixUser(id = A_SESSION_ID.value, displayName = A_SESSION_ID.value)), any(), any(), any(), any()),
-                listOf(value(aMatrixUser(id = A_SESSION_ID.value, displayName = A_SESSION_ID.value, avatarUrl = AN_AVATAR_URL)), any(), any(), any(), any()),
+                listOf(
+                    value(aNotificationAccountParams(user = aMatrixUser(id = A_SESSION_ID.value, displayName = "alice"))),
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                ),
+                listOf(
+                    value(aNotificationAccountParams(user = aMatrixUser(id = A_SESSION_ID.value, displayName = ""))),
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                ),
+                listOf(
+                    value(aNotificationAccountParams(user = aMatrixUser(id = A_SESSION_ID.value, displayName = null, avatarUrl = null))),
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                ),
             )
-
-        defaultNotificationDrawerManager.destroy()
     }
 
     @Test
     fun `clearSummaryNotificationIfNeeded will run after clearing all other notifications`() = runTest {
-        val notificationManager = mockk<NotificationManagerCompat> {
-            every { cancel(any(), any()) } returns Unit
-        }
+        val cancelNotificationResult = lambdaRecorder<String?, Int, Unit> { _, _ -> }
+        val notificationDisplayer = FakeNotificationDisplayer(
+            cancelNotificationResult = cancelNotificationResult,
+        )
         val summaryId = NotificationIdProvider.getSummaryNotificationId(A_SESSION_ID)
+        val roomMessageId = NotificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID)
         val activeNotificationsProvider = FakeActiveNotificationsProvider(
             getSummaryNotificationResult = {
                 mockk {
@@ -166,7 +191,7 @@ class DefaultNotificationDrawerManagerTest {
             countResult = { 1 },
         )
         val defaultNotificationDrawerManager = createDefaultNotificationDrawerManager(
-            notificationManager = notificationManager,
+            notificationDisplayer = notificationDisplayer,
             activeNotificationsProvider = activeNotificationsProvider,
         )
 
@@ -174,24 +199,26 @@ class DefaultNotificationDrawerManagerTest {
         defaultNotificationDrawerManager.clearAllMessagesEvents(A_SESSION_ID)
 
         // Verify we asked to cancel the notification with summaryId
-        verify { notificationManager.cancel(null, summaryId) }
-
-        defaultNotificationDrawerManager.destroy()
+        cancelNotificationResult.assertions().isCalledExactly(2).withSequence(
+            listOf(value(null), value(roomMessageId)),
+            listOf(value(null), value(summaryId)),
+        )
     }
 
     private fun TestScope.createDefaultNotificationDrawerManager(
-        notificationManager: NotificationManagerCompat = NotificationManagerCompat.from(RuntimeEnvironment.getApplication()),
+        notificationDisplayer: NotificationDisplayer = FakeNotificationDisplayer(),
         appNavigationStateService: AppNavigationStateService = FakeAppNavigationStateService(),
         roomGroupMessageCreator: RoomGroupMessageCreator = FakeRoomGroupMessageCreator(),
         summaryGroupMessageCreator: SummaryGroupMessageCreator = FakeSummaryGroupMessageCreator(),
         activeNotificationsProvider: FakeActiveNotificationsProvider = FakeActiveNotificationsProvider(),
         matrixClientProvider: FakeMatrixClientProvider = FakeMatrixClientProvider(),
+        sessionStore: SessionStore = InMemorySessionStore(),
+        enterpriseService: EnterpriseService = FakeEnterpriseService(),
     ): DefaultNotificationDrawerManager {
-        val context = RuntimeEnvironment.getApplication()
         return DefaultNotificationDrawerManager(
-            notificationManager = notificationManager,
+            notificationDisplayer = notificationDisplayer,
             notificationRenderer = NotificationRenderer(
-                notificationDisplayer = DefaultNotificationDisplayer(context, NotificationManagerCompat.from(context)),
+                notificationDisplayer = FakeNotificationDisplayer(),
                 notificationDataFactory = DefaultNotificationDataFactory(
                     notificationCreator = FakeNotificationCreator(),
                     roomGroupMessageCreator = roomGroupMessageCreator,
@@ -199,9 +226,11 @@ class DefaultNotificationDrawerManagerTest {
                     activeNotificationsProvider = activeNotificationsProvider,
                     stringProvider = FakeStringProvider(),
                 ),
+                enterpriseService = enterpriseService,
+                sessionStore = sessionStore,
             ),
             appNavigationStateService = appNavigationStateService,
-            coroutineScope = this,
+            coroutineScope = backgroundScope,
             matrixClientProvider = matrixClientProvider,
             imageLoaderHolder = FakeImageLoaderHolder(),
             activeNotificationsProvider = activeNotificationsProvider,
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 25e00f7977..1a47200e12 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,23 +16,19 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.notification.FakeNotificationService
 import io.element.android.libraries.matrix.test.notification.aNotificationData
+import io.element.android.libraries.matrix.ui.media.test.FakeImageLoaderHolder
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDataFactory
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 import io.element.android.tests.testutils.lambda.lambdaRecorder
-import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
 class DefaultOnMissedCallNotificationHandlerTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
@@ -51,9 +48,8 @@ class DefaultOnMissedCallNotificationHandlerTest {
         val defaultOnMissedCallNotificationHandler = DefaultOnMissedCallNotificationHandler(
             matrixClientProvider = matrixClientProvider,
             defaultNotificationDrawerManager = DefaultNotificationDrawerManager(
-                notificationManager = mockk(relaxed = true),
-                notificationRenderer = NotificationRenderer(
-                    notificationDisplayer = FakeNotificationDisplayer(),
+                notificationDisplayer = FakeNotificationDisplayer(),
+                notificationRenderer = createNotificationRenderer(
                     notificationDataFactory = dataFactory,
                 ),
                 appNavigationStateService = FakeAppNavigationStateService(),
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 aae742fa6d..ba17fd0683 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,7 @@ import android.app.Notification
 import androidx.core.app.NotificationCompat
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
@@ -33,7 +34,7 @@ class DefaultSummaryGroupMessageCreatorTest {
         )
 
         val result = summaryCreator.createSummaryNotification(
-            currentUser = aMatrixUser(),
+            notificationAccountParams = aNotificationAccountParams(),
             roomNotifications = listOf(
                 RoomNotification(
                     notification = Notification(),
@@ -42,6 +43,7 @@ class DefaultSummaryGroupMessageCreatorTest {
                     messageCount = 1,
                     latestTimestamp = A_FAKE_TIMESTAMP + 10,
                     shouldBing = true,
+                    threadId = null,
                 )
             ),
             invitationNotifications = emptyList(),
@@ -51,7 +53,7 @@ class DefaultSummaryGroupMessageCreatorTest {
 
         notificationCreator.createSummaryListNotificationResult.assertions()
             .isCalledOnce()
-            .with(any(), nonNull(), any(), any())
+            .with(any(), any(), nonNull(), any(), any())
 
         // Set from the events included
         @Suppress("DEPRECATION")
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeNotifiableEventResolver.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeNotifiableEventResolver.kt
index d38bc098a0..17ba7448ec 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeNotifiableEventResolver.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeNotifiableEventResolver.kt
@@ -1,13 +1,15 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.push.api.push.NotificationEventRequest
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
 import io.element.android.tests.testutils.lambda.lambdaError
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeReplyMessageExtractor.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeReplyMessageExtractor.kt
index 010da2d1a4..c0098a3947 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeReplyMessageExtractor.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeReplyMessageExtractor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7a6f6b0118..a52eb16b07 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,6 +40,7 @@ import io.element.android.libraries.push.impl.push.FakeOnNotifiableEventReceived
 import io.element.android.libraries.push.impl.push.OnNotifiableEventReceived
 import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
+import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
 import io.element.android.services.toolbox.api.strings.StringProvider
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
@@ -222,10 +224,11 @@ class NotificationBroadcastReceiverHandlerTest {
         )
         val clearMessagesForRoomLambda = lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> }
         val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { Result.success(Unit) }
+        val timeline = FakeTimeline(markAsReadResult = markAsReadResult)
         val joinedRoom = FakeJoinedRoom(
-            baseRoom = FakeBaseRoom(
-                markAsReadResult = markAsReadResult,
-            ),
+            baseRoom = FakeBaseRoom(),
+            liveTimeline = timeline,
+            createTimelineResult = { Result.success(timeline) },
         )
         val fakeNotificationCleaner = FakeNotificationCleaner(
             clearMessagesForRoomLambda = clearMessagesForRoomLambda,
@@ -480,7 +483,7 @@ class NotificationBroadcastReceiverHandlerTest {
         onNotifiableEventReceived: OnNotifiableEventReceived = FakeOnNotifiableEventReceived(),
         stringProvider: StringProvider = FakeStringProvider(),
         replyMessageExtractor: ReplyMessageExtractor = FakeReplyMessageExtractor(),
-        activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(),
+        activeRoomsHolder: ActiveRoomsHolder = DefaultActiveRoomsHolder(),
     ): NotificationBroadcastReceiverHandler {
         return NotificationBroadcastReceiverHandler(
             appCoroutineScope = this,
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 30c433a513..7d9d1e6550 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,8 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 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.ui.media.test.FakeImageLoader
+import io.element.android.libraries.push.impl.notifications.factories.aNotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
 import io.element.android.libraries.push.impl.notifications.fake.FakeRoomGroupMessageCreator
@@ -20,7 +23,6 @@ import io.element.android.libraries.push.impl.notifications.fake.FakeSummaryGrou
 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.libraries.push.test.notifications.FakeImageLoader
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -50,16 +52,18 @@ class NotificationDataFactoryTest {
 
     @Test
     fun `given a room invitation when mapping to notification then it's added`() = testWith(notificationDataFactory) {
-        val expectedNotification = notificationCreator.createRoomInvitationNotificationResult(AN_INVITATION_EVENT)
+        val expectedNotification = notificationCreator.createRoomInvitationNotificationResult(
+            aNotificationAccountParams(),
+            AN_INVITATION_EVENT,
+        )
         val roomInvitation = listOf(AN_INVITATION_EVENT)
-
-        val result = toNotifications(roomInvitation)
+        val result = toNotifications(roomInvitation, aNotificationAccountParams())
 
         assertThat(result).isEqualTo(
             listOf(
                 OneShotNotification(
                     notification = expectedNotification,
-                    key = A_ROOM_ID.value,
+                    tag = A_ROOM_ID.value,
                     summaryLine = AN_INVITATION_EVENT.description,
                     isNoisy = AN_INVITATION_EVENT.noisy,
                     timestamp = AN_INVITATION_EVENT.timestamp
@@ -70,20 +74,18 @@ class NotificationDataFactoryTest {
 
     @Test
     fun `given a simple event when mapping to notification then it's added`() = testWith(notificationDataFactory) {
-        val expectedNotification = notificationCreator.createRoomInvitationNotificationResult(AN_INVITATION_EVENT)
-        val roomInvitation = listOf(A_SIMPLE_EVENT)
-
-        val result = toNotifications(roomInvitation)
-
-        assertThat(result).isEqualTo(
-            listOf(
-                OneShotNotification(
-                    notification = expectedNotification,
-                    key = AN_EVENT_ID.value,
-                    summaryLine = A_SIMPLE_EVENT.description,
-                    isNoisy = A_SIMPLE_EVENT.noisy,
-                    timestamp = AN_INVITATION_EVENT.timestamp
-                )
+        val expectedNotification = notificationCreator.createRoomInvitationNotificationResult(
+            aNotificationAccountParams(),
+            AN_INVITATION_EVENT,
+        )
+        val result = toNotifications(listOf(A_SIMPLE_EVENT), aNotificationAccountParams())
+        assertThat(result).containsExactly(
+            OneShotNotification(
+                notification = expectedNotification,
+                tag = AN_EVENT_ID.value,
+                summaryLine = A_SIMPLE_EVENT.description,
+                isNoisy = A_SIMPLE_EVENT.noisy,
+                timestamp = AN_INVITATION_EVENT.timestamp
             )
         )
     }
@@ -93,45 +95,49 @@ class NotificationDataFactoryTest {
         val events = listOf(A_MESSAGE_EVENT)
         val expectedNotification = RoomNotification(
             notification = fakeRoomGroupMessageCreator.createRoomMessage(
-                MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
-                events,
-                A_ROOM_ID,
-                FakeImageLoader().getImageLoader(),
-                null,
+                notificationAccountParams = aNotificationAccountParams(
+                    user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
+                ),
+                events = events,
+                roomId = A_ROOM_ID,
+                threadId = null,
+                imageLoader = FakeImageLoader(),
+                existingNotification = null,
             ),
             roomId = A_ROOM_ID,
             summaryLine = "A room name: Bob Hello world!",
             messageCount = events.size,
             latestTimestamp = events.maxOf { it.timestamp },
-            shouldBing = events.any { it.noisy }
+            shouldBing = events.any { it.noisy },
+            threadId = null,
         )
-        val roomWithMessage = listOf(A_MESSAGE_EVENT)
-
         val fakeImageLoader = FakeImageLoader()
         val result = toNotifications(
-            messages = roomWithMessage,
-            currentUser = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
-            imageLoader = fakeImageLoader.getImageLoader(),
+            messages = listOf(A_MESSAGE_EVENT),
+            notificationAccountParams = aNotificationAccountParams(
+                user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
+            ),
+            imageLoader = fakeImageLoader,
         )
 
         assertThat(result.size).isEqualTo(1)
         assertThat(result.first().isDataEqualTo(expectedNotification)).isTrue()
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
     fun `given a room with only redacted events when mapping to notification then is Empty`() = testWith(notificationDataFactory) {
-        val redactedRoom = listOf(A_MESSAGE_EVENT.copy(isRedacted = true))
-
+        val redactedRoom = A_MESSAGE_EVENT.copy(isRedacted = true)
         val fakeImageLoader = FakeImageLoader()
         val result = toNotifications(
-            messages = redactedRoom,
-            currentUser = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
-            imageLoader = fakeImageLoader.getImageLoader(),
+            messages = listOf(redactedRoom),
+            notificationAccountParams = aNotificationAccountParams(
+                user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
+            ),
+            imageLoader = fakeImageLoader,
         )
-
         assertThat(result).isEmpty()
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 
     @Test
@@ -145,29 +151,35 @@ class NotificationDataFactoryTest {
         val withRedactedRemoved = listOf(A_MESSAGE_EVENT.copy(eventId = EventId("\$not-redacted")))
         val expectedNotification = RoomNotification(
             notification = fakeRoomGroupMessageCreator.createRoomMessage(
-                MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
-                withRedactedRemoved,
-                A_ROOM_ID,
-                FakeImageLoader().getImageLoader(),
-                null,
+                notificationAccountParams = aNotificationAccountParams(
+                    user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
+                ),
+                events = withRedactedRemoved,
+                roomId = A_ROOM_ID,
+                threadId = null,
+                imageLoader = FakeImageLoader(),
+                existingNotification = null,
             ),
             roomId = A_ROOM_ID,
             summaryLine = "A room name: Bob Hello world!",
             messageCount = withRedactedRemoved.size,
             latestTimestamp = withRedactedRemoved.maxOf { it.timestamp },
-            shouldBing = withRedactedRemoved.any { it.noisy }
+            shouldBing = withRedactedRemoved.any { it.noisy },
+            threadId = null,
         )
 
         val fakeImageLoader = FakeImageLoader()
         val result = toNotifications(
             messages = roomWithRedactedMessage,
-            currentUser = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
-            imageLoader = fakeImageLoader.getImageLoader(),
+            notificationAccountParams = aNotificationAccountParams(
+                user = MatrixUser(A_SESSION_ID, A_SESSION_ID.value, MY_AVATAR_URL),
+            ),
+            imageLoader = fakeImageLoader,
         )
 
         assertThat(result.size).isEqualTo(1)
         assertThat(result.first().isDataEqualTo(expectedNotification)).isTrue()
-        assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
+        assertThat(fakeImageLoader.getExecutedRequestsData()).isEmpty()
     }
 }
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt
index 60d5dad2ac..bf9b06fa6e 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationIdProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 8912693bc4..51d491f444 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
@@ -1,19 +1,24 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.libraries.matrix.api.user.MatrixUser
 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.ui.media.test.FakeImageLoader
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
+import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDataFactory
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.fake.FakeRoomGroupMessageCreator
 import io.element.android.libraries.push.impl.notifications.fake.FakeSummaryGroupMessageCreator
@@ -22,7 +27,8 @@ import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiable
 import io.element.android.libraries.push.impl.notifications.fixtures.aSimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.anInviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -37,7 +43,7 @@ private const val USE_COMPLETE_NOTIFICATION_FORMAT = true
 
 private val A_SUMMARY_NOTIFICATION = SummaryNotification.Update(A_NOTIFICATION)
 private val ONE_SHOT_NOTIFICATION =
-    OneShotNotification(notification = A_NOTIFICATION, key = "ignored", summaryLine = "ignored", isNoisy = false, timestamp = -1)
+    OneShotNotification(notification = A_NOTIFICATION, tag = "ignored", summaryLine = "ignored", isNoisy = false, timestamp = -1)
 
 @RunWith(RobolectricTestRunner::class)
 class NotificationRendererTest {
@@ -55,7 +61,7 @@ class NotificationRendererTest {
     )
     private val notificationIdProvider = NotificationIdProvider
 
-    private val notificationRenderer = NotificationRenderer(
+    private val notificationRenderer = createNotificationRenderer(
         notificationDisplayer = notificationDisplayer,
         notificationDataFactory = notificationDataFactory,
     )
@@ -69,11 +75,11 @@ class NotificationRendererTest {
 
     @Test
     fun `given a room message group notification is added when rendering then show the message notification and update summary`() = runTest {
-        roomGroupMessageCreator.createRoomMessageResult = lambdaRecorder { _, _, _, _, _ -> A_NOTIFICATION }
+        roomGroupMessageCreator.createRoomMessageResult = lambdaRecorder { _, _, _, _, _, _ -> A_NOTIFICATION }
 
         renderEventsAsNotifications(listOf(aNotifiableMessageEvent()))
 
-        notificationDisplayer.showNotificationMessageResult.assertions().isCalledExactly(2).withSequence(
+        notificationDisplayer.showNotificationResult.assertions().isCalledExactly(2).withSequence(
             listOf(value(A_ROOM_ID.value), value(notificationIdProvider.getRoomMessagesNotificationId(A_SESSION_ID)), value(A_NOTIFICATION)),
             listOf(value(null), value(notificationIdProvider.getSummaryNotificationId(A_SESSION_ID)), value(A_SUMMARY_NOTIFICATION.notification))
         )
@@ -81,11 +87,11 @@ class NotificationRendererTest {
 
     @Test
     fun `given a simple notification is added when rendering then show the simple notification and update summary`() = runTest {
-        notificationCreator.createSimpleNotificationResult = lambdaRecorder { _ -> ONE_SHOT_NOTIFICATION.copy(key = AN_EVENT_ID.value).notification }
+        notificationCreator.createSimpleNotificationResult = lambdaRecorder { _, _ -> ONE_SHOT_NOTIFICATION.copy(tag = AN_EVENT_ID.value).notification }
 
         renderEventsAsNotifications(listOf(aSimpleNotifiableEvent(eventId = AN_EVENT_ID)))
 
-        notificationDisplayer.showNotificationMessageResult.assertions().isCalledExactly(2).withSequence(
+        notificationDisplayer.showNotificationResult.assertions().isCalledExactly(2).withSequence(
             listOf(value(AN_EVENT_ID.value), value(notificationIdProvider.getRoomEventNotificationId(A_SESSION_ID)), value(A_NOTIFICATION)),
             listOf(value(null), value(notificationIdProvider.getSummaryNotificationId(A_SESSION_ID)), value(A_SUMMARY_NOTIFICATION.notification))
         )
@@ -93,11 +99,11 @@ class NotificationRendererTest {
 
     @Test
     fun `given an invitation notification is added when rendering then show the invitation notification and update summary`() = runTest {
-        notificationCreator.createRoomInvitationNotificationResult = lambdaRecorder { _ -> ONE_SHOT_NOTIFICATION.copy(key = AN_EVENT_ID.value).notification }
+        notificationCreator.createRoomInvitationNotificationResult = lambdaRecorder { _, _ -> ONE_SHOT_NOTIFICATION.copy(tag = AN_EVENT_ID.value).notification }
 
         renderEventsAsNotifications(listOf(anInviteNotifiableEvent()))
 
-        notificationDisplayer.showNotificationMessageResult.assertions().isCalledExactly(2).withSequence(
+        notificationDisplayer.showNotificationResult.assertions().isCalledExactly(2).withSequence(
             listOf(value(A_ROOM_ID.value), value(notificationIdProvider.getRoomInvitationNotificationId(A_SESSION_ID)), value(A_NOTIFICATION)),
             listOf(value(null), value(notificationIdProvider.getSummaryNotificationId(A_SESSION_ID)), value(A_SUMMARY_NOTIFICATION.notification))
         )
@@ -108,7 +114,19 @@ class NotificationRendererTest {
             MatrixUser(A_SESSION_ID, MY_USER_DISPLAY_NAME, MY_USER_AVATAR_URL),
             useCompleteNotificationFormat = USE_COMPLETE_NOTIFICATION_FORMAT,
             eventsToProcess = events,
-            imageLoader = FakeImageLoader().getImageLoader(),
+            imageLoader = FakeImageLoader(),
         )
     }
 }
+
+fun createNotificationRenderer(
+    notificationDisplayer: NotificationDisplayer = FakeNotificationDisplayer(),
+    notificationDataFactory: NotificationDataFactory = FakeNotificationDataFactory(),
+    enterpriseService: EnterpriseService = FakeEnterpriseService(),
+    sessionStore: SessionStore = InMemorySessionStore(),
+) = NotificationRenderer(
+    notificationDisplayer = notificationDisplayer,
+    notificationDataFactory = notificationDataFactory,
+    enterpriseService = enterpriseService,
+    sessionStore = sessionStore,
+)
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 89ce153f10..6caf02b41b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b93bbcaf15..e6b28831bd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 d05966f9a6..d4d7713c2d 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,9 +21,9 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 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.FakeMatrixClientProvider
+import io.element.android.libraries.matrix.ui.media.test.FakeImageLoaderHolder
 import io.element.android.libraries.push.impl.notifications.factories.FakeIntentProvider
 import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
-import io.element.android.libraries.push.test.notifications.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
 import kotlinx.coroutines.ExperimentalCoroutinesApi
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 7786fb261e..0504ae433b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,11 +17,14 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_COLOR_INT
 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.core.aBuildMeta
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.matrix.ui.media.test.FakeImageLoader
+import io.element.android.libraries.matrix.ui.media.test.FakeInitialsAvatarBitmapGenerator
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
 import io.element.android.libraries.push.impl.notifications.DefaultNotificationBitmapLoader
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
@@ -31,10 +35,10 @@ import io.element.android.libraries.push.impl.notifications.factories.action.Acc
 import io.element.android.libraries.push.impl.notifications.factories.action.MarkAsReadActionFactory
 import io.element.android.libraries.push.impl.notifications.factories.action.QuickReplyActionFactory
 import io.element.android.libraries.push.impl.notifications.factories.action.RejectInvitationActionFactory
+import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
-import io.element.android.libraries.push.test.notifications.FakeImageLoader
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
@@ -50,17 +54,35 @@ class DefaultNotificationCreatorTest {
     @Test
     fun `test createDiagnosticNotification`() {
         val sut = createNotificationCreator()
-        val result = sut.createDiagnosticNotification()
+        val result = sut.createDiagnosticNotification(
+            color = A_COLOR_INT,
+        )
         result.commonAssertions(
             expectedGroup = null,
             expectedCategory = NotificationCompat.CATEGORY_STATUS,
         )
     }
 
+    @Test
+    fun `test createUnregistrationNotification`() {
+        val sut = createNotificationCreator()
+        val matrixUser = aMatrixUser()
+        val result = sut.createUnregistrationNotification(
+            notificationAccountParams = aNotificationAccountParams(
+                user = matrixUser,
+            ),
+        )
+        result.commonAssertions(
+            expectedGroup = matrixUser.userId.value,
+            expectedCategory = NotificationCompat.CATEGORY_ERROR,
+        )
+    }
+
     @Test
     fun `test createFallbackNotification`() {
         val sut = createNotificationCreator()
         val result = sut.createFallbackNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             FallbackNotifiableEvent(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -72,7 +94,7 @@ class DefaultNotificationCreatorTest {
                 isUpdated = false,
                 timestamp = A_FAKE_TIMESTAMP,
                 cause = null,
-            )
+            ),
         )
         result.commonAssertions(
             expectedCategory = null,
@@ -83,6 +105,7 @@ class DefaultNotificationCreatorTest {
     fun `test createSimpleEventNotification`() {
         val sut = createNotificationCreator()
         val result = sut.createSimpleEventNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             SimpleNotifiableEvent(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -97,7 +120,7 @@ class DefaultNotificationCreatorTest {
                 canBeReplaced = false,
                 isRedacted = false,
                 isUpdated = false,
-            )
+            ),
         )
         result.commonAssertions(
             expectedCategory = null,
@@ -108,6 +131,7 @@ class DefaultNotificationCreatorTest {
     fun `test createSimpleEventNotification noisy`() {
         val sut = createNotificationCreator()
         val result = sut.createSimpleEventNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             SimpleNotifiableEvent(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -122,7 +146,7 @@ class DefaultNotificationCreatorTest {
                 canBeReplaced = false,
                 isRedacted = false,
                 isUpdated = false,
-            )
+            ),
         )
         result.commonAssertions(
             expectedCategory = null,
@@ -133,6 +157,7 @@ class DefaultNotificationCreatorTest {
     fun `test createRoomInvitationNotification`() {
         val sut = createNotificationCreator()
         val result = sut.createRoomInvitationNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             InviteNotifiableEvent(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -148,7 +173,7 @@ class DefaultNotificationCreatorTest {
                 isRedacted = false,
                 isUpdated = false,
                 roomName = "roomName",
-            )
+            ),
         )
         result.commonAssertions(
             expectedCategory = null,
@@ -166,6 +191,7 @@ class DefaultNotificationCreatorTest {
     fun `test createRoomInvitationNotification noisy`() {
         val sut = createNotificationCreator()
         val result = sut.createRoomInvitationNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             InviteNotifiableEvent(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -181,7 +207,7 @@ class DefaultNotificationCreatorTest {
                 isRedacted = false,
                 isUpdated = false,
                 roomName = "roomName",
-            )
+            ),
         )
         result.commonAssertions(
             expectedCategory = null,
@@ -193,7 +219,7 @@ class DefaultNotificationCreatorTest {
         val sut = createNotificationCreator()
         val matrixUser = aMatrixUser()
         val result = sut.createSummaryListNotification(
-            currentUser = matrixUser,
+            notificationAccountParams = aNotificationAccountParams(user = matrixUser),
             compatSummary = "compatSummary",
             noisy = false,
             lastMessageTimestamp = 123_456L,
@@ -208,7 +234,7 @@ class DefaultNotificationCreatorTest {
         val sut = createNotificationCreator()
         val matrixUser = aMatrixUser()
         val result = sut.createSummaryListNotification(
-            currentUser = matrixUser,
+            notificationAccountParams = aNotificationAccountParams(user = matrixUser),
             compatSummary = "compatSummary",
             noisy = true,
             lastMessageTimestamp = 123_456L,
@@ -221,8 +247,8 @@ class DefaultNotificationCreatorTest {
     @Test
     fun `test createMessagesListNotification`() = runTest {
         val sut = createNotificationCreator()
-        aMatrixUser()
         val result = sut.createMessagesListNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             roomInfo = RoomEventGroupInfo(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -236,10 +262,9 @@ class DefaultNotificationCreatorTest {
             largeIcon = null,
             lastMessageTimestamp = 123_456L,
             tickerText = "tickerText",
-            currentUser = aMatrixUser(),
             existingNotification = null,
-            imageLoader = FakeImageLoader().getImageLoader(),
-            events = emptyList(),
+            imageLoader = FakeImageLoader(),
+            events = listOf(aNotifiableMessageEvent()),
         )
         result.commonAssertions()
     }
@@ -247,8 +272,8 @@ class DefaultNotificationCreatorTest {
     @Test
     fun `test createMessagesListNotification should bing and thread`() = runTest {
         val sut = createNotificationCreator()
-        aMatrixUser()
         val result = sut.createMessagesListNotification(
+            notificationAccountParams = aNotificationAccountParams(),
             roomInfo = RoomEventGroupInfo(
                 sessionId = A_SESSION_ID,
                 roomId = A_ROOM_ID,
@@ -262,16 +287,15 @@ class DefaultNotificationCreatorTest {
             largeIcon = null,
             lastMessageTimestamp = 123_456L,
             tickerText = "tickerText",
-            currentUser = aMatrixUser(),
             existingNotification = null,
-            imageLoader = FakeImageLoader().getImageLoader(),
-            events = emptyList(),
+            imageLoader = FakeImageLoader(),
+            events = listOf(aNotifiableMessageEvent()),
         )
         result.commonAssertions()
     }
 
     private fun Notification.commonAssertions(
-        expectedGroup: String? = A_SESSION_ID.value,
+        expectedGroup: String? = aMatrixUser().userId.value,
         expectedCategory: String? = NotificationCompat.CATEGORY_MESSAGE,
     ) {
         assertThat(contentIntent).isNotNull()
@@ -289,7 +313,11 @@ fun createNotificationCreator(
     context: Context = RuntimeEnvironment.getApplication(),
     buildMeta: BuildMeta = aBuildMeta(),
     notificationChannels: NotificationChannels = createNotificationChannels(),
-    bitmapLoader: NotificationBitmapLoader = DefaultNotificationBitmapLoader(context, FakeBuildVersionSdkIntProvider(Build.VERSION_CODES.R)),
+    bitmapLoader: NotificationBitmapLoader = DefaultNotificationBitmapLoader(
+        context = context,
+        sdkIntProvider = FakeBuildVersionSdkIntProvider(Build.VERSION_CODES.R),
+        initialsAvatarBitmapGenerator = FakeInitialsAvatarBitmapGenerator(),
+    ),
 ): NotificationCreator {
     return DefaultNotificationCreator(
         context = context,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt
index 29aade1753..62ab850ae7 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/FakeIntentProvider.kt
@@ -1,18 +1,27 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.factories
 
 import android.content.Intent
+import android.os.Bundle
+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.core.ThreadId
 import io.element.android.libraries.push.impl.intent.IntentProvider
 
 class FakeIntentProvider : IntentProvider {
-    override fun getViewRoomIntent(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?) = Intent(Intent.ACTION_VIEW)
+    override fun getViewRoomIntent(
+        sessionId: SessionId,
+        roomId: RoomId?,
+        threadId: ThreadId?,
+        eventId: EventId?,
+        extras: Bundle?,
+    ) = Intent(Intent.ACTION_VIEW)
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationAccountParams.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationAccountParams.kt
new file mode 100644
index 0000000000..d0c724d259
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationAccountParams.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.push.impl.notifications.factories
+
+import androidx.annotation.ColorInt
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.test.A_COLOR_INT
+import io.element.android.libraries.matrix.ui.components.aMatrixUser
+
+fun aNotificationAccountParams(
+    user: MatrixUser = aMatrixUser(),
+    @ColorInt color: Int = A_COLOR_INT,
+    showSessionId: Boolean = false,
+) = NotificationAccountParams(
+    user = user,
+    color = color,
+    showSessionId = showSessionId,
+)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt
index 0e93ba3506..ae3edce437 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeActiveNotificationsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,18 +11,24 @@ package io.element.android.libraries.push.impl.notifications.fake
 import android.service.notification.StatusBarNotification
 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.ThreadId
 import io.element.android.libraries.push.impl.notifications.ActiveNotificationsProvider
 
 class FakeActiveNotificationsProvider(
-    private val getMessageNotificationsForRoomResult: (SessionId, RoomId) -> List<StatusBarNotification> = { _, _ -> emptyList() },
+    private val getMessageNotificationsForRoomResult: (SessionId, RoomId, ThreadId?) -> List<StatusBarNotification> = { _, _, _ -> emptyList() },
+    private val getAllMessageNotificationsForRoomResult: (SessionId, RoomId) -> List<StatusBarNotification> = { _, _ -> emptyList() },
     private val getNotificationsForSessionResult: (SessionId) -> List<StatusBarNotification> = { emptyList() },
     private val getMembershipNotificationForSessionResult: (SessionId) -> List<StatusBarNotification> = { emptyList() },
     private val getMembershipNotificationForRoomResult: (SessionId, RoomId) -> List<StatusBarNotification> = { _, _ -> emptyList() },
     private val getSummaryNotificationResult: (SessionId) -> StatusBarNotification? = { null },
     private val countResult: (SessionId) -> Int = { 0 },
 ) : ActiveNotificationsProvider {
-    override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
-        return getMessageNotificationsForRoomResult(sessionId, roomId)
+    override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId, threadId: ThreadId?): List<StatusBarNotification> {
+        return getMessageNotificationsForRoomResult(sessionId, roomId, threadId)
+    }
+
+    override fun getAllMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
+        return getAllMessageNotificationsForRoomResult(sessionId, roomId)
     }
 
     override fun getNotificationsForSession(sessionId: SessionId): List<StatusBarNotification> {
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 3cbed6e8bc..d5e4ad9695 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,70 +10,93 @@ package io.element.android.libraries.push.impl.notifications.fake
 
 import android.app.Notification
 import android.graphics.Bitmap
+import androidx.annotation.ColorInt
 import coil3.ImageLoader
 import io.element.android.libraries.matrix.api.core.ThreadId
-import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.push.impl.notifications.RoomEventGroupInfo
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
 import io.element.android.libraries.push.impl.notifications.fixtures.A_NOTIFICATION
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
 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.SimpleNotifiableEvent
-import io.element.android.tests.testutils.lambda.LambdaFourParamsRecorder
+import io.element.android.tests.testutils.lambda.LambdaFiveParamsRecorder
 import io.element.android.tests.testutils.lambda.LambdaListAnyParamsRecorder
-import io.element.android.tests.testutils.lambda.LambdaNoParamRecorder
 import io.element.android.tests.testutils.lambda.LambdaOneParamRecorder
+import io.element.android.tests.testutils.lambda.LambdaTwoParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaAnyRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 
 class FakeNotificationCreator(
     var createMessagesListNotificationResult: LambdaListAnyParamsRecorder<Notification> = lambdaAnyRecorder { A_NOTIFICATION },
-    var createRoomInvitationNotificationResult: LambdaOneParamRecorder<InviteNotifiableEvent, Notification> = lambdaRecorder { _ -> A_NOTIFICATION },
-    var createSimpleNotificationResult: LambdaOneParamRecorder<SimpleNotifiableEvent, Notification> = lambdaRecorder { _ -> A_NOTIFICATION },
-    var createFallbackNotificationResult: LambdaOneParamRecorder<FallbackNotifiableEvent, Notification> = lambdaRecorder { _ -> A_NOTIFICATION },
-    var createSummaryListNotificationResult: LambdaFourParamsRecorder<MatrixUser, String, Boolean, Long, Notification> =
-        lambdaRecorder { _, _, _, _ -> A_NOTIFICATION },
-    var createDiagnosticNotificationResult: LambdaNoParamRecorder<Notification> = lambdaRecorder { -> A_NOTIFICATION },
+    var createRoomInvitationNotificationResult: LambdaTwoParamsRecorder<NotificationAccountParams, InviteNotifiableEvent, Notification> =
+        lambdaRecorder { _, _ -> A_NOTIFICATION },
+    var createSimpleNotificationResult: LambdaTwoParamsRecorder<NotificationAccountParams, SimpleNotifiableEvent, Notification> =
+        lambdaRecorder { _, _ -> A_NOTIFICATION },
+    var createFallbackNotificationResult: LambdaTwoParamsRecorder<NotificationAccountParams, FallbackNotifiableEvent, Notification> =
+        lambdaRecorder { _, _ -> A_NOTIFICATION },
+    var createSummaryListNotificationResult: LambdaFiveParamsRecorder<
+        NotificationAccountParams, String, Boolean, Long, NotificationAccountParams, Notification
+        > = lambdaRecorder { _, _, _, _, _ -> A_NOTIFICATION },
+    var createDiagnosticNotificationResult: LambdaOneParamRecorder<Int, Notification> =
+        lambdaRecorder<Int, Notification> { _ -> A_NOTIFICATION },
+    val createUnregistrationNotificationResult: LambdaOneParamRecorder<NotificationAccountParams, Notification> =
+        lambdaRecorder { _ -> A_NOTIFICATION },
 ) : NotificationCreator {
     override suspend fun createMessagesListNotification(
+        notificationAccountParams: NotificationAccountParams,
         roomInfo: RoomEventGroupInfo,
         threadId: ThreadId?,
         largeIcon: Bitmap?,
         lastMessageTimestamp: Long,
         tickerText: String,
-        currentUser: MatrixUser,
         existingNotification: Notification?,
         imageLoader: ImageLoader,
-        events: List<NotifiableMessageEvent>
+        events: List<NotifiableMessageEvent>,
     ): Notification {
         return createMessagesListNotificationResult(
-            listOf(roomInfo, threadId, largeIcon, lastMessageTimestamp, tickerText, currentUser, existingNotification, imageLoader, events)
+            listOf(notificationAccountParams, roomInfo, threadId, largeIcon, lastMessageTimestamp, tickerText, existingNotification, imageLoader, events)
         )
     }
 
-    override fun createRoomInvitationNotification(inviteNotifiableEvent: InviteNotifiableEvent): Notification {
-        return createRoomInvitationNotificationResult(inviteNotifiableEvent)
+    override fun createRoomInvitationNotification(
+        notificationAccountParams: NotificationAccountParams,
+        inviteNotifiableEvent: InviteNotifiableEvent,
+    ): Notification {
+        return createRoomInvitationNotificationResult(notificationAccountParams, inviteNotifiableEvent)
     }
 
-    override fun createSimpleEventNotification(simpleNotifiableEvent: SimpleNotifiableEvent): Notification {
-        return createSimpleNotificationResult(simpleNotifiableEvent)
+    override fun createSimpleEventNotification(
+        notificationAccountParams: NotificationAccountParams,
+        simpleNotifiableEvent: SimpleNotifiableEvent,
+    ): Notification {
+        return createSimpleNotificationResult(notificationAccountParams, simpleNotifiableEvent)
     }
 
-    override fun createFallbackNotification(fallbackNotifiableEvent: FallbackNotifiableEvent): Notification {
-        return createFallbackNotificationResult(fallbackNotifiableEvent)
+    override fun createFallbackNotification(
+        notificationAccountParams: NotificationAccountParams,
+        fallbackNotifiableEvent: FallbackNotifiableEvent,
+    ): Notification {
+        return createFallbackNotificationResult(notificationAccountParams, fallbackNotifiableEvent)
     }
 
     override fun createSummaryListNotification(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         compatSummary: String,
         noisy: Boolean,
-        lastMessageTimestamp: Long
+        lastMessageTimestamp: Long,
     ): Notification {
-        return createSummaryListNotificationResult(currentUser, compatSummary, noisy, lastMessageTimestamp)
+        return createSummaryListNotificationResult(notificationAccountParams, compatSummary, noisy, lastMessageTimestamp, notificationAccountParams)
     }
 
-    override fun createDiagnosticNotification(): Notification {
-        return createDiagnosticNotificationResult()
+    override fun createDiagnosticNotification(
+        @ColorInt color: Int,
+    ): Notification {
+        return createDiagnosticNotificationResult(color)
+    }
+
+    override fun createUnregistrationNotification(notificationAccountParams: NotificationAccountParams): Notification {
+        return createUnregistrationNotificationResult(notificationAccountParams)
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt
index fed6e3c7a3..009513b640 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDataFactory.kt
@@ -1,18 +1,19 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.fake
 
 import coil3.ImageLoader
-import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.push.impl.notifications.NotificationDataFactory
 import io.element.android.libraries.push.impl.notifications.OneShotNotification
 import io.element.android.libraries.push.impl.notifications.RoomNotification
 import io.element.android.libraries.push.impl.notifications.SummaryNotification
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fixtures.A_NOTIFICATION
 import io.element.android.libraries.push.impl.notifications.model.FallbackNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
@@ -24,56 +25,70 @@ import io.element.android.tests.testutils.lambda.LambdaThreeParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 
 class FakeNotificationDataFactory(
-    var messageEventToNotificationsResult: LambdaThreeParamsRecorder<List<NotifiableMessageEvent>, MatrixUser, ImageLoader, List<RoomNotification>> =
-        lambdaRecorder { _, _, _ -> emptyList() },
+    var messageEventToNotificationsResult: LambdaThreeParamsRecorder<
+        List<NotifiableMessageEvent>, ImageLoader, NotificationAccountParams, List<RoomNotification>
+        > = lambdaRecorder { _, _, _ -> emptyList() },
     var summaryToNotificationsResult: LambdaFiveParamsRecorder<
-        MatrixUser,
         List<RoomNotification>,
         List<OneShotNotification>,
         List<OneShotNotification>,
         List<OneShotNotification>,
+        NotificationAccountParams,
         SummaryNotification
-    > = lambdaRecorder { _, _, _, _, _ -> SummaryNotification.Update(A_NOTIFICATION) },
+        > = lambdaRecorder { _, _, _, _, _ -> SummaryNotification.Update(A_NOTIFICATION) },
     var inviteToNotificationsResult: LambdaOneParamRecorder<List<InviteNotifiableEvent>, List<OneShotNotification>> = lambdaRecorder { _ -> emptyList() },
     var simpleEventToNotificationsResult: LambdaOneParamRecorder<List<SimpleNotifiableEvent>, List<OneShotNotification>> = lambdaRecorder { _ -> emptyList() },
     var fallbackEventToNotificationsResult: LambdaOneParamRecorder<List<FallbackNotifiableEvent>, List<OneShotNotification>> =
         lambdaRecorder { _ -> emptyList() },
 ) : NotificationDataFactory {
-    override suspend fun toNotifications(messages: List<NotifiableMessageEvent>, currentUser: MatrixUser, imageLoader: ImageLoader): List<RoomNotification> {
-        return messageEventToNotificationsResult(messages, currentUser, imageLoader)
+    override suspend fun toNotifications(
+        messages: List<NotifiableMessageEvent>,
+        imageLoader: ImageLoader,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<RoomNotification> {
+        return messageEventToNotificationsResult(messages, imageLoader, notificationAccountParams)
     }
 
     @JvmName("toNotificationInvites")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(invites: List<InviteNotifiableEvent>): List<OneShotNotification> {
+    override fun toNotifications(
+        invites: List<InviteNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification> {
         return inviteToNotificationsResult(invites)
     }
 
     @JvmName("toNotificationSimpleEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(simpleEvents: List<SimpleNotifiableEvent>): List<OneShotNotification> {
+    override fun toNotifications(
+        simpleEvents: List<SimpleNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification> {
         return simpleEventToNotificationsResult(simpleEvents)
     }
 
     @JvmName("toNotificationFallbackEvents")
     @Suppress("INAPPLICABLE_JVM_NAME")
-    override fun toNotifications(fallback: List<FallbackNotifiableEvent>): List<OneShotNotification> {
+    override fun toNotifications(
+        fallback: List<FallbackNotifiableEvent>,
+        notificationAccountParams: NotificationAccountParams,
+    ): List<OneShotNotification> {
         return fallbackEventToNotificationsResult(fallback)
     }
 
     override fun createSummaryNotification(
-        currentUser: MatrixUser,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
         fallbackNotifications: List<OneShotNotification>,
+        notificationAccountParams: NotificationAccountParams,
     ): SummaryNotification {
         return summaryToNotificationsResult(
-            currentUser,
             roomNotifications,
             invitationNotifications,
             simpleNotifications,
             fallbackNotifications,
+            notificationAccountParams,
         )
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDisplayer.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDisplayer.kt
index cd3d047e2e..fd4af70a72 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDisplayer.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationDisplayer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,17 +20,18 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 
 class FakeNotificationDisplayer(
-    var showNotificationMessageResult: LambdaThreeParamsRecorder<String?, Int, Notification, Boolean> = lambdaRecorder { _, _, _ -> true },
-    var cancelNotificationMessageResult: LambdaTwoParamsRecorder<String?, Int, Unit> = lambdaRecorder { _, _ -> },
+    var showNotificationResult: LambdaThreeParamsRecorder<String?, Int, Notification, Boolean> = lambdaRecorder { _, _, _ -> true },
+    var cancelNotificationResult: LambdaTwoParamsRecorder<String?, Int, Unit> = lambdaRecorder { _, _ -> },
     var displayDiagnosticNotificationResult: LambdaOneParamRecorder<Notification, Boolean> = lambdaRecorder { _ -> true },
     var dismissDiagnosticNotificationResult: LambdaNoParamRecorder<Unit> = lambdaRecorder { -> },
+    var displayUnregistrationNotificationResult: LambdaOneParamRecorder<Notification, Boolean> = lambdaRecorder { _ -> true },
 ) : NotificationDisplayer {
-    override fun showNotificationMessage(tag: String?, id: Int, notification: Notification): Boolean {
-        return showNotificationMessageResult(tag, id, notification)
+    override fun showNotification(tag: String?, id: Int, notification: Notification): Boolean {
+        return showNotificationResult(tag, id, notification)
     }
 
-    override fun cancelNotificationMessage(tag: String?, id: Int) {
-        return cancelNotificationMessageResult(tag, id)
+    override fun cancelNotification(tag: String?, id: Int) {
+        return cancelNotificationResult(tag, id)
     }
 
     override fun displayDiagnosticNotification(notification: Notification): Boolean {
@@ -40,8 +42,12 @@ class FakeNotificationDisplayer(
         return dismissDiagnosticNotificationResult()
     }
 
+    override fun displayUnregistrationNotification(notification: Notification): Boolean {
+        return displayUnregistrationNotificationResult(notification)
+    }
+
     fun verifySummaryCancelled(times: Int = 1) {
-        cancelNotificationMessageResult.assertions().isCalledExactly(times).withSequence(
+        cancelNotificationResult.assertions().isCalledExactly(times).withSequence(
             listOf(value(null), value(NotificationIdProvider.getSummaryNotificationId(A_SESSION_ID)))
         )
     }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationMediaRepo.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationMediaRepo.kt
index 66c64fb83e..ecf4a15129 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationMediaRepo.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationMediaRepo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeRoomGroupMessageCreator.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeRoomGroupMessageCreator.kt
index c531735a1e..c4b9513fa3 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeRoomGroupMessageCreator.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeRoomGroupMessageCreator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,24 +11,29 @@ package io.element.android.libraries.push.impl.notifications.fake
 import android.app.Notification
 import coil3.ImageLoader
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.push.impl.notifications.RoomGroupMessageCreator
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fixtures.A_NOTIFICATION
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
-import io.element.android.tests.testutils.lambda.LambdaFiveParamsRecorder
+import io.element.android.tests.testutils.lambda.LambdaSixParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 
+// We just can't make the param types fit
+@Suppress("MaxLineLength", "ktlint:standard:max-line-length", "ktlint:standard:parameter-wrapping")
 class FakeRoomGroupMessageCreator(
-    var createRoomMessageResult: LambdaFiveParamsRecorder<MatrixUser, List<NotifiableMessageEvent>, RoomId, ImageLoader, Notification?, Notification> =
-        lambdaRecorder { _, _, _, _, _, -> A_NOTIFICATION }
+    var createRoomMessageResult: LambdaSixParamsRecorder<
+        NotificationAccountParams, List<NotifiableMessageEvent>, RoomId, ThreadId?, ImageLoader, Notification?, Notification
+        > = lambdaRecorder { _, _, _, _, _, _ -> A_NOTIFICATION }
 ) : RoomGroupMessageCreator {
     override suspend fun createRoomMessage(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         events: List<NotifiableMessageEvent>,
         roomId: RoomId,
+        threadId: ThreadId?,
         imageLoader: ImageLoader,
-        existingNotification: Notification?
+        existingNotification: Notification?,
     ): Notification {
-        return createRoomMessageResult(currentUser, events, roomId, imageLoader, existingNotification)
+        return createRoomMessageResult(notificationAccountParams, events, roomId, threadId, imageLoader, existingNotification)
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt
index ed3ca3027e..9db6853408 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeSummaryGroupMessageCreator.kt
@@ -1,36 +1,36 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.fake
 
 import android.app.Notification
-import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.push.impl.notifications.OneShotNotification
 import io.element.android.libraries.push.impl.notifications.RoomNotification
 import io.element.android.libraries.push.impl.notifications.SummaryGroupMessageCreator
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
 import io.element.android.libraries.push.impl.notifications.fixtures.A_NOTIFICATION
 import io.element.android.tests.testutils.lambda.LambdaFiveParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 
 class FakeSummaryGroupMessageCreator(
     var createSummaryNotificationResult: LambdaFiveParamsRecorder<
-        MatrixUser, List<RoomNotification>, List<OneShotNotification>, List<OneShotNotification>, List<OneShotNotification>, Notification
-    > =
+        NotificationAccountParams, List<RoomNotification>, List<OneShotNotification>, List<OneShotNotification>, List<OneShotNotification>, Notification> =
         lambdaRecorder { _, _, _, _, _ -> A_NOTIFICATION }
 ) : SummaryGroupMessageCreator {
     override fun createSummaryNotification(
-        currentUser: MatrixUser,
+        notificationAccountParams: NotificationAccountParams,
         roomNotifications: List<RoomNotification>,
         invitationNotifications: List<OneShotNotification>,
         simpleNotifications: List<OneShotNotification>,
         fallbackNotifications: List<OneShotNotification>,
     ): Notification {
         return createSummaryNotificationResult(
-            currentUser,
+            notificationAccountParams,
             roomNotifications,
             invitationNotifications,
             simpleNotifications,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt
index 0d466d90fd..edd0c2ba17 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationEventRequestFixture.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationEventRequestFixture.kt
new file mode 100644
index 0000000000..c450287fbd
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationEventRequestFixture.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.push.impl.notifications.fixtures
+
+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.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.push.api.push.NotificationEventRequest
+
+fun aNotificationEventRequest(
+    sessionId: SessionId = A_SESSION_ID,
+    roomId: RoomId = A_ROOM_ID,
+    eventId: EventId = AN_EVENT_ID,
+    providerInfo: String = "providerInfo",
+) = NotificationEventRequest(
+    sessionId = sessionId,
+    roomId = roomId,
+    eventId = eventId,
+    providerInfo = providerInfo,
+)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationFixture.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationFixture.kt
index 48c9ec4316..5ae1156b36 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationFixture.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotificationFixture.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1b08f7b14c..2bab4c14c2 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
@@ -1,27 +1,37 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.Notification
 import android.service.notification.StatusBarNotification
+import androidx.core.app.NotificationCompat
+import androidx.core.app.Person
 import androidx.test.platform.app.InstrumentationRegistry
+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.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
 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.A_USER_NAME
+import io.element.android.libraries.push.impl.notifications.factories.DefaultNotificationCreator
 import io.element.android.libraries.push.impl.notifications.fake.FakeActiveNotificationsProvider
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
 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.mockk.every
 import io.mockk.mockk
-import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,43 +39,113 @@ import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
 class DefaultOnRedactedEventReceivedTest {
+    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)
+    }
+    private val fakeNotification = NotificationCompat.Builder(InstrumentationRegistry.getInstrumentation().targetContext, "aChannel")
+        .setStyle(
+            NotificationCompat.MessagingStyle(fakePerson)
+                .addMessage(fakeMessage)
+        )
+        .setGroup(A_SESSION_ID.value)
+        .build()
+
+    private val fakeIncorrectMessage = NotificationCompat.MessagingStyle.Message("The wrong message", 0L, fakePerson).also {
+        it.extras.putString(DefaultNotificationCreator.MESSAGE_EVENT_ID, AN_EVENT_ID_2.value)
+    }
+    private val fakeIncorrectNotification = NotificationCompat.Builder(InstrumentationRegistry.getInstrumentation().targetContext, "aChannel")
+        .setGroup(A_SESSION_ID.value)
+        .setStyle(
+            NotificationCompat.MessagingStyle(fakePerson)
+                .addMessage(fakeIncorrectMessage)
+        )
+        .build()
+
     @Test
     fun `when no notifications are found, nothing happen`() = runTest {
+        val showNotificationLambda = lambdaRecorder<String?, Int, Notification, Boolean> { _, _, _ -> true }
         val sut = createDefaultOnRedactedEventReceived(
-            getMessageNotificationsForRoomResult = { _, _ -> emptyList() }
+            getAllMessageNotificationsForRoomResult = { _, _ -> emptyList() },
+            displayer = FakeNotificationDisplayer(showNotificationLambda),
         )
         sut.onRedactedEventsReceived(listOf(ResolvedPushEvent.Redaction(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, null)))
+        showNotificationLambda.assertions().isNeverCalled()
     }
 
     @Test
     fun `when a notification is found, try to retrieve the message`() = runTest {
+        val showNotificationLambda = lambdaRecorder<String?, Int, Notification, Boolean> { tag, id, _ ->
+            assertThat(tag).isEqualTo(A_ROOM_ID.value)
+            assertThat(id).isEqualTo(1)
+            true
+        }
         val sut = createDefaultOnRedactedEventReceived(
-            getMessageNotificationsForRoomResult = { _, _ ->
+            getAllMessageNotificationsForRoomResult = { _, _ ->
                 listOf(
                     mockk {
-                        every { notification } returns mockk {}
+                        every { id } returns 1
+                        every { notification } returns fakeNotification
+                        every { tag } returns A_ROOM_ID.value
+                    },
+                    mockk {
+                        every { id } returns 2
+                        every { notification } returns fakeIncorrectNotification
+                        every { tag } returns A_ROOM_ID.value
                     }
                 )
-            }
+            },
+            displayer = FakeNotificationDisplayer(showNotificationLambda),
         )
         sut.onRedactedEventsReceived(listOf(ResolvedPushEvent.Redaction(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, null)))
+        showNotificationLambda.assertions().isCalledOnce()
     }
 
-    private fun TestScope.createDefaultOnRedactedEventReceived(
-        getMessageNotificationsForRoomResult: (SessionId, RoomId) -> List<StatusBarNotification> = { _, _ -> lambdaError() },
+    @Test
+    fun `when thread notifications are found, try to retrieve the message`() = runTest {
+        val showNotificationLambda = lambdaRecorder<String?, Int, Notification, Boolean> { tag, id, _ ->
+            assertThat(tag).isEqualTo("$A_ROOM_ID|$A_THREAD_ID")
+            assertThat(id).isEqualTo(1)
+            true
+        }
+        val sut = createDefaultOnRedactedEventReceived(
+            getAllMessageNotificationsForRoomResult = { _, _ ->
+                listOf(
+                    mockk {
+                        every { id } returns 1
+                        every { notification } returns fakeNotification
+                        every { tag } returns "$A_ROOM_ID|$A_THREAD_ID"
+                    },
+                    mockk {
+                        every { id } returns 2
+                        every { notification } returns fakeIncorrectNotification
+                        every { tag } returns A_ROOM_ID.value
+                    }
+                )
+            },
+            displayer = FakeNotificationDisplayer(showNotificationResult = showNotificationLambda),
+        )
+        sut.onRedactedEventsReceived(listOf(ResolvedPushEvent.Redaction(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, null)))
+
+        showNotificationLambda.assertions().isCalledOnce()
+    }
+
+    private fun createDefaultOnRedactedEventReceived(
+        getAllMessageNotificationsForRoomResult: (SessionId, RoomId) -> List<StatusBarNotification> = { _, _ -> lambdaError() },
+        displayer: FakeNotificationDisplayer = FakeNotificationDisplayer(),
     ): DefaultOnRedactedEventReceived {
         val context = InstrumentationRegistry.getInstrumentation().context
         return DefaultOnRedactedEventReceived(
             activeNotificationsProvider = FakeActiveNotificationsProvider(
-                getMessageNotificationsForRoomResult = getMessageNotificationsForRoomResult,
+                getMessageNotificationsForRoomResult = { _, _, _ -> lambdaError() },
+                getAllMessageNotificationsForRoomResult = getAllMessageNotificationsForRoomResult,
                 getNotificationsForSessionResult = { lambdaError() },
                 getMembershipNotificationForSessionResult = { lambdaError() },
                 getMembershipNotificationForRoomResult = { _, _ -> lambdaError() },
                 getSummaryNotificationResult = { lambdaError() },
                 countResult = { lambdaError() },
             ),
-            notificationDisplayer = FakeNotificationDisplayer(),
-            coroutineScope = this,
+            notificationDisplayer = displayer,
             context = context,
             stringProvider = FakeStringProvider(),
         )
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 e482385b3d..7c95034985 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,10 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.call.api.CallType
 import io.element.android.features.call.test.FakeElementCallEntryPoint
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
 import io.element.android.libraries.core.meta.BuildMeta
+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.SessionId
@@ -28,12 +32,13 @@ import io.element.android.libraries.matrix.test.A_SECRET
 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.core.aBuildMeta
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.push.api.push.SyncOnNotifiableEvent
 import io.element.android.libraries.push.impl.history.FakePushHistoryService
 import io.element.android.libraries.push.impl.history.PushHistoryService
+import io.element.android.libraries.push.impl.notifications.DefaultNotificationResolverQueue
 import io.element.android.libraries.push.impl.notifications.FakeNotifiableEventResolver
 import io.element.android.libraries.push.impl.notifications.FallbackNotificationFactory
-import io.element.android.libraries.push.impl.notifications.NotificationEventRequest
-import io.element.android.libraries.push.impl.notifications.NotificationResolverQueue
 import io.element.android.libraries.push.impl.notifications.channels.FakeNotificationChannels
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableCallEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
@@ -42,12 +47,16 @@ import io.element.android.libraries.push.impl.notifications.model.NotifiableEven
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
 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.SyncNotificationsWorkerDataConverter
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushstore.api.UserPushStore
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStore
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStoreFactory
 import io.element.android.libraries.pushstore.test.userpushstore.clientsecret.FakePushClientSecret
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.test.FakeWorkManagerScheduler
+import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.any
@@ -131,6 +140,45 @@ class DefaultPushHandlerTest {
             .isCalledOnce()
     }
 
+    @Test
+    fun `when classical PushData is received and the workmanager flag is enabled, the work is scheduled`() = runTest {
+        val aNotifiableMessageEvent = aNotifiableMessageEvent()
+        val notifiableEventResult =
+            lambdaRecorder<SessionId, List<NotificationEventRequest>, Result<Map<NotificationEventRequest, Result<ResolvedPushEvent>>>> { _, _ ->
+                val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO)
+                Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent))))
+            }
+        val incrementPushCounterResult = lambdaRecorder<Unit> {}
+        val aPushData = PushData(
+            eventId = AN_EVENT_ID,
+            roomId = A_ROOM_ID,
+            unread = 0,
+            clientSecret = A_SECRET,
+        )
+
+        val featureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.SyncNotificationsWithWorkManager.key to true))
+        val submitWorkLambda = lambdaRecorder<WorkManagerRequest, Unit> {}
+        val workManagerScheduler = FakeWorkManagerScheduler(submitLambda = submitWorkLambda)
+
+        val defaultPushHandler = createDefaultPushHandler(
+            notifiableEventsResult = notifiableEventResult,
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_USER_ID }
+            ),
+            incrementPushCounterResult = incrementPushCounterResult,
+            featureFlagService = featureFlagService,
+            workManagerScheduler = workManagerScheduler,
+        )
+        defaultPushHandler.handle(aPushData, A_PUSHER_INFO)
+
+        advanceTimeBy(300.milliseconds)
+
+        submitWorkLambda.assertions().isCalledOnce()
+
+        incrementPushCounterResult.assertions()
+            .isCalledOnce()
+    }
+
     @Test
     fun `when classical PushData is received, but notifications are disabled, nothing happen`() =
         runTest {
@@ -644,6 +692,9 @@ class DefaultPushHandlerTest {
         elementCallEntryPoint: FakeElementCallEntryPoint = FakeElementCallEntryPoint(),
         notificationChannels: FakeNotificationChannels = FakeNotificationChannels(),
         pushHistoryService: PushHistoryService = FakePushHistoryService(),
+        syncOnNotifiableEvent: SyncOnNotifiableEvent = SyncOnNotifiableEvent {},
+        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.SyncNotificationsWithWorkManager.key to false)),
+        workManagerScheduler: FakeWorkManagerScheduler = FakeWorkManagerScheduler(),
     ): DefaultPushHandler {
         return DefaultPushHandler(
             onNotifiableEventReceived = FakeOnNotifiableEventReceived(onNotifiableEventsReceived),
@@ -661,12 +712,22 @@ class DefaultPushHandlerTest {
             elementCallEntryPoint = elementCallEntryPoint,
             notificationChannels = notificationChannels,
             pushHistoryService = pushHistoryService,
-            resolverQueue = NotificationResolverQueue(notifiableEventResolver = FakeNotifiableEventResolver(notifiableEventsResult), backgroundScope),
+            // We don't use a fake here so we can perform tests that are a bit more end to end
+            resolverQueue = DefaultNotificationResolverQueue(
+                notifiableEventResolver = FakeNotifiableEventResolver(notifiableEventsResult),
+                appCoroutineScope = backgroundScope,
+                workManagerScheduler = workManagerScheduler,
+                featureFlagService = featureFlagService,
+                workerDataConverter = SyncNotificationsWorkerDataConverter(DefaultJsonProvider()),
+                buildVersionSdkIntProvider = FakeBuildVersionSdkIntProvider(33),
+            ),
             appCoroutineScope = backgroundScope,
             fallbackNotificationFactory = FallbackNotificationFactory(
                 clock = FakeSystemClock(),
                 stringProvider = FakeStringProvider(),
-            )
+            ),
+            syncOnNotifiableEvent = syncOnNotifiableEvent,
+            featureFlagService = featureFlagService,
         )
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt
index d4d3992f1e..f5de845350 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeMutableBatteryOptimizationStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnNotifiableEventReceived.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnNotifiableEventReceived.kt
index 055b1f322e..6686577dbb 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnNotifiableEventReceived.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnNotifiableEventReceived.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnRedactedEventReceived.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnRedactedEventReceived.kt
index b5a3731830..e295298c63 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnRedactedEventReceived.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/FakeOnRedactedEventReceived.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ import io.element.android.tests.testutils.lambda.lambdaError
 class FakeOnRedactedEventReceived(
     private val onRedactedEventsReceivedResult: (List<ResolvedPushEvent.Redaction>) -> Unit = { lambdaError() },
 ) : OnRedactedEventReceived {
-    override fun onRedactedEventsReceived(redactions: List<ResolvedPushEvent.Redaction>) {
+    override suspend fun onRedactedEventsReceived(redactions: List<ResolvedPushEvent.Redaction>) {
         onRedactedEventsReceivedResult(redactions)
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt
index e1c4b33acf..6c88e7bf12 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,22 +19,17 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 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.sync.FakeSyncService
-import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableCallEvent
-import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
+import io.element.android.libraries.push.api.push.SyncOnNotifiableEvent
+import io.element.android.libraries.push.impl.notifications.fixtures.aNotificationEventRequest
 import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.testCoroutineDispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.time.Duration.Companion.seconds
 
 class SyncOnNotifiableEventTest {
     private val startSyncLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
@@ -57,60 +53,19 @@ class SyncOnNotifiableEventTest {
         givenGetRoomResult(A_ROOM_ID, room)
     }
 
-    private val notifiableEvent = aNotifiableMessageEvent()
-    private val incomingCallNotifiableEvent = aNotifiableCallEvent()
+    private val notificationRequest = aNotificationEventRequest()
 
     @Test
     fun `when feature flag is disabled, nothing happens`() = runTest {
         val sut = createSyncOnNotifiableEvent(client = client, isSyncOnPushEnabled = false)
 
-        sut(listOf(notifiableEvent))
+        sut(listOf(notificationRequest))
 
         assert(startSyncLambda).isNeverCalled()
         assert(stopSyncLambda).isNeverCalled()
         assert(subscribeToSyncLambda).isNeverCalled()
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun `when feature flag is enabled, a ringing call waits until the room is in 'in-call' state`() = runTest {
-        val appForegroundStateService = FakeAppForegroundStateService(
-            initialForegroundValue = false,
-        )
-        val sut = createSyncOnNotifiableEvent(client = client, appForegroundStateService = appForegroundStateService, isSyncOnPushEnabled = true)
-
-        val unlocked = AtomicBoolean(false)
-        launch {
-            advanceTimeBy(1.seconds)
-            unlocked.set(true)
-            room.givenRoomInfo(aRoomInfo(hasRoomCall = true))
-        }
-        sut(listOf(incomingCallNotifiableEvent))
-
-        // The process was completed before the timeout
-        assertThat(unlocked.get()).isTrue()
-    }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun `when feature flag is enabled, a ringing call waits until the room is in 'in-call' state or timeouts`() = runTest {
-        val appForegroundStateService = FakeAppForegroundStateService(
-            initialForegroundValue = false,
-        )
-        val sut = createSyncOnNotifiableEvent(client = client, appForegroundStateService = appForegroundStateService, isSyncOnPushEnabled = true)
-
-        val unlocked = AtomicBoolean(false)
-        launch {
-            advanceTimeBy(120.seconds)
-            unlocked.set(true)
-            room.givenRoomInfo(aRoomInfo(hasRoomCall = true))
-        }
-        sut(listOf(incomingCallNotifiableEvent))
-
-        // Didn't unlock before the timeout
-        assertThat(unlocked.get()).isFalse()
-    }
-
     @Test
     fun `when feature flag is enabled and app is in background, sync is started and stopped`() = runTest {
         val appForegroundStateService = FakeAppForegroundStateService(
@@ -120,7 +75,7 @@ class SyncOnNotifiableEventTest {
 
         appForegroundStateService.isSyncingNotificationEvent.test {
             syncService.emitSyncState(SyncState.Running)
-            sut(listOf(notifiableEvent))
+            sut(listOf(notificationRequest))
 
             // It's initially false
             assertThat(awaitItem()).isFalse()
@@ -141,8 +96,8 @@ class SyncOnNotifiableEventTest {
         val sut = createSyncOnNotifiableEvent(client = client, appForegroundStateService = appForegroundStateService, isSyncOnPushEnabled = true)
 
         appForegroundStateService.isSyncingNotificationEvent.test {
-            launch { sut(listOf(notifiableEvent)) }
-            launch { sut(listOf(notifiableEvent)) }
+            launch { sut(listOf(notificationRequest)) }
+            launch { sut(listOf(notificationRequest)) }
 
             // It's initially false
             assertThat(awaitItem()).isFalse()
@@ -168,7 +123,7 @@ class SyncOnNotifiableEventTest {
             )
         )
         val matrixClientProvider = FakeMatrixClientProvider { Result.success(client) }
-        return SyncOnNotifiableEvent(
+        return DefaultSyncOnNotifiableEvent(
             matrixClientProvider = matrixClientProvider,
             featureFlagService = featureFlagService,
             appForegroundStateService = appForegroundStateService,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/DefaultPushGatewayNotifyRequestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/DefaultPushGatewayNotifyRequestTest.kt
index 223f2f4d8a..47dc027b43 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/DefaultPushGatewayNotifyRequestTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/DefaultPushGatewayNotifyRequestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/FakePushGatewayApiFactory.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/FakePushGatewayApiFactory.kt
index 563b6d1c37..1b1958a8a3 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/FakePushGatewayApiFactory.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/pushgateway/FakePushGatewayApiFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt
index 41b0546f33..591e533262 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/store/InMemoryPushDataStore.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/DefaultTestPushTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/DefaultTestPushTest.kt
index c3231097a0..9ab0f16b62 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/DefaultTestPushTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/DefaultTestPushTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@ package io.element.android.libraries.push.impl.test
 
 import io.element.android.appconfig.PushConfig
 import io.element.android.libraries.push.impl.pushgateway.PushGatewayNotifyRequest
-import io.element.android.libraries.pushproviders.test.aCurrentUserPushConfig
+import io.element.android.libraries.pushproviders.test.aSessionPushConfig
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.runTest
@@ -24,7 +25,7 @@ class DefaultTestPushTest {
                 executeResult = executeResult,
             )
         )
-        val aConfig = aCurrentUserPushConfig()
+        val aConfig = aSessionPushConfig()
         defaultTestPush.execute(aConfig)
         executeResult.assertions()
             .isCalledOnce()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakePushGatewayNotifyRequest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakePushGatewayNotifyRequest.kt
index 97d3172262..173b05e1c9 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakePushGatewayNotifyRequest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakePushGatewayNotifyRequest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakeTestPush.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakeTestPush.kt
index f09832cc3b..9050601f4a 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakeTestPush.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/test/FakeTestPush.kt
@@ -1,19 +1,20 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.test
 
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeTestPush(
-    private val executeResult: (CurrentUserPushConfig) -> Unit = { lambdaError() }
+    private val executeResult: (Config) -> Unit = { lambdaError() }
 ) : TestPush {
-    override suspend fun execute(config: CurrentUserPushConfig) {
+    override suspend fun execute(config: Config) {
         executeResult(config)
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTestTest.kt
index a11c6b147e..c49bff6c38 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTestTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/CurrentPushProviderTestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTestTest.kt
index e38baa7321..c662361f44 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTestTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/IgnoredUsersTestTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,7 +40,7 @@ class IgnoredUsersTestTest {
         )
         val openIgnoredUsersResult = lambdaRecorder<Unit> {}
         val navigator = object : NotificationTroubleshootNavigator {
-            override fun openIgnoredUsers() = openIgnoredUsersResult()
+            override fun navigateToBlockedUsers() = openIgnoredUsersResult()
         }
         sut.quickFix(
             coroutineScope = backgroundScope,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTestTest.kt
index eecb3801fd..06dbe383ea 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTestTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/NotificationTestTest.kt
@@ -1,13 +1,16 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTestState
@@ -64,10 +67,12 @@ class NotificationTestTest {
 
     private fun createNotificationTest(): NotificationTest {
         return NotificationTest(
+            sessionId = A_SESSION_ID,
             notificationCreator = notificationCreator,
             notificationDisplayer = fakeNotificationDisplayer,
             notificationClickHandler = notificationClickHandler,
             stringProvider = FakeStringProvider(),
+            enterpriseService = FakeEnterpriseService(),
         )
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt
index f06b6a9e1b..f83fb660ce 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushLoopbackTestTest.kt
@@ -1,21 +1,27 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.SessionId
 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_SESSION_ID
+import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.push.api.gateway.PushGatewayFailure
 import io.element.android.libraries.push.test.FakePushService
 import io.element.android.libraries.pushproviders.test.FakePushProvider
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTestState
 import io.element.android.libraries.troubleshoot.test.FakeNotificationTroubleshootNavigator
 import io.element.android.libraries.troubleshoot.test.runAndTestState
+import io.element.android.services.toolbox.api.strings.StringProvider
+import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -25,13 +31,7 @@ import org.junit.Test
 class PushLoopbackTestTest {
     @Test
     fun `test PushLoopbackTest timeout - push is not received`() = runTest {
-        val diagnosticPushHandler = DiagnosticPushHandler()
-        val sut = PushLoopbackTest(
-            pushService = FakePushService(),
-            diagnosticPushHandler = diagnosticPushHandler,
-            clock = FakeSystemClock(),
-            stringProvider = FakeStringProvider(),
-        )
+        val sut = createPushLoopbackTest()
         sut.runAndTestState {
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.InProgress)
@@ -42,16 +42,12 @@ class PushLoopbackTestTest {
 
     @Test
     fun `test PushLoopbackTest PusherRejected error`() = runTest {
-        val diagnosticPushHandler = DiagnosticPushHandler()
-        val sut = PushLoopbackTest(
+        val sut = createPushLoopbackTest(
             pushService = FakePushService(
                 testPushBlock = {
                     throw PushGatewayFailure.PusherRejected()
                 }
             ),
-            diagnosticPushHandler = diagnosticPushHandler,
-            clock = FakeSystemClock(),
-            stringProvider = FakeStringProvider(),
         )
         sut.runAndTestState {
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))
@@ -65,9 +61,8 @@ class PushLoopbackTestTest {
 
     @Test
     fun `test PushLoopbackTest PusherRejected error with quick fix`() = runTest {
-        val diagnosticPushHandler = DiagnosticPushHandler()
         val rotateTokenLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
-        val sut = PushLoopbackTest(
+        val sut = createPushLoopbackTest(
             pushService = FakePushService(
                 testPushBlock = {
                     throw PushGatewayFailure.PusherRejected()
@@ -79,9 +74,6 @@ class PushLoopbackTestTest {
                     )
                 }
             ),
-            diagnosticPushHandler = diagnosticPushHandler,
-            clock = FakeSystemClock(),
-            stringProvider = FakeStringProvider(),
         )
         sut.runAndTestState {
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))
@@ -97,14 +89,10 @@ class PushLoopbackTestTest {
 
     @Test
     fun `test PushLoopbackTest setup error`() = runTest {
-        val diagnosticPushHandler = DiagnosticPushHandler()
-        val sut = PushLoopbackTest(
+        val sut = createPushLoopbackTest(
             pushService = FakePushService(
                 testPushBlock = { false }
             ),
-            diagnosticPushHandler = diagnosticPushHandler,
-            clock = FakeSystemClock(),
-            stringProvider = FakeStringProvider(),
         )
         sut.runAndTestState {
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))
@@ -116,16 +104,12 @@ class PushLoopbackTestTest {
 
     @Test
     fun `test PushLoopbackTest other error`() = runTest {
-        val diagnosticPushHandler = DiagnosticPushHandler()
-        val sut = PushLoopbackTest(
+        val sut = createPushLoopbackTest(
             pushService = FakePushService(
                 testPushBlock = {
                     throw AN_EXCEPTION
                 }
             ),
-            diagnosticPushHandler = diagnosticPushHandler,
-            clock = FakeSystemClock(),
-            stringProvider = FakeStringProvider(),
         )
         sut.runAndTestState {
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))
@@ -139,14 +123,12 @@ class PushLoopbackTestTest {
     @Test
     fun `test PushLoopbackTest push is received`() = runTest {
         val diagnosticPushHandler = DiagnosticPushHandler()
-        val sut = PushLoopbackTest(
+        val sut = createPushLoopbackTest(
             pushService = FakePushService(testPushBlock = {
                 diagnosticPushHandler.handlePush()
                 true
             }),
             diagnosticPushHandler = diagnosticPushHandler,
-            clock = FakeSystemClock(),
-            stringProvider = FakeStringProvider(),
         )
         sut.runAndTestState {
             assertThat(awaitItem().status).isEqualTo(NotificationTroubleshootTestState.Status.Idle(true))
@@ -156,3 +138,17 @@ class PushLoopbackTestTest {
         }
     }
 }
+
+private fun createPushLoopbackTest(
+    sessionId: SessionId = A_SESSION_ID,
+    pushService: PushService = FakePushService(),
+    diagnosticPushHandler: DiagnosticPushHandler = DiagnosticPushHandler(),
+    clock: SystemClock = FakeSystemClock(),
+    stringProvider: StringProvider = FakeStringProvider(),
+) = PushLoopbackTest(
+    sessionId = sessionId,
+    pushService = pushService,
+    diagnosticPushHandler = diagnosticPushHandler,
+    clock = clock,
+    stringProvider = stringProvider
+)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt
index b274f0bdab..ce94d389ba 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/troubleshoot/PushProvidersTestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/unregistration/DefaultServiceUnregisteredHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/unregistration/DefaultServiceUnregisteredHandlerTest.kt
new file mode 100644
index 0000000000..bda82a3c3e
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/unregistration/DefaultServiceUnregisteredHandlerTest.kt
@@ -0,0 +1,118 @@
+/*
+ * 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.push.impl.unregistration
+
+import android.app.Notification
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import io.element.android.appconfig.NotificationConfig
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.libraries.matrix.api.user.MatrixUser
+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.push.impl.notifications.NotificationDisplayer
+import io.element.android.libraries.push.impl.notifications.factories.NotificationAccountParams
+import io.element.android.libraries.push.impl.notifications.factories.NotificationCreator
+import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationCreator
+import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDisplayer
+import io.element.android.libraries.push.impl.notifications.fixtures.A_NOTIFICATION
+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.lambda.value
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultServiceUnregisteredHandlerTest {
+    @Test
+    fun `handle will create a notification and render it`() = runTest {
+        val notification = A_NOTIFICATION
+        val createUnregistrationNotificationResult = lambdaRecorder<NotificationAccountParams, Notification> { notification }
+        val displayUnregistrationNotificationResult = lambdaRecorder<Notification, Boolean> { true }
+        val sut = createDefaultServiceUnregisteredHandler(
+            notificationCreator = FakeNotificationCreator(
+                createUnregistrationNotificationResult = createUnregistrationNotificationResult,
+            ),
+            notificationDisplayer = FakeNotificationDisplayer(
+                displayUnregistrationNotificationResult = displayUnregistrationNotificationResult,
+            )
+        )
+        sut.handle(A_SESSION_ID)
+        createUnregistrationNotificationResult.assertions().isCalledOnce().with(
+            value(
+                NotificationAccountParams(
+                    MatrixUser(
+                        userId = A_SESSION_ID,
+                        displayName = null,
+                        avatarUrl = null,
+                    ),
+                    color = NotificationConfig.NOTIFICATION_ACCENT_COLOR,
+                    showSessionId = false,
+                )
+            )
+        )
+        displayUnregistrationNotificationResult.assertions().isCalledOnce().with(
+            value(notification)
+        )
+    }
+
+    @Test
+    fun `handle will create a notification and render it - custom color and multi accounts`() = runTest {
+        val notification = A_NOTIFICATION
+        val createUnregistrationNotificationResult = lambdaRecorder<NotificationAccountParams, Notification> { notification }
+        val displayUnregistrationNotificationResult = lambdaRecorder<Notification, Boolean> { true }
+        val sut = createDefaultServiceUnregisteredHandler(
+            enterpriseService = FakeEnterpriseService(
+                initialBrandColor = Color.Red,
+            ),
+            notificationCreator = FakeNotificationCreator(
+                createUnregistrationNotificationResult = createUnregistrationNotificationResult,
+            ),
+            notificationDisplayer = FakeNotificationDisplayer(
+                displayUnregistrationNotificationResult = displayUnregistrationNotificationResult,
+            ),
+            sessionStore = InMemorySessionStore(
+                initialList = listOf(
+                    aSessionData(sessionId = A_SESSION_ID.value),
+                    aSessionData(sessionId = A_SESSION_ID_2.value),
+                )
+            )
+        )
+        sut.handle(A_SESSION_ID)
+        createUnregistrationNotificationResult.assertions().isCalledOnce().with(
+            value(
+                NotificationAccountParams(
+                    MatrixUser(
+                        userId = A_SESSION_ID,
+                        displayName = null,
+                        avatarUrl = null,
+                    ),
+                    color = Color.Red.toArgb(),
+                    showSessionId = true,
+                )
+            )
+        )
+        displayUnregistrationNotificationResult.assertions().isCalledOnce().with(
+            value(notification)
+        )
+    }
+
+    private fun createDefaultServiceUnregisteredHandler(
+        enterpriseService: EnterpriseService = FakeEnterpriseService(),
+        notificationCreator: NotificationCreator = FakeNotificationCreator(),
+        notificationDisplayer: NotificationDisplayer = FakeNotificationDisplayer(),
+        sessionStore: SessionStore = InMemorySessionStore(),
+    ) = DefaultServiceUnregisteredHandler(
+        enterpriseService = enterpriseService,
+        notificationCreator = notificationCreator,
+        notificationDisplayer = notificationDisplayer,
+        sessionStore = sessionStore,
+    )
+}
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/unregistration/FakeServiceUnregisteredHandler.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/unregistration/FakeServiceUnregisteredHandler.kt
new file mode 100644
index 0000000000..0ae4190973
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/unregistration/FakeServiceUnregisteredHandler.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.push.impl.unregistration
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeServiceUnregisteredHandler(
+    private val handleResult: (UserId) -> Unit = { lambdaError() },
+) : ServiceUnregisteredHandler {
+    override suspend fun handle(userId: UserId) {
+        handleResult(userId)
+    }
+}
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationWorkerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationWorkerTest.kt
new file mode 100644
index 0000000000..d40ef17b53
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationWorkerTest.kt
@@ -0,0 +1,209 @@
+/*
+ * 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.push.impl.workmanager
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.work.Data
+import androidx.work.ListenableWorker
+import androidx.work.WorkerParameters
+import androidx.work.impl.utils.taskexecutor.WorkManagerTaskExecutor
+import androidx.work.workDataOf
+import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.ListenableFuture
+import io.element.android.features.networkmonitor.api.NetworkStatus
+import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.push.api.push.SyncOnNotifiableEvent
+import io.element.android.libraries.push.impl.notifications.FakeNotifiableEventResolver
+import io.element.android.libraries.push.impl.notifications.NotificationResolverQueue
+import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
+import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
+import io.element.android.libraries.push.test.notifications.FakeNotificationResolverQueue
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
+import io.element.android.libraries.workmanager.test.FakeWorkManagerScheduler
+import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+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.runTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.UUID
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.seconds
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(AndroidJUnit4::class)
+class FetchNotificationWorkerTest {
+    @Test
+    fun `test - success`() = runTest {
+        var synced = false
+        val syncOnNotifiableEventLambda = SyncOnNotifiableEvent { synced = true }
+
+        val queue = FakeNotificationResolverQueue(
+            processingLambda = { Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent())) }
+        )
+        val worker = createWorker(
+            input = """
+            [
+                {
+                    "session_id": "@alice:matrix.org",
+                    "room_id": "!roomid:matrix.org",
+                    "event_id": "$1436ebk:matrix.org",
+                    "provider_info": "some_info"
+                }
+            ]
+            """.trimIndent(),
+            queue = queue,
+            syncOnNotifiableEvent = syncOnNotifiableEventLambda,
+        )
+
+        val result = worker.doWork()
+
+        // The process finished successfully
+        assertThat(result).isEqualTo(ListenableWorker.Result.success())
+
+        // A result was emitted
+        assertThat(queue.results.replayCache).isNotEmpty()
+
+        // An opportunistic sync was triggered
+        assertThat(synced).isTrue()
+    }
+
+    @Test
+    fun `test - invalid input fails the work`() = runTest {
+        val worker = createWorker(
+            input = """
+            [
+                {
+                    "session_id": "!alice:matrix.org",
+                    "room_id": "!roomid:matrix.org",
+                    "event_id": "$1436ebk:matrix.org",
+                    "provider_info": "some_info"
+                }
+            ]
+            """.trimIndent(),
+        )
+
+        val result = worker.doWork()
+
+        // The process failed
+        assertThat(result).isEqualTo(ListenableWorker.Result.failure())
+    }
+
+    @Test
+    fun `test - no network connectivity fails the work`() = runTest {
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Disconnected)
+        val worker = createWorker(
+            input = """
+            [
+                {
+                    "session_id": "@alice:matrix.org",
+                    "room_id": "!roomid:matrix.org",
+                    "event_id": "$1436ebk:matrix.org",
+                    "provider_info": "some_info"
+                }
+            ]
+            """.trimIndent(),
+            networkMonitor = networkMonitor,
+        )
+
+        val result = worker.doWork()
+
+        advanceTimeBy(10.seconds)
+
+        // The process failed due to a timeout in getting the network connectivity, a retry is scheduled
+        assertThat(result).isEqualTo(ListenableWorker.Result.retry())
+    }
+
+    @Test
+    fun `test - failing to resolve events re-schedules the work`() = runTest {
+        val submitWorkerLambda = lambdaRecorder<WorkManagerRequest, Unit> {}
+        val scheduler = FakeWorkManagerScheduler(submitLambda = submitWorkerLambda)
+
+        val resolver = FakeNotifiableEventResolver(
+            resolveEventsResult = { _, _ -> Result.failure(Exception("Failed to resolve events")) }
+        )
+
+        val worker = createWorker(
+            input = """
+            [
+                {
+                    "session_id": "@alice:matrix.org",
+                    "room_id": "!roomid:matrix.org",
+                    "event_id": "$1436ebk:matrix.org",
+                    "provider_info": "some_info"
+                }
+            ]
+            """.trimIndent(),
+            eventResolver = resolver,
+            workManagerScheduler = scheduler,
+        )
+
+        val result = worker.doWork()
+
+        // The process was considered successful, but a retry was scheduled due to the failure to resolve events
+        assertThat(result).isEqualTo(ListenableWorker.Result.success())
+        submitWorkerLambda.assertions().isCalledOnce()
+    }
+
+    private fun TestScope.createWorker(
+        input: String,
+        networkMonitor: FakeNetworkMonitor = FakeNetworkMonitor(),
+        eventResolver: FakeNotifiableEventResolver = FakeNotifiableEventResolver(resolveEventsResult = { _, _ -> Result.success(emptyMap()) }),
+        queue: NotificationResolverQueue = FakeNotificationResolverQueue(
+            processingLambda = { Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent())) }
+        ),
+        workManagerScheduler: FakeWorkManagerScheduler = FakeWorkManagerScheduler(),
+        syncOnNotifiableEvent: SyncOnNotifiableEvent = SyncOnNotifiableEvent {},
+    ) = FetchNotificationsWorker(
+        workerParams = createWorkerParams(workDataOf("requests" to input)),
+        context = InstrumentationRegistry.getInstrumentation().context,
+        networkMonitor = networkMonitor,
+        eventResolver = eventResolver,
+        queue = queue,
+        workManagerScheduler = workManagerScheduler,
+        syncOnNotifiableEvent = syncOnNotifiableEvent,
+        coroutineDispatchers = testCoroutineDispatchers(),
+        workerDataConverter = SyncNotificationsWorkerDataConverter(DefaultJsonProvider()),
+        buildVersionSdkIntProvider = FakeBuildVersionSdkIntProvider(33),
+    )
+
+    private fun TestScope.createWorkerParams(
+        inputData: Data = Data.EMPTY,
+    ): WorkerParameters = WorkerParameters(
+        UUID.randomUUID(),
+        inputData,
+        emptySet(),
+        WorkerParameters.RuntimeExtras(),
+        0,
+        0,
+        Executors.newSingleThreadExecutor(),
+        backgroundScope.coroutineContext,
+        WorkManagerTaskExecutor(Executors.newSingleThreadExecutor()),
+        MetroWorkerFactory(emptyMap()),
+        { context, id, data -> FakeListenableFuture() },
+        { context, id, foregroundInfo -> FakeListenableFuture() },
+    )
+}
+
+class FakeListenableFuture<T> : ListenableFuture<T> {
+    override fun addListener(listener: Runnable, executor: Executor) = Unit
+    override fun cancel(mayInterruptIfRunning: Boolean): Boolean = true
+    override fun get(): T? = null
+    override fun get(timeout: Long, unit: TimeUnit?): T? = null
+    override fun isCancelled(): Boolean = false
+    override fun isDone(): Boolean = false
+}
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationWorkManagerRequestTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationWorkManagerRequestTest.kt
new file mode 100644
index 0000000000..1f8d646e2b
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/SyncNotificationWorkManagerRequestTest.kt
@@ -0,0 +1,98 @@
+/*
+ * 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.push.impl.workmanager
+
+import androidx.work.OneTimeWorkRequest
+import androidx.work.hasKeyWithValueOfType
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.push.impl.notifications.fixtures.aNotificationEventRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.workManagerTag
+import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import kotlin.collections.first
+
+class SyncNotificationWorkManagerRequestTest {
+    @Test
+    fun `build - success API 33`() = runTest {
+        val request = createSyncNotificationWorkManagerRequest(
+            sessionId = A_SESSION_ID,
+            notificationEventRequests = listOf(aNotificationEventRequest()),
+            sdkVersion = 33,
+        )
+
+        val result = request.build()
+        assertThat(result.isSuccess).isTrue()
+        result.getOrNull()!!.first().run {
+            assertThat(this).isInstanceOf(OneTimeWorkRequest::class.java)
+            assertThat(workSpec.input.hasKeyWithValueOfType<String>("requests")).isTrue()
+            // True in API 33+
+            assertThat(workSpec.expedited).isTrue()
+            assertThat(workSpec.traceTag).isEqualTo(workManagerTag(A_SESSION_ID, WorkManagerRequestType.NOTIFICATION_SYNC))
+        }
+    }
+
+    @Test
+    fun `build - success API 32 and lower`() = runTest {
+        val request = createSyncNotificationWorkManagerRequest(
+            sessionId = A_SESSION_ID,
+            notificationEventRequests = listOf(aNotificationEventRequest()),
+            sdkVersion = 32,
+        )
+
+        val result = request.build()
+        assertThat(result.isSuccess).isTrue()
+        result.getOrNull()!!.first().run {
+            assertThat(this).isInstanceOf(OneTimeWorkRequest::class.java)
+            assertThat(workSpec.input.hasKeyWithValueOfType<String>("requests")).isTrue()
+            // False before API 33
+            assertThat(workSpec.expedited).isFalse()
+            assertThat(workSpec.traceTag).isEqualTo(workManagerTag(A_SESSION_ID, WorkManagerRequestType.NOTIFICATION_SYNC))
+        }
+    }
+
+    @Test
+    fun `build - empty list of requests fails`() = runTest {
+        val request = createSyncNotificationWorkManagerRequest(
+            sessionId = A_SESSION_ID,
+            notificationEventRequests = emptyList()
+        )
+
+        val result = request.build()
+        assertThat(result.isFailure).isTrue()
+    }
+
+    @Test
+    fun `build - invalid serialization`() = runTest {
+        val request = createSyncNotificationWorkManagerRequest(
+            sessionId = A_SESSION_ID,
+            notificationEventRequests = listOf(aNotificationEventRequest()),
+            workerDataConverter = SyncNotificationsWorkerDataConverter({ error("error during serialization") })
+        )
+        val result = request.build()
+        assertThat(result.isFailure).isTrue()
+    }
+}
+
+private fun createSyncNotificationWorkManagerRequest(
+    sessionId: SessionId,
+    notificationEventRequests: List<NotificationEventRequest>,
+    workerDataConverter: SyncNotificationsWorkerDataConverter = SyncNotificationsWorkerDataConverter(DefaultJsonProvider()),
+    sdkVersion: Int = 33,
+) = SyncNotificationWorkManagerRequest(
+    sessionId = sessionId,
+    notificationEventRequests = notificationEventRequests,
+    workerDataConverter = workerDataConverter,
+    buildVersionSdkIntProvider = FakeBuildVersionSdkIntProvider(sdkVersion),
+)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/WorkerDataConverterTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/WorkerDataConverterTest.kt
new file mode 100644
index 0000000000..85b55e0d62
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/WorkerDataConverterTest.kt
@@ -0,0 +1,141 @@
+/*
+ * 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.push.impl.workmanager
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.matrix.api.core.EventId
+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_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.A_SESSION_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID_2
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import org.junit.Test
+
+class WorkerDataConverterTest {
+    @Test
+    fun `ensure identity when serializing - deserializing an empty list`() {
+        testIdentity(emptyList())
+    }
+
+    @Test
+    fun `ensure identity when serializing - deserializing a list`() {
+        testIdentity(
+            listOf(
+                NotificationEventRequest(
+                    sessionId = A_SESSION_ID,
+                    roomId = A_ROOM_ID,
+                    eventId = AN_EVENT_ID,
+                    providerInfo = "info1",
+                ),
+                NotificationEventRequest(
+                    sessionId = A_SESSION_ID_2,
+                    roomId = A_ROOM_ID_2,
+                    eventId = AN_EVENT_ID_2,
+                    providerInfo = "info2",
+                ),
+            )
+        )
+    }
+
+    @Test
+    fun `serializing lots of data leads to several work data generated - one room - 100 events should be split in 5 chunks`() {
+        val data = List(100) {
+            NotificationEventRequest(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID,
+                eventId = EventId(AN_EVENT_ID.value + it),
+                providerInfo = "info$it",
+            )
+        }
+        val sut = SyncNotificationsWorkerDataConverter(DefaultJsonProvider())
+        val serialized = sut.serialize(data)
+        assertThat(serialized.getOrNull()?.size).isGreaterThan(1)
+        assertThat(serialized.getOrNull()?.size).isEqualTo(100 / SyncNotificationsWorkerDataConverter.CHUNK_SIZE)
+        // All the items are present
+        val deserialized = serialized.getOrNull()?.flatMap { sut.deserialize(it)!! }
+        assertThat(deserialized).containsExactlyElementsIn(data)
+    }
+
+    @Test
+    fun `serializing lots of data leads to several work data generated - one room - 101 events should be split in 6 chunks`() {
+        val data = List(101) {
+            NotificationEventRequest(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID,
+                eventId = EventId(AN_EVENT_ID.value + it),
+                providerInfo = "info$it",
+            )
+        }
+        val sut = SyncNotificationsWorkerDataConverter(DefaultJsonProvider())
+        val serialized = sut.serialize(data)
+        assertThat(serialized.getOrNull()?.size).isGreaterThan(1)
+        assertThat(serialized.getOrNull()?.size).isEqualTo(100 / SyncNotificationsWorkerDataConverter.CHUNK_SIZE + 1)
+        // All the items are present
+        val deserialized = serialized.getOrNull()?.flatMap { sut.deserialize(it)!! }
+        assertThat(deserialized).containsExactlyElementsIn(data)
+    }
+
+    @Test
+    fun `serializing lots of data leads to several work data generated - 3 rooms - 25 events should be split in 2 chunks and room not mixed`() {
+        val data1 = List(15) {
+            NotificationEventRequest(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID,
+                eventId = EventId(AN_EVENT_ID.value + it),
+                providerInfo = "info".repeat(100) + it,
+            )
+        }
+        val data2 = List(3) {
+            NotificationEventRequest(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID_2,
+                eventId = EventId(AN_EVENT_ID.value + it),
+                providerInfo = "info".repeat(100) + it,
+            )
+        }
+        val data3 = List(7) {
+            NotificationEventRequest(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID_3,
+                eventId = EventId(AN_EVENT_ID.value + it),
+                providerInfo = "info".repeat(100) + it,
+            )
+        }
+        val data = (data1 + data2 + data3).shuffled()
+        val sut = SyncNotificationsWorkerDataConverter(DefaultJsonProvider())
+        val serialized = sut.serialize(data)
+        assertThat(serialized.getOrNull()?.size).isEqualTo(2)
+        // All the items are present
+        val deserialized = serialized.getOrNull()?.flatMap { sut.deserialize(it)!! }
+        assertThat(deserialized).containsExactlyElementsIn(data)
+        // Rooms are not mixed between the chunks
+        val setsOfRooms = serialized.getOrNull()!!
+            .map { workData -> sut.deserialize(workData)!! }
+            .map {
+                it.map { request -> request.roomId }.toSet()
+            }
+        // Ensure that all sets are distinct
+        assertThat(setsOfRooms.size).isEqualTo(2)
+        // 3 roomId are present
+        assertThat(setsOfRooms.flatten().toSet()).containsExactly(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3)
+        // No intersection between sets
+        assertThat(setsOfRooms[0].intersect(setsOfRooms[1])).isEmpty()
+    }
+
+    private fun testIdentity(data: List<NotificationEventRequest>) {
+        val sut = SyncNotificationsWorkerDataConverter(DefaultJsonProvider())
+        val serialized = sut.serialize(data).getOrThrow()
+        val result = sut.deserialize(serialized.first())
+        assertThat(result).isEqualTo(data)
+    }
+}
diff --git a/libraries/push/test/build.gradle.kts b/libraries/push/test/build.gradle.kts
index fa0db0738b..3a0b5532ae 100644
--- a/libraries/push/test/build.gradle.kts
+++ b/libraries/push/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ android {
 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.matrixui)
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakeGetCurrentPushProvider.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakeGetCurrentPushProvider.kt
index e2fc48aada..f9cae82f8c 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakeGetCurrentPushProvider.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakeGetCurrentPushProvider.kt
@@ -1,16 +1,18 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
 
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.GetCurrentPushProvider
 
 class FakeGetCurrentPushProvider(
     private val currentPushProvider: String?
 ) : GetCurrentPushProvider {
-    override suspend fun getCurrentPushProvider(): String? = currentPushProvider
+    override suspend fun getCurrentPushProvider(sessionId: SessionId): String? = currentPushProvider
 }
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt
index 553ac09465..604ff88728 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.libraries.push.test
 
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import io.element.android.libraries.pushproviders.api.Distributor
@@ -19,19 +21,21 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 
 class FakePushService(
-    private val testPushBlock: suspend () -> Boolean = { true },
+    private val testPushBlock: suspend (SessionId) -> Boolean = { true },
     private val availablePushProviders: List<PushProvider> = emptyList(),
-    private val registerWithLambda: suspend (MatrixClient, PushProvider, Distributor) -> Result<Unit> = { _, _, _ ->
+    private val registerWithLambda: (MatrixClient, PushProvider, Distributor) -> Result<Unit> = { _, _, _ ->
         Result.success(Unit)
     },
-    private val currentPushProvider: () -> PushProvider? = { availablePushProviders.firstOrNull() },
+    private val currentPushProvider: (SessionId) -> PushProvider? = { availablePushProviders.firstOrNull() },
     private val selectPushProviderLambda: suspend (SessionId, PushProvider) -> Unit = { _, _ -> lambdaError() },
     private val setIgnoreRegistrationErrorLambda: (SessionId, Boolean) -> Unit = { _, _ -> lambdaError() },
     private val resetPushHistoryResult: () -> Unit = { lambdaError() },
     private val resetBatteryOptimizationStateResult: () -> Unit = { lambdaError() },
+    private val onServiceUnregisteredResult: (UserId) -> Unit = { lambdaError() },
+    private val ensurePusherIsRegisteredResult: () -> Result<Unit> = { lambdaError() },
 ) : PushService {
-    override suspend fun getCurrentPushProvider(): PushProvider? {
-        return registeredPushProvider ?: currentPushProvider()
+    override suspend fun getCurrentPushProvider(sessionId: SessionId): PushProvider? {
+        return registeredPushProvider ?: currentPushProvider(sessionId)
     }
 
     override fun getAvailablePushProviders(): List<PushProvider> {
@@ -53,6 +57,10 @@ class FakePushService(
             }
     }
 
+    override suspend fun ensurePusherIsRegistered(matrixClient: MatrixClient): Result<Unit> {
+        return ensurePusherIsRegisteredResult()
+    }
+
     override suspend fun selectPushProvider(sessionId: SessionId, pushProvider: PushProvider) {
         selectPushProviderLambda(sessionId, pushProvider)
     }
@@ -68,8 +76,8 @@ class FakePushService(
         setIgnoreRegistrationErrorLambda(sessionId, ignore)
     }
 
-    override suspend fun testPush(): Boolean = simulateLongTask {
-        testPushBlock()
+    override suspend fun testPush(sessionId: SessionId): Boolean = simulateLongTask {
+        testPushBlock(sessionId)
     }
 
     private val pushHistoryItemsFlow = MutableStateFlow<List<PushHistoryItem>>(emptyList())
@@ -97,4 +105,8 @@ class FakePushService(
     override suspend fun resetBatteryOptimizationState() {
         resetBatteryOptimizationStateResult()
     }
+
+    override suspend fun onServiceUnregistered(userId: UserId) {
+        onServiceUnregisteredResult(userId)
+    }
 }
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePusherSubscriber.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePusherSubscriber.kt
index 7148409acf..50ed06251c 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePusherSubscriber.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePusherSubscriber.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt
index 947d57ee7e..f923d0c9fe 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoader.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoader.kt
deleted file mode 100644
index 067376cfbc..0000000000
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeImageLoader.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.push.test.notifications
-
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import coil3.ImageLoader
-import coil3.test.FakeImageLoaderEngine
-import coil3.test.intercept
-import org.robolectric.RuntimeEnvironment
-
-class FakeImageLoader {
-    private val coilRequests = mutableListOf<Any>()
-
-    private var cache: ImageLoader? = null
-
-    fun getImageLoader(): ImageLoader {
-        return cache ?: ImageLoader.Builder(RuntimeEnvironment.getApplication())
-            .components {
-                val engine = FakeImageLoaderEngine.Builder()
-                    .intercept(
-                        predicate = {
-                            coilRequests.add(it)
-                            true
-                        },
-                        drawable = ColorDrawable(Color.BLUE)
-                    )
-                    .build()
-                add(engine)
-            }
-            .build()
-            .also {
-                cache = it
-            }
-    }
-
-    fun getCoilRequests(): List<Any> {
-        return coilRequests.toList()
-    }
-}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationCleaner.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationCleaner.kt
index be6a31ca75..28a249dc9b 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationCleaner.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationCleaner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,12 +11,14 @@ package io.element.android.libraries.push.test.notifications
 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.core.ThreadId
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeNotificationCleaner(
     private val clearAllMessagesEventsLambda: (SessionId) -> Unit = { lambdaError() },
     private val clearMessagesForRoomLambda: (SessionId, RoomId) -> Unit = { _, _ -> lambdaError() },
+    private val clearMessagesForThreadLambda: (SessionId, RoomId, ThreadId) -> Unit = { _, _, _ -> lambdaError() },
     private val clearEventLambda: (SessionId, EventId) -> Unit = { _, _ -> lambdaError() },
     private val clearMembershipNotificationForSessionLambda: (SessionId) -> Unit = { lambdaError() },
     private val clearMembershipNotificationForRoomLambda: (SessionId, RoomId) -> Unit = { _, _ -> lambdaError() }
@@ -28,6 +31,10 @@ class FakeNotificationCleaner(
         clearMessagesForRoomLambda(sessionId, roomId)
     }
 
+    override fun clearMessagesForThread(sessionId: SessionId, roomId: RoomId, threadId: ThreadId) {
+        clearMessagesForThreadLambda(sessionId, roomId, threadId)
+    }
+
     override fun clearEvent(sessionId: SessionId, eventId: EventId) {
         clearEventLambda(sessionId, eventId)
     }
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationResolverQueue.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationResolverQueue.kt
new file mode 100644
index 0000000000..d4279ab028
--- /dev/null
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationResolverQueue.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.push.test.notifications
+
+import io.element.android.libraries.push.api.push.NotificationEventRequest
+import io.element.android.libraries.push.impl.notifications.NotificationResolverQueue
+import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
+import kotlinx.coroutines.flow.MutableSharedFlow
+
+class FakeNotificationResolverQueue(
+    private val processingLambda: suspend (NotificationEventRequest) -> Result<ResolvedPushEvent>,
+) : NotificationResolverQueue {
+    override val results = MutableSharedFlow<Pair<List<NotificationEventRequest>, Map<NotificationEventRequest, Result<ResolvedPushEvent>>>>(replay = 1)
+
+    override suspend fun enqueue(request: NotificationEventRequest) {
+        results.emit(listOf(request) to mapOf(request to processingLambda(request)))
+    }
+}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeOnMissedCallNotificationHandler.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeOnMissedCallNotificationHandler.kt
index 10d7ba7c78..5e8063d788 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeOnMissedCallNotificationHandler.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeOnMissedCallNotificationHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4076171ca6..0c8d870448 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/push/FakeNotificationBitmapLoader.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/push/FakeNotificationBitmapLoader.kt
index c44837b230..78af0e56c1 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/push/FakeNotificationBitmapLoader.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/push/FakeNotificationBitmapLoader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,17 +11,18 @@ package io.element.android.libraries.push.test.notifications.push
 import android.graphics.Bitmap
 import androidx.core.graphics.drawable.IconCompat
 import coil3.ImageLoader
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
 
 class FakeNotificationBitmapLoader(
-    var getRoomBitmapResult: (String?, ImageLoader, Long) -> Bitmap? = { _, _, _ -> null },
-    var getUserIconResult: (String?, ImageLoader) -> IconCompat? = { _, _ -> null },
+    var getRoomBitmapResult: (AvatarData, ImageLoader, Long) -> Bitmap? = { _, _, _ -> null },
+    var getUserIconResult: (AvatarData, ImageLoader) -> IconCompat? = { _, _ -> null },
 ) : NotificationBitmapLoader {
-    override suspend fun getRoomBitmap(path: String?, imageLoader: ImageLoader, targetSize: Long): Bitmap? {
-        return getRoomBitmapResult(path, imageLoader, targetSize)
+    override suspend fun getRoomBitmap(avatarData: AvatarData, imageLoader: ImageLoader, targetSize: Long): Bitmap? {
+        return getRoomBitmapResult(avatarData, imageLoader, targetSize)
     }
 
-    override suspend fun getUserIcon(path: String?, imageLoader: ImageLoader): IconCompat? {
-        return getUserIconResult(path, imageLoader)
+    override suspend fun getUserIcon(avatarData: AvatarData, imageLoader: ImageLoader): IconCompat? {
+        return getUserIconResult(avatarData, imageLoader)
     }
 }
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/test/FakePushHandler.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/test/FakePushHandler.kt
index 1279d6e5a0..a7e476be9c 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/test/FakePushHandler.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/test/FakePushHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/api/build.gradle.kts b/libraries/pushproviders/api/build.gradle.kts
index 587b38f617..3581a43952 100644
--- a/libraries/pushproviders/api/build.gradle.kts
+++ b/libraries/pushproviders/api/build.gradle.kts
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/CurrentUserPushConfig.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Config.kt
similarity index 68%
rename from libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/CurrentUserPushConfig.kt
rename to libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Config.kt
index 0d3bf0241f..fec79067db 100644
--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/CurrentUserPushConfig.kt
+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Config.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api
 
-data class CurrentUserPushConfig(
+data class Config(
     val url: String,
     val pushKey: String,
 )
diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Distributor.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Distributor.kt
index d623740444..e7082f8d5b 100644
--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Distributor.kt
+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/Distributor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushData.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushData.kt
index 6000f74a95..b8fb5378b5 100644
--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushData.kt
+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushHandler.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushHandler.kt
index a9dfd76c2c..d3105111c5 100644
--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushHandler.kt
+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt
index 38a7135b75..405a83b9b8 100644
--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt
+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PushProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -59,7 +60,7 @@ interface PushProvider {
      */
     suspend fun onSessionDeleted(sessionId: SessionId)
 
-    suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig?
+    suspend fun getPushConfig(sessionId: SessionId): Config?
 
     fun canRotateToken(): Boolean
 
diff --git a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PusherSubscriber.kt b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PusherSubscriber.kt
index ef0cf9ddef..989170c975 100644
--- a/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PusherSubscriber.kt
+++ b/libraries/pushproviders/api/src/main/kotlin/io/element/android/libraries/pushproviders/api/PusherSubscriber.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts
index 05e60920e5..ee5bd942ff 100644
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/main/AndroidManifest.xml b/libraries/pushproviders/firebase/src/main/AndroidManifest.xml
index 946de39546..24bad30d77 100644
--- a/libraries/pushproviders/firebase/src/main/AndroidManifest.xml
+++ b/libraries/pushproviders/firebase/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseConfig.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseConfig.kt
index f592a1ae6e..10891d515a 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseConfig.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseGatewayProvider.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseGatewayProvider.kt
index a872808e16..1ae27d5d23 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseGatewayProvider.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseGatewayProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.firebase
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.enterprise.api.EnterpriseService
 
 interface FirebaseGatewayProvider {
@@ -17,7 +17,6 @@ interface FirebaseGatewayProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFirebaseGatewayProvider(
     private val enterpriseService: EnterpriseService,
 ) : FirebaseGatewayProvider {
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/FirebaseNewTokenHandler.kt
index 2853d52685..72977afa3b 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/FirebaseNewTokenHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.firebase
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.matrix.api.MatrixClientProvider
@@ -30,7 +30,6 @@ interface FirebaseNewTokenHandler {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFirebaseNewTokenHandler(
     private val pusherSubscriber: PusherSubscriber,
     private val sessionStore: SessionStore,
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParser.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParser.kt
index 410fc05014..a5b9bbcd23 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParser.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParser.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4f8c99cd3e..0aa345769f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
@@ -74,9 +75,9 @@ class FirebasePushProvider(
      */
     override suspend fun onSessionDeleted(sessionId: SessionId) = Unit
 
-    override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {
+    override suspend fun getPushConfig(sessionId: SessionId): Config? {
         return firebaseStore.getFcmToken()?.let { fcmToken ->
-            CurrentUserPushConfig(
+            Config(
                 url = firebaseGatewayProvider.getFirebaseGateway(),
                 pushKey = fcmToken
             )
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 91fec3bb57..1f6a4709cc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,7 +12,6 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.onCompletion
@@ -27,7 +27,6 @@ interface FirebaseStore {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class SharedPreferencesFirebaseStore(
     private val sharedPreferences: SharedPreferences,
 ) : FirebaseStore {
@@ -41,7 +40,7 @@ class SharedPreferencesFirebaseStore(
             if (k == PREFS_KEY_FCM_TOKEN) {
                 try {
                     flow.value = getFcmToken()
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     flow.value = null
                 }
             }
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
index 4a8be152ad..21fa189121 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushproviders.firebase
 import com.google.firebase.messaging.FirebaseMessaging
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import timber.log.Timber
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -24,7 +24,6 @@ interface FirebaseTokenDeleter {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFirebaseTokenDeleter(
     private val isPlayServiceAvailable: IsPlayServiceAvailable,
 ) : FirebaseTokenDeleter {
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
index 4add5e4f8b..80fd9726d4 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushproviders.firebase
 import com.google.firebase.messaging.FirebaseMessaging
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import timber.log.Timber
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -25,7 +25,6 @@ interface FirebaseTokenGetter {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFirebaseTokenGetter(
     private val isPlayServiceAvailable: IsPlayServiceAvailable,
 ) : FirebaseTokenGetter {
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
index c54221aa38..78b33cbb08 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.firebase
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 
 interface FirebaseTokenRotator {
@@ -20,7 +20,6 @@ interface FirebaseTokenRotator {
  * This class delete the Firebase token and generate a new one.
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFirebaseTokenRotator(
     private val firebaseTokenDeleter: FirebaseTokenDeleter,
     private val firebaseTokenGetter: FirebaseTokenGetter,
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 132996ee34..78fce0338d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.firebase
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 
 interface FirebaseTroubleshooter {
@@ -20,7 +20,6 @@ interface FirebaseTroubleshooter {
  * This class force retrieving and storage of the Firebase token.
  */
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultFirebaseTroubleshooter(
     private val newTokenHandler: FirebaseNewTokenHandler,
     private val firebaseTokenGetter: FirebaseTokenGetter,
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt
index 8e25407a91..828b7bb60a 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/IsPlayServiceAvailable.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailabilityLight
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import timber.log.Timber
 
@@ -27,7 +27,6 @@ fun IsPlayServiceAvailable.checkAvailableOrThrow() {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultIsPlayServiceAvailable(
     @ApplicationContext private val context: Context,
 ) : IsPlayServiceAvailable {
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/PushDataFirebase.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/PushDataFirebase.kt
index fb33ab9c1f..04bdb12cfd 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/PushDataFirebase.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/PushDataFirebase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6d13143ddc..532ee8a4a1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceBindings.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceBindings.kt
index 0f3e109fef..6de938c5c2 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceBindings.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceBindings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTest.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTest.kt
index c4ffe19db3..69ffd504fd 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTest.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a886b5fb77..8bcd44911e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/main/res/values-hr/translations.xml b/libraries/pushproviders/firebase/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..026949086d
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/res/values-hr/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">"Provjerite je li Firebase dostupan."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_failure">"Firebase nije dostupan."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_success">"Firebase je dostupan."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_title">"Provjeri Firebase"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_description">"Provjerite je li Firebaseov token dostupan."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_failure">"Firebaseov token nije poznat."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_success">"Firebaseov token: %1$s."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_title">"Provjeri Firebaseov token"</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/DefaultFirebaseNewTokenHandlerTest.kt
index 70cd24e6c8..4db9ea667f 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/DefaultFirebaseNewTokenHandlerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseGatewayProvider.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseGatewayProvider.kt
index 3540562a3d..cdd50e9af3 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseGatewayProvider.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseGatewayProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/FakeFirebaseNewTokenHandler.kt
index 87c7495693..2fa9508103 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/FakeFirebaseNewTokenHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/FakeFirebaseTokenRotator.kt
index 568ef30ae6..d504aa32ae 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/FakeFirebaseTokenRotator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTroubleshooter.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTroubleshooter.kt
index ceabcd0c58..6563c7d398 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTroubleshooter.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTroubleshooter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeIsPlayServiceAvailable.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeIsPlayServiceAvailable.kt
index 1f5cfc72e6..226e57a795 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeIsPlayServiceAvailable.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeIsPlayServiceAvailable.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParserTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParserTest.kt
index 49ed5bc6d4..d4a8ef6349 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParserTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushParserTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 53ed52be07..312689da6e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ 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.FakeMatrixClient
 import io.element.android.libraries.push.test.FakePusherSubscriber
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -152,7 +153,7 @@ class FirebasePushProviderTest {
                 token = null
             )
         )
-        val result = firebasePushProvider.getCurrentUserPushConfig()
+        val result = firebasePushProvider.getPushConfig(A_SESSION_ID)
         assertThat(result).isNull()
     }
 
@@ -163,8 +164,8 @@ class FirebasePushProviderTest {
                 token = "aToken"
             ),
         )
-        val result = firebasePushProvider.getCurrentUserPushConfig()
-        assertThat(result).isEqualTo(CurrentUserPushConfig(A_FIREBASE_GATEWAY, "aToken"))
+        val result = firebasePushProvider.getPushConfig(A_SESSION_ID)
+        assertThat(result).isEqualTo(Config(A_FIREBASE_GATEWAY, "aToken"))
     }
 
     @Test
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 e64f3338eb..3e6292f445 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6b8c19934f..1140d6f45e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTestTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTestTest.kt
index ce617799f5..22bc762a32 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTestTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseAvailabilityTestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 7e6981ef57..8f9721a17d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/test/build.gradle.kts b/libraries/pushproviders/test/build.gradle.kts
index 90b88c1313..61143e7ffc 100644
--- a/libraries/pushproviders/test/build.gradle.kts
+++ b/libraries/pushproviders/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt b/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt
index afb4d833d4..86cb4a468f 100644
--- a/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt
+++ b/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/FakePushProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@ package io.element.android.libraries.pushproviders.test
 
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -21,7 +22,7 @@ class FakePushProvider(
     private val distributors: List<Distributor> = listOf(Distributor("aDistributorValue", "aDistributorName")),
     private val currentDistributorValue: () -> String? = { lambdaError() },
     private val currentDistributor: () -> Distributor? = { distributors.firstOrNull() },
-    private val currentUserPushConfig: CurrentUserPushConfig? = null,
+    private val config: Config? = null,
     private val registerWithResult: (MatrixClient, Distributor) -> Result<Unit> = { _, _ -> lambdaError() },
     private val unregisterWithResult: (MatrixClient) -> Result<Unit> = { lambdaError() },
     private val onSessionDeletedLambda: (SessionId) -> Unit = { lambdaError() },
@@ -50,8 +51,8 @@ class FakePushProvider(
         onSessionDeletedLambda(sessionId)
     }
 
-    override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {
-        return currentUserPushConfig
+    override suspend fun getPushConfig(sessionId: SessionId): Config? {
+        return config
     }
 
     override fun canRotateToken(): Boolean {
diff --git a/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/Fixtures.kt b/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/Fixtures.kt
index cd3b95d672..0e8dcb91fa 100644
--- a/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/Fixtures.kt
+++ b/libraries/pushproviders/test/src/main/kotlin/io/element/android/libraries/pushproviders/test/Fixtures.kt
@@ -1,18 +1,19 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.test
 
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 
-fun aCurrentUserPushConfig(
+fun aSessionPushConfig(
     url: String = "aUrl",
     pushKey: String = "aPushKey",
-) = CurrentUserPushConfig(
+) = Config(
     url = url,
     pushKey = pushKey,
 )
diff --git a/libraries/pushproviders/unifiedpush/build.gradle.kts b/libraries/pushproviders/unifiedpush/build.gradle.kts
index e416ccf8bf..1b24bc4b1f 100644
--- a/libraries/pushproviders/unifiedpush/build.gradle.kts
+++ b/libraries/pushproviders/unifiedpush/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -23,6 +24,7 @@ dependencies {
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.push.api)
     implementation(projects.libraries.uiStrings)
     api(projects.libraries.troubleshoot.api)
 
@@ -30,7 +32,6 @@ dependencies {
     implementation(projects.libraries.pushproviders.api)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
-    implementation(projects.services.appnavstate.api)
     implementation(projects.services.toolbox.api)
 
     implementation(projects.libraries.network)
@@ -53,5 +54,4 @@ dependencies {
     testImplementation(projects.libraries.pushstore.test)
     testImplementation(projects.libraries.troubleshoot.test)
     testImplementation(projects.services.toolbox.test)
-    testImplementation(projects.services.appnavstate.test)
 }
diff --git a/libraries/pushproviders/unifiedpush/src/main/AndroidManifest.xml b/libraries/pushproviders/unifiedpush/src/main/AndroidManifest.xml
index e85f18e3c0..5845883c5b 100644
--- a/libraries/pushproviders/unifiedpush/src/main/AndroidManifest.xml
+++ b/libraries/pushproviders/unifiedpush/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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"
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultPushGatewayHttpUrlProvider.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultPushGatewayHttpUrlProvider.kt
index d330b2b7fe..ae3b2a9e66 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultPushGatewayHttpUrlProvider.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultPushGatewayHttpUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.features.enterprise.api.EnterpriseService
 
 interface DefaultPushGatewayHttpUrlProvider {
@@ -17,7 +17,6 @@ interface DefaultPushGatewayHttpUrlProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultDefaultPushGatewayHttpUrlProvider(
     private val enterpriseService: EnterpriseService,
 ) : DefaultPushGatewayHttpUrlProvider {
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
index 57813f8fde..4a8eefe37f 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 
 interface GuardServiceStarter {
     fun start() {}
@@ -17,5 +17,4 @@ interface GuardServiceStarter {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class NoopGuardServiceStarter : GuardServiceStarter
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/KeepInternalDistributor.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/KeepInternalDistributor.kt
index 9b9a09f1c2..5530699dfa 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/KeepInternalDistributor.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/KeepInternalDistributor.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/PushDataUnifiedPush.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/PushDataUnifiedPush.kt
index c994f466aa..cda789785b 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/PushDataUnifiedPush.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/PushDataUnifiedPush.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -39,6 +40,7 @@ data class PushDataUnifiedPushNotification(
     @SerialName("event_id") val eventId: String? = null,
     @SerialName("room_id") val roomId: String? = null,
     @SerialName("counts") val counts: PushDataUnifiedPushCounts? = null,
+    @SerialName("prio") val prio: String? = null,
 )
 
 @Serializable
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/RegisterUnifiedPushUseCase.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/RegisterUnifiedPushUseCase.kt
index 2f300f891d..00e5649533 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/RegisterUnifiedPushUseCase.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/RegisterUnifiedPushUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.unifiedpush.registration.EndpointRegistrationHandler
@@ -25,7 +25,6 @@ interface RegisterUnifiedPushUseCase {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultRegisterUnifiedPushUseCase(
     @ApplicationContext private val context: Context,
     private val endpointRegistrationHandler: EndpointRegistrationHandler,
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushApiFactory.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushApiFactory.kt
index 6427b6bd00..5ff74b3d9f 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushApiFactory.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushApiFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.network.RetrofitFactory
 import io.element.android.libraries.pushproviders.unifiedpush.network.UnifiedPushApi
 
@@ -18,7 +18,6 @@ interface UnifiedPushApiFactory {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUnifiedPushApiFactory(
     private val retrofitFactory: RetrofitFactory,
 ) : UnifiedPushApiFactory {
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushConfig.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushConfig.kt
index 94f16bafba..9a92711f7a 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushConfig.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushCurrentUserPushConfigProvider.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushCurrentUserPushConfigProvider.kt
deleted file mode 100644
index ba7301e010..0000000000
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushCurrentUserPushConfigProvider.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.libraries.pushproviders.unifiedpush
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
-import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
-import io.element.android.services.appnavstate.api.AppNavigationStateService
-import io.element.android.services.appnavstate.api.currentSessionId
-
-interface UnifiedPushCurrentUserPushConfigProvider {
-    suspend fun provide(): CurrentUserPushConfig?
-}
-
-@ContributesBinding(AppScope::class)
-@Inject
-class DefaultUnifiedPushCurrentUserPushConfigProvider(
-    private val pushClientSecret: PushClientSecret,
-    private val unifiedPushStore: UnifiedPushStore,
-    private val appNavigationStateService: AppNavigationStateService,
-) : UnifiedPushCurrentUserPushConfigProvider {
-    override suspend fun provide(): CurrentUserPushConfig? {
-        val currentSession = appNavigationStateService.appNavigationState.value.navigationState.currentSessionId() ?: return null
-        val clientSecret = pushClientSecret.getSecretForUser(currentSession)
-        val url = unifiedPushStore.getPushGateway(clientSecret) ?: return null
-        val pushKey = unifiedPushStore.getEndpoint(clientSecret) ?: return null
-        return CurrentUserPushConfig(
-            url = url,
-            pushKey = pushKey,
-        )
-    }
-}
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushDistributorProvider.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushDistributorProvider.kt
index aad8d9cd0b..ac9dc745fe 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushDistributorProvider.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushDistributorProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.system.getApplicationLabel
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.pushproviders.api.Distributor
@@ -21,7 +21,6 @@ interface UnifiedPushDistributorProvider {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUnifiedPushDistributorProvider(
     @ApplicationContext private val context: Context,
 ) : UnifiedPushDistributorProvider {
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayResolver.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayResolver.kt
index 1aa6b5d436..8aa67b1ee9 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayResolver.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.log.logger.LoggerTag
@@ -33,7 +33,6 @@ interface UnifiedPushGatewayResolver {
 private val loggerTag = LoggerTag("DefaultUnifiedPushGatewayResolver")
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUnifiedPushGatewayResolver(
     private val unifiedPushApiFactory: UnifiedPushApiFactory,
     private val coroutineDispatchers: CoroutineDispatchers,
@@ -65,8 +64,9 @@ class DefaultUnifiedPushGatewayResolver(
                         UnifiedPushGatewayResolverResult.NoMatrixGateway
                     }
                 } catch (throwable: Throwable) {
-                    if ((throwable as? HttpException)?.code() == HttpURLConnection.HTTP_NOT_FOUND) {
-                        Timber.tag(loggerTag.value).i("Checking for UnifiedPush endpoint yielded 404, using fallback")
+                    val code = (throwable as? HttpException)?.code()
+                    if (code in NoMatrixGatewayResp) {
+                        Timber.tag(loggerTag.value).i("Checking for UnifiedPush endpoint yielded $code, using fallback")
                         UnifiedPushGatewayResolverResult.NoMatrixGateway
                     } else {
                         Timber.tag(loggerTag.value).e(throwable, "Error checking for UnifiedPush endpoint")
@@ -76,4 +76,14 @@ class DefaultUnifiedPushGatewayResolver(
             }
         }
     }
+
+    companion object {
+        private val NoMatrixGatewayResp = listOf<Int>(
+            HttpURLConnection.HTTP_UNAUTHORIZED,
+            HttpURLConnection.HTTP_FORBIDDEN,
+            HttpURLConnection.HTTP_NOT_FOUND,
+            HttpURLConnection.HTTP_BAD_METHOD,
+            HttpURLConnection.HTTP_NOT_ACCEPTABLE
+        )
+    }
 }
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 48f8153787..78a569a211 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 
 interface UnifiedPushGatewayUrlResolver {
     fun resolve(
@@ -19,7 +19,6 @@ interface UnifiedPushGatewayUrlResolver {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUnifiedPushGatewayUrlResolver(
     private val unifiedPushStore: UnifiedPushStore,
     private val defaultPushGatewayHttpUrlProvider: DefaultPushGatewayHttpUrlProvider,
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushNewGatewayHandler.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushNewGatewayHandler.kt
index a899c0787f..d7de923a26 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushNewGatewayHandler.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushNewGatewayHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.matrix.api.MatrixClientProvider
@@ -28,7 +28,6 @@ interface UnifiedPushNewGatewayHandler {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUnifiedPushNewGatewayHandler(
     private val pusherSubscriber: PusherSubscriber,
     private val userPushStoreFactory: UserPushStoreFactory,
@@ -40,7 +39,7 @@ class DefaultUnifiedPushNewGatewayHandler(
         val userId = pushClientSecret.getUserIdFromSecret(clientSecret) ?: return Result.failure<Unit>(
             IllegalStateException("Unable to retrieve session")
         ).also {
-            Timber.w("Unable to retrieve session")
+            Timber.tag(loggerTag.value).w("Unable to retrieve session")
         }
         val userDataStore = userPushStoreFactory.getOrCreate(userId)
         return if (userDataStore.getPushProviderName() == UnifiedPushConfig.NAME) {
@@ -49,6 +48,9 @@ class DefaultUnifiedPushNewGatewayHandler(
                 .flatMap { client ->
                     pusherSubscriber.registerPusher(client, endpoint, pushGateway)
                 }
+                .onFailure {
+                    Timber.tag(loggerTag.value).w(it, "Unable to register pusher")
+                }
         } else {
             Timber.tag(loggerTag.value).d("This session is not using UnifiedPush pusher")
             Result.failure(
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParser.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParser.kt
index f1290636c3..0cc9560c70 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParser.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParser.kt
@@ -1,22 +1,23 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.Inject
+import io.element.android.libraries.androidutils.json.JsonProvider
 import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.pushproviders.api.PushData
-import kotlinx.serialization.json.Json
 
 @Inject
-class UnifiedPushParser {
-    private val json by lazy { Json { ignoreUnknownKeys = true } }
-
+class UnifiedPushParser(
+    private val json: JsonProvider,
+) {
     fun parse(message: ByteArray, clientSecret: String): PushData? {
-        return tryOrNull { json.decodeFromString<PushDataUnifiedPush>(String(message)) }?.toPushData(clientSecret)
+        return tryOrNull { json().decodeFromString<PushDataUnifiedPush>(String(message)) }?.toPushData(clientSecret)
     }
 }
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt
index 92d7c9ebc3..7c65e8e2e4 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,7 @@ import dev.zacsweers.metro.ContributesIntoSet
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
@@ -25,7 +26,7 @@ class UnifiedPushProvider(
     private val unRegisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
     private val pushClientSecret: PushClientSecret,
     private val unifiedPushStore: UnifiedPushStore,
-    private val unifiedPushCurrentUserPushConfigProvider: UnifiedPushCurrentUserPushConfigProvider,
+    private val unifiedPushSessionPushConfigProvider: UnifiedPushSessionPushConfigProvider,
 ) : PushProvider {
     override val index = UnifiedPushConfig.INDEX
     override val name = UnifiedPushConfig.NAME
@@ -62,8 +63,8 @@ class UnifiedPushProvider(
         unRegisterUnifiedPushUseCase.cleanup(clientSecret)
     }
 
-    override suspend fun getCurrentUserPushConfig(): CurrentUserPushConfig? {
-        return unifiedPushCurrentUserPushConfigProvider.provide()
+    override suspend fun getPushConfig(sessionId: SessionId): Config? {
+        return unifiedPushSessionPushConfigProvider.provide(sessionId)
     }
 
     override fun canRotateToken(): Boolean = false
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushRemovedGatewayHandler.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushRemovedGatewayHandler.kt
new file mode 100644
index 0000000000..7baaaab1bd
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushRemovedGatewayHandler.kt
@@ -0,0 +1,126 @@
+/*
+ * 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.pushproviders.unifiedpush
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.androidutils.throttler.FirstThrottler
+import io.element.android.libraries.core.extensions.flatMap
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.MatrixClientProvider
+import io.element.android.libraries.push.api.PushService
+import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
+import kotlinx.coroutines.CoroutineScope
+import timber.log.Timber
+
+private val loggerTag = LoggerTag("UnifiedPushRemovedGatewayHandler", LoggerTag.PushLoggerTag)
+
+/**
+ * Handle endpoint removal received from UnifiedPush. Will try to register again.
+ */
+fun interface UnifiedPushRemovedGatewayHandler {
+    suspend fun handle(clientSecret: String): Result<Unit>
+}
+
+@Inject
+@SingleIn(AppScope::class)
+class UnifiedPushRemovedGatewayThrottler(
+    @AppCoroutineScope
+    private val appCoroutineScope: CoroutineScope,
+) {
+    private val firstThrottler = FirstThrottler(
+        minimumInterval = 60_000,
+        coroutineScope = appCoroutineScope,
+    )
+
+    fun canRegisterAgain(): Boolean {
+        return firstThrottler.canHandle()
+    }
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultUnifiedPushRemovedGatewayHandler(
+    private val unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase,
+    private val pushClientSecret: PushClientSecret,
+    private val matrixClientProvider: MatrixClientProvider,
+    private val pushService: PushService,
+    private val unifiedPushRemovedGatewayThrottler: UnifiedPushRemovedGatewayThrottler,
+) : UnifiedPushRemovedGatewayHandler {
+    /**
+     * The application has been informed by the UnifiedPush distributor that the topic has been deleted.
+     * So this code aim to unregister the pusher from the homeserver, register a new topic on the
+     * UnifiedPush application then register a new pusher to the homeserver.
+     * No registration will happen if the topic deletion has already occurred in the last minute.
+     */
+    override suspend fun handle(clientSecret: String): Result<Unit> {
+        val sessionId = pushClientSecret.getUserIdFromSecret(clientSecret) ?: return Result.failure<Unit>(
+            IllegalStateException("Unable to retrieve session")
+        ).also {
+            Timber.tag(loggerTag.value).w("Unable to retrieve session")
+        }
+        return matrixClientProvider
+            .getOrRestore(sessionId)
+            .onFailure {
+                // Silently ignore this error (do not invoke onServiceUnregistered)
+                Timber.tag(loggerTag.value).w(it, "Fails to restore client")
+            }
+            .flatMap { client ->
+                client.rotateRegistration(clientSecret = clientSecret)
+                    .onFailure {
+                        Timber.tag(loggerTag.value).w(it, "Issue during pusher unregistration / re registration")
+                        // Let the user know
+                        pushService.onServiceUnregistered(sessionId)
+                    }
+            }
+    }
+
+    /**
+     * Unregister the pusher for the session. Then register again if possible.
+     */
+    private suspend fun MatrixClient.rotateRegistration(clientSecret: String): Result<Unit> {
+        val unregisterResult = unregisterUnifiedPushUseCase.unregister(
+            matrixClient = this,
+            clientSecret = clientSecret,
+            unregisterUnifiedPush = false,
+        ).onFailure {
+            Timber.tag(loggerTag.value).w(it, "Unable to unregister pusher")
+        }
+        return unregisterResult.flatMap {
+            registerAgain()
+        }
+    }
+
+    /**
+     * Attempt to register again, if possible i.e. the current configuration is known and the
+     * deletion of data in the UnifiedPush application has not already occurred in the last minute.
+     */
+    private suspend fun MatrixClient.registerAgain(): Result<Unit> {
+        return if (unifiedPushRemovedGatewayThrottler.canRegisterAgain()) {
+            val pushProvider = pushService.getCurrentPushProvider(sessionId)
+            val distributor = pushProvider?.getCurrentDistributor(sessionId)
+            if (pushProvider != null && distributor != null) {
+                pushService.registerWith(
+                    matrixClient = this,
+                    pushProvider = pushProvider,
+                    distributor = distributor,
+                ).onFailure {
+                    Timber.tag(loggerTag.value).w(it, "Unable to register with current data")
+                }
+            } else {
+                Result.failure(IllegalStateException("Unable to register again"))
+            }
+        } else {
+            Timber.tag(loggerTag.value).w("Second removal in less than 1 minute, do not register again")
+            Result.failure(IllegalStateException("Too many requests to register again"))
+        }
+    }
+}
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushSessionPushConfigProvider.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushSessionPushConfigProvider.kt
new file mode 100644
index 0000000000..20ac923184
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushSessionPushConfigProvider.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.unifiedpush
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.pushproviders.api.Config
+import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
+
+interface UnifiedPushSessionPushConfigProvider {
+    suspend fun provide(sessionId: SessionId): Config?
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultUnifiedPushPushConfigProvider(
+    private val pushClientSecret: PushClientSecret,
+    private val unifiedPushStore: UnifiedPushStore,
+) : UnifiedPushSessionPushConfigProvider {
+    override suspend fun provide(sessionId: SessionId): Config? {
+        val clientSecret = pushClientSecret.getSecretForUser(sessionId)
+        val url = unifiedPushStore.getPushGateway(clientSecret) ?: return null
+        val pushKey = unifiedPushStore.getEndpoint(clientSecret) ?: return null
+        return Config(
+            url = url,
+            pushKey = pushKey,
+        )
+    }
+}
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushStore.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushStore.kt
index 96c92b09d8..009c863d5c 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushStore.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.UserId
 
@@ -26,7 +26,6 @@ interface UnifiedPushStore {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class SharedPreferencesUnifiedPushStore(
     @ApplicationContext val context: Context,
     private val sharedPreferences: SharedPreferences,
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
index 429c23d747..2e0d6ea413 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushproviders.unifiedpush
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
@@ -19,24 +19,34 @@ import timber.log.Timber
 
 interface UnregisterUnifiedPushUseCase {
     /**
-     * Unregister the app from the homeserver, then from UnifiedPush.
+     * Unregister the app from the homeserver, then from UnifiedPush if [unregisterUnifiedPush] is true.
      */
-    suspend fun unregister(matrixClient: MatrixClient, clientSecret: String): Result<Unit>
+    suspend fun unregister(
+        matrixClient: MatrixClient,
+        clientSecret: String,
+        unregisterUnifiedPush: Boolean = true,
+    ): Result<Unit>
 
     /**
      * Cleanup any remaining data for the given client secret and unregister the app from UnifiedPush.
      */
-    fun cleanup(clientSecret: String)
+    fun cleanup(
+        clientSecret: String,
+        unregisterUnifiedPush: Boolean = true,
+    )
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUnregisterUnifiedPushUseCase(
     @ApplicationContext private val context: Context,
     private val unifiedPushStore: UnifiedPushStore,
     private val pusherSubscriber: PusherSubscriber,
 ) : UnregisterUnifiedPushUseCase {
-    override suspend fun unregister(matrixClient: MatrixClient, clientSecret: String): Result<Unit> {
+    override suspend fun unregister(
+        matrixClient: MatrixClient,
+        clientSecret: String,
+        unregisterUnifiedPush: Boolean,
+    ): Result<Unit> {
         val endpoint = unifiedPushStore.getEndpoint(clientSecret)
         val gateway = unifiedPushStore.getPushGateway(clientSecret)
         if (endpoint == null || gateway == null) {
@@ -47,13 +57,15 @@ class DefaultUnregisterUnifiedPushUseCase(
         }
         return pusherSubscriber.unregisterPusher(matrixClient, endpoint, gateway)
             .onSuccess {
-                cleanup(clientSecret)
+                cleanup(clientSecret, unregisterUnifiedPush)
             }
     }
 
-    override fun cleanup(clientSecret: String) {
+    override fun cleanup(clientSecret: String, unregisterUnifiedPush: Boolean) {
         unifiedPushStore.storeUpEndpoint(clientSecret, null)
         unifiedPushStore.storePushGateway(clientSecret, null)
-        UnifiedPush.unregister(context, clientSecret)
+        if (unregisterUnifiedPush) {
+            UnifiedPush.unregister(context, clientSecret)
+        }
     }
 }
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 97ef0b27f1..05f6969fc5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,7 +35,9 @@ class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
     @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
+
     @AppCoroutineScope
     @Inject lateinit var coroutineScope: CoroutineScope
 
@@ -103,30 +106,23 @@ class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
      */
     override fun onRegistrationFailed(context: Context, reason: FailedReason, instance: String) {
         Timber.tag(loggerTag.value).e("onRegistrationFailed for $instance, reason: $reason")
-        /*
-        Toast.makeText(context, "Push service registration failed", Toast.LENGTH_SHORT).show()
-        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
-        pushDataStore.setFdroidSyncBackgroundMode(mode)
-        guardServiceStarter.start()
-         */
+        coroutineScope.launch {
+            endpointRegistrationHandler.registrationDone(
+                RegistrationResult(
+                    clientSecret = instance,
+                    result = Result.failure(Exception("Registration failed. Reason: $reason")),
+                )
+            )
+        }
     }
 
     /**
      * Called when this application is unregistered from receiving push messages.
      */
     override fun onUnregistered(context: Context, instance: String) {
-        Timber.tag(loggerTag.value).w("UnifiedPush: Unregistered")
-        /*
-        val mode = BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME
-        pushDataStore.setFdroidSyncBackgroundMode(mode)
-        guardServiceStarter.start()
-        runBlocking {
-            try {
-                pushersManager.unregisterPusher(unifiedPushHelper.getEndpointOrToken().orEmpty())
-            } catch (e: Exception) {
-                Timber.tag(loggerTag.value).d("Probably unregistering a non existing pusher")
-            }
+        Timber.tag(loggerTag.value).w("onUnregistered $instance")
+        coroutineScope.launch {
+            removedGatewayHandler.handle(instance)
         }
-         */
     }
 }
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverBindings.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverBindings.kt
index bbec3f272c..1d227b3b83 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverBindings.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverBindings.kt
@@ -1,21 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.Binds
 import dev.zacsweers.metro.ContributesTo
-import org.unifiedpush.android.connector.MessagingReceiver
 
 @ContributesTo(AppScope::class)
 interface VectorUnifiedPushMessagingReceiverBindings {
     fun inject(receiver: VectorUnifiedPushMessagingReceiver)
-
-    @Binds
-    fun bindsMessagingReceiver(vectorUnifiedPushMessagingReceiver: VectorUnifiedPushMessagingReceiver): MessagingReceiver
 }
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryResponse.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryResponse.kt
index 2984b47125..ecdfad09e8 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryResponse.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryResponse.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryUnifiedPush.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryUnifiedPush.kt
index 0b7f48adca..023dd992dc 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryUnifiedPush.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/DiscoveryUnifiedPush.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/UnifiedPushApi.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/UnifiedPushApi.kt
index c6fad7ecba..ca99f47f31 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/UnifiedPushApi.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/network/UnifiedPushApi.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/registration/EndpointRegistrationHandler.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/registration/EndpointRegistrationHandler.kt
index c6a1353a2f..b11484952e 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/registration/EndpointRegistrationHandler.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/registration/EndpointRegistrationHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/OpenDistributorWebPageAction.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/OpenDistributorWebPageAction.kt
index 5f4eb4538c..7f805ad560 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/OpenDistributorWebPageAction.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/OpenDistributorWebPageAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushproviders.unifiedpush.troubleshoot
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.androidutils.system.openUrlInExternalApp
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushConfig
@@ -20,7 +20,6 @@ interface OpenDistributorWebPageAction {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultOpenDistributorWebPageAction(
     @ApplicationContext private val context: Context,
 ) : OpenDistributorWebPageAction {
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTest.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTest.kt
index 7a22e92222..7a50077915 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTest.kt
@@ -1,19 +1,21 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot
 
-import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoSet
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushApiFactory
 import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushConfig
-import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushCurrentUserPushConfigProvider
+import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushSessionPushConfigProvider
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTest
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTestDelegate
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTestState
@@ -22,12 +24,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 
-@ContributesIntoSet(AppScope::class)
+@ContributesIntoSet(SessionScope::class)
 @Inject
 class UnifiedPushMatrixGatewayTest(
+    private val sessionId: SessionId,
     private val unifiedPushApiFactory: UnifiedPushApiFactory,
     private val coroutineDispatchers: CoroutineDispatchers,
-    private val unifiedPushCurrentUserPushConfigProvider: UnifiedPushCurrentUserPushConfigProvider,
+    private val unifiedPushSessionPushConfigProvider: UnifiedPushSessionPushConfigProvider,
 ) : NotificationTroubleshootTest {
     override val order = 450
     private val delegate = NotificationTroubleshootTestDelegate(
@@ -44,7 +47,7 @@ class UnifiedPushMatrixGatewayTest(
 
     override suspend fun run(coroutineScope: CoroutineScope) {
         delegate.start()
-        val config = unifiedPushCurrentUserPushConfigProvider.provide()
+        val config = unifiedPushSessionPushConfigProvider.provide(sessionId)
         if (config == null) {
             delegate.updateState(
                 description = "No current push provider",
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTest.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTest.kt
index bb2c88bcdd..6d6d3b68af 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-hr/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..a77fcce68c
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-hr/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_unified_push_description">"Provjerite jesu li UnifiedPush distributeri dostupni."</string>
+  <string name="troubleshoot_notifications_test_unified_push_failure">"Nisu pronađeni distributeri push obavijesti."</string>
+  <plurals name="troubleshoot_notifications_test_unified_push_success">
+    <item quantity="one">"Pronađen je %1$d distributer: %2$s."</item>
+    <item quantity="few">"Pronađena su %1$d distributera: %2$s."</item>
+    <item quantity="other">"Pronađeno je %1$d distributera: %2$s."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_unified_push_title">"Provjeri 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 ba84c5896f..1e77df79a2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,16 +15,23 @@ import io.element.android.libraries.matrix.test.A_SECRET
 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 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 {
+    @Before
+    fun setup() {
+        FakeAndroidKeyStore.setup
+    }
+
     @Test
     fun `test registration successful`() = runTest {
         val endpointRegistrationHandler = EndpointRegistrationHandler()
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushCurrentUserPushConfigProviderTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushCurrentUserPushConfigProviderTest.kt
index deabff4488..7a8ec16001 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushCurrentUserPushConfigProviderTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushCurrentUserPushConfigProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,36 +11,16 @@ package io.element.android.libraries.pushproviders.unifiedpush
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.A_SECRET
 import io.element.android.libraries.matrix.test.A_SESSION_ID
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
+import io.element.android.libraries.pushproviders.api.Config
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import io.element.android.libraries.pushstore.test.userpushstore.clientsecret.FakePushClientSecret
-import io.element.android.services.appnavstate.api.AppNavigationState
-import io.element.android.services.appnavstate.api.AppNavigationStateService
-import io.element.android.services.appnavstate.api.NavigationState
-import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class DefaultUnifiedPushCurrentUserPushConfigProviderTest {
-    @Test
-    fun `getCurrentUserPushConfig no session`() = runTest {
-        val sut = createDefaultUnifiedPushCurrentUserPushConfigProvider()
-        val result = sut.provide()
-        assertThat(result).isNull()
-    }
-
     @Test
     fun `getCurrentUserPushConfig no push gateway`() = runTest {
         val sut = createDefaultUnifiedPushCurrentUserPushConfigProvider(
-            appNavigationStateService = FakeAppNavigationStateService(
-                appNavigationState = MutableStateFlow(
-                    AppNavigationState(
-                        navigationState = NavigationState.Session(owner = "owner", sessionId = A_SESSION_ID),
-                        isInForeground = true
-                    )
-                )
-            ),
             pushClientSecret = FakePushClientSecret(
                 getSecretForUserResult = { A_SECRET }
             ),
@@ -47,21 +28,13 @@ class DefaultUnifiedPushCurrentUserPushConfigProviderTest {
                 getPushGatewayResult = { null }
             ),
         )
-        val result = sut.provide()
+        val result = sut.provide(A_SESSION_ID)
         assertThat(result).isNull()
     }
 
     @Test
     fun `getCurrentUserPushConfig no push key`() = runTest {
         val sut = createDefaultUnifiedPushCurrentUserPushConfigProvider(
-            appNavigationStateService = FakeAppNavigationStateService(
-                appNavigationState = MutableStateFlow(
-                    AppNavigationState(
-                        navigationState = NavigationState.Session(owner = "owner", sessionId = A_SESSION_ID),
-                        isInForeground = true
-                    )
-                )
-            ),
             pushClientSecret = FakePushClientSecret(
                 getSecretForUserResult = { A_SECRET }
             ),
@@ -70,21 +43,13 @@ class DefaultUnifiedPushCurrentUserPushConfigProviderTest {
                 getEndpointResult = { null }
             ),
         )
-        val result = sut.provide()
+        val result = sut.provide(A_SESSION_ID)
         assertThat(result).isNull()
     }
 
     @Test
     fun `getCurrentUserPushConfig ok`() = runTest {
         val sut = createDefaultUnifiedPushCurrentUserPushConfigProvider(
-            appNavigationStateService = FakeAppNavigationStateService(
-                appNavigationState = MutableStateFlow(
-                    AppNavigationState(
-                        navigationState = NavigationState.Session(owner = "owner", sessionId = A_SESSION_ID),
-                        isInForeground = true
-                    )
-                )
-            ),
             pushClientSecret = FakePushClientSecret(
                 getSecretForUserResult = { A_SECRET }
             ),
@@ -93,19 +58,17 @@ class DefaultUnifiedPushCurrentUserPushConfigProviderTest {
                 getEndpointResult = { "aEndpoint" }
             ),
         )
-        val result = sut.provide()
-        assertThat(result).isEqualTo(CurrentUserPushConfig("aPushGateway", "aEndpoint"))
+        val result = sut.provide(A_SESSION_ID)
+        assertThat(result).isEqualTo(Config("aPushGateway", "aEndpoint"))
     }
 
     private fun createDefaultUnifiedPushCurrentUserPushConfigProvider(
         pushClientSecret: PushClientSecret = FakePushClientSecret(),
         unifiedPushStore: UnifiedPushStore = FakeUnifiedPushStore(),
-        appNavigationStateService: AppNavigationStateService = FakeAppNavigationStateService(),
-    ): DefaultUnifiedPushCurrentUserPushConfigProvider {
-        return DefaultUnifiedPushCurrentUserPushConfigProvider(
+    ): DefaultUnifiedPushPushConfigProvider {
+        return DefaultUnifiedPushPushConfigProvider(
             pushClientSecret = pushClientSecret,
             unifiedPushStore = unifiedPushStore,
-            appNavigationStateService = appNavigationStateService,
         )
     }
 }
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt
index c36449f838..642f14438f 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -118,7 +119,7 @@ class DefaultUnifiedPushGatewayResolverTest {
     }
 
     @Test
-    fun `when a custom url is forbidden (403), Error is returned`() = runTest {
+    fun `when a custom url is forbidden (403), NoMatrixGateway is returned`() = runTest {
         val unifiedPushApiFactory = FakeUnifiedPushApiFactory(
             discoveryResponse = {
                 throw HttpException(Response.error<Unit>(HttpURLConnection.HTTP_FORBIDDEN, "".toResponseBody()))
@@ -129,6 +130,36 @@ class DefaultUnifiedPushGatewayResolverTest {
         )
         val result = sut.getGateway("http://custom.url")
         assertThat(unifiedPushApiFactory.baseUrlParameter).isEqualTo("http://custom.url")
+        assertThat(result).isEqualTo(UnifiedPushGatewayResolverResult.NoMatrixGateway)
+    }
+
+    @Test
+    fun `when a custom url is not acceptable (406), NoMatrixGateway is returned`() = runTest {
+        val unifiedPushApiFactory = FakeUnifiedPushApiFactory(
+            discoveryResponse = {
+                throw HttpException(Response.error<Unit>(HttpURLConnection.HTTP_NOT_ACCEPTABLE, "".toResponseBody()))
+            }
+        )
+        val sut = createDefaultUnifiedPushGatewayResolver(
+            unifiedPushApiFactory = unifiedPushApiFactory
+        )
+        val result = sut.getGateway("http://custom.url")
+        assertThat(unifiedPushApiFactory.baseUrlParameter).isEqualTo("http://custom.url")
+        assertThat(result).isEqualTo(UnifiedPushGatewayResolverResult.NoMatrixGateway)
+    }
+
+    @Test
+    fun `when a custom url is internal error (500), Error is returned`() = runTest {
+        val unifiedPushApiFactory = FakeUnifiedPushApiFactory(
+            discoveryResponse = {
+                throw HttpException(Response.error<Unit>(HttpURLConnection.HTTP_INTERNAL_ERROR, "".toResponseBody()))
+            }
+        )
+        val sut = createDefaultUnifiedPushGatewayResolver(
+            unifiedPushApiFactory = unifiedPushApiFactory
+        )
+        val result = sut.getGateway("http://custom.url")
+        assertThat(unifiedPushApiFactory.baseUrlParameter).isEqualTo("http://custom.url")
         assertThat(result).isEqualTo(UnifiedPushGatewayResolverResult.Error("http://custom.url/_matrix/push/v1/notify"))
     }
 
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 27008d96ec..3f437bdafa 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt
index 1e429d7b2d..d5f2aa8026 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushRemovedGatewayHandlerTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushRemovedGatewayHandlerTest.kt
new file mode 100644
index 0000000000..2fcaa3934b
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushRemovedGatewayHandlerTest.kt
@@ -0,0 +1,298 @@
+/*
+ * 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.pushproviders.unifiedpush
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.MatrixClientProvider
+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_SECRET
+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.FakeMatrixClientProvider
+import io.element.android.libraries.push.api.PushService
+import io.element.android.libraries.push.test.FakePushService
+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.api.clientsecret.PushClientSecret
+import io.element.android.libraries.pushstore.test.userpushstore.clientsecret.FakePushClientSecret
+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 kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import kotlin.time.Duration.Companion.seconds
+
+class DefaultUnifiedPushRemovedGatewayHandlerTest {
+    @Test
+    fun `handle returns error if the secret is unknown`() = runTest {
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { null },
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isFailure).isTrue()
+    }
+
+    @Test
+    fun `handle returns error if cannot restore the client`() = runTest {
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.failure(AN_EXCEPTION) },
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isFailure).isTrue()
+    }
+
+    @Test
+    fun `handle returns error if cannot unregister the pusher, and user is notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = { _, _, _ -> Result.failure(AN_EXCEPTION) },
+            ),
+            pushService = FakePushService(
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isFailure).isTrue()
+        onServiceUnregisteredResult.assertions().isCalledOnce().with(value(A_SESSION_ID))
+    }
+
+    @Test
+    fun `handle returns error if cannot get current push provider, and user is notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = { _, _, _ -> Result.success(Unit) },
+            ),
+            pushService = FakePushService(
+                currentPushProvider = { null },
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isFailure).isTrue()
+        onServiceUnregisteredResult.assertions().isCalledOnce().with(value(A_SESSION_ID))
+    }
+
+    @Test
+    fun `handle returns error if cannot get current distributor, and user is notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = { _, _, _ -> Result.success(Unit) },
+            ),
+            pushService = FakePushService(
+                currentPushProvider = {
+                    FakePushProvider(
+                        currentDistributor = { null },
+                    )
+                },
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isFailure).isTrue()
+        onServiceUnregisteredResult.assertions().isCalledOnce().with(value(A_SESSION_ID))
+    }
+
+    @Test
+    fun `handle returns error if cannot register again, and user is notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = { _, _, _ -> Result.success(Unit) },
+            ),
+            pushService = FakePushService(
+                currentPushProvider = {
+                    FakePushProvider(
+                        currentDistributor = { Distributor("aValue", "aName") },
+                    )
+                },
+                registerWithLambda = { _, _, _ -> Result.failure(AN_EXCEPTION) },
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isFailure).isTrue()
+        onServiceUnregisteredResult.assertions().isCalledOnce().with(value(A_SESSION_ID))
+    }
+
+    @Test
+    fun `handle returns success if can register again, and user is not notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val unregisterLambda = lambdaRecorder<MatrixClient, String, Boolean, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = unregisterLambda,
+            ),
+            pushService = FakePushService(
+                currentPushProvider = {
+                    FakePushProvider(
+                        currentDistributor = { Distributor("aValue", "aName") },
+                    )
+                },
+                registerWithLambda = { _, _, _ -> Result.success(Unit) },
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isSuccess).isTrue()
+        unregisterLambda.assertions().isCalledOnce().with(
+            any(),
+            value(A_SECRET),
+            value(false),
+        )
+        onServiceUnregisteredResult.assertions().isNeverCalled()
+    }
+
+    @Test
+    fun `handle returns success if can register again, but after 2 removals user is notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val unregisterLambda = lambdaRecorder<MatrixClient, String, Boolean, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val registerWithLambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = unregisterLambda,
+            ),
+            pushService = FakePushService(
+                currentPushProvider = {
+                    FakePushProvider(
+                        currentDistributor = { Distributor("aValue", "aName") },
+                    )
+                },
+                registerWithLambda = registerWithLambda,
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isSuccess).isTrue()
+        unregisterLambda.assertions().isCalledOnce().with(
+            any(),
+            value(A_SECRET),
+            value(false),
+        )
+        registerWithLambda.assertions().isCalledOnce()
+        onServiceUnregisteredResult.assertions().isNeverCalled()
+        // Second attempt in less than 1 minute
+        val result2 = sut.handle(A_SECRET)
+        assertThat(result2.isFailure).isTrue()
+        unregisterLambda.assertions().isCalledExactly(2)
+        // Registration is not called twice
+        registerWithLambda.assertions().isCalledOnce()
+        onServiceUnregisteredResult.assertions().isCalledOnce().with(value(A_SESSION_ID))
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `handle returns success if can register again, but after 2 distant removals user is not notified`() = runTest {
+        val onServiceUnregisteredResult = lambdaRecorder<UserId, Unit> { }
+        val unregisterLambda = lambdaRecorder<MatrixClient, String, Boolean, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val registerWithLambda = lambdaRecorder<MatrixClient, PushProvider, Distributor, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val sut = createDefaultUnifiedPushRemovedGatewayHandler(
+            pushClientSecret = FakePushClientSecret(
+                getUserIdFromSecretResult = { A_SESSION_ID },
+            ),
+            matrixClientProvider = FakeMatrixClientProvider(
+                getClient = { Result.success(FakeMatrixClient()) },
+            ),
+            unregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(
+                unregisterLambda = unregisterLambda,
+            ),
+            pushService = FakePushService(
+                currentPushProvider = {
+                    FakePushProvider(
+                        currentDistributor = { Distributor("aValue", "aName") },
+                    )
+                },
+                registerWithLambda = registerWithLambda,
+                onServiceUnregisteredResult = onServiceUnregisteredResult,
+            ),
+        )
+        val result = sut.handle(A_SECRET)
+        assertThat(result.isSuccess).isTrue()
+        unregisterLambda.assertions().isCalledOnce().with(
+            any(),
+            value(A_SECRET),
+            value(false),
+        )
+        registerWithLambda.assertions().isCalledOnce()
+        onServiceUnregisteredResult.assertions().isNeverCalled()
+        // Second attempt in more than 1 minute
+        advanceTimeBy(61.seconds)
+        val result2 = sut.handle(A_SECRET)
+        assertThat(result2.isSuccess).isTrue()
+        unregisterLambda.assertions().isCalledExactly(2)
+        // Registration is not called twice
+        registerWithLambda.assertions().isCalledExactly(2)
+        onServiceUnregisteredResult.assertions().isNeverCalled()
+    }
+
+    private fun TestScope.createDefaultUnifiedPushRemovedGatewayHandler(
+        unregisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(),
+        pushClientSecret: PushClientSecret = FakePushClientSecret(),
+        matrixClientProvider: MatrixClientProvider = FakeMatrixClientProvider(),
+        pushService: PushService = FakePushService(),
+    ) = DefaultUnifiedPushRemovedGatewayHandler(
+        unregisterUnifiedPushUseCase = unregisterUnifiedPushUseCase,
+        pushClientSecret = pushClientSecret,
+        matrixClientProvider = matrixClientProvider,
+        pushService = pushService,
+        unifiedPushRemovedGatewayThrottler = UnifiedPushRemovedGatewayThrottler(
+            appCoroutineScope = backgroundScope,
+        ),
+    )
+}
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 8540a2e4ec..ed2337c5bb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeDefaultPushGatewayHttpUrlProvider.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeDefaultPushGatewayHttpUrlProvider.kt
index de0a293fc2..288fd30f36 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeDefaultPushGatewayHttpUrlProvider.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeDefaultPushGatewayHttpUrlProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeRegisterUnifiedPushUseCase.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeRegisterUnifiedPushUseCase.kt
index e7556ebe19..3055dad6b7 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeRegisterUnifiedPushUseCase.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeRegisterUnifiedPushUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushApiFactory.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushApiFactory.kt
index e089fb4a84..5bd9dfccff 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushApiFactory.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushApiFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayResolver.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayResolver.kt
index f5da318e9d..f4578c0346 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayResolver.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayUrlResolver.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayUrlResolver.kt
index d27ed89921..b02e0c3aad 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayUrlResolver.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushGatewayUrlResolver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushNewGatewayHandler.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushNewGatewayHandler.kt
index aac2e7a28c..9bfef750cd 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushNewGatewayHandler.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushNewGatewayHandler.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushStore.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushStore.kt
index 6d2bf51235..ff1c3ef84b 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushStore.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnifiedPushStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnregisterUnifiedPushUseCase.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnregisterUnifiedPushUseCase.kt
index 15ab7281c1..182bb5f823 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnregisterUnifiedPushUseCase.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/FakeUnregisterUnifiedPushUseCase.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +12,21 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeUnregisterUnifiedPushUseCase(
-    private val unregisterLambda: (MatrixClient, String) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val cleanupLambda: (String) -> Unit = { lambdaError() },
+    private val unregisterLambda: (MatrixClient, String, Boolean) -> Result<Unit> = { _, _, _ -> lambdaError() },
+    private val cleanupLambda: (String, Boolean) -> Unit = { _, _ -> lambdaError() },
 ) : UnregisterUnifiedPushUseCase {
-    override suspend fun unregister(matrixClient: MatrixClient, clientSecret: String): Result<Unit> {
-        return unregisterLambda(matrixClient, clientSecret)
+    override suspend fun unregister(
+        matrixClient: MatrixClient,
+        clientSecret: String,
+        unregisterUnifiedPush: Boolean,
+    ): Result<Unit> {
+        return unregisterLambda(matrixClient, clientSecret, unregisterUnifiedPush)
     }
 
-    override fun cleanup(clientSecret: String) {
-        cleanupLambda(clientSecret)
+    override fun cleanup(
+        clientSecret: String,
+        unregisterUnifiedPush: Boolean,
+    ) {
+        cleanupLambda(clientSecret, unregisterUnifiedPush)
     }
 }
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt
index 89d4fec3b2..4b057e9cba 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushParserTest.kt
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
 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.pushproviders.api.PushData
@@ -25,7 +27,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test edge cases UnifiedPush`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         // Empty string
         assertThat(pushParser.parse("".toByteArray(), aClientSecret)).isNull()
         // Empty Json
@@ -36,13 +38,13 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test UnifiedPush format`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThat(pushParser.parse(UNIFIED_PUSH_DATA.toByteArray(), aClientSecret)).isEqualTo(validData)
     }
 
     @Test
     fun `test empty roomId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.replace(A_ROOM_ID.value, "").toByteArray(), aClientSecret)
         }
@@ -50,7 +52,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test invalid roomId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.mutate(A_ROOM_ID.value, "aRoomId:domain"), aClientSecret)
         }
@@ -58,7 +60,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test empty eventId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.mutate(AN_EVENT_ID.value, ""), aClientSecret)
         }
@@ -66,7 +68,7 @@ class UnifiedPushParserTest {
 
     @Test
     fun `test invalid eventId`() {
-        val pushParser = UnifiedPushParser()
+        val pushParser = createUnifiedPushParser()
         assertThrowsInDebug {
             pushParser.parse(UNIFIED_PUSH_DATA.mutate(AN_EVENT_ID.value, "anEventId"), aClientSecret)
         }
@@ -81,3 +83,7 @@ class UnifiedPushParserTest {
 private fun String.mutate(oldValue: String, newValue: String): ByteArray {
     return replace(oldValue, newValue).toByteArray()
 }
+
+fun createUnifiedPushParser() = UnifiedPushParser(
+    json = DefaultJsonProvider(),
+)
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProviderTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProviderTest.kt
index 5e48728322..e22c1c3bf4 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProviderTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,9 +17,9 @@ import io.element.android.libraries.matrix.test.A_SECRET
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.pushproviders.api.Distributor
-import io.element.android.libraries.pushproviders.test.aCurrentUserPushConfig
-import io.element.android.libraries.pushproviders.unifiedpush.troubleshoot.FakeUnifiedPushCurrentUserPushConfigProvider
+import io.element.android.libraries.pushproviders.test.aSessionPushConfig
 import io.element.android.libraries.pushproviders.unifiedpush.troubleshoot.FakeUnifiedPushDistributorProvider
+import io.element.android.libraries.pushproviders.unifiedpush.troubleshoot.FakeUnifiedPushSessionPushConfigProvider
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import io.element.android.libraries.pushstore.test.userpushstore.clientsecret.FakePushClientSecret
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -117,7 +118,7 @@ class UnifiedPushProviderTest {
     fun `unregister ok`() = runTest {
         val matrixClient = FakeMatrixClient()
         val getSecretForUserResultLambda = lambdaRecorder<SessionId, String> { A_SECRET }
-        val unregisterLambda = lambdaRecorder<MatrixClient, String, Result<Unit>> { _, _ -> Result.success(Unit) }
+        val unregisterLambda = lambdaRecorder<MatrixClient, String, Boolean, Result<Unit>> { _, _, _ -> Result.success(Unit) }
         val unifiedPushProvider = createUnifiedPushProvider(
             pushClientSecret = FakePushClientSecret(
                 getSecretForUserResult = getSecretForUserResultLambda,
@@ -133,14 +134,14 @@ class UnifiedPushProviderTest {
             .with(value(A_SESSION_ID))
         unregisterLambda.assertions()
             .isCalledOnce()
-            .with(value(matrixClient), value(A_SECRET))
+            .with(value(matrixClient), value(A_SECRET), value(true))
     }
 
     @Test
     fun `unregister ko`() = runTest {
         val matrixClient = FakeMatrixClient()
         val getSecretForUserResultLambda = lambdaRecorder<SessionId, String> { A_SECRET }
-        val unregisterLambda = lambdaRecorder<MatrixClient, String, Result<Unit>> { _, _ -> Result.failure(AN_EXCEPTION) }
+        val unregisterLambda = lambdaRecorder<MatrixClient, String, Boolean, Result<Unit>> { _, _, _ -> Result.failure(AN_EXCEPTION) }
         val unifiedPushProvider = createUnifiedPushProvider(
             pushClientSecret = FakePushClientSecret(
                 getSecretForUserResult = getSecretForUserResultLambda,
@@ -156,7 +157,7 @@ class UnifiedPushProviderTest {
             .with(value(A_SESSION_ID))
         unregisterLambda.assertions()
             .isCalledOnce()
-            .with(value(matrixClient), value(A_SECRET))
+            .with(value(matrixClient), value(A_SECRET), value(true))
     }
 
     @Test
@@ -211,13 +212,13 @@ class UnifiedPushProviderTest {
 
     @Test
     fun `getCurrentUserPushConfig invokes the provider methods`() = runTest {
-        val currentUserPushConfig = aCurrentUserPushConfig()
+        val currentUserPushConfig = aSessionPushConfig()
         val unifiedPushProvider = createUnifiedPushProvider(
-            unifiedPushCurrentUserPushConfigProvider = FakeUnifiedPushCurrentUserPushConfigProvider(
-                currentUserPushConfig = { currentUserPushConfig }
+            unifiedPushSessionPushConfigProvider = FakeUnifiedPushSessionPushConfigProvider(
+                config = { currentUserPushConfig }
             )
         )
-        val result = unifiedPushProvider.getCurrentUserPushConfig()
+        val result = unifiedPushProvider.getPushConfig(A_SESSION_ID)
         assertThat(result).isEqualTo(currentUserPushConfig)
     }
 
@@ -229,7 +230,7 @@ class UnifiedPushProviderTest {
 
     @Test
     fun `onSessionDeleted should do the cleanup`() = runTest {
-        val cleanupLambda = lambdaRecorder<String, Unit> { }
+        val cleanupLambda = lambdaRecorder<String, Boolean, Unit> { _, _ -> }
         val unifiedPushProvider = createUnifiedPushProvider(
             pushClientSecret = FakePushClientSecret(
                 getSecretForUserResult = { A_SECRET }
@@ -239,7 +240,7 @@ class UnifiedPushProviderTest {
             ),
         )
         unifiedPushProvider.onSessionDeleted(A_SESSION_ID)
-        cleanupLambda.assertions().isCalledOnce().with(value(A_SECRET))
+        cleanupLambda.assertions().isCalledOnce().with(value(A_SECRET), value(true))
     }
 
     private fun createUnifiedPushProvider(
@@ -248,7 +249,7 @@ class UnifiedPushProviderTest {
         unRegisterUnifiedPushUseCase: UnregisterUnifiedPushUseCase = FakeUnregisterUnifiedPushUseCase(),
         pushClientSecret: PushClientSecret = FakePushClientSecret(),
         unifiedPushStore: UnifiedPushStore = FakeUnifiedPushStore(),
-        unifiedPushCurrentUserPushConfigProvider: UnifiedPushCurrentUserPushConfigProvider = FakeUnifiedPushCurrentUserPushConfigProvider(),
+        unifiedPushSessionPushConfigProvider: UnifiedPushSessionPushConfigProvider = FakeUnifiedPushSessionPushConfigProvider(),
     ): UnifiedPushProvider {
         return UnifiedPushProvider(
             unifiedPushDistributorProvider = unifiedPushDistributorProvider,
@@ -256,7 +257,7 @@ class UnifiedPushProviderTest {
             unRegisterUnifiedPushUseCase = unRegisterUnifiedPushUseCase,
             pushClientSecret = pushClientSecret,
             unifiedPushStore = unifiedPushStore,
-            unifiedPushCurrentUserPushConfigProvider = unifiedPushCurrentUserPushConfigProvider,
+            unifiedPushSessionPushConfigProvider = unifiedPushSessionPushConfigProvider,
         )
     }
 }
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 5bb0a6731f..f10f6430f0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,6 +23,7 @@ import io.element.android.libraries.pushproviders.api.PushData
 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
+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
@@ -50,10 +52,17 @@ class VectorUnifiedPushMessagingReceiverTest {
     }
 
     @Test
-    fun `onUnregistered does nothing`() = runTest {
+    fun `onUnregistered invokes the removedGatewayHandler`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
-        val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver()
+        val handleResult = lambdaRecorder<String, Result<Unit>> {
+            Result.success(Unit)
+        }
+        val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver(
+            removedGatewayHandler = UnifiedPushRemovedGatewayHandler { handleResult(it) },
+        )
         vectorUnifiedPushMessagingReceiver.onUnregistered(context, A_SECRET)
+        advanceUntilIdle()
+        handleResult.assertions().isCalledOnce().with(value(A_SECRET))
     }
 
     @Test
@@ -191,21 +200,24 @@ class VectorUnifiedPushMessagingReceiverTest {
     }
 
     private fun TestScope.createVectorUnifiedPushMessagingReceiver(
+        unifiedPushParser: UnifiedPushParser = createUnifiedPushParser(),
         pushHandler: PushHandler = FakePushHandler(),
         unifiedPushStore: UnifiedPushStore = FakeUnifiedPushStore(),
         unifiedPushGatewayResolver: UnifiedPushGatewayResolver = FakeUnifiedPushGatewayResolver(),
         unifiedPushGatewayUrlResolver: UnifiedPushGatewayUrlResolver = FakeUnifiedPushGatewayUrlResolver(),
         unifiedPushNewGatewayHandler: UnifiedPushNewGatewayHandler = FakeUnifiedPushNewGatewayHandler(),
         endpointRegistrationHandler: EndpointRegistrationHandler = EndpointRegistrationHandler(),
+        removedGatewayHandler: UnifiedPushRemovedGatewayHandler = UnifiedPushRemovedGatewayHandler { lambdaError() },
     ): VectorUnifiedPushMessagingReceiver {
         return VectorUnifiedPushMessagingReceiver().apply {
-            this.pushParser = UnifiedPushParser()
+            this.pushParser = unifiedPushParser
             this.pushHandler = pushHandler
             this.guardServiceStarter = NoopGuardServiceStarter()
             this.unifiedPushStore = unifiedPushStore
             this.unifiedPushGatewayResolver = unifiedPushGatewayResolver
             this.unifiedPushGatewayUrlResolver = unifiedPushGatewayUrlResolver
             this.newGatewayHandler = unifiedPushNewGatewayHandler
+            this.removedGatewayHandler = removedGatewayHandler
             this.endpointRegistrationHandler = endpointRegistrationHandler
             this.coroutineScope = this@createVectorUnifiedPushMessagingReceiver
         }
@@ -223,7 +235,9 @@ private fun aPushMessage(
 private fun aPushEndpoint(
     url: String = "anEndpoint",
     pubKeySet: PublicKeySet? = null,
+    temporary: Boolean = false,
 ) = PushEndpoint(
     url = url,
     pubKeySet = pubKeySet,
+    temporary = temporary,
 )
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeOpenDistributorWebPageAction.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeOpenDistributorWebPageAction.kt
index d048784e05..7ef5dbec6e 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeOpenDistributorWebPageAction.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeOpenDistributorWebPageAction.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushCurrentUserPushConfigProvider.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushCurrentUserPushConfigProvider.kt
deleted file mode 100644
index 92be615054..0000000000
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushCurrentUserPushConfigProvider.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 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.
- */
-
-package io.element.android.libraries.pushproviders.unifiedpush.troubleshoot
-
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
-import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushCurrentUserPushConfigProvider
-import io.element.android.tests.testutils.lambda.lambdaError
-
-class FakeUnifiedPushCurrentUserPushConfigProvider(
-    private val currentUserPushConfig: () -> CurrentUserPushConfig? = { lambdaError() },
-) : UnifiedPushCurrentUserPushConfigProvider {
-    override suspend fun provide(): CurrentUserPushConfig? {
-        return currentUserPushConfig()
-    }
-}
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushDistributorProvider.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushDistributorProvider.kt
index ac3547f25d..8ee80c7fa9 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushDistributorProvider.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushDistributorProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushSessionPushConfigProvider.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushSessionPushConfigProvider.kt
new file mode 100644
index 0000000000..8d5d58ea44
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/FakeUnifiedPushSessionPushConfigProvider.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.unifiedpush.troubleshoot
+
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.pushproviders.api.Config
+import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushSessionPushConfigProvider
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeUnifiedPushSessionPushConfigProvider(
+    private val config: (SessionId) -> Config? = { lambdaError() },
+) : UnifiedPushSessionPushConfigProvider {
+    override suspend fun provide(sessionId: SessionId): Config? {
+        return config(sessionId)
+    }
+}
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTestTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTestTest.kt
index f4a0cf5da4..f10715fce3 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTestTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushMatrixGatewayTestTest.kt
@@ -1,15 +1,18 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.pushproviders.api.CurrentUserPushConfig
-import io.element.android.libraries.pushproviders.test.aCurrentUserPushConfig
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.pushproviders.api.Config
+import io.element.android.libraries.pushproviders.test.aSessionPushConfig
 import io.element.android.libraries.pushproviders.unifiedpush.FakeUnifiedPushApiFactory
 import io.element.android.libraries.pushproviders.unifiedpush.UnifiedPushConfig
 import io.element.android.libraries.pushproviders.unifiedpush.invalidDiscoveryResponse
@@ -27,7 +30,7 @@ class UnifiedPushMatrixGatewayTestTest {
     @Test
     fun `test UnifiedPushMatrixGatewayTest success`() = runTest {
         val sut = createUnifiedPushMatrixGatewayTest(
-            currentUserPushConfig = aCurrentUserPushConfig(),
+            config = aSessionPushConfig(),
             discoveryResponse = matrixDiscoveryResponse,
         )
         sut.runAndTestState {
@@ -41,7 +44,7 @@ class UnifiedPushMatrixGatewayTestTest {
     @Test
     fun `test UnifiedPushMatrixGatewayTest no config found`() = runTest {
         val sut = createUnifiedPushMatrixGatewayTest(
-            currentUserPushConfig = null,
+            config = null,
             discoveryResponse = matrixDiscoveryResponse,
         )
         sut.runAndTestState {
@@ -55,7 +58,7 @@ class UnifiedPushMatrixGatewayTestTest {
     @Test
     fun `test UnifiedPushMatrixGatewayTest not valid gateway`() = runTest {
         val sut = createUnifiedPushMatrixGatewayTest(
-            currentUserPushConfig = aCurrentUserPushConfig(),
+            config = aSessionPushConfig(),
             discoveryResponse = invalidDiscoveryResponse,
         )
         sut.runAndTestState {
@@ -72,7 +75,7 @@ class UnifiedPushMatrixGatewayTestTest {
     @Test
     fun `test UnifiedPushMatrixGatewayTest network error`() = runTest {
         val sut = createUnifiedPushMatrixGatewayTest(
-            currentUserPushConfig = aCurrentUserPushConfig(),
+            config = aSessionPushConfig(),
             discoveryResponse = { error("Network error") },
         )
         sut.runAndTestState {
@@ -91,14 +94,16 @@ class UnifiedPushMatrixGatewayTestTest {
     }
 
     private fun TestScope.createUnifiedPushMatrixGatewayTest(
-        currentUserPushConfig: CurrentUserPushConfig? = null,
+        sessionId: SessionId = A_SESSION_ID,
+        config: Config? = null,
         discoveryResponse: () -> DiscoveryResponse = matrixDiscoveryResponse,
     ): UnifiedPushMatrixGatewayTest {
         return UnifiedPushMatrixGatewayTest(
+            sessionId = sessionId,
             unifiedPushApiFactory = FakeUnifiedPushApiFactory(discoveryResponse),
             coroutineDispatchers = testCoroutineDispatchers(),
-            unifiedPushCurrentUserPushConfigProvider = FakeUnifiedPushCurrentUserPushConfigProvider(
-                currentUserPushConfig = { currentUserPushConfig }
+            unifiedPushSessionPushConfigProvider = FakeUnifiedPushSessionPushConfigProvider(
+                config = { config }
             ),
         )
     }
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTestTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTestTest.kt
index 28ab0186da..2804f53519 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTestTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/troubleshoot/UnifiedPushTestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/api/build.gradle.kts b/libraries/pushstore/api/build.gradle.kts
index 7a82c59110..a495a4ea9d 100644
--- a/libraries/pushstore/api/build.gradle.kts
+++ b/libraries/pushstore/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStore.kt b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStore.kt
index 5b3396b095..8a1b2f9f21 100644
--- a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStore.kt
+++ b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStoreFactory.kt b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStoreFactory.kt
index fb972376b0..78571d8b30 100644
--- a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStoreFactory.kt
+++ b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/UserPushStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecret.kt b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecret.kt
index c03a252f03..da3ea946f0 100644
--- a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecret.kt
+++ b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecret.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretFactory.kt b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretFactory.kt
index 259b732c74..d7ea7d5239 100644
--- a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretFactory.kt
+++ b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretStore.kt b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretStore.kt
index ae3be2fe6c..ecb87b2b14 100644
--- a/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretStore.kt
+++ b/libraries/pushstore/api/src/main/kotlin/io/element/android/libraries/pushstore/api/clientsecret/PushClientSecretStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/impl/build.gradle.kts b/libraries/pushstore/impl/build.gradle.kts
index ea45836d1f..4e643fd5f9 100644
--- a/libraries/pushstore/impl/build.gradle.kts
+++ b/libraries/pushstore/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -35,7 +36,6 @@ dependencies {
     testCommonDependencies(libs)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.preferences.test)
-    testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.libraries.pushstore.test)
 
     androidTestImplementation(libs.coroutines.test)
diff --git a/libraries/pushstore/impl/src/androidTest/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactoryTest.kt b/libraries/pushstore/impl/src/androidTest/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactoryTest.kt
index dbc212efe1..a3b31acf6c 100644
--- a/libraries/pushstore/impl/src/androidTest/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactoryTest.kt
+++ b/libraries/pushstore/impl/src/androidTest/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactory.kt b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactory.kt
index 41dbe5c212..0690fbc569 100644
--- a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactory.kt
+++ b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/DefaultUserPushStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.pushstore.impl
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultUserPushStoreFactory(
     @ApplicationContext private val context: Context,
     private val preferenceDataStoreFactory: PreferenceDataStoreFactory,
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 399b9648f4..8ad2d62b33 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DataStorePushClientSecretStore.kt b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DataStorePushClientSecretStore.kt
index 98ab23c9ea..827f4ef515 100644
--- a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DataStorePushClientSecretStore.kt
+++ b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DataStorePushClientSecretStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,14 +12,12 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecretStore
 import kotlinx.coroutines.flow.first
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DataStorePushClientSecretStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : PushClientSecretStore {
diff --git a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecret.kt b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecret.kt
index 7125a7c122..8db0031912 100644
--- a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecret.kt
+++ b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecret.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,14 +10,12 @@ package io.element.android.libraries.pushstore.impl.clientsecret
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecretFactory
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecretStore
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushClientSecret(
     private val pushClientSecretFactory: PushClientSecretFactory,
     private val pushClientSecretStore: PushClientSecretStore,
diff --git a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretFactory.kt b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretFactory.kt
index be991ca0c5..1ac17770a2 100644
--- a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretFactory.kt
+++ b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,12 +10,10 @@ package io.element.android.libraries.pushstore.impl.clientsecret
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecretFactory
 import java.util.UUID
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushClientSecretFactory : PushClientSecretFactory {
     override fun create(): String {
         return UUID.randomUUID().toString()
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 2c1a10a333..9191ea4ab4 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretTest.kt b/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretTest.kt
index 7c12979946..2f7d16fbb5 100644
--- a/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretTest.kt
+++ b/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/DefaultPushClientSecretTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/FakePushClientSecretFactory.kt b/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/FakePushClientSecretFactory.kt
index 61eabeada9..325095a386 100644
--- a/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/FakePushClientSecretFactory.kt
+++ b/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/clientsecret/FakePushClientSecretFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/test/build.gradle.kts b/libraries/pushstore/test/build.gradle.kts
index 79aa02a219..ecc451d3e5 100644
--- a/libraries/pushstore/test/build.gradle.kts
+++ b/libraries/pushstore/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStore.kt b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStore.kt
index 3ddbb2e6bb..e095a490e3 100644
--- a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStore.kt
+++ b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStoreFactory.kt b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStoreFactory.kt
index 2f1afeaaa7..e2bb6ed607 100644
--- a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStoreFactory.kt
+++ b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/FakeUserPushStoreFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/FakePushClientSecret.kt b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/FakePushClientSecret.kt
index 87fe760a5b..2e7ccca9ae 100644
--- a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/FakePushClientSecret.kt
+++ b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/FakePushClientSecret.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/InMemoryPushClientSecretStore.kt b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/InMemoryPushClientSecretStore.kt
index cd08d5fdcc..b82cf1367c 100644
--- a/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/InMemoryPushClientSecretStore.kt
+++ b/libraries/pushstore/test/src/main/kotlin/io/element/android/libraries/pushstore/test/userpushstore/clientsecret/InMemoryPushClientSecretStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/qrcode/build.gradle.kts b/libraries/qrcode/build.gradle.kts
index a64b4363f6..cf76e117c0 100644
--- a/libraries/qrcode/build.gradle.kts
+++ b/libraries/qrcode/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -18,4 +19,5 @@ dependencies {
     implementation(libs.androidx.camera.view)
     implementation(libs.androidx.camera.camera2)
     implementation(libs.zxing.cpp)
+    implementation(libs.google.zxing)
 }
diff --git a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt
index 777d09362a..168e898965 100644
--- a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt
+++ b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QRCodeAnalyzer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,19 +15,24 @@ import timber.log.Timber
 import zxingcpp.BarcodeReader
 
 internal class QRCodeAnalyzer(
-    private val onScanQrCode: (result: ByteArray?) -> Unit
+    private val onScanQrCode: (data: ByteArray) -> Unit
 ) : ImageAnalysis.Analyzer {
     private val reader by lazy { BarcodeReader() }
 
     override fun analyze(image: ImageProxy) {
-        if (image.format in SUPPORTED_IMAGE_FORMATS) {
-            try {
-                val bytes = reader.read(image).firstNotNullOfOrNull { it.bytes }
-                bytes?.let { onScanQrCode(it) }
-            } catch (e: Exception) {
-                Timber.w(e, "Error decoding QR code")
-            } finally {
-                image.close()
+        image.use {
+            if (image.format in SUPPORTED_IMAGE_FORMATS) {
+                try {
+                    val bytes = reader.read(image).firstNotNullOfOrNull { it.bytes }
+                    if (bytes != null) {
+                        Timber.d("QR code scanned!")
+                        onScanQrCode(bytes)
+                    }
+                } catch (e: Exception) {
+                    Timber.w(e, "Error decoding QR code")
+                }
+            } else {
+                Timber.w("Unsupported image format: ${image.format}")
             }
         }
     }
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 0087a8a9bb..18bd1cff10 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -30,6 +31,7 @@ import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -44,99 +46,102 @@ import kotlin.coroutines.suspendCoroutine
 @Composable
 fun QrCodeCameraView(
     onScanQrCode: (ByteArray) -> Unit,
-    renderPreview: Boolean,
+    isScanning: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    if (LocalInspectionMode.current) {
-        Box(
-            modifier = modifier
-                .background(color = ElementTheme.colors.bgSubtlePrimary),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text("CameraView")
-        }
-    } else {
-        val coroutineScope = rememberCoroutineScope()
-        val localContext = LocalContext.current
-        val lifecycleOwner = LocalLifecycleOwner.current
-        var cameraProvider by remember { mutableStateOf<ProcessCameraProvider?>(null) }
-        val previewUseCase = remember { Preview.Builder().build() }
-        var lastFrame by remember { mutableStateOf<Bitmap?>(null) }
-        val imageAnalysis = remember {
-            ImageAnalysis.Builder()
-                .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-                .build()
-        }
+    val coroutineScope = rememberCoroutineScope()
+    val localContext = LocalContext.current
+    val lifecycleOwner = LocalLifecycleOwner.current
+    var cameraProvider by remember { mutableStateOf<ProcessCameraProvider?>(null) }
+    val previewUseCase = remember { Preview.Builder().build() }
+    var lastFrame by remember { mutableStateOf<Bitmap?>(null) }
+    val imageAnalysis = remember {
+        ImageAnalysis.Builder()
+            .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
+            .build()
+    }
 
-        LaunchedEffect(Unit) {
-            cameraProvider = localContext.getCameraProvider()
-        }
+    LaunchedEffect(Unit) {
+        cameraProvider = localContext.getCameraProvider()
+    }
 
-        suspend fun startQRCodeAnalysis(cameraProvider: ProcessCameraProvider, previewView: PreviewView, attempt: Int = 1) {
-            lastFrame = null
-            val cameraSelector = CameraSelector.Builder()
-                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
-                .build()
-            imageAnalysis.setAnalyzer(
-                ContextCompat.getMainExecutor(previewView.context),
-                QRCodeAnalyzer { result ->
-                    result?.let {
-                        Timber.d("QR code scanned!")
-                        onScanQrCode(it)
-                    }
-                }
+    suspend fun startQRCodeAnalysis(cameraProvider: ProcessCameraProvider, attempt: Int = 1) {
+        lastFrame = null
+        val cameraSelector = CameraSelector.Builder()
+            .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+            .build()
+        imageAnalysis.setAnalyzer(
+            ContextCompat.getMainExecutor(localContext),
+            QRCodeAnalyzer(onScanQrCode)
+        )
+        try {
+            // Make sure we unbind all use cases before binding them again
+            cameraProvider.unbindAll()
+
+            cameraProvider.bindToLifecycle(
+                lifecycleOwner,
+                cameraSelector,
+                previewUseCase,
+                imageAnalysis,
             )
-            try {
-                // Make sure we unbind all use cases before binding them again
-                cameraProvider.unbindAll()
+            lastFrame = null
+        } catch (e: Exception) {
+            val maxAttempts = 3
+            if (attempt > maxAttempts) {
+                Timber.e(e, "Use case binding failed after $maxAttempts attempts. Giving up.")
+            } else {
+                Timber.e(e, "Use case binding failed (attempt #$attempt). Retrying after a delay...")
+                delay(100)
+                startQRCodeAnalysis(cameraProvider, attempt + 1)
+            }
+        }
+    }
 
-                cameraProvider.bindToLifecycle(
-                    lifecycleOwner,
-                    cameraSelector,
-                    previewUseCase,
-                    imageAnalysis
+    fun stopQRCodeAnalysis(previewView: PreviewView) {
+        // Stop analyzer
+        imageAnalysis.clearAnalyzer()
+
+        // Save last frame to display it as the 'frozen' preview
+        if (lastFrame == null) {
+            lastFrame = previewView.bitmap
+            Timber.d("Saving last frame for frozen preview.")
+        }
+
+        // Unbind preview use case
+        cameraProvider?.unbindAll()
+    }
+
+    Box(modifier.clipToBounds()) {
+        if (LocalInspectionMode.current) {
+            Box(
+                modifier = modifier
+                    .background(color = ElementTheme.colors.bgSubtlePrimary),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(
+                    text = buildString {
+                        append("CameraView\n")
+                        append(if (isScanning) "scanning" else "frozen")
+                    },
+                    textAlign = TextAlign.Center,
                 )
-                lastFrame = null
-            } catch (e: Exception) {
-                val maxAttempts = 3
-                if (attempt > maxAttempts) {
-                    Timber.e(e, "Use case binding failed after $maxAttempts attempts. Giving up.")
-                } else {
-                    Timber.e(e, "Use case binding failed (attempt #$attempt). Retrying after a delay...")
-                    delay(100)
-                    startQRCodeAnalysis(cameraProvider, previewView, attempt + 1)
-                }
             }
-        }
-
-        fun stopQRCodeAnalysis(previewView: PreviewView) {
-            // Stop analyzer
-            imageAnalysis.clearAnalyzer()
-
-            // Save last frame to display it as the 'frozen' preview
-            if (lastFrame == null) {
-                lastFrame = previewView.bitmap
-                Timber.d("Saving last frame for frozen preview.")
-            }
-
-            // Unbind preview use case
-            cameraProvider?.unbindAll()
-        }
-
-        Box(modifier.clipToBounds()) {
+        } else {
             AndroidView(
                 factory = { context ->
                     val previewView = PreviewView(context)
-                    previewUseCase.setSurfaceProvider(previewView.surfaceProvider)
+                    previewUseCase.surfaceProvider = previewView.surfaceProvider
                     previewView.previewStreamState.observe(lifecycleOwner) { state ->
                         previewView.alpha = if (state == PreviewView.StreamState.STREAMING) 1f else 0f
                     }
                     previewView
                 },
                 update = { previewView ->
-                    if (renderPreview) {
+                    if (isScanning) {
                         cameraProvider?.let { provider ->
-                            coroutineScope.launch { startQRCodeAnalysis(provider, previewView) }
+                            coroutineScope.launch {
+                                startQRCodeAnalysis(provider)
+                            }
                         }
                     } else {
                         stopQRCodeAnalysis(previewView)
@@ -147,19 +152,21 @@ fun QrCodeCameraView(
                     cameraProvider = null
                 },
             )
-            lastFrame?.let {
-                Image(bitmap = it.asImageBitmap(), contentDescription = null)
-            }
+        }
+        lastFrame?.let {
+            Image(bitmap = it.asImageBitmap(), contentDescription = null)
         }
     }
 }
 
-@Suppress("BlockingMethodInNonBlockingContext")
 private suspend fun Context.getCameraProvider(): ProcessCameraProvider =
     suspendCoroutine { continuation ->
         ProcessCameraProvider.getInstance(this).also { cameraProvider ->
-            cameraProvider.addListener({
-                continuation.resume(cameraProvider.get())
-            }, ContextCompat.getMainExecutor(this))
+            cameraProvider.addListener(
+                {
+                    continuation.resume(cameraProvider.get())
+                },
+                ContextCompat.getMainExecutor(this),
+            )
         }
     }
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
new file mode 100644
index 0000000000..e045e42f17
--- /dev/null
+++ b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeImage.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.qrcode
+
+import android.graphics.Bitmap
+import android.graphics.Color
+import androidx.annotation.ColorInt
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxHeight
+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.graphics.asImageBitmap
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntSize
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.common.BitMatrix
+import com.google.zxing.qrcode.QRCodeWriter
+import io.element.android.libraries.designsystem.modifiers.squareSize
+import io.element.android.libraries.designsystem.utils.ForceMaxBrightness
+
+private fun String.toBitMatrix(size: Int): BitMatrix {
+    return QRCodeWriter().encode(
+        this,
+        BarcodeFormat.QR_CODE,
+        size,
+        size,
+    )
+}
+
+private fun BitMatrix.toBitmap(
+    @ColorInt backgroundColor: Int = Color.WHITE,
+    @ColorInt foregroundColor: Int = Color.BLACK,
+): Bitmap {
+    val colorBuffer = IntArray(width * height)
+    var rowOffset = 0
+    for (y in 0 until height) {
+        for (x in 0 until width) {
+            val arrayIndex = x + rowOffset
+            colorBuffer[arrayIndex] = if (get(x, y)) foregroundColor else backgroundColor
+        }
+        rowOffset += width
+    }
+    return Bitmap.createBitmap(colorBuffer, width, height, Bitmap.Config.ARGB_8888)
+}
+
+@Composable
+fun QrCodeImage(
+    data: String,
+    forceMaxBrightness: Boolean = true,
+    modifier: Modifier = Modifier,
+) {
+    if (forceMaxBrightness) {
+        ForceMaxBrightness()
+    }
+    var size by remember { mutableStateOf(IntSize.Zero) }
+    Box(
+        modifier = modifier
+            .squareSize()
+            .onSizeChanged {
+                size = it
+            },
+    ) {
+        val image = remember(data, size) {
+            val sideSide = maxOf(size.width, size.height).coerceAtLeast(128)
+            data.toBitMatrix(sideSide).toBitmap().asImageBitmap()
+        }
+        Image(
+            contentDescription = null,
+            bitmap = image,
+        )
+    }
+}
+
+@Composable
+@Preview
+internal fun QrCodeViewPreview() {
+    QrCodeImage(
+        modifier = Modifier.fillMaxHeight(),
+        data = "RANDOM_QRCODE_DATA",
+    )
+}
diff --git a/libraries/recentemojis/api/build.gradle.kts b/libraries/recentemojis/api/build.gradle.kts
new file mode 100644
index 0000000000..2fc74c03c7
--- /dev/null
+++ b/libraries/recentemojis/api/build.gradle.kts
@@ -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.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.recentemojis.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.matrix.emojibase.bindings)
+}
diff --git a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/AddRecentEmoji.kt b/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/AddRecentEmoji.kt
new file mode 100644
index 0000000000..5b50823f77
--- /dev/null
+++ b/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/AddRecentEmoji.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.api
+
+fun interface AddRecentEmoji {
+    suspend operator fun invoke(emoji: String): Result<Unit>
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt b/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/EmojibaseProvider.kt
similarity index 65%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt
rename to libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/EmojibaseProvider.kt
index ce394150b7..9d6e41eb55 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseProvider.kt
+++ b/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/EmojibaseProvider.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
+package io.element.android.libraries.recentemojis.api
 
 import io.element.android.emojibasebindings.EmojibaseStore
 
diff --git a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/GetRecentEmojis.kt b/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/GetRecentEmojis.kt
new file mode 100644
index 0000000000..6517512f44
--- /dev/null
+++ b/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/GetRecentEmojis.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.api
+
+import kotlinx.collections.immutable.ImmutableList
+
+/**
+ * Returns the list of recently used emojis for reactions.
+ */
+fun interface GetRecentEmojis {
+    suspend operator fun invoke(): Result<ImmutableList<String>>
+}
diff --git a/libraries/recentemojis/impl/build.gradle.kts b/libraries/recentemojis/impl/build.gradle.kts
new file mode 100644
index 0000000000..a1a72c8672
--- /dev/null
+++ b/libraries/recentemojis/impl/build.gradle.kts
@@ -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.
+ */
+
+import extension.setupDependencyInjection
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.libraries.recentemojis.impl"
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.libraries.recentemojis.api)
+    implementation(projects.libraries.matrix.api)
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.matrix.emojibase.bindings)
+
+    testImplementation(projects.libraries.recentemojis.test)
+    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)
+    testImplementation(projects.tests.testutils)
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/recentemojis/GetRecentEmojis.kt b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultAddRecentEmoji.kt
similarity index 60%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/recentemojis/GetRecentEmojis.kt
rename to libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultAddRecentEmoji.kt
index 53adf88c37..4444d7e01a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/recentemojis/GetRecentEmojis.kt
+++ b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultAddRecentEmoji.kt
@@ -1,30 +1,26 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.recentemojis
+package io.element.android.libraries.recentemojis.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 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.recentemojis.api.AddRecentEmoji
 import kotlinx.coroutines.withContext
 
-fun interface GetRecentEmojis {
-    suspend operator fun invoke(): Result<List<String>>
-}
-
 @ContributesBinding(SessionScope::class)
-@Inject
-class DefaultGetRecentEmojis(
+class DefaultAddRecentEmoji(
     private val client: MatrixClient,
     private val dispatchers: CoroutineDispatchers,
-) : GetRecentEmojis {
-    override suspend operator fun invoke(): Result<List<String>> = withContext(dispatchers.io) {
-        client.getRecentEmojis()
+) : AddRecentEmoji {
+    override suspend operator fun invoke(emoji: String): Result<Unit> = withContext(dispatchers.io) {
+        client.addRecentEmoji(emoji)
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultEmojibaseProvider.kt
similarity index 69%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt
rename to libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultEmojibaseProvider.kt
index e07c78f578..161dd0cc56 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/DefaultEmojibaseProvider.kt
+++ b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultEmojibaseProvider.kt
@@ -1,15 +1,17 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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
+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 {
diff --git a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojis.kt b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojis.kt
new file mode 100644
index 0000000000..9c5ed178dd
--- /dev/null
+++ b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojis.kt
@@ -0,0 +1,38 @@
+/*
+ * 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 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.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
+
+@ContributesBinding(SessionScope::class)
+class DefaultGetRecentEmojis(
+    private val client: MatrixClient,
+    private val dispatchers: CoroutineDispatchers,
+    private val emojibaseProvider: EmojibaseProvider,
+) : GetRecentEmojis {
+    override suspend operator fun invoke(): Result<ImmutableList<String>> = withContext(dispatchers.io) {
+        val allEmojis = emojibaseProvider.emojibaseStore.allEmojis
+        client.getRecentEmojis()
+            .map { emojis ->
+                // Remove any possible duplicates
+                emojis.distinct()
+                    // Return only those emojis that are valid
+                    .filter { recent -> allEmojis.any { recent == it.unicode } }
+                    .toImmutableList()
+            }
+    }
+}
diff --git a/libraries/recentemojis/impl/src/test/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojisTest.kt b/libraries/recentemojis/impl/src/test/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojisTest.kt
new file mode 100644
index 0000000000..722aaee234
--- /dev/null
+++ b/libraries/recentemojis/impl/src/test/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojisTest.kt
@@ -0,0 +1,69 @@
+/*
+ * 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 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.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
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultGetRecentEmojisTest {
+    @Test
+    fun `invoke - deduplicates results`() = runTest {
+        val recentEmojiResult = persistentListOf(":)", ":D", ":)")
+        val getRecentEmojis = createDefaultGetRecentEmojis(
+            recentEmojis = { Result.success(recentEmojiResult) },
+            emojibaseContents = persistentMapOf(People to recentEmojiResult.map { emoji(it) }.toImmutableList())
+        )
+
+        assertThat(getRecentEmojis()).isEqualTo(Result.success(persistentListOf(":)", ":D")))
+    }
+
+    @Test
+    fun `invoke - removes non-standard emojis`() = runTest {
+        val recentEmojiResult = persistentListOf(":)", ":D", "Custom reaction")
+        val getRecentEmojis = createDefaultGetRecentEmojis(
+            recentEmojis = { Result.success(recentEmojiResult) },
+            emojibaseContents = persistentMapOf(
+                People to persistentListOf(emoji(":)"), emoji(":D"))
+            )
+        )
+
+        assertThat(getRecentEmojis()).isEqualTo(Result.success(persistentListOf(":)", ":D")))
+    }
+
+    private fun emoji(unicode: String) = Emoji(
+        hexcode = "",
+        label = "",
+        tags = null,
+        shortcodes = persistentListOf(),
+        unicode = unicode,
+        skins = null,
+    )
+
+    private fun TestScope.createDefaultGetRecentEmojis(
+        recentEmojis: () -> Result<List<String>> = { Result.success(emptyList()) },
+        emojibaseContents: ImmutableMap<EmojibaseCategory, ImmutableList<Emoji>> = persistentMapOf(People to persistentListOf(emoji(":)"))),
+    ) = DefaultGetRecentEmojis(
+        client = FakeMatrixClient(getRecentEmojisLambda = recentEmojis),
+        dispatchers = testCoroutineDispatchers(),
+        emojibaseProvider = FakeEmojibaseProvider(emojibaseContents),
+    )
+}
diff --git a/libraries/recentemojis/test/build.gradle.kts b/libraries/recentemojis/test/build.gradle.kts
new file mode 100644
index 0000000000..7c32d162ee
--- /dev/null
+++ b/libraries/recentemojis/test/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * 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/recentemojis/test/src/main/kotlin/io/element/android/libraries/recentemojis/test/FakeEmojibaseProvider.kt b/libraries/recentemojis/test/src/main/kotlin/io/element/android/libraries/recentemojis/test/FakeEmojibaseProvider.kt
new file mode 100644
index 0000000000..4774144707
--- /dev/null
+++ b/libraries/recentemojis/test/src/main/kotlin/io/element/android/libraries/recentemojis/test/FakeEmojibaseProvider.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.libraries.recentemojis.test
+
+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 kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toPersistentMap
+
+class FakeEmojibaseProvider(
+    val emojis: Map<EmojibaseCategory, ImmutableList<Emoji>> = mapOf(),
+) : EmojibaseProvider {
+    override val emojibaseStore: EmojibaseStore
+        get() = EmojibaseStore(emojis.toPersistentMap())
+}
diff --git a/libraries/roomselect/api/build.gradle.kts b/libraries/roomselect/api/build.gradle.kts
index 75bdb90b4c..7bd15bb0ac 100644
--- a/libraries/roomselect/api/build.gradle.kts
+++ b/libraries/roomselect/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 a5d13609bd..ba5ca79d40 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -18,12 +19,12 @@ interface RoomSelectEntryPoint : FeatureEntryPoint {
         val mode: RoomSelectMode,
     )
 
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onRoomSelected(roomIds: List<RoomId>)
diff --git a/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectMode.kt b/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectMode.kt
index aef8f203c5..fad4ffae79 100644
--- a/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectMode.kt
+++ b/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectMode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/roomselect/impl/build.gradle.kts b/libraries/roomselect/impl/build.gradle.kts
index de0834e635..1a5ae81928 100644
--- a/libraries/roomselect/impl/build.gradle.kts
+++ b/libraries/roomselect/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 0c6ba57b9f..4ca92663a9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,33 +10,25 @@ package io.element.android.libraries.roomselect.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultRoomSelectEntryPoint : RoomSelectEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomSelectEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : RoomSelectEntryPoint.NodeBuilder {
-            override fun params(params: RoomSelectEntryPoint.Params): RoomSelectEntryPoint.NodeBuilder {
-                plugins += RoomSelectNode.Inputs(mode = params.mode)
-                return this
-            }
-
-            override fun callback(callback: RoomSelectEntryPoint.Callback): RoomSelectEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<RoomSelectNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: RoomSelectEntryPoint.Params,
+        callback: RoomSelectEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<RoomSelectNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                RoomSelectNode.Inputs(mode = params.mode),
+                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/RoomSelectEvents.kt
index 98fb21c6a4..b5ea0e0727 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/RoomSelectEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a7e6dc0cb0..93294c9753 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,9 +17,9 @@ 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
-import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 
@@ -35,24 +36,15 @@ class RoomSelectNode(
 
     private val inputs: Inputs = inputs()
     private val presenter = presenterFactory.create(inputs.mode)
-
-    private val callbacks = plugins.filterIsInstance<RoomSelectEntryPoint.Callback>()
-
-    private fun onDismiss() {
-        callbacks.forEach { it.onCancel() }
-    }
-
-    private fun onSubmit(roomIds: List<RoomId>) {
-        callbacks.forEach { it.onRoomSelected(roomIds) }
-    }
+    private val callback: RoomSelectEntryPoint.Callback = callback()
 
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         RoomSelectView(
             state = state,
-            onDismiss = ::onDismiss,
-            onSubmit = ::onSubmit,
+            onDismiss = callback::onCancel,
+            onSubmit = callback::onRoomSelected,
             modifier = modifier
         )
     }
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 ffd3fda5c0..be66db77dc 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -63,7 +64,7 @@ class RoomSelectPresenter(
             }
         }
 
-        fun handleEvents(event: RoomSelectEvents) {
+        fun handleEvent(event: RoomSelectEvents) {
             when (event) {
                 is RoomSelectEvents.SetSelectedRoom -> {
                     selectedRooms = persistentListOf(event.room)
@@ -87,7 +88,7 @@ class RoomSelectPresenter(
             query = searchQuery,
             isSearchActive = isSearchActive,
             selectedRooms = selectedRooms,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectSearchDataSource.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectSearchDataSource.kt
index 9e636ead7b..15148eb15b 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectSearchDataSource.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectSearchDataSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 549de0338f..c1ccb0077d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2372ed78e1..5b63d6dbd7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a14ac7ab66..4d02e1ba10 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,6 +25,10 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 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.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -80,15 +85,20 @@ fun RoomSelectView(
         )
     }
 
+    var canHandleBack by remember { mutableStateOf(true) }
     fun onBackButton(state: RoomSelectState) {
         if (state.isSearchActive) {
             state.eventSink(RoomSelectEvents.ToggleSearchActive)
-        } else {
+        } else if (canHandleBack) {
+            canHandleBack = false
             onDismiss()
         }
     }
 
-    BackHandler(onBack = { onBackButton(state) })
+    BackHandler(
+        enabled = canHandleBack,
+        onBack = { onBackButton(state) }
+    )
 
     Scaffold(
         modifier = modifier,
@@ -99,7 +109,10 @@ fun RoomSelectView(
                     RoomSelectMode.Share -> stringResource(CommonStrings.common_send_to)
                 },
                 navigationIcon = {
-                    BackButton(onClick = { onBackButton(state) })
+                    BackButton(
+                        enabled = canHandleBack,
+                        onClick = { onBackButton(state) }
+                    )
                 },
                 actions = {
                     TextButton(
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 bb9c15e7e6..0d805904db 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -42,10 +43,12 @@ class DefaultRoomSelectEntryPointTest {
             override fun onCancel() = lambdaError()
         }
         val params = RoomSelectEntryPoint.Params(testMode)
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(RoomSelectNode::class.java)
         assertThat(result.plugins).contains(RoomSelectNode.Inputs(params.mode))
         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 8294c97fad..f6c7ef516d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/roomselect/test/build.gradle.kts b/libraries/roomselect/test/build.gradle.kts
new file mode 100644
index 0000000000..8a3d063b3a
--- /dev/null
+++ b/libraries/roomselect/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.roomselect.test"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.roomselect.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/libraries/roomselect/test/src/main/kotlin/io/element/android/libraries/roomselect/test/FakeRoomSelectEntryPoint.kt b/libraries/roomselect/test/src/main/kotlin/io/element/android/libraries/roomselect/test/FakeRoomSelectEntryPoint.kt
new file mode 100644
index 0000000000..6514c2c7d9
--- /dev/null
+++ b/libraries/roomselect/test/src/main/kotlin/io/element/android/libraries/roomselect/test/FakeRoomSelectEntryPoint.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.libraries.roomselect.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeRoomSelectEntryPoint : RoomSelectEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: RoomSelectEntryPoint.Params,
+        callback: RoomSelectEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/libraries/session-storage/api/build.gradle.kts b/libraries/session-storage/api/build.gradle.kts
index 5a03e913b4..74dfa910a9 100644
--- a/libraries/session-storage/api/build.gradle.kts
+++ b/libraries/session-storage/api/build.gradle.kts
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoggedInState.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoggedInState.kt
index 71fdbe65e6..f9267ee951 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoggedInState.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoggedInState.kt
@@ -1,12 +1,16 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api
 
+import androidx.compose.runtime.Immutable
+
+@Immutable
 sealed interface LoggedInState {
     data object NotLoggedIn : LoggedInState
     data class LoggedIn(
diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoginType.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoginType.kt
index 60e4477a85..3e80dbd38e 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoginType.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/LoginType.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 90b0a0b7c7..568dbe7e3a 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -25,8 +26,6 @@ data class SessionData(
     val homeserverUrl: String,
     /** The Open ID Connect info for this session, if any. */
     val oidcData: String?,
-    /** The Sliding Sync Proxy URL for this session, if any. */
-    val slidingSyncProxy: 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/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
index 9d9f143e15..fb60311418 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -50,6 +51,11 @@ interface SessionStore {
      */
     suspend fun getAllSessions(): List<SessionData>
 
+    /**
+     * Get the number of sessions.
+     */
+    suspend fun numberOfSessions(): Int
+
     /**
      * Get the latest session, or null if no session exists.
      */
@@ -73,3 +79,15 @@ fun List<SessionData>.toUserList(): List<String> {
 fun Flow<List<SessionData>>.toUserListFlow(): Flow<List<String>> {
     return map { it.toUserList() }
 }
+
+/**
+ * @return a flow emitting the sessionId of the latest session if logged in, null otherwise.
+ */
+fun SessionStore.sessionIdFlow(): Flow<String?> {
+    return loggedInStateFlow().map {
+        when (it) {
+            is LoggedInState.LoggedIn -> it.sessionId
+            is LoggedInState.NotLoggedIn -> null
+        }
+    }
+}
diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt
index b0db9fa4bc..8dadcafc7d 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionListener.kt
@@ -1,13 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api.observer
 
 interface SessionListener {
-    suspend fun onSessionCreated(userId: String)
-    suspend fun onSessionDeleted(userId: String)
+    suspend fun onSessionCreated(userId: String) {}
+    suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {}
 }
diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionObserver.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionObserver.kt
index dc987457c3..fb120acd56 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionObserver.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/observer/SessionObserver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/session-storage/impl/build.gradle.kts b/libraries/session-storage/impl/build.gradle.kts
index 3ceb4076cc..8b7d9d6e15 100644
--- a/libraries/session-storage/impl/build.gradle.kts
+++ b/libraries/session-storage/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
index d6197d868d..9be59e4bae 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,13 +13,13 @@ import app.cash.sqldelight.coroutines.mapToList
 import app.cash.sqldelight.coroutines.mapToOneOrNull
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.sessionstorage.api.LoggedInState
 import io.element.android.libraries.sessionstorage.api.SessionData
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -26,7 +27,6 @@ import timber.log.Timber
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DatabaseSessionStore(
     private val database: SessionDatabase,
     private val dispatchers: CoroutineDispatchers,
@@ -47,6 +47,7 @@ class DatabaseSessionStore(
                     )
                 }
             }
+            .distinctUntilChanged()
     }
 
     override suspend fun addSession(sessionData: SessionData) {
@@ -161,6 +162,15 @@ class DatabaseSessionStore(
         }
     }
 
+    override suspend fun numberOfSessions(): Int {
+        return sessionDataMutex.withLock {
+            database.sessionDataQueries.count()
+                .executeAsOneOrNull()
+                ?.toInt()
+                ?: 0
+        }
+    }
+
     override fun sessionsFlow(): Flow<List<SessionData>> {
         return database.sessionDataQueries.selectAll()
             .asFlow()
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 3b694c0124..ea69709bbd 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -20,7 +21,6 @@ internal fun SessionData.toDbModel(): DbSessionData {
         refreshToken = refreshToken,
         homeserverUrl = homeserverUrl,
         oidcData = oidcData,
-        slidingSyncProxy = slidingSyncProxy,
         loginTimestamp = loginTimestamp?.time,
         isTokenValid = if (isTokenValid) 1L else 0L,
         loginType = loginType.name,
@@ -42,7 +42,6 @@ internal fun DbSessionData.toApiModel(): SessionData {
         refreshToken = refreshToken,
         homeserverUrl = homeserverUrl,
         oidcData = oidcData,
-        slidingSyncProxy = slidingSyncProxy,
         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 00bdfaf587..fb2c9a2c78 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserver.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserver.kt
index 78d596e5a6..3c78f5ea8a 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserver.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.libraries.sessionstorage.impl.observer
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.annotations.AppCoroutineScope
@@ -27,7 +27,6 @@ import java.util.concurrent.CopyOnWriteArraySet
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSessionObserver(
     private val sessionStore: SessionStore,
     @AppCoroutineScope
@@ -62,9 +61,10 @@ class DefaultSessionObserver(
                             // Compute diff
                             // Removed user
                             val removedUsers = currentUserSet - newUserSet
+                            val wasLastSession = newUserSet.isEmpty()
                             removedUsers.forEach { removedUser ->
                                 listeners.onEach { listener ->
-                                    listener.onSessionDeleted(removedUser)
+                                    listener.onSessionDeleted(removedUser, wasLastSession)
                                 }
                             }
                             // Added user
diff --git a/libraries/session-storage/impl/src/main/sqldelight/databases/11.db b/libraries/session-storage/impl/src/main/sqldelight/databases/11.db
new file mode 100644
index 0000000000..92222fe421
Binary files /dev/null and b/libraries/session-storage/impl/src/main/sqldelight/databases/11.db differ
diff --git a/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq b/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
index 53d07bfba3..8e5fb7a1f8 100644
--- a/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
+++ b/libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq
@@ -14,7 +14,6 @@ CREATE TABLE SessionData (
     accessToken TEXT NOT NULL,
     refreshToken TEXT,
     homeserverUrl TEXT NOT NULL,
-    slidingSyncProxy TEXT,
     -- added in version 2
     loginTimestamp INTEGER,
     -- added in version 3
@@ -47,6 +46,9 @@ SELECT * FROM SessionData ORDER BY lastUsageIndex DESC LIMIT 1;
 selectAll:
 SELECT * FROM SessionData ORDER BY lastUsageIndex DESC;
 
+count:
+SELECT count(*) FROM SessionData;
+
 selectByUserId:
 SELECT * FROM SessionData WHERE userId = ?;
 
diff --git a/libraries/session-storage/impl/src/main/sqldelight/migrations/10.sqm b/libraries/session-storage/impl/src/main/sqldelight/migrations/10.sqm
new file mode 100644
index 0000000000..3d969333de
--- /dev/null
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/10.sqm
@@ -0,0 +1,43 @@
+-- Migrate DB from version 10
+-- Remove field slidingSyncProxy
+
+-- Equivalent to (DROP not supported by sqldelight):
+-- ALTER TABLE SessionData DROP slidingSyncProxy;
+
+CREATE TABLE SessionData_bak (
+    userId TEXT NOT NULL PRIMARY KEY,
+    deviceId TEXT NOT NULL,
+    accessToken TEXT NOT NULL,
+    refreshToken TEXT,
+    homeserverUrl TEXT NOT NULL,
+    loginTimestamp INTEGER,
+    oidcData TEXT,
+    isTokenValid INTEGER NOT NULL DEFAULT 1,
+    loginType TEXT,
+    passphrase TEXT,
+    sessionPath TEXT NOT NULL DEFAULT "",
+    cachePath TEXT NOT NULL DEFAULT "",
+    position INTEGER NOT NULL DEFAULT 0,
+    lastUsageIndex INTEGER NOT NULL DEFAULT 0,
+    userDisplayName TEXT,
+    userAvatarUrl TEXT
+);
+INSERT INTO SessionData_bak SELECT
+    userId,
+    deviceId,
+    accessToken,
+    refreshToken,
+    homeserverUrl,
+    loginTimestamp,
+    oidcData,
+    isTokenValid,
+    loginType,
+    passphrase,
+    sessionPath,
+    cachePath,
+    position,
+    lastUsageIndex,
+    userDisplayName,
+    userAvatarUrl FROM SessionData;
+DROP TABLE SessionData;
+ALTER TABLE SessionData_bak RENAME TO SessionData;
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt
index 7d264f42db..e40000986b 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,7 +25,7 @@ class DatabaseSessionStoreTest {
     private lateinit var database: SessionDatabase
     private lateinit var databaseSessionStore: DatabaseSessionStore
 
-    private val aSessionData = aSessionData()
+    private val aSessionData = aDbSessionData()
 
     @OptIn(ExperimentalCoroutinesApi::class)
     @Before
@@ -52,6 +53,7 @@ class DatabaseSessionStoreTest {
 
         assertThat(database.sessionDataQueries.selectLatest().executeAsOneOrNull()).isEqualTo(aSessionData)
         assertThat(database.sessionDataQueries.selectAll().executeAsList().size).isEqualTo(1)
+        assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(1)
     }
 
     @Test
@@ -109,6 +111,7 @@ class DatabaseSessionStoreTest {
 
         assertThat(foundSession).isEqualTo(aSessionData)
         assertThat(database.sessionDataQueries.selectAll().executeAsList().size).isEqualTo(2)
+        assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(2)
     }
 
     @Test
@@ -196,12 +199,16 @@ class DatabaseSessionStoreTest {
                 position = 1,
                 lastUsageIndex = 1,
             )
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(1)
             databaseSessionStore.addSession(secondSessionData.toApiModel())
             assertThat(awaitItem().size).isEqualTo(2)
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(2)
             databaseSessionStore.removeSession(aSessionData.userId)
             assertThat(awaitItem().size).isEqualTo(1)
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(1)
             databaseSessionStore.removeSession(secondSessionData.userId)
             assertThat(awaitItem()).isEmpty()
+            assertThat(database.sessionDataQueries.count().executeAsOneOrNull()).isEqualTo(0)
         }
     }
 
@@ -213,7 +220,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessToken",
             refreshToken = "refreshToken",
             homeserverUrl = "homeserverUrl",
-            slidingSyncProxy = "slidingSyncProxy",
             loginTimestamp = 1,
             oidcData = "aOidcData",
             isTokenValid = 1,
@@ -232,7 +238,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessTokenAltered",
             refreshToken = "refreshTokenAltered",
             homeserverUrl = "homeserverUrlAltered",
-            slidingSyncProxy = "slidingSyncProxyAltered",
             loginTimestamp = 2,
             oidcData = "aOidcDataAltered",
             isTokenValid = 1,
@@ -259,7 +264,6 @@ class DatabaseSessionStoreTest {
         assertThat(alteredSession.accessToken).isEqualTo(secondSessionData.accessToken)
         assertThat(alteredSession.refreshToken).isEqualTo(secondSessionData.refreshToken)
         assertThat(alteredSession.homeserverUrl).isEqualTo(secondSessionData.homeserverUrl)
-        assertThat(alteredSession.slidingSyncProxy).isEqualTo(secondSessionData.slidingSyncProxy)
         // Check that alteredSession.loginTimestamp is not altered, so equal to firstSessionData.loginTimestamp
         assertThat(alteredSession.loginTimestamp).isEqualTo(firstSessionData.loginTimestamp)
         assertThat(alteredSession.oidcData).isEqualTo(secondSessionData.oidcData)
@@ -279,7 +283,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessToken",
             refreshToken = "refreshToken",
             homeserverUrl = "homeserverUrl",
-            slidingSyncProxy = "slidingSyncProxy",
             loginTimestamp = 1,
             oidcData = "aOidcData",
             isTokenValid = 1,
@@ -298,7 +301,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessTokenAltered",
             refreshToken = "refreshTokenAltered",
             homeserverUrl = "homeserverUrlAltered",
-            slidingSyncProxy = "slidingSyncProxyAltered",
             loginTimestamp = 2,
             oidcData = "aOidcDataAltered",
             isTokenValid = 1,
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt
index e8713dac1a..4a488588ff 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,13 +11,14 @@ package io.element.android.libraries.sessionstorage.impl
 import io.element.android.libraries.matrix.session.SessionData
 import io.element.android.libraries.sessionstorage.api.LoginType
 
-internal fun aSessionData() = SessionData(
-    userId = "userId",
+internal fun aDbSessionData(
+    userId: String = "userId",
+) = SessionData(
+    userId = userId,
     deviceId = "deviceId",
     accessToken = "accessToken",
     refreshToken = "refreshToken",
     homeserverUrl = "homeserverUrl",
-    slidingSyncProxy = null,
     loginTimestamp = null,
     oidcData = "aOidcData",
     isTokenValid = 1,
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserverTest.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserverTest.kt
index 8b0184fdc7..54b41a2c60 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserverTest.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/DefaultSessionObserverTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,11 +12,10 @@ import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.sessionstorage.impl.DatabaseSessionStore
 import io.element.android.libraries.sessionstorage.impl.SessionDatabase
-import io.element.android.libraries.sessionstorage.impl.aSessionData
+import io.element.android.libraries.sessionstorage.impl.aDbSessionData
 import io.element.android.libraries.sessionstorage.impl.toApiModel
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runCurrent
@@ -23,7 +23,8 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class) class DefaultSessionObserverTest {
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultSessionObserverTest {
     private lateinit var database: SessionDatabase
     private lateinit var databaseSessionStore: DatabaseSessionStore
 
@@ -46,7 +47,7 @@ import org.junit.Test
 
     @Test
     fun `adding data invokes onSessionCreated`() = runTest {
-        val sessionData = aSessionData()
+        val sessionData = aDbSessionData()
         val sut = createDefaultSessionObserver()
         runCurrent()
         val listener = TestSessionListener()
@@ -54,12 +55,11 @@ import org.junit.Test
         databaseSessionStore.addSession(sessionData.toApiModel())
         listener.assertEvents(TestSessionListener.Event.Created(sessionData.userId))
         sut.removeListener(listener)
-        coroutineContext.cancelChildren()
     }
 
     @Test
     fun `adding and deleting data invokes onSessionCreated and onSessionDeleted`() = runTest {
-        val sessionData = aSessionData()
+        val sessionData = aDbSessionData()
         val sut = createDefaultSessionObserver()
         runCurrent()
         val listener = TestSessionListener()
@@ -69,15 +69,34 @@ import org.junit.Test
         databaseSessionStore.removeSession(sessionData.userId)
         listener.assertEvents(
             TestSessionListener.Event.Created(sessionData.userId),
-            TestSessionListener.Event.Deleted(sessionData.userId),
+            TestSessionListener.Event.Deleted(sessionData.userId, true),
+        )
+    }
+
+    @Test
+    fun `adding and deleting data twice invokes onSessionCreated and onSessionDeleted`() = runTest {
+        val sessionData1 = aDbSessionData(userId = "user1")
+        val sessionData2 = aDbSessionData(userId = "user2")
+        val sut = createDefaultSessionObserver()
+        runCurrent()
+        val listener = TestSessionListener()
+        sut.addListener(listener)
+        databaseSessionStore.addSession(sessionData1.toApiModel())
+        databaseSessionStore.addSession(sessionData2.toApiModel())
+        databaseSessionStore.removeSession(sessionData2.userId)
+        databaseSessionStore.removeSession(sessionData1.userId)
+        listener.assertEvents(
+            TestSessionListener.Event.Created(sessionData1.userId),
+            TestSessionListener.Event.Created(sessionData2.userId),
+            TestSessionListener.Event.Deleted(sessionData2.userId, wasLastSession = false),
+            TestSessionListener.Event.Deleted(sessionData1.userId, wasLastSession = true),
         )
-        coroutineContext.cancelChildren()
     }
 
     private fun TestScope.createDefaultSessionObserver(): DefaultSessionObserver {
         return DefaultSessionObserver(
             sessionStore = databaseSessionStore,
-            coroutineScope = this,
+            coroutineScope = backgroundScope,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
         )
     }
diff --git a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/TestSessionListener.kt b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/TestSessionListener.kt
index 91ae519538..f104039f57 100644
--- a/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/TestSessionListener.kt
+++ b/libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/observer/TestSessionListener.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,7 @@ import io.element.android.libraries.sessionstorage.api.observer.SessionListener
 class TestSessionListener : SessionListener {
     sealed interface Event {
         data class Created(val userId: String) : Event
-        data class Deleted(val userId: String) : Event
+        data class Deleted(val userId: String, val wasLastSession: Boolean) : Event
     }
 
     private val trackRecord: MutableList<Event> = mutableListOf()
@@ -22,8 +23,8 @@ class TestSessionListener : SessionListener {
         trackRecord.add(Event.Created(userId))
     }
 
-    override suspend fun onSessionDeleted(userId: String) {
-        trackRecord.add(Event.Deleted(userId))
+    override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
+        trackRecord.add(Event.Deleted(userId, wasLastSession))
     }
 
     fun assertEvents(vararg events: Event) {
diff --git a/libraries/session-storage/test/build.gradle.kts b/libraries/session-storage/test/build.gradle.kts
index 59759d0d3f..cfdc3018a9 100644
--- a/libraries/session-storage/test/build.gradle.kts
+++ b/libraries/session-storage/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt
index c8f3078e7a..05e58ac623 100644
--- a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt
+++ b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -67,6 +68,10 @@ class InMemorySessionStore(
         return sessionDataListFlow.value
     }
 
+    override suspend fun numberOfSessions(): Int {
+        return sessionDataListFlow.value.size
+    }
+
     override suspend fun getLatestSession(): SessionData? {
         return sessionDataListFlow.value.firstOrNull()
     }
@@ -76,8 +81,6 @@ class InMemorySessionStore(
     }
 
     override suspend fun removeSession(sessionId: String) {
-        val currentList = sessionDataListFlow.value.toMutableList()
-        currentList.removeAll { it.userId == sessionId }
-        sessionDataListFlow.value = currentList
+        sessionDataListFlow.value = sessionDataListFlow.value.filter { it.userId != sessionId }
     }
 }
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 61b5370813..c791a20620 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -30,7 +31,6 @@ fun aSessionData(
         refreshToken = refreshToken,
         homeserverUrl = "aHomeserverUrl",
         oidcData = null,
-        slidingSyncProxy = 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 817046517a..fdf5cc5f1b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,7 +29,7 @@ class FakeSessionObserver : SessionObserver {
         listeners.forEach { it.onSessionCreated(userId) }
     }
 
-    suspend fun onSessionDeleted(userId: String) {
-        listeners.forEach { it.onSessionDeleted(userId) }
+    suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean = true) {
+        listeners.forEach { it.onSessionDeleted(userId, wasLastSession = wasLastSession) }
     }
 }
diff --git a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/NoOpSessionObserver.kt b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/NoOpSessionObserver.kt
index 9bb6cd7552..ff1010a415 100644
--- a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/NoOpSessionObserver.kt
+++ b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/NoOpSessionObserver.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/testtags/build.gradle.kts b/libraries/testtags/build.gradle.kts
index 6db99062a4..68f5a34770 100644
--- a/libraries/testtags/build.gradle.kts
+++ b/libraries/testtags/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt
index 7f8700adb4..21ce0533d1 100644
--- a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt
+++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/Compose.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6363c6781b..e564ddac41 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/build.gradle.kts b/libraries/textcomposer/impl/build.gradle.kts
index 6f735bec23..a339890201 100644
--- a/libraries/textcomposer/impl/build.gradle.kts
+++ b/libraries/textcomposer/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 4154d7a594..23b4fae3a9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1299f99463..ac64245668 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 357507ba23..57f0abefbb 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerModeSpecialProvider.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerModeSpecialProvider.kt
index 8deae21375..60850d26c2 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerModeSpecialProvider.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/MessageComposerModeSpecialProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/SoftKeyboardEffect.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/SoftKeyboardEffect.kt
index e98c6453e7..55a985efca 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/SoftKeyboardEffect.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/SoftKeyboardEffect.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 1126a39466..f2070c9610 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -52,7 +53,7 @@ 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.androidutils.ui.showKeyboard
-import io.element.android.libraries.designsystem.components.media.createFakeWaveform
+import io.element.android.libraries.designsystem.components.media.WaveFormSamples
 import io.element.android.libraries.designsystem.preview.DAY_MODE_NAME
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.NIGHT_MODE_NAME
@@ -139,8 +140,8 @@ fun TextComposer(
     }
 
     val layoutModifier = modifier
-            .fillMaxSize()
-            .height(IntrinsicSize.Min)
+        .fillMaxSize()
+        .height(IntrinsicSize.Min)
 
     val composerOptionsButton: @Composable () -> Unit = remember(composerMode) {
         @Composable {
@@ -177,18 +178,18 @@ fun TextComposer(
                 @Composable {
                     TextInputBox(
                         modifier = Modifier
-                                .clickable(
-                                        interactionSource = remember { MutableInteractionSource() },
-                                        indication = null,
-                                ) {
-                                    coroutineScope.launch {
-                                        state.requestFocus()
-                                        view.showKeyboard()
-                                    }
+                            .clickable(
+                                interactionSource = remember { MutableInteractionSource() },
+                                indication = null,
+                            ) {
+                                coroutineScope.launch {
+                                    state.requestFocus()
+                                    view.showKeyboard()
                                 }
-                                .semantics {
-                                    hideFromAccessibility()
-                                },
+                            }
+                            .semantics {
+                                hideFromAccessibility()
+                            },
                         composerMode = composerMode,
                         onResetComposerMode = onResetComposerMode,
                         isTextEmpty = state.richTextEditorState.messageHtml.isEmpty(),
@@ -198,8 +199,8 @@ fun TextComposer(
                             placeholder = placeholder,
                             registerStateUpdates = true,
                             modifier = Modifier
-                                    .padding(top = 6.dp, bottom = 6.dp)
-                                    .fillMaxWidth(),
+                                .padding(top = 6.dp, bottom = 6.dp)
+                                .fillMaxWidth(),
                             style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.richTextEditorState.hasFocus),
                             resolveMentionDisplay = resolveMentionDisplay,
                             resolveRoomMentionDisplay = resolveAtRoomMentionDisplay,
@@ -298,7 +299,10 @@ fun TextComposer(
                     onSeek = onSeekVoiceMessage,
                 )
             is VoiceMessageState.Recording ->
-                VoiceMessageRecording(voiceMessageState.levels, voiceMessageState.duration)
+                VoiceMessageRecording(
+                    levels = voiceMessageState.levels,
+                    duration = voiceMessageState.duration,
+                )
             VoiceMessageState.Idle -> {}
         }
     }
@@ -419,8 +423,8 @@ private fun StandardLayout(
                 if (voiceMessageState is VoiceMessageState.Preview || voiceMessageState is VoiceMessageState.Recording) {
                     Box(
                         modifier = Modifier
-                                .padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp)
-                                .size(48.dp),
+                            .padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp)
+                            .size(48.dp),
                         contentAlignment = Alignment.Center,
                     ) {
                         voiceDeleteButton()
@@ -430,8 +434,8 @@ private fun StandardLayout(
                 }
                 Box(
                     modifier = Modifier
-                            .padding(bottom = 8.dp, top = 8.dp)
-                            .weight(1f)
+                        .padding(bottom = 8.dp, top = 8.dp)
+                        .weight(1f)
                 ) {
                     voiceRecording()
                 }
@@ -444,17 +448,17 @@ private fun StandardLayout(
                 }
                 Box(
                     modifier = Modifier
-                            .padding(bottom = 8.dp, top = 8.dp)
-                            .weight(1f)
+                        .padding(bottom = 8.dp, top = 8.dp)
+                        .weight(1f)
                 ) {
                     textInput()
                 }
             }
             Box(
                 Modifier
-                        .padding(bottom = 5.dp, top = 5.dp, end = 6.dp, start = 6.dp)
-                        .size(48.dp)
-                        .clearAndSetSemantics(endButtonA11y),
+                    .padding(bottom = 5.dp, top = 5.dp, end = 6.dp, start = 6.dp)
+                    .size(48.dp)
+                    .clearAndSetSemantics(endButtonA11y),
                 contentAlignment = Alignment.Center,
             ) {
                 endButton()
@@ -505,8 +509,8 @@ private fun TextFormattingLayout(
         }
         Box(
             modifier = Modifier
-                    .weight(1f)
-                    .padding(horizontal = 12.dp)
+                .weight(1f)
+                .padding(horizontal = 12.dp)
         ) {
             textInput()
         }
@@ -525,11 +529,11 @@ private fun TextFormattingLayout(
             }
             Box(
                 modifier = Modifier
-                        .padding(
-                                start = 14.dp,
-                                end = 6.dp,
-                        )
-                        .clearAndSetSemantics(endButtonA11y)
+                    .padding(
+                        start = 14.dp,
+                        end = 6.dp,
+                    )
+                    .clearAndSetSemantics(endButtonA11y)
             ) {
                 sendButton()
             }
@@ -551,12 +555,12 @@ private fun TextInputBox(
 
     Column(
         modifier = Modifier
-                .clip(roundedCorners)
-                .border(0.5.dp, borderColor, roundedCorners)
-                .background(color = bgColor)
-                .requiredHeightIn(min = 42.dp)
-                .fillMaxSize()
-                .then(modifier),
+            .clip(roundedCorners)
+            .border(0.5.dp, borderColor, roundedCorners)
+            .background(color = bgColor)
+            .requiredHeightIn(min = 42.dp)
+            .fillMaxSize()
+            .then(modifier),
     ) {
         if (composerMode is MessageComposerMode.Special) {
             ComposerModeView(
@@ -566,8 +570,8 @@ private fun TextInputBox(
         }
         Box(
             modifier = Modifier
-                    .padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)
-                    .then(Modifier.testTag(TestTags.textEditor)),
+                .padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)
+                .then(Modifier.testTag(TestTags.textEditor)),
             contentAlignment = Alignment.CenterStart,
         ) {
             textInput()
@@ -575,9 +579,9 @@ private fun TextInputBox(
                 var showBottomSheet by remember { mutableStateOf(false) }
                 Icon(
                     modifier = Modifier
-                            .clickable { showBottomSheet = true }
-                            .padding(horizontal = 8.dp, vertical = 4.dp)
-                            .align(Alignment.CenterEnd),
+                        .clickable { showBottomSheet = true }
+                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                        .align(Alignment.CenterEnd),
                     imageVector = CompoundIcons.InfoSolid(),
                     tint = ElementTheme.colors.iconCriticalPrimary,
                     contentDescription = null,
@@ -808,30 +812,33 @@ internal fun TextComposerCaptionPreview() = ElementPreview {
 internal fun TextComposerVoicePreview() = ElementPreview {
     PreviewColumn(
         items = persistentListOf(
-            VoiceMessageState.Recording(61.seconds, createFakeWaveform()),
+            VoiceMessageState.Recording(
+                duration = 61.seconds,
+                levels = WaveFormSamples.realisticWaveForm,
+            ),
             VoiceMessageState.Preview(
                 isSending = false,
                 isPlaying = false,
                 showCursor = false,
-                waveform = createFakeWaveform(),
+                waveform = WaveFormSamples.realisticWaveForm,
                 time = 0.seconds,
-                playbackProgress = 0.0f
+                playbackProgress = 0.0f,
             ),
             VoiceMessageState.Preview(
                 isSending = false,
                 isPlaying = true,
                 showCursor = true,
-                waveform = createFakeWaveform(),
+                waveform = WaveFormSamples.realisticWaveForm,
                 time = 3.seconds,
-                playbackProgress = 0.2f
+                playbackProgress = 0.2f,
             ),
             VoiceMessageState.Preview(
                 isSending = true,
                 isPlaying = false,
                 showCursor = false,
-                waveform = createFakeWaveform(),
+                waveform = WaveFormSamples.realisticWaveForm,
                 time = 61.seconds,
-                playbackProgress = 0.0f
+                playbackProgress = 0.0f,
             ),
         )
     ) { voiceMessageState ->
@@ -848,12 +855,15 @@ internal fun TextComposerVoicePreview() = ElementPreview {
 internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {
     PreviewColumn(
         items = persistentListOf(
-            VoiceMessageState.Recording(61.seconds, createFakeWaveform()),
+            VoiceMessageState.Recording(
+                duration = 61.seconds,
+                levels = WaveFormSamples.realisticWaveForm,
+            ),
             VoiceMessageState.Preview(
                 isSending = false,
                 isPlaying = false,
                 showCursor = false,
-                waveform = createFakeWaveform(),
+                waveform = WaveFormSamples.realisticWaveForm,
                 time = 0.seconds,
                 playbackProgress = 0.0f
             ),
@@ -861,7 +871,7 @@ internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {
                 isSending = false,
                 isPlaying = true,
                 showCursor = true,
-                waveform = createFakeWaveform(),
+                waveform = WaveFormSamples.realisticWaveForm,
                 time = 3.seconds,
                 playbackProgress = 0.2f
             ),
@@ -869,7 +879,7 @@ internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {
                 isSending = true,
                 isPlaying = false,
                 showCursor = false,
-                waveform = createFakeWaveform(),
+                waveform = WaveFormSamples.realisticWaveForm,
                 time = 61.seconds,
                 playbackProgress = 0.0f
             ),
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 533a03e62c..3ee191d724 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3a07dd5ee6..db133a9a09 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOptionState.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOptionState.kt
index b572bd8965..8c41a3db09 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOptionState.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOptionState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
index 836089fc7d..d18b85c987 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/LiveWaveformView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -14,7 +15,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -50,27 +50,23 @@ fun LiveWaveformView(
     linePadding: Dp = 2.dp,
 ) {
     var canvasSize by remember { mutableStateOf(DpSize(0.dp, 0.dp)) }
-
     var parentWidth by remember { mutableIntStateOf(0) }
-
-    val waveformWidth by remember(levels, lineWidth, linePadding) {
-        derivedStateOf {
-            levels.size * (lineWidth.value + linePadding.value)
-        }
+    val waveformWidth = remember(levels.size, lineWidth, linePadding) {
+        levels.size * (lineWidth.value + linePadding.value)
     }
 
     Box(
         contentAlignment = Alignment.CenterEnd,
         modifier = modifier
-                .fillMaxWidth()
-                .height(waveFormHeight)
-                .onSizeChanged { parentWidth = it.width }
+            .fillMaxWidth()
+            .height(waveFormHeight)
+            .onSizeChanged { parentWidth = it.width }
     ) {
         Canvas(
             modifier = Modifier
-                    .width(Dp(waveformWidth))
-                    .graphicsLayer(alpha = DEFAULT_GRAPHICS_LAYER_ALPHA)
-                    .then(modifier)
+                .width(Dp(waveformWidth))
+                .graphicsLayer(alpha = DEFAULT_GRAPHICS_LAYER_ALPHA)
+                .then(modifier)
         ) {
             val width = min(waveformWidth, parentWidth.toFloat())
             canvasSize = DpSize(width.dp, size.height.toDp())
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/SendButton.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/SendButton.kt
index 4ee00e550d..a136f63b09 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/SendButton.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/SendButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt
index 08c1bec23a..64e289a3fd 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextInputRoundedCornerShape.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextInputRoundedCornerShape.kt
index c7d8fb4881..c6519d5168 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextInputRoundedCornerShape.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextInputRoundedCornerShape.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageDeleteButton.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageDeleteButton.kt
index 7d7b54b3c6..af5f443cc7 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageDeleteButton.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageDeleteButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessagePreview.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessagePreview.kt
index d965a3d0d6..d893979889 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessagePreview.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessagePreview.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -29,8 +30,8 @@ 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.components.media.WaveFormSamples
 import io.element.android.libraries.designsystem.components.media.WaveformPlaybackView
-import io.element.android.libraries.designsystem.components.media.createFakeWaveform
 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
@@ -138,14 +139,18 @@ private fun PlayerButton(
 private fun PauseIcon() = Icon(
     imageVector = CompoundIcons.PauseSolid(),
     contentDescription = stringResource(id = CommonStrings.a11y_pause),
-    modifier = Modifier.size(20.dp).padding(2.dp),
+    modifier = Modifier
+        .size(20.dp)
+        .padding(2.dp),
 )
 
 @Composable
 private fun PlayIcon() = Icon(
     imageVector = CompoundIcons.PlaySolid(),
     contentDescription = stringResource(id = CommonStrings.a11y_play),
-    modifier = Modifier.size(20.dp).padding(2.dp),
+    modifier = Modifier
+        .size(20.dp)
+        .padding(2.dp),
 )
 
 @PreviewsDayNight
@@ -160,7 +165,7 @@ internal fun VoiceMessagePreviewPreview() = ElementPreview {
             time = 2.seconds,
             playbackProgress = 0.2f,
             showCursor = true,
-            waveform = createFakeWaveform()
+            waveform = WaveFormSamples.longRealisticWaveForm,
         )
         AVoiceMessagePreview(
             isInteractive = true,
@@ -168,7 +173,7 @@ internal fun VoiceMessagePreviewPreview() = ElementPreview {
             time = 0.seconds,
             playbackProgress = 0.0f,
             showCursor = true,
-            waveform = createFakeWaveform()
+            waveform = WaveFormSamples.longRealisticWaveForm,
         )
         AVoiceMessagePreview(
             isInteractive = false,
@@ -176,7 +181,7 @@ internal fun VoiceMessagePreviewPreview() = ElementPreview {
             time = 789.seconds,
             playbackProgress = 0.0f,
             showCursor = false,
-            waveform = createFakeWaveform()
+            waveform = WaveFormSamples.longRealisticWaveForm,
         )
     }
 }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecorderButton.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecorderButton.kt
index 3a92dfbeb0..32fe2847c2 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecorderButton.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecorderButton.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt
index 7a56d37b3c..e742372108 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/VoiceMessageRecording.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -73,7 +74,7 @@ internal fun VoiceMessageRecording(
             modifier = Modifier
                 .height(26.dp)
                 .weight(1f),
-            levels = levels
+            levels = levels,
         )
     }
 }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownEditText.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownEditText.kt
index 413760e209..bd808c9acb 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownEditText.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownEditText.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ffce571dc4..725abe3dae 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -167,6 +168,7 @@ private fun Editable.checkSuggestionNeeded(): Suggestion? {
             '@' -> SuggestionType.Mention
             '#' -> SuggestionType.Room
             '/' -> SuggestionType.Command
+            ':' -> SuggestionType.Emoji
             else -> error("Unknown suggestion type. This should never happen.")
         }
         Suggestion(startOfWord, endOfWord, suggestionType, text)
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/StableCharSequence.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/StableCharSequence.kt
index bc1de30826..2b2f42a223 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/StableCharSequence.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/StableCharSequence.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 76587d6e12..2531a605b9 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanFormatter.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanFormatter.kt
index 4c74a6edd5..96a3dc6335 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanFormatter.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanFormatter.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.textcomposer.mentions
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.core.UserId
@@ -28,7 +28,6 @@ interface MentionSpanFormatter {
  * based on its MentionType and context.
  */
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultMentionSpanFormatter(
     private val roomMemberProfilesCache: RoomMemberProfilesCache,
     private val roomNamesCache: RoomNamesCache,
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanProvider.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanProvider.kt
index edaf417db7..5942ca9d22 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanProvider.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanTheme.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanTheme.kt
index e23fc8e83a..f64c8112d1 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanTheme.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanTheme.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9a9714b351..a530d64437 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,7 +14,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.ui.messages.RoomMemberProfilesCache
@@ -27,7 +27,6 @@ interface MentionSpanUpdater {
 }
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultMentionSpanUpdater(
     private val formatter: MentionSpanFormatter,
     private val theme: MentionSpanTheme,
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 fe5d9c1174..d91735fb83 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Fixtures.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Fixtures.kt
index d9a71273f1..1d76494ae0 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Fixtures.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Fixtures.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 14f56f3bbb..ba7e3c50c0 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -128,15 +129,15 @@ class MarkdownTextEditorState(
     }
 
     @Parcelize
-    data class SavedState(
+    data class SavedValue(
         val text: CharSequence,
         val selectionStart: Int,
         val selectionEnd: Int,
     ) : Parcelable
 }
 
-object MarkdownTextEditorStateSaver : Saver<MarkdownTextEditorState, MarkdownTextEditorState.SavedState> {
-    override fun restore(value: MarkdownTextEditorState.SavedState): MarkdownTextEditorState {
+object MarkdownTextEditorStateSaver : Saver<MarkdownTextEditorState, MarkdownTextEditorState.SavedValue> {
+    override fun restore(value: MarkdownTextEditorState.SavedValue): MarkdownTextEditorState {
         return MarkdownTextEditorState(
             initialText = "",
             initialFocus = false,
@@ -146,8 +147,8 @@ object MarkdownTextEditorStateSaver : Saver<MarkdownTextEditorState, MarkdownTex
         }
     }
 
-    override fun SaverScope.save(value: MarkdownTextEditorState): MarkdownTextEditorState.SavedState {
-        return MarkdownTextEditorState.SavedState(
+    override fun SaverScope.save(value: MarkdownTextEditorState): MarkdownTextEditorState.SavedValue {
+        return MarkdownTextEditorState.SavedValue(
             text = value.text.value(),
             selectionStart = value.selection.first,
             selectionEnd = value.selection.last,
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Message.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Message.kt
index f3167966e9..26e4248c6e 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Message.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Message.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt
index ab5d3bb4e1..83e9f932a9 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MessageComposerMode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt
index fc56b7f150..094fe4dfde 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/Suggestion.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,6 +29,7 @@ sealed interface SuggestionType {
     data object Mention : SuggestionType
     data object Command : SuggestionType
     data object Room : SuggestionType
+    data object Emoji : SuggestionType
     data class Custom(val pattern: String) : SuggestionType
 
     companion object {
@@ -36,6 +38,7 @@ sealed interface SuggestionType {
                 PatternKey.At -> Mention
                 PatternKey.Slash -> Command
                 PatternKey.Hash -> Room
+                PatternKey.Colon -> Emoji
                 is PatternKey.Custom -> Custom(key.v1)
             }
         }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/TextEditorState.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/TextEditorState.kt
index b0090185d2..7161268a6b 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/TextEditorState.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/TextEditorState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessagePlayerEvent.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessagePlayerEvent.kt
index 4da60276f9..f806dc4b6a 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessagePlayerEvent.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessagePlayerEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageRecorderEvent.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageRecorderEvent.kt
index efdd2a4640..ae78501bb8 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageRecorderEvent.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageRecorderEvent.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageState.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageState.kt
index 8fa0ffbe55..54fa2bcae7 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageState.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/VoiceMessageState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -21,11 +22,13 @@ sealed interface VoiceMessageState {
         val showCursor: Boolean,
         val playbackProgress: Float,
         val time: Duration,
+        // Values are between 0 and 1
         val waveform: ImmutableList<Float>,
     ) : VoiceMessageState
 
     data class Recording(
         val duration: Duration,
+        // Values are between 0 and 1
         val levels: ImmutableList<Float>,
     ) : VoiceMessageState
 }
diff --git a/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml b/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml
index 602d35363c..fd55fdf9d9 100644
--- a/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml
@@ -2,7 +2,7 @@
 <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_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>
diff --git a/libraries/textcomposer/impl/src/main/res/values-hr/translations.xml b/libraries/textcomposer/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..2b116627fb
--- /dev/null
+++ b/libraries/textcomposer/impl/src/main/res/values-hr/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">"Dodaj privitak"</string>
+  <string name="rich_text_editor_bullet_list">"Uključi/isključi popis s grafičkim oznakama"</string>
+  <string name="rich_text_editor_close_formatting_options">"Otkaži i zatvori oblikovanje teksta"</string>
+  <string name="rich_text_editor_code_block">"Uključi/isključi blok koda"</string>
+  <string name="rich_text_editor_composer_caption_placeholder">"Dodaj opis"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Šifrirana poruka…"</string>
+  <string name="rich_text_editor_composer_placeholder">"Poruka…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Nešifrirana poruka…"</string>
+  <string name="rich_text_editor_create_link">"Izradi poveznicu"</string>
+  <string name="rich_text_editor_edit_link">"Uredi poveznicu"</string>
+  <string name="rich_text_editor_format_action">"%1$s, stanje: %2$s"</string>
+  <string name="rich_text_editor_format_bold">"Primijeni podebljano"</string>
+  <string name="rich_text_editor_format_italic">"Primijeni kurziv"</string>
+  <string name="rich_text_editor_format_state_disabled">"onemogućen"</string>
+  <string name="rich_text_editor_format_state_off">"isključen"</string>
+  <string name="rich_text_editor_format_state_on">"uključen"</string>
+  <string name="rich_text_editor_format_strikethrough">"Primijeni precrtavanje"</string>
+  <string name="rich_text_editor_format_underline">"Primijeni podcrtavanje"</string>
+  <string name="rich_text_editor_full_screen_toggle">"Uključi/isključi prikaz na cijelom zaslonu"</string>
+  <string name="rich_text_editor_indent">"Uvlaka"</string>
+  <string name="rich_text_editor_inline_code">"Primijeni kod u retku"</string>
+  <string name="rich_text_editor_link">"Postavi poveznicu"</string>
+  <string name="rich_text_editor_numbered_list">"Uključi/isključi numerirani popis"</string>
+  <string name="rich_text_editor_open_compose_options">"Otvori mogućnosti sastavljanja"</string>
+  <string name="rich_text_editor_quote">"Uključi/isključi citat"</string>
+  <string name="rich_text_editor_remove_link">"Ukloni poveznicu"</string>
+  <string name="rich_text_editor_unindent">"Poništi uvlaku"</string>
+  <string name="rich_text_editor_url_placeholder">"Poveznica"</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_room_voice_message_tooltip">"Držite za snimanje"</string>
+</resources>
diff --git a/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml b/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml
index 9b28fd8ef6..d5a7002665 100644
--- a/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-uz/translations.xml
@@ -5,11 +5,17 @@
   <string name="rich_text_editor_close_formatting_options">"Formatlash parametrlarini yoping"</string>
   <string name="rich_text_editor_code_block">"Kod blokini almashtirish"</string>
   <string name="rich_text_editor_composer_caption_placeholder">"Taglavha kiritish"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Shifrlangan xabar…"</string>
   <string name="rich_text_editor_composer_placeholder">"Xabar…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Shifrlanmagan xabar…"</string>
   <string name="rich_text_editor_create_link">"Havola yarating"</string>
   <string name="rich_text_editor_edit_link">"Havolani tahrirlash"</string>
+  <string name="rich_text_editor_format_action">"%1$s, holat: %2$s"</string>
   <string name="rich_text_editor_format_bold">"Qalin formatni qo\'llang"</string>
   <string name="rich_text_editor_format_italic">"Kursiv formatini qo\'llang"</string>
+  <string name="rich_text_editor_format_state_disabled">"oʻchirilgan"</string>
+  <string name="rich_text_editor_format_state_off">"o\'chiq"</string>
+  <string name="rich_text_editor_format_state_on">"yoniq"</string>
   <string name="rich_text_editor_format_strikethrough">"Chizilgan formatni qo\'llash"</string>
   <string name="rich_text_editor_format_underline">"Pastki chiziq formatini qo\'llang"</string>
   <string name="rich_text_editor_full_screen_toggle">"Toʻliq ekran rejimiga oʻtish"</string>
@@ -22,5 +28,6 @@
   <string name="rich_text_editor_remove_link">"Havolani olib tashlang"</string>
   <string name="rich_text_editor_unindent">"Paragrafni bekor qilish"</string>
   <string name="rich_text_editor_url_placeholder">"Havola"</string>
+  <string name="screen_media_upload_preview_caption_warning">"Taglavhalar eski ilovalardan foydalanuvchilarga ko‘rinmasligi mumkin."</string>
   <string name="screen_room_voice_message_tooltip">"Yozib olish uchun bosib turing"</string>
 </resources>
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 fa003b74d8..9a65ca0ad5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 de4b9bc64a..7bac75cc75 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanFormatterTest.kt b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanFormatterTest.kt
index 2d0156a3df..522912b3d2 100644
--- a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanFormatterTest.kt
+++ b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanFormatterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanProviderFixture.kt b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanProviderFixture.kt
index cc40a56bf4..2537615be3 100644
--- a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanProviderFixture.kt
+++ b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/MentionSpanProviderFixture.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 2c7905e2da..04b700925e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/api/build.gradle.kts b/libraries/troubleshoot/api/build.gradle.kts
index 6ce2d3e9f8..177b2a5fce 100644
--- a/libraries/troubleshoot/api/build.gradle.kts
+++ b/libraries/troubleshoot/api/build.gradle.kts
@@ -1,11 +1,12 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * 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 {
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/NotificationTroubleShootEntryPoint.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/NotificationTroubleShootEntryPoint.kt
index bf0c6bb883..4000fd1043 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/NotificationTroubleShootEntryPoint.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/NotificationTroubleShootEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,15 +14,14 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface NotificationTroubleShootEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone()
-        fun openIgnoredUsers()
+        fun navigateToBlockedUsers()
     }
 }
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt
index 0eab9b8e5a..e5a3c9c90c 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,15 +16,14 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface PushHistoryEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         fun onDone()
-        fun navigateTo(roomId: RoomId, eventId: EventId)
+        fun navigateToEvent(roomId: RoomId, eventId: EventId)
     }
 }
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootNavigator.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootNavigator.kt
index 0cce358072..a4be22e70b 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootNavigator.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootNavigator.kt
@@ -1,12 +1,13 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot.api.test
 
 interface NotificationTroubleshootNavigator {
-    fun openIgnoredUsers()
+    fun navigateToBlockedUsers()
 }
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTest.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTest.kt
index f729cd3300..23144644d1 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTest.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestDelegate.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestDelegate.kt
index 830ba74818..6dbf1f190d 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestDelegate.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestDelegate.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestState.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestState.kt
index 4069d78cb3..f022651024 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestState.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootTestState.kt
@@ -1,17 +1,21 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.troubleshoot.api.test
 
+import androidx.compose.runtime.Immutable
+
 data class NotificationTroubleshootTestState(
     val name: String,
     val description: String,
     val status: Status,
 ) {
+    @Immutable
     sealed interface Status {
         data class Idle(val visible: Boolean) : Status
         data object InProgress : Status
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/TestFilterData.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/TestFilterData.kt
index f0c5c8378f..960d78e108 100644
--- a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/TestFilterData.kt
+++ b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/TestFilterData.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/build.gradle.kts b/libraries/troubleshoot/impl/build.gradle.kts
index bcc7c4357b..e2efdb3a6a 100644
--- a/libraries/troubleshoot/impl/build.gradle.kts
+++ b/libraries/troubleshoot/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPoint.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPoint.kt
index b9d9c91814..117b3521bc 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPoint.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.libraries.troubleshoot.impl
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.troubleshoot.api.NotificationTroubleShootEntryPoint
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultNotificationTroubleShootEntryPoint : NotificationTroubleShootEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NotificationTroubleShootEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : NotificationTroubleShootEntryPoint.NodeBuilder {
-            override fun callback(callback: NotificationTroubleShootEntryPoint.Callback): NotificationTroubleShootEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<TroubleshootNotificationsNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: NotificationTroubleShootEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<TroubleshootNotificationsNode>(buildContext, listOf(callback))
     }
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsEvents.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsEvents.kt
index 894c439324..94330907ea 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsEvents.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
index 508010a3d6..ce24c723c5 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.troubleshoot.api.NotificationTroubleShootEntryPoint
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootNavigator
@@ -31,20 +32,13 @@ class TroubleshootNotificationsNode(
     factory: TroubleshootNotificationsPresenter.Factory,
 ) : Node(buildContext, plugins = plugins),
     NotificationTroubleshootNavigator {
+    private val callback: NotificationTroubleShootEntryPoint.Callback = callback()
     private val presenter = factory.create(
         navigator = this,
     )
 
-    private fun onDone() {
-        plugins<NotificationTroubleShootEntryPoint.Callback>().forEach {
-            it.onDone()
-        }
-    }
-
-    override fun openIgnoredUsers() {
-        plugins<NotificationTroubleShootEntryPoint.Callback>().forEach {
-            it.openIgnoredUsers()
-        }
+    override fun navigateToBlockedUsers() {
+        callback.navigateToBlockedUsers()
     }
 
     @Composable
@@ -53,7 +47,7 @@ class TroubleshootNotificationsNode(
         val state = presenter.present()
         TroubleshootNotificationsView(
             state = state,
-            onBackClick = ::onDone,
+            onBackClick = callback::onDone,
             modifier = modifier,
         )
     }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenter.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenter.kt
index 07840b023c..00958b1f99 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenter.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -37,7 +38,7 @@ class TroubleshootNotificationsPresenter(
         }
 
         val testSuiteState by troubleshootTestSuite.state.collectAsState()
-        fun handleEvents(event: TroubleshootNotificationsEvents) {
+        fun handleEvent(event: TroubleshootNotificationsEvents) {
             when (event) {
                 TroubleshootNotificationsEvents.StartTests -> coroutineScope.launch {
                     troubleshootTestSuite.runTestSuite(this)
@@ -57,7 +58,7 @@ class TroubleshootNotificationsPresenter(
 
         return TroubleshootNotificationsState(
             testSuiteState = testSuiteState,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsState.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsState.kt
index 2f7bed8202..92f4d668c4 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsState.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsStateProvider.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsStateProvider.kt
index 8c2708ed9d..5cc565559e 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsStateProvider.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9feeeb505e..fa5e7078d2 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuite.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuite.kt
index c26510fc92..52f0d894dc 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuite.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuite.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,7 @@ package io.element.android.libraries.troubleshoot.impl
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.NotificationTroubleshoot
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.GetCurrentPushProvider
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootNavigator
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTest
@@ -25,6 +27,7 @@ import kotlinx.coroutines.flow.onEach
 
 @Inject
 class TroubleshootTestSuite(
+    private val sessionId: SessionId,
     private val notificationTroubleshootTests: Set<@JvmSuppressWildcards NotificationTroubleshootTest>,
     private val getCurrentPushProvider: GetCurrentPushProvider,
     private val analyticsService: AnalyticsService,
@@ -41,7 +44,7 @@ class TroubleshootTestSuite(
 
     suspend fun start(coroutineScope: CoroutineScope) {
         val testFilterData = TestFilterData(
-            currentPushProviderName = getCurrentPushProvider.getCurrentPushProvider()
+            currentPushProviderName = getCurrentPushProvider.getCurrentPushProvider(sessionId)
         )
         tests = notificationTroubleshootTests
             .filter { it.isRelevant(testFilterData) }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuiteState.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuiteState.kt
index c5ffbf89bc..c51af92be7 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuiteState.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuiteState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPoint.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPoint.kt
index 9a33848cae..d19dcb603e 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPoint.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPoint.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,28 +10,18 @@ package io.element.android.libraries.troubleshoot.impl.history
 
 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.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.troubleshoot.api.PushHistoryEntryPoint
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultPushHistoryEntryPoint : PushHistoryEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): PushHistoryEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : PushHistoryEntryPoint.NodeBuilder {
-            override fun callback(callback: PushHistoryEntryPoint.Callback): PushHistoryEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<PushHistoryNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: PushHistoryEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<PushHistoryNode>(buildContext, listOf(callback))
     }
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt
index 893be607a0..5116e0e101 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt
index 69070298ec..ed5eaad997 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,11 @@ 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 com.bumble.appyx.core.plugin.plugins
 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.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -31,16 +32,10 @@ class PushHistoryNode(
     presenterFactory: PushHistoryPresenter.Factory,
     private val screenTracker: ScreenTracker,
 ) : Node(buildContext, plugins = plugins), PushHistoryNavigator {
-    private fun onDone() {
-        plugins<PushHistoryEntryPoint.Callback>().forEach {
-            it.onDone()
-        }
-    }
+    private val callback: PushHistoryEntryPoint.Callback = callback()
 
     override fun navigateTo(roomId: RoomId, eventId: EventId) {
-        plugins<PushHistoryEntryPoint.Callback>().forEach {
-            it.navigateTo(roomId, eventId)
-        }
+        callback.navigateToEvent(roomId, eventId)
     }
 
     private val presenter = presenterFactory.create(this)
@@ -51,7 +46,7 @@ class PushHistoryNode(
         val state = presenter.present()
         PushHistoryView(
             state = state,
-            onBackClick = ::onDone,
+            onBackClick = callback::onDone,
             modifier = modifier,
         )
     }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt
index b98fcee970..ad1878051d 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -61,7 +62,7 @@ class PushHistoryPresenter(
         var resetAction: AsyncAction<Unit> by remember { mutableStateOf(AsyncAction.Uninitialized) }
         var showNotSameAccountError by remember { mutableStateOf(false) }
 
-        fun handleEvents(event: PushHistoryEvents) {
+        fun handleEvent(event: PushHistoryEvents) {
             when (event) {
                 is PushHistoryEvents.SetShowOnlyErrors -> {
                     showOnlyErrors = event.showOnlyErrors
@@ -97,7 +98,7 @@ class PushHistoryPresenter(
             showOnlyErrors = showOnlyErrors,
             resetAction = resetAction,
             showNotSameAccountError = showNotSameAccountError,
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt
index b4b6d7f75e..dbc98bdbe3 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt
index 11d9c509cc..e7384048f4 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 3193716d34..9ae748d03a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/main/res/values-hr/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..a39bf5d2ad
--- /dev/null
+++ b/libraries/troubleshoot/impl/src/main/res/values-hr/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">"Povijest push obavijesti"</string>
+  <string name="troubleshoot_notifications_screen_action">"Pokreni testove"</string>
+  <string name="troubleshoot_notifications_screen_action_again">"Ponovno pokreni testove"</string>
+  <string name="troubleshoot_notifications_screen_failure">"Neki testovi nisu uspjeli. Provjerite pojedinosti."</string>
+  <string name="troubleshoot_notifications_screen_notice">"Pokrenite testove kako biste otkrili bilo kakve probleme u konfiguraciji koji bi mogli uzrokovati da se obavijesti ne ponašaju kako se očekuje."</string>
+  <string name="troubleshoot_notifications_screen_quick_fix_action">"Pokušaj popravka"</string>
+  <string name="troubleshoot_notifications_screen_success">"Svi testovi uspješno su izvedeni."</string>
+  <string name="troubleshoot_notifications_screen_title">"Rješavanje problema s obavijestima"</string>
+  <string name="troubleshoot_notifications_screen_waiting">"Neki testovi zahtijevaju vašu pažnju. Provjerite pojedinosti."</string>
+</resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml
index e01e098f5f..d7fa7207e7 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-uz/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="screen_push_history_title">"Bildirishnoma tarixi"</string>
   <string name="troubleshoot_notifications_screen_action">"Testlarni ishga tushirish"</string>
   <string name="troubleshoot_notifications_screen_action_again">"Testlarni qayta ishga tushirish"</string>
   <string name="troubleshoot_notifications_screen_failure">"Ba’zi testlar muvaffaqiyatsiz tugadi. Iltimos, tafsilotlarni tekshirib chiqing."</string>
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPointTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPointTest.kt
index e0d817a4ca..4bef725e0a 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPointTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/DefaultNotificationTroubleShootEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,11 +35,13 @@ class DefaultNotificationTroubleShootEntryPointTest {
         }
         val callback = object : NotificationTroubleShootEntryPoint.Callback {
             override fun onDone() = lambdaError()
-            override fun openIgnoredUsers() = lambdaError()
+            override fun navigateToBlockedUsers() = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(TroubleshootNotificationsNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/FakeNotificationTroubleshootTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/FakeNotificationTroubleshootTest.kt
index 7fa2e93d85..597e45a5f7 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/FakeNotificationTroubleshootTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/FakeNotificationTroubleshootTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenterTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenterTest.kt
index 4d6b338db7..c8f8382ecf 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenterTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,6 +10,7 @@ package io.element.android.libraries.troubleshoot.impl
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.push.test.FakeGetCurrentPushProvider
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootNavigator
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootTest
@@ -170,6 +172,7 @@ private fun createTroubleshootTestSuite(
     currentPushProvider: String? = null,
 ): TroubleshootTestSuite {
     return TroubleshootTestSuite(
+        sessionId = A_SESSION_ID,
         notificationTroubleshootTests = tests,
         getCurrentPushProvider = FakeGetCurrentPushProvider(currentPushProvider),
         analyticsService = FakeAnalyticsService(),
@@ -178,7 +181,7 @@ private fun createTroubleshootTestSuite(
 
 internal fun createTroubleshootNotificationsPresenter(
     navigator: NotificationTroubleshootNavigator = object : NotificationTroubleshootNavigator {
-        override fun openIgnoredUsers() = lambdaError()
+        override fun navigateToBlockedUsers() = lambdaError()
     },
     troubleshootTestSuite: TroubleshootTestSuite = createTroubleshootTestSuite(),
 ): TroubleshootNotificationsPresenter {
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 8dcf18217f..0ba6c22710 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPointTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPointTest.kt
index 858956488c..1aa98fc157 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPointTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/DefaultPushHistoryEntryPointTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -46,11 +47,13 @@ class DefaultPushHistoryEntryPointTest {
         }
         val callback = object : PushHistoryEntryPoint.Callback {
             override fun onDone() = lambdaError()
-            override fun navigateTo(roomId: RoomId, eventId: EventId) = lambdaError()
+            override fun navigateToEvent(roomId: RoomId, eventId: EventId) = lambdaError()
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
         assertThat(result).isInstanceOf(PushHistoryNode::class.java)
         assertThat(result.plugins).contains(callback)
     }
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenterTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenterTest.kt
index 9c1cdee25c..15fb6b5f25 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenterTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 ada8b61f35..fa4e65ad9a 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/troubleshoot/test/build.gradle.kts b/libraries/troubleshoot/test/build.gradle.kts
index 830eb5d6b0..ff0743c72e 100644
--- a/libraries/troubleshoot/test/build.gradle.kts
+++ b/libraries/troubleshoot/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -13,19 +14,10 @@ android {
 }
 
 dependencies {
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.troubleshoot.api)
     implementation(projects.tests.testutils)
     implementation(libs.coroutines.test)
     implementation(libs.test.core)
     implementation(libs.test.turbine)
 }
-
-ktlint {
-    filter {
-        exclude { element ->
-            val path = element.file.path
-            // Exclude this file, that ktlint cannot parse.
-            path.contains("libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/Utils.kt")
-        }
-    }
-}
diff --git a/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleShootEntryPoint.kt b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleShootEntryPoint.kt
new file mode 100644
index 0000000000..85a30e4e8d
--- /dev/null
+++ b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleShootEntryPoint.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.troubleshoot.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.troubleshoot.api.NotificationTroubleShootEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeNotificationTroubleShootEntryPoint : NotificationTroubleShootEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: NotificationTroubleShootEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleshootNavigator.kt b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleshootNavigator.kt
index 63445e5a3e..f983c8bcf1 100644
--- a/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleshootNavigator.kt
+++ b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleshootNavigator.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,5 +14,5 @@ import io.element.android.tests.testutils.lambda.lambdaError
 class FakeNotificationTroubleshootNavigator(
     private val openIgnoredUsersResult: () -> Unit = { lambdaError() },
 ) : NotificationTroubleshootNavigator {
-    override fun openIgnoredUsers() = openIgnoredUsersResult()
+    override fun navigateToBlockedUsers() = openIgnoredUsersResult()
 }
diff --git a/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakePushHistoryEntryPoint.kt b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakePushHistoryEntryPoint.kt
new file mode 100644
index 0000000000..28643f4551
--- /dev/null
+++ b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakePushHistoryEntryPoint.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.troubleshoot.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.troubleshoot.api.PushHistoryEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakePushHistoryEntryPoint : PushHistoryEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: PushHistoryEntryPoint.Callback,
+    ): Node = lambdaError()
+}
diff --git a/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/Utils.kt b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/Utils.kt
index 77034da584..5636195713 100644
--- a/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/Utils.kt
+++ b/libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/Utils.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-common/build.gradle.kts b/libraries/ui-common/build.gradle.kts
index 55ef7eaf49..76c772f9fc 100644
--- a/libraries/ui-common/build.gradle.kts
+++ b/libraries/ui-common/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
index ab622b4b9d..53cc8c8443 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-strings/build.gradle.kts b/libraries/ui-strings/build.gradle.kts
index 7e34891c66..06c23bd026 100644
--- a/libraries/ui-strings/build.gradle.kts
+++ b/libraries/ui-strings/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonPlurals.kt b/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonPlurals.kt
index e35c7d7c1f..36fb0d21dc 100644
--- a/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonPlurals.kt
+++ b/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonPlurals.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonStrings.kt b/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonStrings.kt
index 4f6b442e03..bf3c2c4930 100644
--- a/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonStrings.kt
+++ b/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/CommonStrings.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 247dc9f026..d2a1f4dea7 100644
--- a/libraries/ui-strings/src/main/res/values-be/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-be/translations.xml
@@ -117,6 +117,7 @@
   <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_take_photo">"Зрабіць фота"</string>
@@ -132,6 +133,7 @@
   <string name="common_acceptable_use_policy">"Палітыка дапушчальнага выкарыстання"</string>
   <string name="common_advanced_settings">"Пашыраныя налады"</string>
   <string name="common_analytics">"Аналітыка"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Вы выйшлі з пакоя"</string>
   <string name="common_appearance">"Знешні выгляд"</string>
   <string name="common_audio">"Аўдыя"</string>
   <string name="common_blocked_users">"Заблакіраваныя карыстальнікі"</string>
@@ -272,6 +274,7 @@
   <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="error_account_creation_not_possible">"Ваш хатні сервер неабходна абнавіць для падтрымкі Matrix Authentication Service і стварэння ўліковага запісу."</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 57b3a43d1a..483c47fbea 100644
--- a/libraries/ui-strings/src/main/res/values-bg/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-bg/translations.xml
@@ -84,6 +84,7 @@
   <string name="action_manage_account">"Управление на профила"</string>
   <string name="action_manage_devices">"Управление на устройствата"</string>
   <string name="action_message">"Съобщение"</string>
+  <string name="action_next">"Напред"</string>
   <string name="action_no">"Не"</string>
   <string name="action_not_now">"Не сега"</string>
   <string name="action_ok">"Добре"</string>
@@ -129,9 +130,11 @@
   <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_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_left_room">"Вие напуснахте стаята"</string>
   <string name="common_appearance">"Облик"</string>
   <string name="common_audio">"Аудио"</string>
   <string name="common_blocked_users">"Блокирани потребители"</string>
@@ -140,6 +143,8 @@
   <string name="common_chat_backup">"Резервно копие на чатовете"</string>
   <string name="common_copyright">"Авторски права"</string>
   <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>
@@ -170,6 +175,7 @@
   <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_link_copied_to_clipboard">"Връзката е копирана в клипборда"</string>
   <string name="common_loading">"Зарежда се…"</string>
@@ -212,6 +218,7 @@
   <string name="common_preparing">"Подготвя се…"</string>
   <string name="common_privacy_policy">"Политика за поверителност"</string>
   <string name="common_private_room">"Частна стая"</string>
+  <string name="common_private_space">"Частно пространство"</string>
   <string name="common_public_room">"Общодостъпна стая"</string>
   <string name="common_public_space">"Общодостъпно пространство"</string>
   <string name="common_reaction">"Реакция"</string>
@@ -241,15 +248,19 @@
   <string name="common_search_results">"Резултати от търсенето"</string>
   <string name="common_security">"Защита"</string>
   <string name="common_seen_by">"Видяно от"</string>
+  <string name="common_select_account">"Избиране на акаунт"</string>
   <string name="common_sending">"Изпраща се…"</string>
   <string name="common_sending_failed">"Изпращането е неуспешно"</string>
   <string name="common_sent">"Изпратено"</string>
   <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>
   <string name="common_something_went_wrong_message">"Възникна проблем. Моля, опитайте отново."</string>
+  <string name="common_space">"Пространство"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d пространство"</item>
     <item quantity="other">"%1$d пространства"</item>
@@ -266,6 +277,7 @@
   <string name="common_topic">"Тема"</string>
   <string name="common_topic_placeholder">"За какво се отнася тази стая?"</string>
   <string name="common_unable_to_decrypt">"Не може да се разшифрова"</string>
+  <string name="common_unable_to_decrypt_no_access">"Нямате достъп до това съобщение"</string>
   <string name="common_unable_to_invite_message">"Поканите не можаха да бъдат изпратени до един или повече потребители."</string>
   <string name="common_unable_to_invite_title">"Не може да се изпрати покана(и)"</string>
   <string name="common_unlock">"Отключване"</string>
@@ -280,6 +292,9 @@
   <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_low">"Ниско качество"</string>
+  <string name="common_video_quality_standard">"Стандартно качество"</string>
   <string name="common_voice_message">"Гласово съобщение"</string>
   <string name="common_waiting">"Изчаква се…"</string>
   <string name="common_waiting_for_decryption_key">"В очакване на това съобщение"</string>
@@ -316,9 +331,13 @@
   <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_parent_space">"%1$s пространство"</string>
+  <string name="screen_space_list_title">"Пространства"</string>
+  <string name="screen_space_menu_action_members">"Преглед на членовете"</string>
   <string name="screen_view_location_title">"Местоположение"</string>
   <string name="settings_version_number">"Версия: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"bg"</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>
 </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 f0e10894b4..196ec6f175 100644
--- a/libraries/ui-strings/src/main/res/values-cs/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml
@@ -97,6 +97,8 @@
   <string name="action_forgot_password">"Zapomněli jste heslo?"</string>
   <string name="action_forward">"Přeposlat"</string>
   <string name="action_go_back">"Přejít zpět"</string>
+  <string name="action_go_to_roles_and_permissions">"Přejít na role a oprávnění"</string>
+  <string name="action_go_to_settings">"Přejít do nastavení"</string>
   <string name="action_ignore">"Ignorovat"</string>
   <string name="action_invite">"Pozvat"</string>
   <string name="action_invite_friends">"Pozvat přátele"</string>
@@ -113,6 +115,7 @@
   <string name="action_manage_account">"Spravovat účet"</string>
   <string name="action_manage_devices">"Spravovat zařízení"</string>
   <string name="action_message">"Zpráva"</string>
+  <string name="action_minimize">"Minimalizovat"</string>
   <string name="action_next">"Další"</string>
   <string name="action_no">"Ne"</string>
   <string name="action_not_now">"Teď ne"</string>
@@ -155,6 +158,7 @@
   <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_take_photo">"Vyfotit"</string>
@@ -180,6 +184,7 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Byli jste odhlášeni z relace"</string>
   <string name="common_appearance">"Vzhled"</string>
   <string name="common_audio">"Zvuk"</string>
+  <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_started">"Hovor zahájen"</string>
@@ -228,6 +233,7 @@ Důvod: %1$s."</string>
   <string name="common_install_apk_android">"Nainstalovat APK"</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>
@@ -319,6 +325,7 @@ Důvod: %1$s."</string>
   <string name="common_settings">"Nastavení"</string>
   <string name="common_share_space">"Sdílet prostor"</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_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>
@@ -388,6 +395,7 @@ Opravdu chcete pokračovat?"</string>
   <string name="dialog_title_error">"Chyba"</string>
   <string name="dialog_title_success">"Úspěch"</string>
   <string name="dialog_title_warning">"Upozornění"</string>
+  <string name="dialog_unsaved_changes_description">"Máte neuložené změny."</string>
   <string name="dialog_unsaved_changes_description_android">"Vaše změny nebyly uloženy. Opravdu se chcete vrátit?"</string>
   <string name="dialog_unsaved_changes_title">"Uložit změny?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maximální povolená velikost souboru je: %1$s"</string>
@@ -468,6 +476,7 @@ Opravdu chcete pokračovat?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s prostor"</string>
   <string name="screen_space_list_title">"Prostory"</string>
+  <string name="screen_space_menu_action_members">"Zobrazit členy"</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_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>
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 11b46cb85c..1aa932f8ed 100644
--- a/libraries/ui-strings/src/main/res/values-cy/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cy/translations.xml
@@ -161,6 +161,7 @@
   <string name="action_skip">"Hepgor"</string>
   <string name="action_start">"Cychwyn"</string>
   <string name="action_start_chat">"Dechrau sgwrs"</string>
+  <string name="action_start_over">"Cychwyn eto"</string>
   <string name="action_start_verification">"Dechrau dilysu"</string>
   <string name="action_static_map_load">"Tapio i lwytho map"</string>
   <string name="action_take_photo">"Cymryd llun"</string>
@@ -414,6 +415,7 @@ Ydych chi\'n siŵr eich bod am barhau?"</string>
   <string name="dialog_title_error">"Gwall"</string>
   <string name="dialog_title_success">"Llwyddiant"</string>
   <string name="dialog_title_warning">"Rhybudd"</string>
+  <string name="dialog_unsaved_changes_description">"Mae gennych newidiadau heb eu cadw."</string>
   <string name="dialog_unsaved_changes_description_android">"Dyw eich newidiadau heb gael eu cadw. Ydych chi\'n siŵr eich bod am fynd nôl?"</string>
   <string name="dialog_unsaved_changes_title">"Cadw\'r newidiadau?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Y maint ffeil mwyaf sy\'n cael ei ganiatáu yw: %1$s"</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 e133ec28ac..73b70cf4f1 100644
--- a/libraries/ui-strings/src/main/res/values-da/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-da/translations.xml
@@ -95,6 +95,7 @@
   <string name="action_forgot_password">"Har du glemt din adgangskode?"</string>
   <string name="action_forward">"Videresend"</string>
   <string name="action_go_back">"Gå tilbage"</string>
+  <string name="action_go_to_roles_and_permissions">"Gå til roller og rettigheder"</string>
   <string name="action_go_to_settings">"Gå til indstillinger"</string>
   <string name="action_ignore">"Ignorér"</string>
   <string name="action_invite">"Invitér"</string>
@@ -107,7 +108,7 @@
   <string name="action_leave">"Forlad"</string>
   <string name="action_leave_conversation">"Forlad samtalen"</string>
   <string name="action_leave_room">"Forlad rum"</string>
-  <string name="action_leave_space">"Forlad klynge"</string>
+  <string name="action_leave_space">"Forlad gruppe"</string>
   <string name="action_load_more">"Indlæs mere"</string>
   <string name="action_manage_account">"Administrer konto"</string>
   <string name="action_manage_devices">"Administrer enheder"</string>
@@ -155,6 +156,7 @@
   <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_take_photo">"Tag billede"</string>
@@ -190,7 +192,7 @@
   <string name="common_creating_room">"Opretter rum…"</string>
   <string name="common_current_user_canceled_knock">"Anmodning annulleret"</string>
   <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_left_space">"Forlod gruppe"</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>
@@ -229,7 +231,7 @@
   <string name="common_install_apk_android">"Installer APK"</string>
   <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_leaving_space">"Forlader gruppe"</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>
@@ -252,7 +254,7 @@
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Ingen resultater"</string>
   <string name="common_no_room_name">"Intet rumnavn"</string>
-  <string name="common_no_space_name">"Intet klyngenavn"</string>
+  <string name="common_no_space_name">"Intet gruppenavn"</string>
   <string name="common_not_encrypted">"Ikke krypteret"</string>
   <string name="common_offline">"Offline"</string>
   <string name="common_open_source_licenses">"Open Source-licenser"</string>
@@ -275,9 +277,9 @@
   <string name="common_preparing">"Forbereder…"</string>
   <string name="common_privacy_policy">"Privatlivspolitik"</string>
   <string name="common_private_room">"Privat rum"</string>
-  <string name="common_private_space">"Privat klynge"</string>
+  <string name="common_private_space">"Privat gruppe"</string>
   <string name="common_public_room">"Offentligt rum"</string>
-  <string name="common_public_space">"Offentlig klynge"</string>
+  <string name="common_public_space">"Offentlig gruppe"</string>
   <string name="common_reaction">"Reaktion"</string>
   <string name="common_reactions">"Reaktioner"</string>
   <string name="common_reason">"Årsag"</string>
@@ -315,16 +317,16 @@
   <string name="common_server_unreachable">"Serveren er ikke tilgængelig"</string>
   <string name="common_server_url">"Server URL"</string>
   <string name="common_settings">"Indstillinger"</string>
-  <string name="common_share_space">"Del klynge"</string>
+  <string name="common_share_space">"Del gruppe"</string>
   <string name="common_shared_location">"Delt placering"</string>
-  <string name="common_shared_space">"Delt klynge"</string>
+  <string name="common_shared_space">"Delt gruppe"</string>
   <string name="common_signing_out">"Logger ud"</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">"Gruppe"</string>
   <plurals name="common_spaces">
-    <item quantity="one">"%1$d Klynge"</item>
-    <item quantity="other">"%1$d Klynger"</item>
+    <item quantity="one">"%1$d Gruppe"</item>
+    <item quantity="other">"%1$d Grupper"</item>
   </plurals>
   <string name="common_starting_chat">"Starter samtale…"</string>
   <string name="common_sticker">"Klistermærke"</string>
@@ -386,6 +388,7 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="dialog_title_error">"Fejl"</string>
   <string name="dialog_title_success">"Succes"</string>
   <string name="dialog_title_warning">"Advarsel"</string>
+  <string name="dialog_unsaved_changes_description">"Du har ændringer, der ikke er gemt."</string>
   <string name="dialog_unsaved_changes_description_android">"Dine ændringer er ikke blevet gemt. Er du sikker på, at du vil gå tilbage?"</string>
   <string name="dialog_unsaved_changes_title">"Gem ændringer?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Den maksimalt tilladte filstørrelse er: %1$s"</string>
@@ -461,10 +464,11 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="screen_share_open_google_maps">"Åbn i Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Åbn i OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Del denne lokation"</string>
-  <string name="screen_space_list_description">"Klynger, du har oprettet eller deltager i"</string>
+  <string name="screen_space_list_description">"Grupper, du har oprettet eller deltager i"</string>
   <string name="screen_space_list_details">"%1$s•%2$s"</string>
-  <string name="screen_space_list_parent_space">"%1$s klynge"</string>
-  <string name="screen_space_list_title">"Klynger"</string>
+  <string name="screen_space_list_parent_space">"%1$s gruppe"</string>
+  <string name="screen_space_list_title">"Grupper"</string>
+  <string name="screen_space_menu_action_members">"Vis medlemmer"</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_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>
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 d1c8b7a6f4..65803db3aa 100644
--- a/libraries/ui-strings/src/main/res/values-de/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-de/translations.xml
@@ -155,6 +155,7 @@
   <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_take_photo">"Foto aufnehmen"</string>
@@ -366,7 +367,7 @@ 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_you">"Sie"</string>
+  <string name="common_you">"Du"</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_new_user_id">"(%1$s)"</string>
@@ -387,6 +388,7 @@ Möchtest du wirklich fortfahren?"</string>
   <string name="dialog_title_error">"Fehler"</string>
   <string name="dialog_title_success">"Erfolg"</string>
   <string name="dialog_title_warning">"Warnung"</string>
+  <string name="dialog_unsaved_changes_description">"Du hast nicht gespeicherte Änderungen."</string>
   <string name="dialog_unsaved_changes_description_android">"Deine Änderungen wurden nicht gespeichert. Bist du sicher, dass du zurückgehen willst?"</string>
   <string name="dialog_unsaved_changes_title">"Änderungen speichern?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Die maximal erlaubte Dateigröße ist: %1$s"</string>
@@ -466,6 +468,7 @@ Möchtest du wirklich fortfahren?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s Space"</string>
   <string name="screen_space_list_title">"Spaces"</string>
+  <string name="screen_space_menu_action_members">"Mitglieder anzeigen"</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_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>
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 5085f404a1..98d20a1599 100644
--- a/libraries/ui-strings/src/main/res/values-el/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-el/translations.xml
@@ -130,6 +130,7 @@
   <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_take_photo">"Τράβηξε φωτογραφία"</string>
@@ -148,6 +149,7 @@
   <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_appearance">"Εμφάνιση"</string>
   <string name="common_audio">"Ήχος"</string>
   <string name="common_blocked_users">"Αποκλεισμένοι χρήστες"</string>
@@ -326,6 +328,7 @@
   <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="error_account_creation_not_possible">"Ο οικιακός διακομιστής σου πρέπει να αναβαθμιστεί για να υποστηρίζει το Matrix Authentication Service και τη δημιουργία λογαριασμού."</string>
diff --git a/libraries/ui-strings/src/main/res/values-en-rUS/translations.xml b/libraries/ui-strings/src/main/res/values-en-rUS/translations.xml
index 00d2674ed7..2fc2fb0889 100644
--- a/libraries/ui-strings/src/main/res/values-en-rUS/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-en-rUS/translations.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_collapse_message_text_field">"Minimize message text field"</string>
   <string name="action_minimize">"Minimize"</string>
   <string name="common_favourite">"Favorite"</string>
   <string name="common_favourited">"Favorited"</string>
+  <string name="crypto_history_visible">"This room has been configured so that new members can read history. %1$s"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-eo/translations.xml b/libraries/ui-strings/src/main/res/values-eo/translations.xml
deleted file mode 100644
index 6f796aef09..0000000000
--- a/libraries/ui-strings/src/main/res/values-eo/translations.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="action_manage_devices">"Manage linked devices"</string>
-  <string name="action_reset_identity">"Start fresh"</string>
-  <string name="common_recovery_key">"Backup password"</string>
-  <string name="common_unable_to_decrypt_insecure_device">"Sent from an unconfirmed device"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Sender\'s security verification has changed"</string>
-  <string name="common_verify_device">"Confirm device"</string>
-  <string name="common_verify_identity">"Verify user"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s\'s security verification has changed. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$s\'s %2$s security verification has changed. %3$s"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$s\'s security verification has changed."</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$s\'s %2$s security verification has changed. %3$s"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"You\'re about to go to your %1$s account to start fresh. Afterwards you\'ll be taken back to the app."</string>
-  <string name="screen_reset_identity_confirmation_title">"Can\'t confirm? Go to your account to start fresh."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Your message was not sent because %1$s\'s security verification has changed"</string>
-  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s is using one or more unconfirmed devices. You can send the message anyway, or you can cancel for now and try again later after %2$s has confirmed all their devices."</string>
-  <string name="screen_resolve_send_failure_unsigned_device_title">"Your message was not sent because %1$s has not confirmed all devices"</string>
-  <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"One or more of your linked devices are unconfirmed. You can send the message anyway, or you can cancel for now and try again later after you have confirmed all of your linked devices."</string>
-  <string name="screen_resolve_send_failure_you_unsigned_device_title">"Your message was not sent because you have not confirmed one or more of your linked devices"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Message not sent because %1$s\'s security verification has changed."</string>
-  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Message not sent because %1$s has not confirmed all their devices."</string>
-  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Message not sent because you have not confirmed one or more of your linked devices."</string>
-  <string name="timeline_decryption_failure_historical_event_unverified_device">"You need to confirm this device for access to historical messages"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"This message was blocked either because you did not confirm your device or because the sender needs to verify you."</string>
-</resources>
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 4428e0b864..740f96edd4 100644
--- a/libraries/ui-strings/src/main/res/values-es/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-es/translations.xml
@@ -128,6 +128,7 @@
   <string name="action_skip">"Saltar"</string>
   <string name="action_start">"Comenzar"</string>
   <string name="action_start_chat">"Iniciar chat"</string>
+  <string name="action_start_over">"Empezar de nuevo"</string>
   <string name="action_start_verification">"Iniciar la verificación"</string>
   <string name="action_static_map_load">"Pulsa para cargar el mapa"</string>
   <string name="action_take_photo">"Hacer foto"</string>
@@ -145,6 +146,7 @@
   <string name="common_adding_caption">"Añadiendo leyenda"</string>
   <string name="common_advanced_settings">"Ajustes avanzados"</string>
   <string name="common_analytics">"Estadísticas"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Saliste de la sala"</string>
   <string name="common_appearance">"Apariencia"</string>
   <string name="common_audio">"Sonido"</string>
   <string name="common_blocked_users">"Usuarios bloqueados"</string>
@@ -318,6 +320,7 @@ Motivo: %1$s."</string>
   <string name="dialog_title_error">"Error"</string>
   <string name="dialog_title_success">"Terminado"</string>
   <string name="dialog_title_warning">"Atención"</string>
+  <string name="dialog_unsaved_changes_description">"Tienes cambios sin guardar."</string>
   <string name="dialog_unsaved_changes_description_android">"Tus cambios no se han guardado. ¿Estás seguro de que quieres volver atrás?"</string>
   <string name="dialog_unsaved_changes_title">"¿Guardar cambios?"</string>
   <string name="error_account_creation_not_possible">"Tu servidor base debe actualizarse para admitir Matrix Authentication Service y la creación de cuentas."</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 dd6bae100e..67d323e77b 100644
--- a/libraries/ui-strings/src/main/res/values-et/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-et/translations.xml
@@ -95,6 +95,8 @@
   <string name="action_forgot_password">"Kas unustasid salasõna?"</string>
   <string name="action_forward">"Edasta"</string>
   <string name="action_go_back">"Tagasi eelmisesse vaatesse"</string>
+  <string name="action_go_to_roles_and_permissions">"Ava „Rollid ja õigused“"</string>
+  <string name="action_go_to_settings">"Ava seadistused"</string>
   <string name="action_ignore">"Eira"</string>
   <string name="action_invite">"Kutsu"</string>
   <string name="action_invite_friends">"Kutsu osalejaid"</string>
@@ -154,10 +156,12 @@
   <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_take_photo">"Tee pilt"</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_view">"Vaata"</string>
@@ -175,10 +179,11 @@
   <string name="common_advanced_settings">"Täiendavad seadistused"</string>
   <string name="common_an_image">"pilt"</string>
   <string name="common_analytics">"Analüütika"</string>
-  <string name="common_android_shortcuts_remove_reason_left_room">"Sa oled jututoast lahkunud"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Sina lahkusid jututoast"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Sa olid sessioonist väljaloginud"</string>
   <string name="common_appearance">"Välimus"</string>
   <string name="common_audio">"Heli"</string>
+  <string name="common_beta">"Beetaversioon"</string>
   <string name="common_blocked_users">"Blokeeritud kasutajad"</string>
   <string name="common_bubbles">"Mullid"</string>
   <string name="common_call_started">"Kõne algas"</string>
@@ -227,9 +232,11 @@ Põhjus: %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_loading">"Laadime…"</string>
   <string name="common_loading_more">"Laadime veel…"</string>
   <plurals name="common_many_members">
@@ -242,10 +249,12 @@ Põhjus: %1$s."</string>
   </plurals>
   <string name="common_message">"Sõnum"</string>
   <string name="common_message_actions">"Tegevused sõnumiga"</string>
+  <string name="common_message_failed_to_send">"Sõnumi saatmine ei õnnestunud"</string>
   <string name="common_message_layout">"Sõnumi paigutus"</string>
   <string name="common_message_removed">"Sõnum on eemaldatud"</string>
   <string name="common_modern">"Kaasaegne"</string>
   <string name="common_mute">"Summutatud"</string>
+  <string name="common_name">"Nimi"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Otsingul pole tulemusi"</string>
   <string name="common_no_room_name">"Jututoal puudub nimi"</string>
@@ -315,10 +324,12 @@ Põhjus: %1$s."</string>
   <string name="common_settings">"Seadistused"</string>
   <string name="common_share_space">"Jaga kogukonda"</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_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>
+  <string name="common_space_topic_placeholder">"Mida selles kogukonnas tehakse?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d kogukond"</item>
     <item quantity="other">"%1$d kogukonda"</item>
@@ -363,6 +374,7 @@ Põhjus: %1$s."</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_you">"Sina"</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_new_user_id">"(%1$s)"</string>
@@ -383,6 +395,7 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="dialog_title_error">"Viga"</string>
   <string name="dialog_title_success">"Õnnestus"</string>
   <string name="dialog_title_warning">"Hoiatus"</string>
+  <string name="dialog_unsaved_changes_description">"Sul on salvestamata muudatusi"</string>
   <string name="dialog_unsaved_changes_description_android">"Sinu tehtud muudatused pole veel salvestatud. Kas sa oled kindel, et soovid minna tagasi?"</string>
   <string name="dialog_unsaved_changes_title">"Kas salvestame muudatused?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Suurim lubatud failisuurus on: %1$s"</string>
@@ -422,6 +435,11 @@ 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_manage_authorized_spaces_header">"Kogukonnad, milles on võimalik jututoaga liituda ilma kutseta."</string>
+  <string name="screen_manage_authorized_spaces_title">"Halda kogukondi"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Tundmatu kogukond)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Muud kogukonnad, mille liige sa ei ole"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Sinu kogukonnad"</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>
@@ -462,6 +480,7 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"Kogukond: %1$s"</string>
   <string name="screen_space_list_title">"Kogukonnad"</string>
+  <string name="screen_space_menu_action_members">"Vaata liikmeid"</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_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>
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 15bfa21fb5..9a92bf6289 100644
--- a/libraries/ui-strings/src/main/res/values-eu/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-eu/translations.xml
@@ -137,6 +137,7 @@
   <string name="action_skip">"Saltatu"</string>
   <string name="action_start">"Hasi"</string>
   <string name="action_start_chat">"Hasi txata"</string>
+  <string name="action_start_over">"Hasi berriro"</string>
   <string name="action_start_verification">"Hasi egiaztapena"</string>
   <string name="action_static_map_load">"Sakatu mapa kargatzeko"</string>
   <string name="action_take_photo">"Egin argazkia"</string>
@@ -155,6 +156,7 @@
   <string name="common_advanced_settings">"Ezarpen aurreratuak"</string>
   <string name="common_an_image">"irudia"</string>
   <string name="common_analytics">"Estatistikak"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Gelatik atera zara"</string>
   <string name="common_appearance">"Itxura"</string>
   <string name="common_audio">"Audioa"</string>
   <string name="common_blocked_users">"Blokeatutako erabiltzaileak"</string>
@@ -336,6 +338,7 @@ Ziur jarraitu nahi duzula?"</string>
   <string name="dialog_title_error">"Errorea"</string>
   <string name="dialog_title_success">"Arrakasta"</string>
   <string name="dialog_title_warning">"Abisua"</string>
+  <string name="dialog_unsaved_changes_description">"Gorde gabeko aldaketak dituzu."</string>
   <string name="dialog_unsaved_changes_description_android">"Zure aldaketak ez dira gorde. Ziur itzuli nahi duzula?"</string>
   <string name="dialog_unsaved_changes_title">"Aldaketak gorde?"</string>
   <string name="dialog_video_quality_selector_title">"Hautatu bideoaren igoera-kalitatea"</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 c599150e83..16872a2e91 100644
--- a/libraries/ui-strings/src/main/res/values-fa/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fa/translations.xml
@@ -30,6 +30,10 @@
   <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="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>
@@ -73,6 +77,7 @@
   <string name="action_decline">"رد"</string>
   <string name="action_decline_and_block">"رد و انسداد"</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>
@@ -83,6 +88,7 @@
   <string name="action_enable">"به کار انداختن"</string>
   <string name="action_end_poll">"پایان نظرسنجی"</string>
   <string name="action_enter_pin">"ورود پین"</string>
+  <string name="action_finish">"پایان"</string>
   <string name="action_forgot_password">"گذرواژه را فراموش کردید؟"</string>
   <string name="action_forward">"پیشروی"</string>
   <string name="action_go_back">"پس‌روی"</string>
@@ -97,6 +103,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>
@@ -113,7 +120,7 @@
   <string name="action_quote">"نقل قول"</string>
   <string name="action_react">"واکنش"</string>
   <string name="action_reject">"رد کردن"</string>
-  <string name="action_remove">"برداشتن"</string>
+  <string name="action_remove">"حذف"</string>
   <string name="action_remove_caption">"برداشتن عنوان"</string>
   <string name="action_remove_message">"برداشتن پیام‌ها"</string>
   <string name="action_reply">"پاسخ"</string>
@@ -129,6 +136,7 @@
   <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>
@@ -142,6 +150,7 @@
   <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_take_photo">"عکس گرفتن"</string>
@@ -156,11 +165,15 @@
   <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_analytics">"تجزیه و تحلیل"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"اتاق را ترک کردید"</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_started">"تماس آغاز شد"</string>
@@ -170,9 +183,11 @@
   <string name="common_creating_room">"ایجاد کردن اتاق…"</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>
   <string name="common_device_id">"شناسه دستگاه"</string>
   <string name="common_direct_chat">"گپ مستقیم"</string>
@@ -204,6 +219,7 @@
   <string name="common_install_apk_android">"نصب APK"</string>
   <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>
@@ -222,6 +238,7 @@
   <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>
@@ -244,7 +261,9 @@
   <string name="common_preparing">"آماده سازی…"</string>
   <string name="common_privacy_policy">"سیاست محرمانگی"</string>
   <string name="common_private_room">"اتاق خصوصی"</string>
+  <string name="common_private_space">"فضای خصوصی"</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>
@@ -265,17 +284,22 @@
   <string name="common_search_results">"نتایج جست‌وجو"</string>
   <string name="common_security">"امنیت"</string>
   <string name="common_seen_by">"دیده شده به دست"</string>
+  <string name="common_select_account">"گزینش حساب"</string>
   <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">"نشانی کارساز"</string>
   <string name="common_settings">"تنظیمات"</string>
+  <string name="common_share_space">"هم‌رسانی فضا"</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_space">"فاصله"</string>
   <string name="common_starting_chat">"آغازیدن گپ…"</string>
   <string name="common_sticker">"عکس برگردان"</string>
   <string name="common_success">"موفّقیت"</string>
@@ -304,6 +328,9 @@
   <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_low">"کیفیت پایین"</string>
+  <string name="common_video_quality_standard">"کیفیت استاندارد"</string>
   <string name="common_voice_message">"پیام صوتی"</string>
   <string name="common_waiting">"در انتظار…"</string>
   <string name="common_waiting_for_decryption_key">"در انتظار این پیام"</string>
@@ -312,14 +339,17 @@
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"انصراف از تأیید"</string>
   <string name="dialog_confirm_link_title">"این پیوند را دوباره بررسی کنید"</string>
+  <string name="dialog_default_video_quality_selector_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="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>
@@ -349,10 +379,12 @@
   <string name="screen_pinned_timeline_screen_title_empty">"پیام‌های سنجاق شده"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"داردید برای بازنشانی هویتتان به حساب %1$s می‌روید. پس از آن به کاره برگردانده خواهید شد."</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_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_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_loading_description">"بار کردن پیام‌ها…"</string>
@@ -364,6 +396,11 @@
   <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_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>
+  <string name="screen_space_list_title">"فضاها"</string>
+  <string name="screen_space_menu_action_members">"دیدن اعضا"</string>
   <string name="screen_view_location_title">"مکان"</string>
   <string name="settings_version_number">"نگارش : %1$s (%2$s)"</string>
   <string name="test_language_identifier">"fa"</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 5959066e9b..f6a7678358 100644
--- a/libraries/ui-strings/src/main/res/values-fi/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fi/translations.xml
@@ -95,10 +95,11 @@
   <string name="action_forgot_password">"Unohditko salasanan?"</string>
   <string name="action_forward">"Välitä"</string>
   <string name="action_go_back">"Takaisin"</string>
+  <string name="action_go_to_roles_and_permissions">"Siirry rooleihin ja oikeuksiin"</string>
   <string name="action_go_to_settings">"Siirry asetuksiin"</string>
   <string name="action_ignore">"Ohita"</string>
   <string name="action_invite">"Kutsu"</string>
-  <string name="action_invite_friends">"Kutsu ihmisiä"</string>
+  <string name="action_invite_friends">"Kutsu henkilöitä"</string>
   <string name="action_invite_friends_to_app">"Kutsu ihmisiä %1$s -sovellukseen"</string>
   <string name="action_invite_people_to_app">"Kutsu ihmisiä %1$s -sovellukseen"</string>
   <string name="action_invites_list">"Kutsut"</string>
@@ -155,6 +156,7 @@
   <string name="action_skip">"Ohita"</string>
   <string name="action_start">"Aloita"</string>
   <string name="action_start_chat">"Aloita keskustelu"</string>
+  <string name="action_start_over">"Aloita alusta"</string>
   <string name="action_start_verification">"Aloita vahvistus"</string>
   <string name="action_static_map_load">"Lataa kartta napauttamalla"</string>
   <string name="action_take_photo">"Ota kuva"</string>
@@ -387,6 +389,7 @@ Haluatko varmasti jatkaa?"</string>
   <string name="dialog_title_error">"Virhe"</string>
   <string name="dialog_title_success">"Onnistui"</string>
   <string name="dialog_title_warning">"Varoitus"</string>
+  <string name="dialog_unsaved_changes_description">"Sinulla on tallentamattomia muutoksia"</string>
   <string name="dialog_unsaved_changes_description_android">"Muutoksiasi ei ole tallennettu. Haluatko varmasti palata takaisin?"</string>
   <string name="dialog_unsaved_changes_title">"Tallennetaanko muutokset?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Suurin sallittu tiedostokoko on: %1$s"</string>
@@ -466,6 +469,7 @@ Haluatko varmasti jatkaa?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s tila"</string>
   <string name="screen_space_list_title">"Tilat"</string>
+  <string name="screen_space_menu_action_members">"Näytä jäsenet"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Viestiä ei lähetetty, koska käyttäjän %1$s vahvistettu 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>
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 591795aaee..9392933cf8 100644
--- a/libraries/ui-strings/src/main/res/values-fr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml
@@ -95,6 +95,7 @@
   <string name="action_forgot_password">"Mot de passe oublié ?"</string>
   <string name="action_forward">"Transférer"</string>
   <string name="action_go_back">"Retour"</string>
+  <string name="action_go_to_roles_and_permissions">"Accédez à l’écran « Rôles et autorisations »."</string>
   <string name="action_go_to_settings">"Ouvrir les paramètres"</string>
   <string name="action_ignore">"Ignorer"</string>
   <string name="action_invite">"Inviter"</string>
@@ -155,6 +156,7 @@
   <string name="action_skip">"Passer"</string>
   <string name="action_start">"Démarrer"</string>
   <string name="action_start_chat">"Démarrer une discussion"</string>
+  <string name="action_start_over">"Recommencer"</string>
   <string name="action_start_verification">"Commencer la vérification"</string>
   <string name="action_static_map_load">"Cliquez pour charger la carte"</string>
   <string name="action_take_photo">"Prendre une photo"</string>
@@ -176,7 +178,7 @@
   <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_shortcuts_remove_reason_left_room">"Vous avez quitter le salon"</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>
   <string name="common_audio">"Audio"</string>
@@ -245,6 +247,7 @@ Raison : %1$s."</string>
   </plurals>
   <string name="common_message">"Message"</string>
   <string name="common_message_actions">"Actions sur le message"</string>
+  <string name="common_message_failed_to_send">"Échec de l’envoi du message"</string>
   <string name="common_message_layout">"Mode d’affichage des messages"</string>
   <string name="common_message_removed">"Message supprimé"</string>
   <string name="common_modern">"Moderne"</string>
@@ -367,6 +370,7 @@ Raison : %1$s."</string>
   <string name="common_waiting">"En attente…"</string>
   <string name="common_waiting_for_decryption_key">"En attente de la clé de déchiffrement"</string>
   <string name="common_you">"Vous"</string>
+  <string name="crypto_history_visible">"Les messages que vous enverrez seront partagés avec les nouveaux membres invités dans ce salon. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"L’identité de %1$s a été réinitialisée. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"L’identité de %1$s %2$s a été réinitialisée. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
@@ -387,6 +391,7 @@ Raison : %1$s."</string>
   <string name="dialog_title_error">"Erreur"</string>
   <string name="dialog_title_success">"Succès"</string>
   <string name="dialog_title_warning">"Attention"</string>
+  <string name="dialog_unsaved_changes_description">"Vous avez des modifications non-enregistrées."</string>
   <string name="dialog_unsaved_changes_description_android">"Vos modifications n’ont pas été enregistrées. Êtes-vous certain de vouloir quitter ?"</string>
   <string name="dialog_unsaved_changes_title">"Enregistrer les changements ?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"La taille maximale de fichier autorisée est: %1$s"</string>
@@ -426,6 +431,11 @@ 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_manage_authorized_spaces_header">"Espaces où les membres peuvent rejoindre le salon sans invitation."</string>
+  <string name="screen_manage_authorized_spaces_title">"Gérer les espaces"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Espace inconnu)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Autres espaces dont vous n’êtes pas membre"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Vos espaces"</string>
   <string name="screen_media_picker_error_failed_selection">"Échec de la sélection du média, veuillez réessayer."</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>
@@ -466,6 +476,7 @@ Raison : %1$s."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"Espace %1$s"</string>
   <string name="screen_space_list_title">"Espaces"</string>
+  <string name="screen_space_menu_action_members">"Voir les membres"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Le message n’a pas été envoyé car l’identité vérifiée de %1$s a été réinitialisée."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Le message n’a pas été envoyé car %1$s n’a pas vérifié tous ses appareils."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Message non envoyé car vous n’avez pas vérifié tous vos appareils."</string>
diff --git a/libraries/ui-strings/src/main/res/values-hr/translations.xml b/libraries/ui-strings/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..91caf1b6f9
--- /dev/null
+++ b/libraries/ui-strings/src/main/res/values-hr/translations.xml
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_reaction">"Dodaj reakciju: %1$s"</string>
+  <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_collapse_message_text_field">"Minimiziraj tekstno polje poruke"</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_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 šifriranja"</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_join_call">"Pridruži se pozivu"</string>
+  <string name="a11y_jump_to_bottom">"Idi na dno"</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>
+  <string name="a11y_notifications_new_mentions">"Nova spominjanja"</string>
+  <string name="a11y_notifications_new_messages">"Nove poruke"</string>
+  <string name="a11y_notifications_ongoing_call">"Poziv u tijeku"</string>
+  <string name="a11y_other_user_avatar">"Avatar drugog korisnika"</string>
+  <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_pin_field">"Polje za PIN"</string>
+  <string name="a11y_play">"Reproduciraj"</string>
+  <string name="a11y_poll">"Anketa"</string>
+  <string name="a11y_poll_end">"Završena anketa"</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>
+  </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_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_session_verification_time_limited_action_required">"Potrebna je vremenski ograničena radnja, imate jednu minutu za potvrdu"</string>
+  <string name="a11y_show_password">"Prikaži zaporku"</string>
+  <string name="a11y_start_call">"Započni poziv"</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_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>
+  <string name="a11y_voice_message_record">"Snimite glasovnu poruku."</string>
+  <string name="a11y_voice_message_stop_recording">"Zaustavi snimanje"</string>
+  <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_to_timeline">"Dodaj na vremensku crtu"</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_photo">"Odaberi fotografiju"</string>
+  <string name="action_clear">"Očisti"</string>
+  <string name="action_close">"Zatvori"</string>
+  <string name="action_complete_verification">"Dovrši provjeru"</string>
+  <string name="action_confirm">"Potvrdi"</string>
+  <string name="action_confirm_password">"Potvrdi zaporku"</string>
+  <string name="action_continue">"Nastavi"</string>
+  <string name="action_copy">"Kopiraj"</string>
+  <string name="action_copy_caption">"Kopiraj opis"</string>
+  <string name="action_copy_link">"Kopiraj poveznicu"</string>
+  <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_a_room">"Stvori sobu"</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_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_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_finish">"Završi"</string>
+  <string name="action_forgot_password">"Zaboravili ste zaporku?"</string>
+  <string name="action_forward">"Proslijedi"</string>
+  <string name="action_go_back">"Idi natrag"</string>
+  <string name="action_go_to_roles_and_permissions">"Idi na uloge i dopuštenja"</string>
+  <string name="action_go_to_settings">"Idi na postavke"</string>
+  <string name="action_ignore">"Zanemari"</string>
+  <string name="action_invite">"Pozovi"</string>
+  <string name="action_invite_friends">"Pozovi osobe"</string>
+  <string name="action_invite_friends_to_app">"Pozovi osobe u %1$s"</string>
+  <string name="action_invite_people_to_app">"Pozovi osobe u %1$s"</string>
+  <string name="action_invites_list">"Pozivnice"</string>
+  <string name="action_join">"Pridruži se"</string>
+  <string name="action_learn_more">"Saznajte više"</string>
+  <string name="action_leave">"Napusti"</string>
+  <string name="action_leave_conversation">"Napusti razgovor"</string>
+  <string name="action_leave_room">"Napusti sobu"</string>
+  <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_devices">"Upravljanje uređajima"</string>
+  <string name="action_message">"Poruka"</string>
+  <string name="action_minimize">"Minimiziraj"</string>
+  <string name="action_next">"Dalje"</string>
+  <string name="action_no">"Ne"</string>
+  <string name="action_not_now">"Ne sada"</string>
+  <string name="action_ok">"U redu"</string>
+  <string name="action_open_context_menu">"Otvori kontekstni izbornik"</string>
+  <string name="action_open_settings">"Postavke"</string>
+  <string name="action_open_with">"Otvori s"</string>
+  <string name="action_pin">"Prikvači"</string>
+  <string name="action_quick_reply">"Brzi odgovor"</string>
+  <string name="action_quote">"Citiraj"</string>
+  <string name="action_react">"Reagiraj"</string>
+  <string name="action_reject">"Odbij"</string>
+  <string name="action_remove">"Ukloni"</string>
+  <string name="action_remove_caption">"Ukloni opis"</string>
+  <string name="action_remove_message">"Ukloni poruku"</string>
+  <string name="action_reply">"Odgovori"</string>
+  <string name="action_reply_in_thread">"Odgovori u niti"</string>
+  <string name="action_report">"Prijavi"</string>
+  <string name="action_report_bug">"Prijavi grešku"</string>
+  <string name="action_report_content">"Prijavi sadržaj"</string>
+  <string name="action_report_dm">"Prijavi razgovor"</string>
+  <string name="action_report_room">"Prijavi sobu"</string>
+  <string name="action_reset">"Poništi"</string>
+  <string name="action_reset_identity">"Poništi identitet"</string>
+  <string name="action_retry">"Pokušaj ponovno"</string>
+  <string name="action_retry_decryption">"Ponovno pokušaj dešifrirati"</string>
+  <string name="action_save">"Spremi"</string>
+  <string name="action_search">"Pretraži"</string>
+  <string name="action_select_all">"Odaberi sve"</string>
+  <string name="action_send">"Pošalji"</string>
+  <string name="action_send_edited_message">"Pošalji uređenu poruku"</string>
+  <string name="action_send_message">"Pošalji poruku"</string>
+  <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_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_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_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_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_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>
+  <string name="banner_migrate_to_native_sliding_sync_title">"Dostupna je nadogradnja"</string>
+  <string name="common_about">"O aplikaciji"</string>
+  <string name="common_acceptable_use_policy">"Pravilnik o prihvatljivoj upotrebi"</string>
+  <string name="common_add_account">"Dodaj račun"</string>
+  <string name="common_add_another_account">"Dodaj još jedan račun"</string>
+  <string name="common_adding_caption">"Dodavanje opisa"</string>
+  <string name="common_advanced_settings">"Napredne postavke"</string>
+  <string name="common_an_image">"slika"</string>
+  <string name="common_analytics">"Analitika"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Napustili ste sobu"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Odjavljeni ste iz sesije"</string>
+  <string name="common_appearance">"Izgled"</string>
+  <string name="common_audio">"Audiozapis"</string>
+  <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_started">"Poziv je započeo"</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_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>
+  <string name="common_device_id">"ID uređaja"</string>
+  <string name="common_direct_chat">"Izravni razgovor"</string>
+  <string name="common_do_not_show_this_again">"Ne prikazuj ovo ponovno"</string>
+  <string name="common_download_failed">"Preuzimanje nije uspjelo"</string>
+  <string name="common_downloading">"Preuzimanje"</string>
+  <string name="common_edited_suffix">"(uređeno)"</string>
+  <string name="common_editing">"Uređivanje"</string>
+  <string name="common_editing_caption">"Uređivanje opisa"</string>
+  <string name="common_emote">"* %1$s %2$s"</string>
+  <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_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.
+
+Razlog: %1$s ."</string>
+  <string name="common_everyone">"Svi"</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_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_gif">"GIF"</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_loading">"Učitavanje…"</string>
+  <string name="common_loading_more">"Učitava se još…"</string>
+  <plurals name="common_many_members">
+    <item quantity="one">"još %d"</item>
+    <item quantity="few">"još %d"</item>
+    <item quantity="other">"još %d"</item>
+  </plurals>
+  <plurals name="common_member_count">
+    <item quantity="one">"%1$d član"</item>
+    <item quantity="few">"%1$d člana"</item>
+    <item quantity="other">"%1$d članova"</item>
+  </plurals>
+  <string name="common_message">"Poruka"</string>
+  <string name="common_message_actions">"Radnje s porukama"</string>
+  <string name="common_message_failed_to_send">"Slanje poruke nije uspjelo"</string>
+  <string name="common_message_layout">"Izgled poruke"</string>
+  <string name="common_message_removed">"Poruka je uklonjena"</string>
+  <string name="common_modern">"Suvremeni"</string>
+  <string name="common_mute">"Isključi zvuk"</string>
+  <string name="common_name">"Naziv"</string>
+  <string name="common_name_and_id">"%1$s (%2$s)"</string>
+  <string name="common_no_results">"Nema rezultata"</string>
+  <string name="common_no_room_name">"Nema naziva sobe"</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_open_source_licenses">"Licencije otvorenog koda"</string>
+  <string name="common_or">"ili"</string>
+  <string name="common_password">"Zaporka"</string>
+  <string name="common_people">"Osobe"</string>
+  <string name="common_permalink">"Stalna poveznica"</string>
+  <string name="common_permission">"Dopuštenje"</string>
+  <string name="common_pinned">"Prikvačeno"</string>
+  <string name="common_please_check_internet_connection">"Provjerite svoju internetsku vezu"</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_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">
+    <item quantity="one">"%d glas"</item>
+    <item quantity="few">"%d glasa"</item>
+    <item quantity="other">"%d glasova"</item>
+  </plurals>
+  <string name="common_preparing">"Priprema…"</string>
+  <string name="common_privacy_policy">"Pravilnik o zaštiti privatnosti"</string>
+  <string name="common_private_room">"Privatna soba"</string>
+  <string name="common_private_space">"Privatni prostor"</string>
+  <string name="common_public_room">"Javna soba"</string>
+  <string name="common_public_space">"Javni prostor"</string>
+  <string name="common_reaction">"Reakcija"</string>
+  <string name="common_reactions">"Reakcije"</string>
+  <string name="common_reason">"Razlog"</string>
+  <string name="common_recovery_key">"Ključ za oporavak"</string>
+  <string name="common_refreshing">"Osvježavanje…"</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_room">"Soba"</string>
+  <string name="common_room_name">"Naziv sobe"</string>
+  <string name="common_room_name_placeholder">"npr. naziv vašeg projekta"</string>
+  <plurals name="common_rooms">
+    <item quantity="one">"%1$d soba"</item>
+    <item quantity="few">"%1$d sobe"</item>
+    <item quantity="other">"%1$d soba"</item>
+  </plurals>
+  <string name="common_saved_changes">"Spremljene promjene"</string>
+  <string name="common_saving">"Spremanje"</string>
+  <string name="common_screen_lock">"Zaključavanje zaslona"</string>
+  <string name="common_search_for_someone">"Potraži nekoga"</string>
+  <string name="common_search_results">"Rezultati pretraživanja"</string>
+  <string name="common_security">"Sigurnost"</string>
+  <string name="common_seen_by">"Vidio/la"</string>
+  <string name="common_select_account">"Odaberi račun"</string>
+  <string name="common_send_to">"Pošalji"</string>
+  <string name="common_sending">"Slanje…"</string>
+  <string name="common_sending_failed">"Slanje nije uspjelo"</string>
+  <string name="common_sent">"Poslano"</string>
+  <string name="common_sentence_delimiter">". "</string>
+  <string name="common_server_not_supported">"Poslužitelj nije podržan"</string>
+  <string name="common_server_unreachable">"Poslužitelj nije dostupan"</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_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_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_topic_placeholder">"O čemu se radi u ovom prostoru?"</string>
+  <plurals name="common_spaces">
+    <item quantity="one">"%1$d prostor"</item>
+    <item quantity="few">"%1$d prostora"</item>
+    <item quantity="other">"%1$d prostora"</item>
+  </plurals>
+  <string name="common_starting_chat">"Započinjanje razgovora…"</string>
+  <string name="common_sticker">"Naljepnica"</string>
+  <string name="common_success">"Uspjeh"</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_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>
+  <string name="common_unable_to_decrypt_insecure_device">"Poslano s nesigurnog uređaja"</string>
+  <string name="common_unable_to_decrypt_no_access">"Nemate pristup ovoj poruci"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Pošiljateljev potvrđeni identitet je poništen"</string>
+  <string name="common_unable_to_invite_message">"Pozivnice se nisu mogle poslati jednom korisniku ili više njih."</string>
+  <string name="common_unable_to_invite_title">"Nije moguće poslati pozivnicu/e"</string>
+  <string name="common_unlock">"Otključaj"</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_username">"Korisničko ime"</string>
+  <string name="common_verification_cancelled">"Provjera je otkazana"</string>
+  <string name="common_verification_complete">"Provjera je dovršena"</string>
+  <string name="common_verification_failed">"Provjera nije uspjela"</string>
+  <string name="common_verified">"Potvrđeno"</string>
+  <string name="common_verify_device">"Provjera uređaja"</string>
+  <string name="common_verify_identity">"Potvrdi identitet"</string>
+  <string name="common_verify_user">"Provjeri korisnika"</string>
+  <string name="common_video">"Videozapis"</string>
+  <string name="common_video_quality_high">"Visoka kvaliteta"</string>
+  <string name="common_video_quality_high_description">"Najbolja kvaliteta, ali veća veličina datoteke"</string>
+  <string name="common_video_quality_low">"Niska kvaliteta"</string>
+  <string name="common_video_quality_low_description">"Najbrža brzina prijenosa i najmanja veličina datoteke"</string>
+  <string name="common_video_quality_standard">"Standardna kvaliteta"</string>
+  <string name="common_video_quality_standard_description">"Ravnoteža kvalitete i brzine prijenosa"</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_you">"Vi"</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>
+  <string name="crypto_identity_change_pin_violation_new_user_id">"(%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_confirm_link_message">"Poveznica %1$s vodi vas na drugo mrežno mjesto %2$s
+
+Jeste li sigurni da želite nastaviti?"</string>
+  <string name="dialog_confirm_link_title">"Dvaput provjerite ovu poveznicu"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Odaberite zadanu kvalitetu videozapisa koje prenosite."</string>
+  <string name="dialog_default_video_quality_selector_title">"Kvaliteta prijenosa videozapisa"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"Maksimalna dopuštena veličina datoteke je: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"Datoteka je prevelika za prijenos"</string>
+  <string name="dialog_room_reported">"Soba je prijavljena"</string>
+  <string name="dialog_room_reported_and_left">"Soba je prijavljena i napuštena"</string>
+  <string name="dialog_title_confirmation">"Potvrda"</string>
+  <string name="dialog_title_error">"Pogreška"</string>
+  <string name="dialog_title_success">"Uspjeh"</string>
+  <string name="dialog_title_warning">"Upozorenje"</string>
+  <string name="dialog_unsaved_changes_description">"Niste spremili sve promjene."</string>
+  <string name="dialog_unsaved_changes_description_android">"Vaše promjene nisu spremljene. Jeste li sigurni da se želite vratiti?"</string>
+  <string name="dialog_unsaved_changes_title">"Želite li spremiti promjene?"</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>
+  <string name="error_failed_loading_map">"%1$s nije mogao učitati kartu. Pokušajte ponovno poslije."</string>
+  <string name="error_failed_loading_messages">"Učitavanje poruka nije uspjelo"</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_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>
+  <string name="error_missing_microphone_voice_rationale_android">"%1$s nema dopuštenje za pristup vašem mikrofonu. Omogućite pristup kako biste mogli snimiti glasovnu poruku."</string>
+  <string name="error_network_or_server_issue">"To može biti zbog problema s mrežom ili poslužiteljem."</string>
+  <string name="error_room_address_already_exists">"Ova adresa sobe već postoji. Pokušajte urediti polje za adresu sobe ili promijeniti naziv sobe"</string>
+  <string name="error_room_address_invalid_symbols">"Neki znakovi nisu dopušteni. Podržana su samo slova, brojke i simboli ! $ &amp; ‘ ( ) * + / ; = ? @ [ ] - . _"</string>
+  <string name="error_some_messages_have_not_been_sent">"Neke poruke nisu poslane"</string>
+  <string name="error_unknown">"Žao nam je, došlo je do pogreške"</string>
+  <string name="event_shield_mismatched_sender">"Pošiljatelj događaja ne podudara se s vlasnikom uređaja koji ga je poslao."</string>
+  <string name="event_shield_reason_authenticity_not_guaranteed">"Autentičnost ove šifrirane poruke ne može se jamčiti na ovom uređaju"</string>
+  <string name="event_shield_reason_previously_verified">"Šifrirao je prethodno provjereni korisnik."</string>
+  <string name="event_shield_reason_sent_in_clear">"Nije šifrirano."</string>
+  <string name="event_shield_reason_unknown_device">"Šifrirano nepoznatim ili izbrisanim uređajem."</string>
+  <string name="event_shield_reason_unsigned_device">"Šifrirano uređajem koji vlasnik nije potvrdio."</string>
+  <string name="event_shield_reason_unverified_identity">"Šifrirao neprovjereni korisnik."</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="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>
+  <string name="screen_create_poll_option_accessibility_label">"%1$s: %2$s"</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_manage_authorized_spaces_header">"Prostori u kojima se članovi mogu pridružiti sobi bez pozivnice."</string>
+  <string name="screen_manage_authorized_spaces_title">"Upravljaj prostorima"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(nepoznati prostor)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Drugi prostori čiji niste član"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Vaši prostori"</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>
+  <plurals name="screen_pinned_timeline_screen_title">
+    <item quantity="one">"%1$d prikvačena poruka"</item>
+    <item quantity="few">"%1$d prikvačene poruke"</item>
+    <item quantity="other">"%1$d prikvačenih poruka"</item>
+  </plurals>
+  <string name="screen_pinned_timeline_screen_title_empty">"Prikvačene poruke"</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Spremate se otići u svoj %1$s račun kako biste poništili identitet. Nakon toga bit ćete vraćeni u aplikaciju."</string>
+  <string name="screen_reset_identity_confirmation_title">"Ne možete potvrditi? Idite na svoj račun kako biste poništili svoj identitet."</string>
+  <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Povuci potvrdu i pošalji"</string>
+  <string name="screen_resolve_send_failure_changed_identity_subtitle">"Možete povući svoju potvrdu i svejedno poslati ovu poruku ili možete za sada otkazati i pokušati ponovno poslije nakon ponovne potvrde korisnika %1$s."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Vaša poruka nije poslana jer je poništen potvrđeni identitet korisnika %1$s"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Svejedno pošalji poruku"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s se služi jednim nepotvrđenim uređajem ili više njih. Možete svejedno poslati poruku ili je za sada otkazati i pokušati ponovno poslije. %2$s je potvrdio/la sve svoje uređaje."</string>
+  <string name="screen_resolve_send_failure_unsigned_device_title">"Vaša poruka nije poslana jer %1$s nije potvrdio sve uređaje"</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Jedan vaš uređaj ili više njih nije potvrđeno. Možete svejedno poslati poruku ili za sada otkazati i pokušati ponovno poslije nakon što potvrdite sve svoje uređaje."</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_title">"Vaša poruka nije poslana jer niste potvrdili jedan svoj uređaj ili više njih"</string>
+  <string name="screen_room_change_role_administrators_or_owners_title">"Uredi administratore ili vlasnike"</string>
+  <string name="screen_room_error_failed_processing_media">"Prijenos medija za obradu nije uspio, pokušajte ponovno."</string>
+  <string name="screen_room_error_failed_retrieving_user_details">"Nije moguće dohvatiti korisničke podatke"</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_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>
+  <string name="screen_room_pinned_banner_loading_description">"Učitavanje poruke…"</string>
+  <string name="screen_room_pinned_banner_view_all_button_title">"Prikaži sve"</string>
+  <string name="screen_room_title">"Razgovor"</string>
+  <string name="screen_share_location_title">"Podijeli lokaciju"</string>
+  <string name="screen_share_my_location_action">"Podijeli moju lokaciju"</string>
+  <string name="screen_share_open_apple_maps">"Otvori u Apple Maps"</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_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_parent_space">"Prostor %1$s"</string>
+  <string name="screen_space_list_title">"Prostori"</string>
+  <string name="screen_space_menu_action_members">"Prikaži članove"</string>
+  <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>
+  <string name="screen_view_location_title">"Lokacija"</string>
+  <string name="settings_version_number">"Inačica: %1$s (%2$s)"</string>
+  <string name="test_language_identifier">"hr"</string>
+  <string name="timeline_decryption_failure_historical_event_no_key_backup">"Prijašnje poruke nisu dostupne na ovom uređaju"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Trebate potvrditi ovaj uređaj kako biste mogli pristupiti prijašnjim porukama"</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>
+</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 40afdf7c1d..0174bd79b1 100644
--- a/libraries/ui-strings/src/main/res/values-hu/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-hu/translations.xml
@@ -95,6 +95,8 @@
   <string name="action_forgot_password">"Elfelejtette a jelszót?"</string>
   <string name="action_forward">"Tovább"</string>
   <string name="action_go_back">"Visszalépés"</string>
+  <string name="action_go_to_roles_and_permissions">"Ugrás a szerepkörökre és jogosultságokra"</string>
+  <string name="action_go_to_settings">"Ugrás a beállításokhoz"</string>
   <string name="action_ignore">"Mellőzés"</string>
   <string name="action_invite">"Meghívás"</string>
   <string name="action_invite_friends">"Ismerősök meghívása"</string>
@@ -111,6 +113,7 @@
   <string name="action_manage_account">"Fiók kezelése"</string>
   <string name="action_manage_devices">"Eszközök kezelése"</string>
   <string name="action_message">"Üzenet"</string>
+  <string name="action_minimize">"Minimalizálás"</string>
   <string name="action_next">"Következő"</string>
   <string name="action_no">"Nem"</string>
   <string name="action_not_now">"Most nem"</string>
@@ -153,6 +156,7 @@
   <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_take_photo">"Fénykép készítése"</string>
@@ -178,6 +182,7 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Ki lett jelentkeztetve a munkamenetből"</string>
   <string name="common_appearance">"Megjelenítés"</string>
   <string name="common_audio">"Hang"</string>
+  <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_started">"A hívás elindult"</string>
@@ -226,6 +231,7 @@ Ok: %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>
@@ -313,6 +319,7 @@ 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_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_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>
@@ -381,6 +388,7 @@ Biztos, hogy folytatja?"</string>
   <string name="dialog_title_error">"Hiba"</string>
   <string name="dialog_title_success">"Sikeres"</string>
   <string name="dialog_title_warning">"Figyelmeztetés"</string>
+  <string name="dialog_unsaved_changes_description">"Mentetlen módosításai vannak."</string>
   <string name="dialog_unsaved_changes_description_android">"A módosítások nem lettek mentve. Biztos, hogy visszalép?"</string>
   <string name="dialog_unsaved_changes_title">"Menti a módosításokat?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"A legnagyobb megengedett fájlméret: %1$s"</string>
@@ -460,6 +468,7 @@ Biztos, hogy folytatja?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s tér"</string>
   <string name="screen_space_list_title">"Terek"</string>
+  <string name="screen_space_menu_action_members">"Tagok megtekintése"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Az üzenet nem lett elküldve, mert %1$s ellenőrzött személyazonossága megváltozott."</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>
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 bd7739d5ba..cc2bad1f2b 100644
--- a/libraries/ui-strings/src/main/res/values-in/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-in/translations.xml
@@ -139,6 +139,7 @@
   <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_take_photo">"Ambil foto"</string>
@@ -158,6 +159,7 @@
   <string name="common_advanced_settings">"Pengaturan tingkat lanjut"</string>
   <string name="common_an_image">"sebuah gambar"</string>
   <string name="common_analytics">"Analitik"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Anda keluar dari ruangan"</string>
   <string name="common_appearance">"Penampilan"</string>
   <string name="common_audio">"Audio"</string>
   <string name="common_blocked_users">"Pengguna yang diblokir"</string>
@@ -332,6 +334,7 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="dialog_title_error">"Eror"</string>
   <string name="dialog_title_success">"Berhasil"</string>
   <string name="dialog_title_warning">"Peringatan"</string>
+  <string name="dialog_unsaved_changes_description">"Anda memiliki perubahan yang belum disimpan."</string>
   <string name="dialog_unsaved_changes_description_android">"Perubahan Anda belum disimpan. Apakah Anda yakin ingin kembali?"</string>
   <string name="dialog_unsaved_changes_title">"Simpan perubahan?"</string>
   <string name="error_account_creation_not_possible">"Homeserver Anda perlu ditingkatkan untuk mendukung Matrix Authentication Service dan pembuatan akun."</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 77a1a20782..abde675f0f 100644
--- a/libraries/ui-strings/src/main/res/values-it/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-it/translations.xml
@@ -42,7 +42,7 @@
   <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_session_verification_time_limited_action_required">"Azione a tempo limitato richiesta"</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_show_password">"Mostra password"</string>
   <string name="a11y_start_call">"Avvia una chiamata"</string>
   <string name="a11y_tombstoned_room">"Stanza obsoleta"</string>
@@ -80,6 +80,7 @@
   <string name="action_decline">"Rifiuta"</string>
   <string name="action_decline_and_block">"Rifiuta e blocca"</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>
@@ -94,6 +95,8 @@
   <string name="action_forgot_password">"Password dimenticata?"</string>
   <string name="action_forward">"Inoltra"</string>
   <string name="action_go_back">"Indietro"</string>
+  <string name="action_go_to_roles_and_permissions">"Vai a ruoli &amp; autorizzazioni"</string>
+  <string name="action_go_to_settings">"Vai alle impostazioni"</string>
   <string name="action_ignore">"Ignora"</string>
   <string name="action_invite">"Invita"</string>
   <string name="action_invite_friends">"Invita persone"</string>
@@ -105,10 +108,12 @@
   <string name="action_leave">"Esci"</string>
   <string name="action_leave_conversation">"Abbandona la conversazione"</string>
   <string name="action_leave_room">"Esci dalla stanza"</string>
+  <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_devices">"Gestisci dispositivi"</string>
   <string name="action_message">"Invia messaggio"</string>
+  <string name="action_minimize">"Riduci"</string>
   <string name="action_next">"Avanti"</string>
   <string name="action_no">"No"</string>
   <string name="action_not_now">"Non ora"</string>
@@ -137,6 +142,7 @@
   <string name="action_retry_decryption">"Riprova la decrittazione"</string>
   <string name="action_save">"Salva"</string>
   <string name="action_search">"Ricerca"</string>
+  <string name="action_select_all">"Seleziona tutti"</string>
   <string name="action_send">"Invia"</string>
   <string name="action_send_edited_message">"Invia messaggio modificato"</string>
   <string name="action_send_message">"Invia messaggio"</string>
@@ -150,6 +156,7 @@
   <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_take_photo">"Scatta foto"</string>
@@ -165,6 +172,8 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Aggiornamento disponibile"</string>
   <string name="common_about">"Informazioni"</string>
   <string name="common_acceptable_use_policy">"Regole sull\'utilizzo consentito"</string>
+  <string name="common_add_account">"Aggiungi un account"</string>
+  <string name="common_add_another_account">"Aggiungi un altro account"</string>
   <string name="common_adding_caption">"Aggiunta didascalia"</string>
   <string name="common_advanced_settings">"Impostazioni avanzate"</string>
   <string name="common_an_image">"un\'immagine"</string>
@@ -173,6 +182,7 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Sei stato disconnesso dalla sessione"</string>
   <string name="common_appearance">"Aspetto"</string>
   <string name="common_audio">"Audio"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Utenti bloccati"</string>
   <string name="common_bubbles">"Fumetti"</string>
   <string name="common_call_started">"Chiamata avviata"</string>
@@ -182,9 +192,11 @@
   <string name="common_creating_room">"Creazione stanza…"</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>
   <string name="common_device_id">"ID dispositivo"</string>
   <string name="common_direct_chat">"Conversazione diretta"</string>
@@ -219,6 +231,7 @@ Motivo:. %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>
@@ -241,6 +254,7 @@ Motivo:. %1$s"</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>
+  <string name="common_no_space_name">"Spazio senza nome"</string>
   <string name="common_not_encrypted">"Non cifrato"</string>
   <string name="common_offline">"Non in linea"</string>
   <string name="common_open_source_licenses">"Licenze open source"</string>
@@ -294,15 +308,19 @@ Motivo:. %1$s"</string>
   <string name="common_search_results">"Risultati di ricerca"</string>
   <string name="common_security">"Sicurezza"</string>
   <string name="common_seen_by">"Visto da"</string>
+  <string name="common_select_account">"Seleziona un account"</string>
   <string name="common_send_to">"Invia a"</string>
   <string name="common_sending">"Invio in corso…"</string>
   <string name="common_sending_failed">"Invio fallito"</string>
   <string name="common_sent">"Inviato"</string>
   <string name="common_sentence_delimiter">"."</string>
   <string name="common_server_not_supported">"Server non supportato"</string>
+  <string name="common_server_unreachable">"Server non raggiungibile"</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_location">"Posizione condivisa"</string>
+  <string name="common_shared_space">"Spazio condiviso"</string>
   <string name="common_signing_out">"Disconnessione"</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>
@@ -371,11 +389,14 @@ Sei sicuro di voler continuare?"</string>
   <string name="dialog_title_error">"Errore"</string>
   <string name="dialog_title_success">"Operazione riuscita"</string>
   <string name="dialog_title_warning">"Attenzione"</string>
+  <string name="dialog_unsaved_changes_description">"Hai delle modifiche non salvate."</string>
   <string name="dialog_unsaved_changes_description_android">"Le modifiche non sono state salvate. Vuoi davvero tornare indietro?"</string>
   <string name="dialog_unsaved_changes_title">"Salvare le modifiche?"</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>
   <string name="error_failed_loading_map">"%1$s non è riuscito a caricare la mappa. Riprova più tardi."</string>
@@ -446,7 +467,9 @@ Sei sicuro di voler continuare?"</string>
   <string name="screen_share_this_location_action">"Condividi questa posizione"</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_parent_space">"%1$s spazio"</string>
   <string name="screen_space_list_title">"Spazi"</string>
+  <string name="screen_space_menu_action_members">"Visualizza membri"</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_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>
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 dd67ca02c2..0a7b612e55 100644
--- a/libraries/ui-strings/src/main/res/values-ka/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ka/translations.xml
@@ -113,6 +113,7 @@
   <string name="common_acceptable_use_policy">"მისაღები გამოყენების პოლიტიკა"</string>
   <string name="common_advanced_settings">"გაფართოებული პარამეტრები"</string>
   <string name="common_analytics">"ანალიტიკა"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"თქვენ დატოვეთ ოთახი"</string>
   <string name="common_appearance">"გარეგნობა"</string>
   <string name="common_audio">"აუდიო"</string>
   <string name="common_blocked_users">"დაბლოკილი მომხმარებლები"</string>
@@ -236,6 +237,7 @@
   <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="error_failed_creating_the_permalink">"მუდმივი ბმულის შექმნა ვერ მოხერხდა"</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 256e561db5..2ea2017c76 100644
--- a/libraries/ui-strings/src/main/res/values-ko/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ko/translations.xml
@@ -148,6 +148,7 @@
   <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_take_photo">"사진 찍기"</string>
@@ -167,7 +168,7 @@
   <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_left_room">"방을 떠남"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"세션에서 로그아웃되었습니다."</string>
   <string name="common_appearance">"외관"</string>
   <string name="common_audio">"소리"</string>
@@ -364,6 +365,7 @@
   <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
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 535e57f7fe..90aed6b6f8 100644
--- a/libraries/ui-strings/src/main/res/values-lt/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-lt/translations.xml
@@ -64,6 +64,7 @@
   <string name="action_yes">"Taip"</string>
   <string name="common_about">"Apie"</string>
   <string name="common_analytics">"Analitika"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Jūs išėjote iš kambario"</string>
   <string name="common_audio">"Garsas"</string>
   <string name="common_bubbles">"Burbulai"</string>
   <string name="common_chat_backup">"Pokalbio atsarginė kopija"</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 6b0db984ea..09d3eab84c 100644
--- a/libraries/ui-strings/src/main/res/values-nb/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-nb/translations.xml
@@ -45,6 +45,7 @@
   <string name="a11y_session_verification_time_limited_action_required">"Tidsbegrenset handling kreves, du har ett minutt på deg til å verifisere"</string>
   <string name="a11y_show_password">"Vis passord"</string>
   <string name="a11y_start_call">"Start en samtale"</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_view_avatar">"Vis avatar"</string>
@@ -94,6 +95,7 @@
   <string name="action_forgot_password">"Glemt passordet?"</string>
   <string name="action_forward">"Videresend"</string>
   <string name="action_go_back">"Gå tilbake"</string>
+  <string name="action_go_to_roles_and_permissions">"Gå til roller og tillatelser"</string>
   <string name="action_go_to_settings">"Gå til innstillinger"</string>
   <string name="action_ignore">"Ignorer"</string>
   <string name="action_invite">"Inviter"</string>
@@ -154,6 +156,7 @@
   <string name="action_skip">"Hopp over"</string>
   <string name="action_start">"Start"</string>
   <string name="action_start_chat">"Start chat"</string>
+  <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_take_photo">"Ta bilde"</string>
@@ -251,6 +254,7 @@
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Ingen resultater"</string>
   <string name="common_no_room_name">"Ingen romnavn"</string>
+  <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_open_source_licenses">"Åpen kildekode-lisenser"</string>
@@ -383,6 +387,7 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="dialog_title_error">"Feil"</string>
   <string name="dialog_title_success">"Suksess"</string>
   <string name="dialog_title_warning">"Advarsel"</string>
+  <string name="dialog_unsaved_changes_description">"Du har endringer som ikke er lagret."</string>
   <string name="dialog_unsaved_changes_description_android">"Endringene dine er ikke lagret. Er du sikker på at du vil gå tilbake?"</string>
   <string name="dialog_unsaved_changes_title">"Lagre endringer?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maksimal tillatt filstørrelse er: %1$s"</string>
@@ -462,6 +467,7 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s område"</string>
   <string name="screen_space_list_title">"Områder"</string>
+  <string name="screen_space_menu_action_members">"Vis medlemmer"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Meldingen ble ikke sendt fordi %1$ss verifiserte identitet er 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>
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 7c682233a6..790363ba54 100644
--- a/libraries/ui-strings/src/main/res/values-nl/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-nl/translations.xml
@@ -140,6 +140,7 @@
   <string name="action_skip">"Overslaan"</string>
   <string name="action_start">"Starten"</string>
   <string name="action_start_chat">"Chat starten"</string>
+  <string name="action_start_over">"Opnieuw beginnen"</string>
   <string name="action_start_verification">"Verificatie starten"</string>
   <string name="action_static_map_load">"Tik om kaart te laden"</string>
   <string name="action_take_photo">"Foto maken"</string>
@@ -158,6 +159,7 @@
   <string name="common_adding_caption">"Bijschrift toevoegen"</string>
   <string name="common_advanced_settings">"Geavanceerde instellingen"</string>
   <string name="common_analytics">"Gebruiksgegevens"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Je hebt de kamer verlaten"</string>
   <string name="common_appearance">"Weergave"</string>
   <string name="common_audio">"Geluid"</string>
   <string name="common_blocked_users">"Geblokkeerde gebruikers"</string>
@@ -300,6 +302,7 @@ Reden: %1$s."</string>
   <string name="dialog_title_error">"Fout"</string>
   <string name="dialog_title_success">"Geslaagd"</string>
   <string name="dialog_title_warning">"Waarschuwing"</string>
+  <string name="dialog_unsaved_changes_description">"Je hebt niet-opgeslagen wijzigingen"</string>
   <string name="dialog_unsaved_changes_description_android">"Je wijzigingen zijn niet opgeslagen. Weet je zeker dat je terug wilt gaan?"</string>
   <string name="dialog_unsaved_changes_title">"Wijzigingen opslaan?"</string>
   <string name="error_account_creation_not_possible">"Je homeserver moet worden geüpgraded om de Matrix Authentication Service en het aanmaken van accounts te ondersteunen."</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 71c60b5f6d..aafac63332 100644
--- a/libraries/ui-strings/src/main/res/values-pl/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pl/translations.xml
@@ -2,6 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Dodaj reakcję: %1$s"</string>
   <string name="a11y_avatar">"Awatar"</string>
+  <string name="a11y_collapse_message_text_field">"Zmniejsz pole tekstowe wiadomości"</string>
   <string name="a11y_delete">"Usuń"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"Wprowadzono %1$d cyfrę"</item>
@@ -11,6 +12,7 @@
   <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_join_call">"Dołącz do połączenia"</string>
   <string name="a11y_jump_to_bottom">"Przejdź na dół"</string>
@@ -42,7 +44,7 @@
   <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_session_verification_time_limited_action_required">"Wymagane jest działanie ograniczone czasowo"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Wymagane jest działanie ograniczone czasowo, została jedna minuta"</string>
   <string name="a11y_show_password">"Pokaż hasło"</string>
   <string name="a11y_start_call">"Rozpocznij rozmowę"</string>
   <string name="a11y_tombstoned_room">"Pokój nagrobkowy"</string>
@@ -80,6 +82,7 @@
   <string name="action_decline">"Odrzuć"</string>
   <string name="action_decline_and_block">"Odrzuć i zablokuj"</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>
@@ -90,9 +93,11 @@
   <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_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_settings">"Przejdź do ustawień"</string>
   <string name="action_ignore">"Ignoruj"</string>
   <string name="action_invite">"Zaproś"</string>
   <string name="action_invite_friends">"Zaproś znajomych"</string>
@@ -104,10 +109,12 @@
   <string name="action_leave">"Opuść"</string>
   <string name="action_leave_conversation">"Opuść rozmowę"</string>
   <string name="action_leave_room">"Opuść pokój"</string>
+  <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_devices">"Zarządzaj urządzeniami"</string>
   <string name="action_message">"Wiadomość"</string>
+  <string name="action_minimize">"Minimalizuj"</string>
   <string name="action_next">"Dalej"</string>
   <string name="action_no">"Nie"</string>
   <string name="action_not_now">"Nie teraz"</string>
@@ -136,6 +143,7 @@
   <string name="action_retry_decryption">"Ponów próbę odszyfrowania"</string>
   <string name="action_save">"Zapisz"</string>
   <string name="action_search">"Szukaj"</string>
+  <string name="action_select_all">"Zaznacz wszystko"</string>
   <string name="action_send">"Wyślij"</string>
   <string name="action_send_edited_message">"Wyślij edytowaną wiadomość"</string>
   <string name="action_send_message">"Wyślij wiadomość"</string>
@@ -149,6 +157,7 @@
   <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_take_photo">"Zrób zdjęcie"</string>
@@ -164,12 +173,17 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Dostępna aktualizacja"</string>
   <string name="common_about">"O programie"</string>
   <string name="common_acceptable_use_policy">"Polityka użytkowania"</string>
+  <string name="common_add_account">"Dodaj konto"</string>
+  <string name="common_add_another_account">"Dodaj kolejne konto"</string>
   <string name="common_adding_caption">"Dodawanie opisu"</string>
   <string name="common_advanced_settings">"Ustawienia zaawansowane"</string>
   <string name="common_an_image">"obraz"</string>
   <string name="common_analytics">"Dane analityczne"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Opuściłeś pokój"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Zostałeś wylogowany z sesji"</string>
   <string name="common_appearance">"Wygląd"</string>
   <string name="common_audio">"Dźwięk"</string>
+  <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_started">"Rozpoczęto rozmowę"</string>
@@ -179,9 +193,11 @@
   <string name="common_creating_room">"Tworzenie pokoju…"</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>
   <string name="common_device_id">"ID urządzenia"</string>
   <string name="common_direct_chat">"Czat prywatny"</string>
@@ -216,6 +232,7 @@ Powód: %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>
@@ -228,7 +245,7 @@ Powód: %1$s."</string>
   </plurals>
   <plurals name="common_member_count">
     <item quantity="one">"%1$d członek"</item>
-    <item quantity="few">"%1$d członki"</item>
+    <item quantity="few">"%1$d członków"</item>
     <item quantity="many">"%1$d członków"</item>
   </plurals>
   <string name="common_message">"Wiadomość"</string>
@@ -240,6 +257,7 @@ Powód: %1$s."</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_open_source_licenses">"Licencje open-source"</string>
@@ -263,7 +281,9 @@ Powód: %1$s."</string>
   <string name="common_preparing">"Przygotowuję…"</string>
   <string name="common_privacy_policy">"Polityka prywatności"</string>
   <string name="common_private_room">"Pokój prywatny"</string>
+  <string name="common_private_space">"Prywatna przestrzeń"</string>
   <string name="common_public_room">"Pokój publiczny"</string>
+  <string name="common_public_space">"Przestrzeń publiczna"</string>
   <string name="common_reaction">"Reakcja"</string>
   <string name="common_reactions">"Reakcje"</string>
   <string name="common_reason">"Powód"</string>
@@ -282,6 +302,11 @@ Powód: %1$s."</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>
+  <plurals name="common_rooms">
+    <item quantity="one">"%1$d Pokój"</item>
+    <item quantity="few">"%1$d Pokoje"</item>
+    <item quantity="many">"%1$d Pokoi"</item>
+  </plurals>
   <string name="common_saved_changes">"Zapisano zmiany"</string>
   <string name="common_saving">"Zapisywanie"</string>
   <string name="common_screen_lock">"Blokada ekranu"</string>
@@ -289,18 +314,28 @@ Powód: %1$s."</string>
   <string name="common_search_results">"Wyniki wyszukiwania"</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>
   <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>
   <string name="common_sent">"Wysłano"</string>
   <string name="common_sentence_delimiter">". "</string>
   <string name="common_server_not_supported">"Serwer nie jest obsługiwany"</string>
+  <string name="common_server_unreachable">"Serwer niedostępny"</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_location">"Udostępniona lokalizacja"</string>
+  <string name="common_shared_space">"Udostępniona przestrzeń"</string>
   <string name="common_signing_out">"Wylogowywanie"</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>
+  <plurals name="common_spaces">
+    <item quantity="one">"%1$d Przestrzeń"</item>
+    <item quantity="few">"%1$d Przestrzenie"</item>
+    <item quantity="many">"%1$d Przestrzeni"</item>
+  </plurals>
   <string name="common_starting_chat">"Rozpoczynanie czatu…"</string>
   <string name="common_sticker">"Naklejka"</string>
   <string name="common_success">"Sukces"</string>
@@ -331,6 +366,12 @@ Powód: %1$s."</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_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>
+  <string name="common_video_quality_low_description">"Największa prędkość przesyłania i najmniejszy rozmiar pliku"</string>
+  <string name="common_video_quality_standard">"Jakość standardowa"</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>
@@ -345,14 +386,24 @@ Powód: %1$s."</string>
 
 Czy na pewno chcesz kontynuować?"</string>
   <string name="dialog_confirm_link_title">"Sprawdź dwukrotnie ten link"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Wybierz domyślną jakość przesyłanych filmów."</string>
+  <string name="dialog_default_video_quality_selector_title">"Jakość przesyłania wideo"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"Maksymalny dozwolony rozmiar pliku to: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"Rozmiar pliku jest za duży, aby go przesłać"</string>
   <string name="dialog_room_reported">"Pokój zgłoszony"</string>
   <string name="dialog_room_reported_and_left">"Opuszczono i zgłoszono pokój"</string>
   <string name="dialog_title_confirmation">"Potwierdzenie"</string>
   <string name="dialog_title_error">"Błąd"</string>
   <string name="dialog_title_success">"Sukces"</string>
   <string name="dialog_title_warning">"Ostrzeżenie"</string>
+  <string name="dialog_unsaved_changes_description">"Masz niezapisane zmiany."</string>
   <string name="dialog_unsaved_changes_description_android">"Zmiany nie zostały zapisane. Czy na pewno chcesz wrócić?"</string>
   <string name="dialog_unsaved_changes_title">"Zapisać zmiany?"</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>
   <string name="error_failed_loading_map">"%1$s nie mogło wczytać mapy. Spróbuj ponownie później."</string>
@@ -404,6 +455,7 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Twoja wiadomość nie została wysłana, ponieważ %1$s nie zweryfikował swoich wszystkich urządzeń"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Jedno lub więcej z Twoich urządzeń jest niezweryfikowanych. Wyślij wiadomość mimo to lub anuluj i spróbuj ponownie po zweryfikowaniu wszystkich swoich urządzeń."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Twoja wiadomość nie została wysłana, ponieważ nie zweryfikowałeś jednego lub więcej swoich urządzeń."</string>
+  <string name="screen_room_change_role_administrators_or_owners_title">"Edytuj administratorów lub właścicieli"</string>
   <string name="screen_room_error_failed_processing_media">"Przetwarzanie multimediów do przesłania nie powiodło się, spróbuj ponownie."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Nie można pobrać danych użytkownika"</string>
   <string name="screen_room_event_pill">"Wiadomość w %1$s"</string>
@@ -421,6 +473,10 @@ Czy na pewno chcesz kontynuować?"</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_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_parent_space">"Przestrzeń %1$s"</string>
+  <string name="screen_space_list_title">"Przestrzenie"</string>
   <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>
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 fabc600b67..3863a24fd8 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
@@ -2,6 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Adicionar reação: %1$s"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_collapse_message_text_field">"Minimizar campo de texto de mensagem"</string>
   <string name="a11y_delete">"Apagar"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d dígito digitado"</item>
@@ -10,6 +11,7 @@
   <string name="a11y_edit_avatar">"Editar avatar"</string>
   <string name="a11y_edit_room_address_hint">"O endereço completo será %1$s"</string>
   <string name="a11y_encryption_details">"Detalhes de criptografia"</string>
+  <string name="a11y_expand_message_text_field">"Expandir campo de texto de mensagem"</string>
   <string name="a11y_hide_password">"Ocultar senha"</string>
   <string name="a11y_join_call">"Entrar à chamada"</string>
   <string name="a11y_jump_to_bottom">"Ir para o final"</string>
@@ -40,7 +42,7 @@
   <string name="a11y_remove_reaction_with">"Remover reação com %1$s"</string>
   <string name="a11y_room_avatar">"Avatar da sala"</string>
   <string name="a11y_send_files">"Enviar arquivos"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Ação de tempo limitado necessária"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Ação de tempo limitado necessária, você tem um minuto para verificar"</string>
   <string name="a11y_show_password">"Mostrar senha"</string>
   <string name="a11y_start_call">"Iniciar uma chamada"</string>
   <string name="a11y_tombstoned_room">"Sala morta"</string>
@@ -78,6 +80,7 @@
   <string name="action_decline">"Recusar"</string>
   <string name="action_decline_and_block">"Recusar e bloquear"</string>
   <string name="action_delete_poll">"Excluir enquete"</string>
+  <string name="action_deselect_all">"Desselecionar tudo"</string>
   <string name="action_disable">"Desativar"</string>
   <string name="action_discard">"Descartar"</string>
   <string name="action_dismiss">"Dispensar"</string>
@@ -88,9 +91,12 @@
   <string name="action_enable">"Ativar"</string>
   <string name="action_end_poll">"Encerrar enquete"</string>
   <string name="action_enter_pin">"Digitar PIN"</string>
+  <string name="action_finish">"Concluir"</string>
   <string name="action_forgot_password">"Esqueceu a senha?"</string>
   <string name="action_forward">"Encaminhar"</string>
   <string name="action_go_back">"Voltar"</string>
+  <string name="action_go_to_roles_and_permissions">"Ir aos cargos e permissões"</string>
+  <string name="action_go_to_settings">"Ir às configurações"</string>
   <string name="action_ignore">"Ignorar"</string>
   <string name="action_invite">"Convidar"</string>
   <string name="action_invite_friends">"Convidar pessoas"</string>
@@ -102,10 +108,12 @@
   <string name="action_leave">"Sair"</string>
   <string name="action_leave_conversation">"Sair da conversa"</string>
   <string name="action_leave_room">"Sair da sala"</string>
+  <string name="action_leave_space">"Sair do espaço"</string>
   <string name="action_load_more">"Carregar mais"</string>
   <string name="action_manage_account">"Gerenciar conta"</string>
   <string name="action_manage_devices">"Gerenciar dispositivos"</string>
   <string name="action_message">"Mensagem"</string>
+  <string name="action_minimize">"Minimizar"</string>
   <string name="action_next">"Avançar"</string>
   <string name="action_no">"Não"</string>
   <string name="action_not_now">"Agora não"</string>
@@ -134,6 +142,7 @@
   <string name="action_retry_decryption">"Tentar descriptografar novamente"</string>
   <string name="action_save">"Salvar"</string>
   <string name="action_search">"Pesquisar"</string>
+  <string name="action_select_all">"Selecionar tudo"</string>
   <string name="action_send">"Enviar"</string>
   <string name="action_send_edited_message">"Enviar mensagem editada"</string>
   <string name="action_send_message">"Enviar mensagem"</string>
@@ -147,6 +156,7 @@
   <string name="action_skip">"Pular"</string>
   <string name="action_start">"Iniciar"</string>
   <string name="action_start_chat">"Iniciar conversa"</string>
+  <string name="action_start_over">"Começar de novo"</string>
   <string name="action_start_verification">"Iniciar verificação"</string>
   <string name="action_static_map_load">"Toque para carregar o mapa"</string>
   <string name="action_take_photo">"Tirar foto"</string>
@@ -162,12 +172,17 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Atualização disponível"</string>
   <string name="common_about">"Sobre"</string>
   <string name="common_acceptable_use_policy">"Política de uso aceitável"</string>
+  <string name="common_add_account">"Adicionar uma conta"</string>
+  <string name="common_add_another_account">"Adicionar outra conta"</string>
   <string name="common_adding_caption">"Adicionando legenda"</string>
   <string name="common_advanced_settings">"Configurações avançadas"</string>
   <string name="common_an_image">"uma imagem"</string>
   <string name="common_analytics">"Telemetria"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Você saiu da sala"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Você foi desconectado da sessão"</string>
   <string name="common_appearance">"Aparência"</string>
   <string name="common_audio">"Áudio"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Usuários bloqueados"</string>
   <string name="common_bubbles">"Balões"</string>
   <string name="common_call_started">"Chamada iniciada"</string>
@@ -177,9 +192,11 @@
   <string name="common_creating_room">"Criando sala…"</string>
   <string name="common_current_user_canceled_knock">"Solicitação cancelada"</string>
   <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>
   <string name="common_device_id">"ID do dispositivo"</string>
   <string name="common_direct_chat">"Conversa direta"</string>
@@ -214,9 +231,11 @@ Motivo:​ %1$s."</string>
   <string name="common_install_apk_android">"Instalar APK"</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>
   <string name="common_loading">"Carregando…"</string>
   <string name="common_loading_more">"Carregando mais…"</string>
   <plurals name="common_many_members">
@@ -229,13 +248,16 @@ Motivo:​ %1$s."</string>
   </plurals>
   <string name="common_message">"Mensagem"</string>
   <string name="common_message_actions">"Ações de mensagem"</string>
+  <string name="common_message_failed_to_send">"Falha no envio da mensagem"</string>
   <string name="common_message_layout">"Layout da mensagem"</string>
   <string name="common_message_removed">"Mensagem removida"</string>
   <string name="common_modern">"Moderno"</string>
   <string name="common_mute">"Mudo"</string>
+  <string name="common_name">"Nome"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Não há resultados"</string>
   <string name="common_no_room_name">"Não há um nome para a sala"</string>
+  <string name="common_no_space_name">"Sem nome de espaço"</string>
   <string name="common_not_encrypted">"Sem criptografia"</string>
   <string name="common_offline">"Off-line"</string>
   <string name="common_open_source_licenses">"Licenças de código aberto"</string>
@@ -289,18 +311,24 @@ Motivo:​ %1$s."</string>
   <string name="common_search_results">"Resultados da pesquisa"</string>
   <string name="common_security">"Segurança"</string>
   <string name="common_seen_by">"Visto por"</string>
+  <string name="common_select_account">"Selecionar uma conta"</string>
   <string name="common_send_to">"Enviar para"</string>
   <string name="common_sending">"Enviando…"</string>
   <string name="common_sending_failed">"Envio falhou"</string>
   <string name="common_sent">"Enviado"</string>
   <string name="common_sentence_delimiter">". "</string>
   <string name="common_server_not_supported">"Servidor não suportado"</string>
+  <string name="common_server_unreachable">"Servidor inacessível"</string>
   <string name="common_server_url">"URL do servidor"</string>
   <string name="common_settings">"Configurações"</string>
+  <string name="common_share_space">"Compartilhar espaço"</string>
   <string name="common_shared_location">"Localização compartilhada"</string>
+  <string name="common_shared_space">"Espaço compartilhado"</string>
   <string name="common_signing_out">"Saindo"</string>
   <string name="common_something_went_wrong">"Algo deu errado"</string>
   <string name="common_something_went_wrong_message">"Encontramos um problema. Tente novamente."</string>
+  <string name="common_space">"Espaço"</string>
+  <string name="common_space_topic_placeholder">"Sobre o que é esse espaço?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d espaço"</item>
     <item quantity="other">"%1$d espaços"</item>
@@ -335,10 +363,17 @@ Motivo:​ %1$s."</string>
   <string name="common_verify_identity">"Verificar identidade"</string>
   <string name="common_verify_user">"Verificar usuário"</string>
   <string name="common_video">"Vídeo"</string>
+  <string name="common_video_quality_high">"Alta qualidade"</string>
+  <string name="common_video_quality_high_description">"Melhor qualidade, mas tamanho de arquivo maior"</string>
+  <string name="common_video_quality_low">"Baixa qualidade"</string>
+  <string name="common_video_quality_low_description">"Maior velocidade de envio e menor tamanho de arquivo"</string>
+  <string name="common_video_quality_standard">"Qualidade normal"</string>
+  <string name="common_video_quality_standard_description">"Equilíbrio entre qualidade e velocidade de envio"</string>
   <string name="common_voice_message">"Mensagem de voz"</string>
   <string name="common_waiting">"Aguardando…"</string>
   <string name="common_waiting_for_decryption_key">"Aguardando por esta mensagem"</string>
   <string name="common_you">"Você"</string>
+  <string name="crypto_history_visible">"Esta sala foi configurada para que membros novos possam ler o histórico. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"A identidade de %1$s foi redefinida. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"A identidade de %1$s %2$s foi redefinida. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
@@ -349,14 +384,24 @@ Motivo:​ %1$s."</string>
 
 Você tem certeza de que deseja continuar?"</string>
   <string name="dialog_confirm_link_title">"Verifique este link duas vezes"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Selecione a qualidade padrão dos videos que você envia."</string>
+  <string name="dialog_default_video_quality_selector_title">"Qualidade de envio de vídeos"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"O tamanho máximo permitido de arquivos é: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"O tamanho do arquivo é muito grande para ser enviado"</string>
   <string name="dialog_room_reported">"Sala denunciada"</string>
   <string name="dialog_room_reported_and_left">"Denunciou e deixou a sala"</string>
   <string name="dialog_title_confirmation">"Confirmação"</string>
   <string name="dialog_title_error">"Erro"</string>
   <string name="dialog_title_success">"Sucesso"</string>
   <string name="dialog_title_warning">"Alerta"</string>
+  <string name="dialog_unsaved_changes_description">"Você tem alterações não salvas."</string>
   <string name="dialog_unsaved_changes_description_android">"Suas alterações não foram salvas. Tem certeza de que você quer voltar?"</string>
   <string name="dialog_unsaved_changes_title">"Salvar alterações?"</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>
   <string name="error_failed_loading_map">"%1$s não conseguiu carregar o mapa. Por favor, tente novamente mais tarde."</string>
@@ -389,6 +434,11 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="screen_create_poll_options_section_title">"Opções"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Remover %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Configurações"</string>
+  <string name="screen_manage_authorized_spaces_header">"Os espaços dos quais os membros podem entrar na sala sem um convite."</string>
+  <string name="screen_manage_authorized_spaces_title">"Gerenciar espaços"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Espaço desconhecido)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Outros espaços dos quais você não é um membro"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Seus espaços"</string>
   <string name="screen_media_picker_error_failed_selection">"Falha ao selecionar a mídia, tente novamente."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Pressione em uma mensagem e escolha \"%1$s\" para incluir aqui."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fixe mensagens importantes para que elas possam ser facilmente descobertas"</string>
@@ -427,7 +477,9 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="screen_share_this_location_action">"Compartilhar esta localização"</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_parent_space">"Espaço %1$s"</string>
   <string name="screen_space_list_title">"Espaços"</string>
+  <string name="screen_space_menu_action_members">"Ver membros"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Mensagem não enviada porque a identidade verificada de %1$s foi redefinida."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"A mensagem não foi enviada porque %1$s não verificou todos os dispositivos."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Mensagem não enviada porque você não verificou um ou mais dos seus dispositivos."</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 5e55f3a9de..019f2e6ac4 100644
--- a/libraries/ui-strings/src/main/res/values-pt/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pt/translations.xml
@@ -153,6 +153,7 @@
   <string name="action_skip">"Saltar"</string>
   <string name="action_start">"Iniciar"</string>
   <string name="action_start_chat">"Iniciar conversa"</string>
+  <string name="action_start_over">"Começar de novo"</string>
   <string name="action_start_verification">"Iniciar verificação"</string>
   <string name="action_static_map_load">"Toca para carregar o mapa"</string>
   <string name="action_take_photo">"Tirar foto"</string>
@@ -382,6 +383,7 @@ Tens a certeza de que queres continuar?"</string>
   <string name="dialog_title_error">"Erro"</string>
   <string name="dialog_title_success">"Sucesso"</string>
   <string name="dialog_title_warning">"Aviso"</string>
+  <string name="dialog_unsaved_changes_description">"Tens alterações por guardar."</string>
   <string name="dialog_unsaved_changes_description_android">"As tuas alterações não foram guardadas. Tens a certeza que queres voltar atrás?"</string>
   <string name="dialog_unsaved_changes_title">"Guardar alterações?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"O tamanho máximo de ficheiro permitido é: %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 0cf1acf673..9e56d09b16 100644
--- a/libraries/ui-strings/src/main/res/values-ro/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ro/translations.xml
@@ -97,6 +97,7 @@
   <string name="action_forgot_password">"Ați uitat parola?"</string>
   <string name="action_forward">"Redirecționați"</string>
   <string name="action_go_back">"Înapoi"</string>
+  <string name="action_go_to_roles_and_permissions">"Mergeți la roluri și permisiuni"</string>
   <string name="action_go_to_settings">"Mergeți la setări"</string>
   <string name="action_ignore">"Ignorați"</string>
   <string name="action_invite">"Invitați"</string>
@@ -157,6 +158,7 @@
   <string name="action_skip">"Omiteți"</string>
   <string name="action_start">"Începeți"</string>
   <string name="action_start_chat">"Începeți discuția"</string>
+  <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_take_photo">"Faceți o fotografie"</string>
@@ -235,6 +237,7 @@ Motiv:%1$s."</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_loading">"Se încarcă…"</string>
   <string name="common_loading_more">"Se încarcă…"</string>
   <plurals name="common_many_members">
@@ -249,10 +252,12 @@ Motiv:%1$s."</string>
   </plurals>
   <string name="common_message">"Mesaj"</string>
   <string name="common_message_actions">"Acțiuni mesaj"</string>
+  <string name="common_message_failed_to_send">"Mesajul nu a putut fi trimis"</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_name">"Nume"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Niciun rezultat"</string>
   <string name="common_no_room_name">"Fără nume de cameră"</string>
@@ -330,6 +335,7 @@ Motiv:%1$s."</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_topic_placeholder">"Despre ce este vorba în acest spațiu?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Spațiu"</item>
     <item quantity="few">"%1$d Spații"</item>
@@ -375,6 +381,7 @@ Motiv:%1$s."</string>
   <string name="common_waiting">"Se aşteaptă…"</string>
   <string name="common_waiting_for_decryption_key">"Mesaj în așteptare"</string>
   <string name="common_you">"Dumneavoastră"</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_new_user_id">"(%1$s)"</string>
@@ -395,6 +402,7 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="dialog_title_error">"Eroare"</string>
   <string name="dialog_title_success">"Succes"</string>
   <string name="dialog_title_warning">"Avertisment"</string>
+  <string name="dialog_unsaved_changes_description">"Aveți modificări nesalvate."</string>
   <string name="dialog_unsaved_changes_description_android">"Modificările dumneavoastră nu au fost salvate. Sunteți sigur că doriți să vă întoarceți?"</string>
   <string name="dialog_unsaved_changes_title">"Salvați modificările?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Dimensiunea maximă permisă pentru fișiere este: %1$s"</string>
@@ -434,6 +442,11 @@ 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_manage_authorized_spaces_header">"Spațile din care membrii se pot alătura camerei fără invitație."</string>
+  <string name="screen_manage_authorized_spaces_title">"Gestionați spațiile"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Spațiu necunoscut)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Alte spații din care nu faceți parte"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Spațiile dumneavoastră"</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>
@@ -475,6 +488,7 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</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_space_menu_action_members">"Vizualizați membrii"</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_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>
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 fc856adf94..1ccde058c3 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/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="a11y_add_reaction">"Добавить реакцию:%1$s"</string>
+  <string name="a11y_add_reaction">"Добавить реакцию: %1$s"</string>
   <string name="a11y_avatar">"Аватар"</string>
   <string name="a11y_collapse_message_text_field">"Свернуть поле текста сообщения"</string>
   <string name="a11y_delete">"Удалить"</string>
@@ -29,7 +29,7 @@
   <string name="a11y_pin_field">"Поле PIN-кода"</string>
   <string name="a11y_play">"Воспроизвести"</string>
   <string name="a11y_poll">"Опрос"</string>
-  <string name="a11y_poll_end">"Опрос завершен"</string>
+  <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>
@@ -85,7 +85,7 @@
   <string name="action_deselect_all">"Отменить выбор"</string>
   <string name="action_disable">"Отключить"</string>
   <string name="action_discard">"Отменить"</string>
-  <string name="action_dismiss">"Отклонить"</string>
+  <string name="action_dismiss">"Закрыть"</string>
   <string name="action_done">"Готово"</string>
   <string name="action_edit">"Редактировать"</string>
   <string name="action_edit_caption">"Изменить подпись"</string>
@@ -97,6 +97,8 @@
   <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>
@@ -156,6 +158,7 @@
   <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_take_photo">"Сделать фото"</string>
@@ -193,7 +196,7 @@
   <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_dark">"Темная"</string>
   <string name="common_decryption_error">"Ошибка расшифровки"</string>
   <string name="common_description">"Описание"</string>
   <string name="common_developer_options">"Для разработчика"</string>
@@ -229,7 +232,7 @@
   <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>
@@ -324,10 +327,11 @@
   <string name="common_settings">"Настройки"</string>
   <string name="common_share_space">"Поделиться пространством"</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">"Пространство"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Пространство"</item>
     <item quantity="few">"%1$d Пространств"</item>
@@ -393,6 +397,7 @@
   <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>
@@ -473,6 +478,7 @@
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s пространство"</string>
   <string name="screen_space_list_title">"Пространства"</string>
+  <string name="screen_space_menu_action_members">"Просмотреть участников"</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>
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 baee4b4367..0928010918 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -2,6 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Pridať reakciu: %1$s"</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>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d zadaná číslica"</item>
@@ -11,6 +12,7 @@
   <string name="a11y_edit_avatar">"Upraviť obrázok"</string>
   <string name="a11y_edit_room_address_hint">"Celá adresa bude %1$s"</string>
   <string name="a11y_encryption_details">"Podrobnosti o šifrovaní"</string>
+  <string name="a11y_expand_message_text_field">"Rozbaliť textové pole správy"</string>
   <string name="a11y_hide_password">"Skryť heslo"</string>
   <string name="a11y_join_call">"Pripojiť sa k hovoru"</string>
   <string name="a11y_jump_to_bottom">"Prejsť na spodok"</string>
@@ -42,7 +44,7 @@
   <string name="a11y_remove_reaction_with">"Odstrániť reakciu s %1$s"</string>
   <string name="a11y_room_avatar">"Obrázok miestnosti"</string>
   <string name="a11y_send_files">"Odoslať súbory"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Vyžaduje sa časovo obmedzená akcia"</string>
+  <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_tombstoned_room">"Opustená miestnosť"</string>
@@ -80,6 +82,7 @@
   <string name="action_decline">"Odmietnuť"</string>
   <string name="action_decline_and_block">"Odmietnuť a zablokovať"</string>
   <string name="action_delete_poll">"Odstrániť anketu"</string>
+  <string name="action_deselect_all">"Zrušiť výber všetkých"</string>
   <string name="action_disable">"Vypnúť"</string>
   <string name="action_discard">"Zahodiť"</string>
   <string name="action_dismiss">"Zamietnuť"</string>
@@ -94,6 +97,8 @@
   <string name="action_forgot_password">"Zabudnuté heslo?"</string>
   <string name="action_forward">"Preposlať"</string>
   <string name="action_go_back">"Ísť späť"</string>
+  <string name="action_go_to_roles_and_permissions">"Prejsť na roly a oprávnenia"</string>
+  <string name="action_go_to_settings">"Prejsť na nastavenia"</string>
   <string name="action_ignore">"Ignorovať"</string>
   <string name="action_invite">"Pozvať"</string>
   <string name="action_invite_friends">"Pozvať ľudí"</string>
@@ -105,10 +110,12 @@
   <string name="action_leave">"Opustiť"</string>
   <string name="action_leave_conversation">"Opustiť konverzáciu"</string>
   <string name="action_leave_room">"Opustiť miestnosť"</string>
+  <string name="action_leave_space">"Opustiť priestor"</string>
   <string name="action_load_more">"Načítať viac"</string>
   <string name="action_manage_account">"Spravovať účet"</string>
   <string name="action_manage_devices">"Spravovať zariadenia"</string>
   <string name="action_message">"Poslať správu"</string>
+  <string name="action_minimize">"Minimalizovať"</string>
   <string name="action_next">"Ďalej"</string>
   <string name="action_no">"Nie"</string>
   <string name="action_not_now">"Teraz nie"</string>
@@ -137,6 +144,7 @@
   <string name="action_retry_decryption">"Opakovať dešifrovanie"</string>
   <string name="action_save">"Uložiť"</string>
   <string name="action_search">"Hľadať"</string>
+  <string name="action_select_all">"Vybrať všetko"</string>
   <string name="action_send">"Odoslať"</string>
   <string name="action_send_edited_message">"Odoslať upravenú správa"</string>
   <string name="action_send_message">"Odoslať správu"</string>
@@ -150,6 +158,7 @@
   <string name="action_skip">"Preskočiť"</string>
   <string name="action_start">"Spustiť"</string>
   <string name="action_start_chat">"Začať konverzáciu"</string>
+  <string name="action_start_over">"Začať odznova"</string>
   <string name="action_start_verification">"Spustiť overovanie"</string>
   <string name="action_static_map_load">"Ťuknutím načítate mapu"</string>
   <string name="action_take_photo">"Urobiť fotku"</string>
@@ -165,6 +174,8 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Aktualizácia je k dispozícii"</string>
   <string name="common_about">"O aplikácii"</string>
   <string name="common_acceptable_use_policy">"Zásady prijateľného používania"</string>
+  <string name="common_add_account">"Pridať účet"</string>
+  <string name="common_add_another_account">"Pridať ďalší účet"</string>
   <string name="common_adding_caption">"Pridáva sa titulok"</string>
   <string name="common_advanced_settings">"Pokročilé nastavenia"</string>
   <string name="common_an_image">"obrázok"</string>
@@ -173,6 +184,7 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Boli ste odhlásení zo relácie."</string>
   <string name="common_appearance">"Vzhľad"</string>
   <string name="common_audio">"Zvuk"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Blokovaní používatelia"</string>
   <string name="common_bubbles">"Bubliny"</string>
   <string name="common_call_started">"Hovor sa začal"</string>
@@ -182,9 +194,11 @@
   <string name="common_creating_room">"Vytváranie miestnosti…"</string>
   <string name="common_current_user_canceled_knock">"Žiadosť bola zrušená"</string>
   <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>
   <string name="common_device_id">"ID zariadenia"</string>
   <string name="common_direct_chat">"Priama konverzácia"</string>
@@ -219,6 +233,7 @@ Dôvod: %1$s."</string>
   <string name="common_install_apk_android">"Inštalovať APK"</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>
@@ -236,6 +251,7 @@ Dôvod: %1$s."</string>
   </plurals>
   <string name="common_message">"Správa"</string>
   <string name="common_message_actions">"Akcie správy"</string>
+  <string name="common_message_failed_to_send">"Správu sa nepodarilo odoslať"</string>
   <string name="common_message_layout">"Štýl správ"</string>
   <string name="common_message_removed">"Správa odstránená"</string>
   <string name="common_modern">"Moderné"</string>
@@ -243,6 +259,7 @@ Dôvod: %1$s."</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Žiadne výsledky"</string>
   <string name="common_no_room_name">"Žiadny názov miestnosti"</string>
+  <string name="common_no_space_name">"Žiadny názov priestoru"</string>
   <string name="common_not_encrypted">"Nešifrované"</string>
   <string name="common_offline">"Offline"</string>
   <string name="common_open_source_licenses">"Licencie s otvoreným zdrojom"</string>
@@ -299,15 +316,19 @@ Dôvod: %1$s."</string>
   <string name="common_search_results">"Výsledky hľadania"</string>
   <string name="common_security">"Bezpečnosť"</string>
   <string name="common_seen_by">"Videné"</string>
+  <string name="common_select_account">"Vyberte účet"</string>
   <string name="common_send_to">"Odoslať"</string>
   <string name="common_sending">"Odosiela sa…"</string>
   <string name="common_sending_failed">"Odoslanie zlyhalo"</string>
   <string name="common_sent">"Odoslané"</string>
   <string name="common_sentence_delimiter">". "</string>
   <string name="common_server_not_supported">"Server nie je podporovaný"</string>
+  <string name="common_server_unreachable">"Server je nedostupný"</string>
   <string name="common_server_url">"URL adresa servera"</string>
   <string name="common_settings">"Nastavenia"</string>
+  <string name="common_share_space">"Zdieľať priestor"</string>
   <string name="common_shared_location">"Zdieľaná poloha"</string>
+  <string name="common_shared_space">"Zdieľaný priestor"</string>
   <string name="common_signing_out">"Odhlasovanie"</string>
   <string name="common_something_went_wrong">"Niečo sa pokazilo"</string>
   <string name="common_something_went_wrong_message">"Vyskytol sa problém. Skúste to prosím znova."</string>
@@ -357,6 +378,7 @@ Dôvod: %1$s."</string>
   <string name="common_waiting">"Čaká sa…"</string>
   <string name="common_waiting_for_decryption_key">"Čaká sa na dešifrovací kľúč"</string>
   <string name="common_you">"Vy"</string>
+  <string name="crypto_history_visible">"Správy, ktoré odošlete, budú zdieľané s novými členmi pozvanými do tejto miestnosti. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"Totožnosť používateľa %1$s sa obnovila.%2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"Totožnosť používateľa %1$s %2$s bola obnovená. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
@@ -377,11 +399,14 @@ Naozaj chcete pokračovať?"</string>
   <string name="dialog_title_error">"Chyba"</string>
   <string name="dialog_title_success">"Úspech"</string>
   <string name="dialog_title_warning">"Upozornenie"</string>
+  <string name="dialog_unsaved_changes_description">"Máte neuložené zmeny."</string>
   <string name="dialog_unsaved_changes_description_android">"Vaše zmeny neboli uložené. Naozaj sa chcete vrátiť?"</string>
   <string name="dialog_unsaved_changes_title">"Uložiť zmeny?"</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>
   <string name="error_failed_loading_map">"%1$s nedokázal načítať mapu. Skúste to prosím neskôr."</string>
@@ -414,6 +439,11 @@ Naozaj chcete pokračovať?"</string>
   <string name="screen_create_poll_options_section_title">"Možnosti"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Odstrániť %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Nastavenia"</string>
+  <string name="screen_manage_authorized_spaces_header">"Priestory, kde sa členovia môžu pripojiť k miestnosti bez pozvania."</string>
+  <string name="screen_manage_authorized_spaces_title">"Spravovať priestory"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Neznámy priestor)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Iné priestory, ktorých nie ste členom"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Vaše priestory"</string>
   <string name="screen_media_picker_error_failed_selection">"Nepodarilo sa vybrať médium, skúste to prosím znova."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Stlačte správu a vyberte možnosť „%1$s“, ktorú chcete zahrnúť sem."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Pripnite dôležité správy, aby sa dali ľahko nájsť"</string>
@@ -453,7 +483,9 @@ Naozaj chcete pokračovať?"</string>
   <string name="screen_share_this_location_action">"Zdieľajte túto 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_parent_space">"%1$s priestor"</string>
   <string name="screen_space_list_title">"Priestory"</string>
+  <string name="screen_space_menu_action_members">"Zobraziť členov"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Správa nebola odoslaná, pretože sa zmenila overená totožnosť používateľa %1$s."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Správa nebola odoslaná, pretože %1$s neoveril/a všetky zariadenia."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Správa nebola odoslaná, pretože ste neoverili jedno alebo viac svojich zariadení."</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 e3cf26193e..7d84b11d87 100644
--- a/libraries/ui-strings/src/main/res/values-sv/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sv/translations.xml
@@ -148,6 +148,7 @@
   <string name="action_skip">"Hoppa över"</string>
   <string name="action_start">"Starta"</string>
   <string name="action_start_chat">"Starta chat"</string>
+  <string name="action_start_over">"Börja om"</string>
   <string name="action_start_verification">"Starta verifiering"</string>
   <string name="action_static_map_load">"Tryck för att ladda kartan"</string>
   <string name="action_take_photo">"Ta ett foto"</string>
@@ -369,6 +370,7 @@ Anledning:%1$s."</string>
   <string name="dialog_title_error">"Fel"</string>
   <string name="dialog_title_success">"Lyckades"</string>
   <string name="dialog_title_warning">"Varning"</string>
+  <string name="dialog_unsaved_changes_description">"Du har osparade ändringar."</string>
   <string name="dialog_unsaved_changes_description_android">"Dina ändringar har inte sparats. Är du säker på att du vill gå tillbaka?"</string>
   <string name="dialog_unsaved_changes_title">"Spara ändringar?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Den maximala tillåtna filstorleken är: %1$s"</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 c72f5a6139..b7b0bc841d 100644
--- a/libraries/ui-strings/src/main/res/values-tr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-tr/translations.xml
@@ -122,6 +122,7 @@
   <string name="action_skip">"Atla"</string>
   <string name="action_start">"Başlat"</string>
   <string name="action_start_chat">"Sohbeti başlat"</string>
+  <string name="action_start_over">"Yeniden Başla"</string>
   <string name="action_start_verification">"Doğrulamayı başlat"</string>
   <string name="action_static_map_load">"Haritayı yüklemek için dokunun"</string>
   <string name="action_take_photo">"Fotoğraf çek"</string>
@@ -139,6 +140,7 @@
   <string name="common_adding_caption">"Açıklama ekleme"</string>
   <string name="common_advanced_settings">"Gelişmiş Ayarlar"</string>
   <string name="common_analytics">"Analizler"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Odadan ayrıldın."</string>
   <string name="common_appearance">"Görünüm"</string>
   <string name="common_audio">"Ses"</string>
   <string name="common_blocked_users">"Engellenen kullanıcılar"</string>
@@ -307,6 +309,7 @@ Devam etmek istediğinizden emin misiniz?"</string>
   <string name="dialog_title_error">"Hata"</string>
   <string name="dialog_title_success">"Başarılı"</string>
   <string name="dialog_title_warning">"Uyarı"</string>
+  <string name="dialog_unsaved_changes_description">"Kaydedilmemiş değişiklikleriniz var."</string>
   <string name="dialog_unsaved_changes_description_android">"Değişiklikleriniz kaydedilmedi. Geri dönmek istediğinden emin misin?"</string>
   <string name="dialog_unsaved_changes_title">"Değişiklikleri Kaydet?"</string>
   <string name="error_account_creation_not_possible">"Ana sunucunuzun Matrix Authentication Service ve hesap oluşturmayı destekleyecek şekilde güncellenmesi gerekiyor."</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 a4c171a21b..0b1083ea1a 100644
--- a/libraries/ui-strings/src/main/res/values-uk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-uk/translations.xml
@@ -152,6 +152,7 @@
   <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_take_photo">"Зробити фото"</string>
@@ -382,6 +383,7 @@
   <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>
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 5abd2e0894..18d8b49ed5 100644
--- a/libraries/ui-strings/src/main/res/values-ur/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ur/translations.xml
@@ -114,6 +114,7 @@
   <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_take_photo">"تصویر لیں"</string>
@@ -129,6 +130,7 @@
   <string name="common_acceptable_use_policy">"قابل قبول استعمال کی سیاست"</string>
   <string name="common_advanced_settings">"اعلیٰ ترتیبات"</string>
   <string name="common_analytics">"تجزیات"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"آپ کمرے سے رخصت ہوگئے"</string>
   <string name="common_appearance">"ظہور"</string>
   <string name="common_audio">"صوت"</string>
   <string name="common_blocked_users">"مسدود صارفین"</string>
@@ -265,6 +267,7 @@
   <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="error_account_creation_not_possible">"‏Matrix Authentication Service اور اکاؤنٹ بنانے میں معاونت کے لیے آپ کے ہوم سرور کو اپ گریڈ کرنے کی ضرورت ہے۔"</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 40da86f9d5..5d5b7ea4d4 100644
--- a/libraries/ui-strings/src/main/res/values-uz/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-uz/translations.xml
@@ -2,6 +2,7 @@
 <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_avatar">"Avatar"</string>
+  <string name="a11y_collapse_message_text_field">"Xabar matni maydonini kichraytirish"</string>
   <string name="a11y_delete">"Oʻchirish"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d ta raqam kiritildi"</item>
@@ -10,6 +11,7 @@
   <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_join_call">"Qoʻngʻiroqga qoʻshilish"</string>
   <string name="a11y_jump_to_bottom">"Pastga o\'tish"</string>
@@ -40,7 +42,7 @@
   <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_session_verification_time_limited_action_required">"Vaqt cheklangan harakat talab qilinadi"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Amal bajarish vaqti cheklangan, tasdiqlash uchun bir daqiqa vaqtingiz bor"</string>
   <string name="a11y_show_password">"Parolni ko\'rsatish"</string>
   <string name="a11y_start_call">"Qoʻngʻiroqni boshlash"</string>
   <string name="a11y_tombstoned_room">"Arxivlangan xona"</string>
@@ -88,6 +90,7 @@
   <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_finish">"Tugatish"</string>
   <string name="action_forgot_password">"Parolni unutdingizmi?"</string>
   <string name="action_forward">"Oldinga"</string>
   <string name="action_go_back">"Ortga qaytish"</string>
@@ -147,6 +150,7 @@
   <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_take_photo">"Rasmga olmoq"</string>
@@ -162,10 +166,14 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Yangilash mavjud"</string>
   <string name="common_about">"Haqida"</string>
   <string name="common_acceptable_use_policy">"Qabul qilinadigan foydalanish siyosati"</string>
+  <string name="common_add_account">"Hisob qo‘shish"</string>
+  <string name="common_add_another_account">"Boshqa hisob qo‘shish"</string>
   <string name="common_adding_caption">"Sarlavha qoʻshish"</string>
   <string name="common_advanced_settings">"Kengaytirilgan sozlamalar"</string>
   <string name="common_an_image">"rasm"</string>
   <string name="common_analytics">"Analitika"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Siz xonani tark etdingiz"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Siz sessiyadan chiqdingiz"</string>
   <string name="common_appearance">"Ko\'rinish"</string>
   <string name="common_audio">"Audio"</string>
   <string name="common_blocked_users">"Bloklangan foydalanuvchilar"</string>
@@ -180,6 +188,7 @@
   <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>
   <string name="common_device_id">"Qurilma ID"</string>
   <string name="common_direct_chat">"Shaxsiy suhbat"</string>
@@ -258,12 +267,18 @@ Sababi:%1$s."</string>
   <string name="common_preparing">"Tayyorlanmoqda…"</string>
   <string name="common_privacy_policy">"Maxfiylik siyosati"</string>
   <string name="common_private_room">"Shaxsiy xona"</string>
+  <string name="common_private_space">"Shaxsiy guruh"</string>
   <string name="common_public_room">"Jamoat xonasi"</string>
+  <string name="common_public_space">"Jamoat guruhi"</string>
   <string name="common_reaction">"Reaktsiya"</string>
   <string name="common_reactions">"reaksiyalar"</string>
   <string name="common_reason">"Sabab"</string>
   <string name="common_recovery_key">"Qayta tiklash kaliti"</string>
   <string name="common_refreshing">"Yangilanmoqda…"</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>
@@ -272,6 +287,10 @@ Sababi:%1$s."</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>
+  <plurals name="common_rooms">
+    <item quantity="one">"%1$d Xona"</item>
+    <item quantity="other">"%1$d Xonalar"</item>
+  </plurals>
   <string name="common_saved_changes">"Saqlangan oʻzgarishlar"</string>
   <string name="common_saving">"Saqlash"</string>
   <string name="common_screen_lock">"Ekran qulfi"</string>
@@ -279,18 +298,25 @@ Sababi:%1$s."</string>
   <string name="common_search_results">"Qidiruv natijalari"</string>
   <string name="common_security">"Xavfsizlik"</string>
   <string name="common_seen_by">"Tomonidan koʻrilgan"</string>
+  <string name="common_select_account">"Hisobni tanlang"</string>
   <string name="common_send_to">"Yubirish"</string>
   <string name="common_sending">"Yuborilmoqda…"</string>
   <string name="common_sending_failed">"Yuborilmadi"</string>
   <string name="common_sent">"Yuborilgan"</string>
   <string name="common_sentence_delimiter">". "</string>
   <string name="common_server_not_supported">"Server qo\'llab-quvvatlanmaydi"</string>
+  <string name="common_server_unreachable">"Serverga kirish imkonsiz"</string>
   <string name="common_server_url">"Server URL manzili"</string>
   <string name="common_settings">"Sozlamalar"</string>
   <string name="common_shared_location">"Joylashuvi ulashildi"</string>
   <string name="common_signing_out">"Chiqish"</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">"Bo‘shliq"</string>
+  <plurals name="common_spaces">
+    <item quantity="one">"%1$d Guruh"</item>
+    <item quantity="other">"%1$d Guruhlar"</item>
+  </plurals>
   <string name="common_starting_chat">"Chat boshlanmoqda…"</string>
   <string name="common_sticker">"Stiker"</string>
   <string name="common_success">"Muvaffaqiyat"</string>
@@ -310,6 +336,7 @@ Sababi:%1$s."</string>
   <string name="common_unable_to_invite_title">"Taklif(lar)ni yuborib bo‘lmadi"</string>
   <string name="common_unlock">"Qulfni ochish"</string>
   <string name="common_unmute">"Ovozni yoqish"</string>
+  <string name="common_unsupported_call">"Qo‘llab-quvvatlanmaydigan chaqiruv"</string>
   <string name="common_unsupported_event">"Qo\'llab-quvvatlanmagan hodisa"</string>
   <string name="common_username">"Foydalanuvchi nomi"</string>
   <string name="common_verification_cancelled">"Tasdiqlash bekor qilindi"</string>
@@ -318,31 +345,63 @@ Sababi:%1$s."</string>
   <string name="common_verified">"Tasdiqlangan"</string>
   <string name="common_verify_device">"Qurilmani tasdiqlash"</string>
   <string name="common_verify_identity">"Shaxsni tasdiqlash"</string>
+  <string name="common_verify_user">"Foydalanuvchini tasdiqlang"</string>
   <string name="common_video">"Video"</string>
+  <string name="common_video_quality_high">"Yuqori sifatli"</string>
+  <string name="common_video_quality_high_description">"Eng yaxshi sifat, lekin kattaroq fayl hajmi"</string>
+  <string name="common_video_quality_low">"Past sifat"</string>
+  <string name="common_video_quality_low_description">"Eng tez yuklash tezligi va eng kichik fayl hajmi"</string>
+  <string name="common_video_quality_standard">"Standart sifat"</string>
+  <string name="common_video_quality_standard_description">"Sifat va yuklash tezligi balansi"</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_you">"Siz"</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_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_withdraw_verification_action">"Tasdiqlashni bekor qilish"</string>
+  <string name="dialog_confirm_link_message">"%1$s havolasi sizni boshqa %2$s saytiga olib boradi
+
+Davom etasizmi?"</string>
+  <string name="dialog_confirm_link_title">"Ushbu havolani ikki marta tekshiring"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Yuklagan videolaringizning standart sifatini tanlang."</string>
+  <string name="dialog_default_video_quality_selector_title">"Video yuklash sifati"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"Ruxsat etilgan maksimal fayl hajmi: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"Fayl hajmi yuklash uchun juda katta"</string>
+  <string name="dialog_room_reported">"Xona haqida xabar"</string>
+  <string name="dialog_room_reported_and_left">"Xabar berildi va xona tark etildi"</string>
   <string name="dialog_title_confirmation">"Tasdiqlash"</string>
   <string name="dialog_title_error">"Xato"</string>
   <string name="dialog_title_success">"Muvaffaqiyat"</string>
   <string name="dialog_title_warning">"Ogohlantirish"</string>
+  <string name="dialog_unsaved_changes_description">"Sizda saqlanmagan oʻzgarishlar bor"</string>
   <string name="dialog_unsaved_changes_description_android">"Oʻzgarishlar saqlanmadi. Haqiqatan ham orqaga qaytmoqchimisiz?"</string>
   <string name="dialog_unsaved_changes_title">"O‘zgartirishlarni saqlaysizmi?"</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>
   <string name="error_failed_loading_map">"%1$sxaritani yuklay olmadi. Iltimos keyinroq qayta urinib ko\'ring."</string>
   <string name="error_failed_loading_messages">"Xabarlar yuklanmadi"</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_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>
   <string name="error_missing_microphone_voice_rationale_android">"%1$smikrofoningizga kirish ruxsatiga ega emas. Ovozli xabar yozish uchun ruxsatni yoqing."</string>
+  <string name="error_network_or_server_issue">"Bu tarmoq yoki server muammolari bilan bog‘liq bo‘lishi mumkin."</string>
+  <string name="error_room_address_already_exists">"Bu xona manzili allaqachon mavjud. Xona manzili maydonini tahrirlang yoki xona nomini o‘zgartiring"</string>
+  <string name="error_room_address_invalid_symbols">"Ayrim belgilarga ruxsat berilmagan. Faqat harf, raqam va quyidagi belgilar ishlaydi! $ &amp;’() * + /; =? @ [ ] -. _"</string>
   <string name="error_some_messages_have_not_been_sent">"Bazi xabarlar yuborilmagan"</string>
   <string name="error_unknown">"Kechirasiz, xatolik yuz berdi"</string>
+  <string name="event_shield_mismatched_sender">"Hodisani yuborgan shaxs uni yuborgan qurilmaning egasi bilan mos kelmaydi."</string>
   <string name="event_shield_reason_authenticity_not_guaranteed">"Bu qurilmada shifrlangan xabarning haqiqiyligini kafolatlash imkonsiz."</string>
   <string name="event_shield_reason_previously_verified">"Avval tasdiqlangan foydalanuvchi tomonidan shifrlangan."</string>
   <string name="event_shield_reason_sent_in_clear">"Shifrlanmagan"</string>
@@ -353,6 +412,11 @@ Sababi:%1$s."</string>
   <string name="invite_friends_text">"Hey, men bilan gaplash%1$s :%2$s"</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>
+  <string name="screen_create_poll_option_accessibility_label">"%1$s:%2$s"</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_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>
@@ -371,8 +435,13 @@ Sababi:%1$s."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"%1$s barcha qurilmalarni tasdiqlamagani uchun xabaringiz yuborilmadi"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Bir yoki bir nechta qurilmangiz tasdiqlanmagan. Xabarni istalgancha yuborishingiz yoki hozircha bekor qilishingiz va barcha qurilmalaringizni tasdiqlaganingizdan keyin qayta urinishingiz mumkin."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Xabaringiz yuborilmadi, chunki bir yoki bir nechta qurilmangizni tasdiqlamagansiz"</string>
+  <string name="screen_room_change_role_administrators_or_owners_title">"Administratorlar yoki egalarni tahrirlash"</string>
   <string name="screen_room_error_failed_processing_media">"Mediani yuklab bo‘lmadi, qayta urinib ko‘ring."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Foydalanuvchi tafsilotlarini olinmadi"</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_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>
   <string name="screen_room_pinned_banner_loading_description">"Xabar yuklanmoqda…"</string>
@@ -384,11 +453,18 @@ Sababi:%1$s."</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_space_list_description">"Siz yaratgan yoki qo‘shilgan guruhlar."</string>
+  <string name="screen_space_list_details">"%1$s•%2$s"</string>
+  <string name="screen_space_list_title">"Bo‘shliqlar"</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_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>
   <string name="settings_version_number">"Versiya:%1$s (%2$s )"</string>
   <string name="test_language_identifier">"en"</string>
+  <string name="timeline_decryption_failure_historical_event_no_key_backup">"Bu qurilmada tarixiy xabarlar mavjud emas"</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>
 </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 346195863e..046d7f36ba 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
@@ -78,6 +78,7 @@
   <string name="action_decline">"拒絕"</string>
   <string name="action_decline_and_block">"拒絕並封鎖"</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>
@@ -92,6 +93,8 @@
   <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>
@@ -108,6 +111,7 @@
   <string name="action_manage_account">"管理帳號"</string>
   <string name="action_manage_devices">"管理裝置"</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>
@@ -136,6 +140,7 @@
   <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>
@@ -149,6 +154,7 @@
   <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_take_photo">"拍照"</string>
@@ -170,10 +176,11 @@
   <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_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_started">"開始通話"</string>
@@ -222,6 +229,7 @@
   <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>
@@ -242,6 +250,7 @@
   <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>
@@ -302,7 +311,9 @@
   <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_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>
@@ -370,6 +381,7 @@
   <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>
@@ -446,7 +458,9 @@
   <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>
   <string name="screen_space_list_title">"空間"</string>
+  <string name="screen_space_menu_action_members">"檢視成員"</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>
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 a4144eb8f0..774a3d3f89 100644
--- a/libraries/ui-strings/src/main/res/values-zh/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh/translations.xml
@@ -93,6 +93,8 @@
   <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>
@@ -152,6 +154,7 @@
   <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_take_photo">"拍摄照片"</string>
@@ -177,6 +180,7 @@
   <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_started">"通话已开始"</string>
@@ -307,7 +311,9 @@
   <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_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>
@@ -375,6 +381,7 @@
   <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>
@@ -451,7 +458,9 @@
   <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>
   <string name="screen_space_list_title">"空间"</string>
+  <string name="screen_space_menu_action_members">"查看成员"</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>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 2484b0be64..df47b71577 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -95,6 +95,7 @@
   <string name="action_forgot_password">"Forgot password?"</string>
   <string name="action_forward">"Forward"</string>
   <string name="action_go_back">"Go back"</string>
+  <string name="action_go_to_roles_and_permissions">"Go to roles &amp; permissions"</string>
   <string name="action_go_to_settings">"Go to settings"</string>
   <string name="action_ignore">"Ignore"</string>
   <string name="action_invite">"Invite"</string>
@@ -155,10 +156,12 @@
   <string name="action_skip">"Skip"</string>
   <string name="action_start">"Start"</string>
   <string name="action_start_chat">"Start chat"</string>
+  <string name="action_start_over">"Start over"</string>
   <string name="action_start_verification">"Start verification"</string>
   <string name="action_static_map_load">"Tap to load map"</string>
   <string name="action_take_photo">"Take photo"</string>
   <string name="action_tap_for_options">"Tap for options"</string>
+  <string name="action_translate">"Translate"</string>
   <string name="action_try_again">"Try again"</string>
   <string name="action_unpin">"Unpin"</string>
   <string name="action_view">"View"</string>
@@ -233,6 +236,7 @@ Reason: %1$s."</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>
   <string name="common_loading">"Loading…"</string>
   <string name="common_loading_more">"Loading more…"</string>
   <plurals name="common_many_members">
@@ -245,10 +249,12 @@ Reason: %1$s."</string>
   </plurals>
   <string name="common_message">"Message"</string>
   <string name="common_message_actions">"Message actions"</string>
+  <string name="common_message_failed_to_send">"Message failed to send"</string>
   <string name="common_message_layout">"Message layout"</string>
   <string name="common_message_removed">"Message removed"</string>
   <string name="common_modern">"Modern"</string>
   <string name="common_mute">"Mute"</string>
+  <string name="common_name">"Name"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"No results"</string>
   <string name="common_no_room_name">"No room name"</string>
@@ -323,6 +329,7 @@ Reason: %1$s."</string>
   <string name="common_something_went_wrong">"Something went wrong"</string>
   <string name="common_something_went_wrong_message">"We encountered an issue. Please try again."</string>
   <string name="common_space">"Space"</string>
+  <string name="common_space_topic_placeholder">"What is this space about?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Space"</item>
     <item quantity="other">"%1$d Spaces"</item>
@@ -367,6 +374,7 @@ Reason: %1$s."</string>
   <string name="common_waiting">"Waiting…"</string>
   <string name="common_waiting_for_decryption_key">"Waiting for this message"</string>
   <string name="common_you">"You"</string>
+  <string name="crypto_history_visible">"This room has been configured so that new members can read history. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"%1$s\'s identity was reset. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"%1$s’s %2$s identity was reset. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
@@ -387,6 +395,7 @@ Are you sure you want to continue?"</string>
   <string name="dialog_title_error">"Error"</string>
   <string name="dialog_title_success">"Success"</string>
   <string name="dialog_title_warning">"Warning"</string>
+  <string name="dialog_unsaved_changes_description">"You have unsaved changes."</string>
   <string name="dialog_unsaved_changes_description_android">"Your changes have not been saved. Are you sure you want to go back?"</string>
   <string name="dialog_unsaved_changes_title">"Save changes?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"The max file size allowed is: %1$s"</string>
@@ -426,6 +435,11 @@ 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_manage_authorized_spaces_header">"Spaces where members can join the room without an invitation."</string>
+  <string name="screen_manage_authorized_spaces_title">"Manage spaces"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Unknown space)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Other spaces you’re not a member of"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Your spaces"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</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>
@@ -466,6 +480,7 @@ Are you sure you want to continue?"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"%1$s space"</string>
   <string name="screen_space_list_title">"Spaces"</string>
+  <string name="screen_space_menu_action_members">"View members"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Message not sent because %1$s’s verified 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>
diff --git a/libraries/ui-utils/build.gradle.kts b/libraries/ui-utils/build.gradle.kts
index 95ce3d21a1..a0144fbc27 100644
--- a/libraries/ui-utils/build.gradle.kts
+++ b/libraries/ui-utils/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,11 +14,11 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.ui.utils"
-
-    dependencies {
-        implementation(projects.libraries.androidutils)
-        implementation(projects.services.toolbox.impl)
-
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.androidutils)
+    implementation(projects.services.toolbox.impl)
+
+    testCommonDependencies(libs)
 }
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlock.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlock.kt
index 15a8b82eee..dee131979c 100644
--- a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlock.kt
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlock.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/formatter/FIleSizeFormatter.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/formatter/FIleSizeFormatter.kt
index 3be7a438f3..da67e48b0e 100644
--- a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/formatter/FIleSizeFormatter.kt
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/formatter/FIleSizeFormatter.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/DurationExt.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/DurationExt.kt
index 4b4a547e4d..0ccbaceb9e 100644
--- a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/DurationExt.kt
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/DurationExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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/time/IsTalkbackEnabled.kt
index 40b0a3cc76..60ac1887c6 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/time/IsTalkbackEnabled.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/KeyEventExt.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/KeyEventExt.kt
index 580807f987..ba69daded7 100644
--- a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/KeyEventExt.kt
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/KeyEventExt.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/version/LocalSdkIntVersionProvider.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/version/LocalSdkIntVersionProvider.kt
index d1dc5a5eb7..88e17c9859 100644
--- a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/version/LocalSdkIntVersionProvider.kt
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/version/LocalSdkIntVersionProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlockTest.kt b/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlockTest.kt
index 1745f617d8..73b91a84ce 100644
--- a/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlockTest.kt
+++ b/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/MultipleTapToUnlockTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/time/DurationFormatTest.kt b/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/time/DurationFormatTest.kt
index 49022ae0a5..d4c007d7e6 100644
--- a/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/time/DurationFormatTest.kt
+++ b/libraries/ui-utils/src/test/kotlin/io/element/android/libraries/ui/utils/time/DurationFormatTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/api/build.gradle.kts b/libraries/usersearch/api/build.gradle.kts
index 1a6567f0f4..978a5c0bae 100644
--- a/libraries/usersearch/api/build.gradle.kts
+++ b/libraries/usersearch/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserListDataSource.kt b/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserListDataSource.kt
index 17f2136c1f..0f7e02c7a8 100644
--- a/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserListDataSource.kt
+++ b/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserListDataSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserRepository.kt b/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserRepository.kt
index 3af6bab425..f7e5367a9a 100644
--- a/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserRepository.kt
+++ b/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserRepository.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserSearchResult.kt b/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserSearchResult.kt
index b60b161b90..30da8cf92e 100644
--- a/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserSearchResult.kt
+++ b/libraries/usersearch/api/src/main/kotlin/io/element/android/libraries/usersearch/api/UserSearchResult.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/impl/build.gradle.kts b/libraries/usersearch/impl/build.gradle.kts
index c7378aa07a..bd8eb47cd1 100644
--- a/libraries/usersearch/impl/build.gradle.kts
+++ b/libraries/usersearch/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSource.kt b/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSource.kt
index 2d968cfb20..3d4331869e 100644
--- a/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSource.kt
+++ b/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSource.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.usersearch.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.UserId
@@ -16,7 +16,6 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.usersearch.api.UserListDataSource
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class MatrixUserListDataSource(
     private val client: MatrixClient
 ) : UserListDataSource {
diff --git a/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt b/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt
index c486c898e1..2b6456b77d 100644
--- a/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt
+++ b/libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.usersearch.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.MatrixPatterns
@@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class MatrixUserRepository(
     private val client: MatrixClient,
     private val dataSource: UserListDataSource
diff --git a/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSourceTest.kt b/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSourceTest.kt
index 43dcb30836..149f7d9e12 100644
--- a/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSourceTest.kt
+++ b/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserListDataSourceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepositoryTest.kt b/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepositoryTest.kt
index abefa0251f..29ee1cb22f 100644
--- a/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepositoryTest.kt
+++ b/libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepositoryTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/test/build.gradle.kts b/libraries/usersearch/test/build.gradle.kts
index 5d8694e918..21cc140a7d 100644
--- a/libraries/usersearch/test/build.gradle.kts
+++ b/libraries/usersearch/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserListDataSource.kt b/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserListDataSource.kt
index d049c038f3..8838bfcaca 100644
--- a/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserListDataSource.kt
+++ b/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserListDataSource.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserRepository.kt b/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserRepository.kt
index 262a2e4a42..a767e4dc0a 100644
--- a/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserRepository.kt
+++ b/libraries/usersearch/test/src/main/kotlin/io/element/android/libraries/usersearch/test/FakeUserRepository.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/api/build.gradle.kts b/libraries/voiceplayer/api/build.gradle.kts
index 4490dbbe11..f37c263d83 100644
--- a/libraries/voiceplayer/api/build.gradle.kts
+++ b/libraries/voiceplayer/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageEvents.kt b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageEvents.kt
index 7e5430a566..01910ddcd6 100644
--- a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageEvents.kt
+++ b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageEvents.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageException.kt b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageException.kt
index a3a610c370..b3ee8e8fd1 100644
--- a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageException.kt
+++ b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageException.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessagePresenterFactory.kt b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessagePresenterFactory.kt
index eba0087615..0229ed991f 100644
--- a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessagePresenterFactory.kt
+++ b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessagePresenterFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageState.kt b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageState.kt
index 522b5cfbe2..a66209c5db 100644
--- a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageState.kt
+++ b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageStateProvider.kt b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageStateProvider.kt
index bfc2f144ab..d8ccb85832 100644
--- a/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageStateProvider.kt
+++ b/libraries/voiceplayer/api/src/main/kotlin/io/element/android/libraries/voiceplayer/api/VoiceMessageStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/impl/build.gradle.kts b/libraries/voiceplayer/impl/build.gradle.kts
index 053914d86b..679e8206d9 100644
--- a/libraries/voiceplayer/impl/build.gradle.kts
+++ b/libraries/voiceplayer/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePresenterFactory.kt b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePresenterFactory.kt
index f109f3d49a..b2518eaca0 100644
--- a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePresenterFactory.kt
+++ b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePresenterFactory.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voiceplayer.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
@@ -21,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlin.time.Duration
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultVoiceMessagePresenterFactory(
     private val analyticsService: AnalyticsService,
     @SessionCoroutineScope
diff --git a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessageMediaRepo.kt b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessageMediaRepo.kt
index a1f4de2087..310120c9fe 100644
--- a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessageMediaRepo.kt
+++ b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessageMediaRepo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePlayer.kt b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePlayer.kt
index 51a1163e36..510b80bae6 100644
--- a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePlayer.kt
+++ b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePlayer.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voiceplayer.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.extensions.mapCatchingExceptions
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.di.RoomScope
@@ -124,8 +124,7 @@ class DefaultVoiceMessagePlayer(
     filename: String?,
 ) : VoiceMessagePlayer {
     @ContributesBinding(RoomScope::class) // Scoped types can't use @Inject.
-    @Inject
-class Factory(
+    class Factory(
         private val mediaPlayer: MediaPlayer,
         private val voiceMessageMediaRepoFactory: VoiceMessageMediaRepo.Factory,
     ) : VoiceMessagePlayer.Factory {
diff --git a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenter.kt b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenter.kt
index 9637c5e587..089e7fa533 100644
--- a/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenter.kt
+++ b/libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -87,7 +88,7 @@ class VoiceMessagePresenter(
             }
         }
 
-        fun eventSink(event: VoiceMessageEvents) {
+        fun handleEvent(event: VoiceMessageEvents) {
             when (event) {
                 is VoiceMessageEvents.PlayPause -> {
                     if (playerState.isPlaying) {
@@ -130,7 +131,7 @@ class VoiceMessagePresenter(
             time = time,
             showCursor = showCursor,
             playbackSpeed = playbackSpeed.value,
-            eventSink = { eventSink(it) },
+            eventSink = ::handleEvent,
         )
     }
 }
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 411b9863eb..5df259fb5b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,8 +12,8 @@ import com.google.common.truth.Truth.assertThat
 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.MediaSource
-import io.element.android.libraries.matrix.api.mxc.MxcTools
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
+import io.element.android.libraries.matrix.test.mxc.FakeMxcTools
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -130,7 +131,7 @@ private fun createDefaultVoiceMessageMediaRepo(
     mxcUri: String = MXC_URI,
 ) = DefaultVoiceMessageMediaRepo(
     cacheDir = temporaryFolder.root,
-    mxcTools = MxcTools(),
+    mxcTools = FakeMxcTools(),
     matrixMediaLoader = matrixMediaLoader,
     mediaSource = MediaSource(
         url = mxcUri,
diff --git a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePlayerTest.kt b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePlayerTest.kt
index cd8a3f6c6b..d4005067fe 100644
--- a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePlayerTest.kt
+++ b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessagePlayerTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -114,7 +115,8 @@ class DefaultVoiceMessagePlayerTest {
             assertThat(player1.prepare().isSuccess).isTrue()
             matchReadyState(1_000L)
             player1.play()
-            awaitItem().let { // it plays until the end.
+            awaitItem().let {
+                // it plays until the end.
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isTrue()
@@ -127,14 +129,16 @@ class DefaultVoiceMessagePlayerTest {
         player2.state.test {
             matchInitialState()
             assertThat(player2.prepare().isSuccess).isTrue()
-            awaitItem().let { // Additional spurious state due to MediaPlayer owner change.
+            awaitItem().let {
+                // Additional spurious state due to MediaPlayer owner change.
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isTrue()
                 assertThat(it.currentPosition).isEqualTo(1000)
                 assertThat(it.duration).isEqualTo(1000)
             }
-            awaitItem().let { // Additional spurious state due to MediaPlayer owner change.
+            awaitItem().let {
+                // Additional spurious state due to MediaPlayer owner change.
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isFalse()
@@ -143,7 +147,8 @@ class DefaultVoiceMessagePlayerTest {
             }
             matchReadyState(1_000L)
             player2.play()
-            awaitItem().let { // it plays until the end.
+            awaitItem().let {
+                // it plays until the end.
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isTrue()
@@ -154,7 +159,8 @@ class DefaultVoiceMessagePlayerTest {
 
         // Play player1 again.
         player1.state.test {
-            awaitItem().let { // Last previous state/
+            awaitItem().let {
+                // Last previous state/
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isTrue()
@@ -162,7 +168,8 @@ class DefaultVoiceMessagePlayerTest {
                 assertThat(it.duration).isEqualTo(1000)
             }
             assertThat(player1.prepare().isSuccess).isTrue()
-            awaitItem().let { // Additional spurious state due to MediaPlayer owner change.
+            awaitItem().let {
+                // Additional spurious state due to MediaPlayer owner change.
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isFalse()
@@ -171,7 +178,8 @@ class DefaultVoiceMessagePlayerTest {
             }
             matchReadyState(1_000L)
             player1.play()
-            awaitItem().let { // it played again until the end.
+            awaitItem().let {
+                // it played again until the end.
                 assertThat(it.isReady).isFalse()
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isTrue()
@@ -189,7 +197,8 @@ class DefaultVoiceMessagePlayerTest {
             assertThat(player.prepare().isSuccess).isTrue()
             matchReadyState()
             player.play()
-            skipItems(1) // skip play state
+            // skip play state
+            skipItems(1)
             player.pause()
             awaitItem().let {
                 assertThat(it.isPlaying).isFalse()
@@ -206,9 +215,11 @@ class DefaultVoiceMessagePlayerTest {
             assertThat(player.prepare().isSuccess).isTrue()
             matchReadyState()
             player.play()
-            skipItems(1) // skip play state
+            // skip play state
+            skipItems(1)
             player.pause()
-            skipItems(1) // skip pause state
+            // skip pause state
+            skipItems(1)
             player.play()
             awaitItem().let {
                 assertThat(it.isPlaying).isTrue()
diff --git a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/FakeVoiceMessageMediaRepo.kt b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/FakeVoiceMessageMediaRepo.kt
index 78975cf7a6..e94f475fbf 100644
--- a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/FakeVoiceMessageMediaRepo.kt
+++ b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/FakeVoiceMessageMediaRepo.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenterTest.kt b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenterTest.kt
index 5f0b34b45e..fe680422f6 100644
--- a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenterTest.kt
+++ b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessagePresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/api/build.gradle.kts b/libraries/voicerecorder/api/build.gradle.kts
index b2be9d5aba..6490762248 100644
--- a/libraries/voicerecorder/api/build.gradle.kts
+++ b/libraries/voicerecorder/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorder.kt b/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorder.kt
index 0fee2da38d..3427f694b3 100644
--- a/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorder.kt
+++ b/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorderState.kt b/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorderState.kt
index cc4dc0238c..0a6840658f 100644
--- a/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorderState.kt
+++ b/libraries/voicerecorder/api/src/main/kotlin/io/element/android/libraries/voicerecorder/api/VoiceRecorderState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -22,16 +23,19 @@ sealed interface VoiceRecorderState {
      * The recorder is currently recording.
      *
      * @property elapsedTime The elapsed time since the recording started.
-     * @property levels The current audio levels of the recording as a fraction of 1.
+     * @property levels The current audio levels of the recording as a fraction of 1. All values are between 0 and 1.
      */
-    data class Recording(val elapsedTime: Duration, val levels: List<Float>) : VoiceRecorderState
+    data class Recording(
+        val elapsedTime: Duration,
+        val levels: List<Float>,
+    ) : VoiceRecorderState
 
     /**
      * The recorder has finished recording.
      *
      * @property file The recorded file.
      * @property mimeType The mime type of the file.
-     * @property waveform The waveform of the recording.
+     * @property waveform The waveform of the recording. All values are between 0 and 1.
      * @property duration The total time spent recording.
      */
     data class Finished(
diff --git a/libraries/voicerecorder/impl/build.gradle.kts b/libraries/voicerecorder/impl/build.gradle.kts
index a09106a8c3..f737ca16d9 100644
--- a/libraries/voicerecorder/impl/build.gradle.kts
+++ b/libraries/voicerecorder/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorder.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorder.kt
index 624282edef..5e4c9ae132 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorder.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,7 +11,6 @@ package io.element.android.libraries.voicerecorder.impl
 import android.Manifest
 import androidx.annotation.RequiresPermission
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.VoiceMessageConfig
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -43,7 +43,6 @@ import kotlin.time.TimeSource
 
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultVoiceRecorder(
     private val dispatchers: CoroutineDispatchers,
     private val timeSource: TimeSource,
@@ -63,6 +62,8 @@ class DefaultVoiceRecorder(
     private var outputFile: File? = null
     private var audioReader: AudioReader? = null
     private var recordingJob: Job? = null
+
+    // List of Float between 0 and 1 representing the audio levels
     private val levels: MutableList<Float> = mutableListOf()
     private val lock = Mutex()
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AndroidAudioReader.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AndroidAudioReader.kt
index cc8a7bbe29..c4686dc312 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AndroidAudioReader.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AndroidAudioReader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Audio.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Audio.kt
index 0677875703..522fe9f59f 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Audio.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Audio.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioConfig.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioConfig.kt
index c2b9352936..350e3f94d3 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioConfig.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioLevelCalculator.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioLevelCalculator.kt
index d58ca3e4e2..2db448acf5 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioLevelCalculator.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioLevelCalculator.kt
@@ -1,12 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voicerecorder.impl.audio
 
+import androidx.annotation.FloatRange
+
 interface AudioLevelCalculator {
     /**
      * Calculate the audio level of the audio buffer.
@@ -14,5 +17,6 @@ interface AudioLevelCalculator {
      * @param buffer The audio buffer containing 16bit PCM audio data.
      * @return A float value between 0 and 1 proportional to the audio level.
      */
+    @FloatRange(from = 0.0, to = 1.0)
     fun calculateAudioLevel(buffer: ShortArray): Float
 }
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioReader.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioReader.kt
index 8af3b55252..9f336991d8 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioReader.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/AudioReader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculator.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculator.kt
index 6001e74615..12cd42c652 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculator.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculator.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voicerecorder.impl.audio
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.RoomScope
 import kotlin.math.log10
 import kotlin.math.sqrt
@@ -20,7 +20,6 @@ import kotlin.math.sqrt
  * See: https://en.wikipedia.org/wiki/DBFS
  */
 @ContributesBinding(RoomScope::class)
-@Inject
 class DBovAudioLevelCalculator : AudioLevelCalculator {
     override fun calculateAudioLevel(buffer: ShortArray): Float {
         return buffer.rms().dBov().normalize().coerceIn(0f, 1f)
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 ef02a45160..9d471f7a6d 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
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voicerecorder.impl.audio
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.Provider
 import io.element.android.libraries.di.RoomScope
 import io.element.android.opusencoder.OggOpusEncoder
@@ -19,7 +19,6 @@ import java.io.File
  * Safe wrapper for OggOpusEncoder.
  */
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultEncoder(
     private val encoderProvider: Provider<OggOpusEncoder>,
     config: AudioConfig,
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Encoder.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Encoder.kt
index 9a7e11d8f5..0ceb04259c 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Encoder.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Encoder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Resample.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Resample.kt
index e2705865de..a8bc81ed5a 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Resample.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/Resample.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/SampleRate.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/SampleRate.kt
index c055e97ec0..c3bfd7ca6d 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/SampleRate.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/SampleRate.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt
index 917ef14415..ee9f7bfa9d 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt
index 768233cfe8..316d003842 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt
@@ -1,14 +1,14 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.voicerecorder.impl.file
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.hash.md5
 import io.element.android.libraries.di.CacheDirectory
 import io.element.android.libraries.di.RoomScope
@@ -18,7 +18,6 @@ import java.io.File
 import java.util.UUID
 
 @ContributesBinding(RoomScope::class)
-@Inject
 class DefaultVoiceFileManager(
     @CacheDirectory private val cacheDir: File,
     private val config: VoiceFileConfig,
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileConfig.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileConfig.kt
index 3eb519dab1..8b5d778514 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileConfig.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileManager.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileManager.kt
index 255cfd809f..81897e0e56 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileManager.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/VoiceFileManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorderTest.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorderTest.kt
index 6ed540a2f4..e3ff6f9198 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorderTest.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/DefaultVoiceRecorderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculatorTest.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculatorTest.kt
index 50ccc03c8c..7fd8c6ed7b 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculatorTest.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DBovAudioLevelCalculatorTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/ResampleTest.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/ResampleTest.kt
index 72f327ec38..91780802d6 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/ResampleTest.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/audio/ResampleTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioLevelCalculator.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioLevelCalculator.kt
index 522d17961c..48e12c3192 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioLevelCalculator.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioLevelCalculator.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReader.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReader.kt
index e18a577184..b14bb400e5 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReader.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReader.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt
index c899f52d43..d4bd241aaa 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeEncoder.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeEncoder.kt
index dcd52d042b..70a6c8b9c0 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeEncoder.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeEncoder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeFileSystem.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeFileSystem.kt
index 8f6f0e4815..b69f019626 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeFileSystem.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeFileSystem.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceFileManager.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceFileManager.kt
index c86305e71f..29bb0aae8b 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceFileManager.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceFileManager.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/test/build.gradle.kts b/libraries/voicerecorder/test/build.gradle.kts
index b1f9bed3ba..c0f74b71e8 100644
--- a/libraries/voicerecorder/test/build.gradle.kts
+++ b/libraries/voicerecorder/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt b/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt
index 351ab63dd1..ec62227857 100644
--- a/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt
+++ b/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,6 +14,7 @@ import io.element.android.libraries.voicerecorder.api.VoiceRecorder
 import io.element.android.libraries.voicerecorder.api.VoiceRecorderState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.yield
 import java.io.File
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -48,6 +50,7 @@ class FakeVoiceRecorder(
         timeSource += recordingDuration
         for (i in 1..levels.size) {
             _state.emit(VoiceRecorderState.Recording(startedAt.elapsedNow(), levels.take(i)))
+            yield()
         }
     }
 
diff --git a/libraries/wellknown/api/build.gradle.kts b/libraries/wellknown/api/build.gradle.kts
index 3a805e38c8..768214d874 100644
--- a/libraries/wellknown/api/build.gradle.kts
+++ b/libraries/wellknown/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
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 064416eec1..7dc230d2e1 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,4 +12,5 @@ data class ElementWellKnown(
     val registrationHelperUrl: String?,
     val enforceElementPro: Boolean?,
     val rageshakeUrl: String?,
+    val brandColor: String?,
 )
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/SessionWellknownRetriever.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/SessionWellknownRetriever.kt
index 7f7b9b983f..b006508fc7 100644
--- a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/SessionWellknownRetriever.kt
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/SessionWellknownRetriever.kt
@@ -1,13 +1,13 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 SessionWellknownRetriever {
-    suspend fun getWellKnown(): WellKnown?
-    suspend fun getElementWellKnown(): ElementWellKnown?
+    suspend fun getElementWellKnown(): WellknownRetrieverResult<ElementWellKnown>
 }
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellKnown.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellKnown.kt
deleted file mode 100644
index 59f63d1655..0000000000
--- a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellKnown.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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.
- */
-
-package io.element.android.libraries.wellknown.api
-
-data class WellKnown(
-    val homeServer: WellKnownBaseConfig?,
-    val identityServer: WellKnownBaseConfig?,
-)
-
-data class WellKnownBaseConfig(
-    val baseURL: String?
-)
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetriever.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetriever.kt
index e617bc8e13..f7b73de8e5 100644
--- a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetriever.kt
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetriever.kt
@@ -1,13 +1,13 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 WellknownRetriever {
-    suspend fun getWellKnown(baseUrl: String): WellKnown?
-    suspend fun getElementWellKnown(baseUrl: String): ElementWellKnown?
+    suspend fun getElementWellKnown(baseUrl: String): WellknownRetrieverResult<ElementWellKnown>
 }
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
new file mode 100644
index 0000000000..3236f18660
--- /dev/null
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetrieverResult.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.wellknown.api
+
+sealed interface WellknownRetrieverResult<out T> {
+    /**
+     * Well-known data has been successfully retrieved.
+     */
+    data class Success<out T>(val data: T) : WellknownRetrieverResult<T>
+
+    /**
+     * Well-known data is not found (file does not exist server side, we got a 404).
+     */
+    data object NotFound : WellknownRetrieverResult<Nothing>
+
+    /**
+     * Any other error.
+     */
+    data class Error(val exception: Exception) : WellknownRetrieverResult<Nothing>
+
+    fun dataOrNull(): T? = when (this) {
+        is Success<T> -> data
+        is Error -> null
+        NotFound -> null
+    }
+}
diff --git a/libraries/wellknown/impl/build.gradle.kts b/libraries/wellknown/impl/build.gradle.kts
index 4de8ecc0fd..f803eeec3c 100644
--- a/libraries/wellknown/impl/build.gradle.kts
+++ b/libraries/wellknown/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,8 +28,9 @@ dependencies {
     implementation(platform(libs.network.retrofit.bom))
     implementation(libs.network.retrofit)
     implementation(libs.serialization.json)
-    implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.network)
 
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 81bbab5ab8..3bcf9bf573 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
@@ -1,54 +1,54 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.ContributesBinding
-import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.json.JsonProvider
 import io.element.android.libraries.core.extensions.mapCatchingExceptions
 import io.element.android.libraries.di.SessionScope
 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.SessionWellknownRetriever
-import io.element.android.libraries.wellknown.api.WellKnown
-import kotlinx.serialization.json.Json
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import timber.log.Timber
 
 @ContributesBinding(SessionScope::class)
-@Inject
 class DefaultSessionWellknownRetriever(
     private val matrixClient: MatrixClient,
-    private val parser: Json,
+    private val json: JsonProvider,
 ) : SessionWellknownRetriever {
     private val domain by lazy { matrixClient.userIdServerName() }
 
-    override suspend fun getWellKnown(): WellKnown? {
-        val url = "https://$domain/.well-known/matrix/client"
-        return matrixClient
-            .getUrl(url)
-            .mapCatchingExceptions {
-                val data = String(it)
-                parser.decodeFromString(InternalWellKnown.serializer(), data)
-            }
-            .onFailure { Timber.e(it, "Failed to retrieve .well-known from $domain") }
-            .map { it.map() }
-            .getOrNull()
-    }
-
-    override suspend fun getElementWellKnown(): ElementWellKnown? {
+    override suspend fun getElementWellKnown(): WellknownRetrieverResult<ElementWellKnown> {
         val url = "https://$domain/.well-known/element/element.json"
         return matrixClient
             .getUrl(url)
             .mapCatchingExceptions {
                 val data = String(it)
-                parser.decodeFromString(InternalElementWellKnown.serializer(), data)
+                json().decodeFromString<InternalElementWellKnown>(data).map()
             }
-            .onFailure { Timber.e(it, "Failed to retrieve Element .well-known from $domain") }
-            .map { it.map() }
-            .getOrNull()
+            .toWellknownRetrieverResult()
     }
+
+    private fun <T> Result<T>.toWellknownRetrieverResult(): WellknownRetrieverResult<T> = fold(
+        onSuccess = {
+            WellknownRetrieverResult.Success(it)
+        },
+        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)
+            }
+        }
+    )
 }
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 aa0e28e85a..02dae72a43 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,47 +10,49 @@ package io.element.android.libraries.wellknown.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
+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.WellKnown
 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
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultWellknownRetriever(
     private val retrofitFactory: RetrofitFactory,
 ) : WellknownRetriever {
-    override suspend fun getWellKnown(baseUrl: String): WellKnown? {
-        val wellknownApi = buildWellknownApi(baseUrl) ?: return null
-        return try {
-            wellknownApi.getWellKnown().map()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to retrieve well-known data for $baseUrl")
-            null
-        }
+    override suspend fun getElementWellKnown(baseUrl: String): WellknownRetrieverResult<ElementWellKnown> {
+        return buildWellknownApi(baseUrl)
+            .map { wellknownApi ->
+                try {
+                    val result = wellknownApi.getElementWellKnown().map()
+                    WellknownRetrieverResult.Success(result)
+                } catch (e: Exception) {
+                    // Is it a 404?
+                    Timber.e(e, "Failed to retrieve Element well-known data for $baseUrl")
+                    if ((e as? HttpException)?.code() == HttpURLConnection.HTTP_NOT_FOUND) {
+                        WellknownRetrieverResult.NotFound
+                    } else {
+                        WellknownRetrieverResult.Error(e)
+                    }
+                }
+            }
+            .fold(
+                onSuccess = { it },
+                onFailure = { WellknownRetrieverResult.Error(it as Exception) }
+            )
     }
 
-    override suspend fun getElementWellKnown(baseUrl: String): ElementWellKnown? {
-        val wellknownApi = buildWellknownApi(baseUrl) ?: return null
-        return try {
-            wellknownApi.getElementWellKnown().map()
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to retrieve Element well-known data for $baseUrl")
-            null
-        }
-    }
-
-    private fun buildWellknownApi(accountProviderUrl: String): WellknownAPI? {
-        return try {
+    private fun buildWellknownApi(accountProviderUrl: String): Result<WellknownAPI> {
+        return runCatchingExceptions {
             retrofitFactory.create(accountProviderUrl.ensureProtocol())
                 .create(WellknownAPI::class.java)
-        } catch (e: Exception) {
+        }.onFailure { e ->
             // If the base URL is not valid, we cannot retrieve the well-known data
             Timber.e(e, "Failed to create Retrofit instance for $accountProviderUrl")
-            null
         }
     }
 }
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 e81d78d498..c79d8fa4c3 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -27,4 +28,6 @@ data class InternalElementWellKnown(
     val enforceElementPro: Boolean? = null,
     @SerialName("rageshake_url")
     val rageshakeUrl: String? = null,
+    @SerialName("brand_color")
+    val brandColor: String? = null,
 )
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnown.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnown.kt
index 8915359771..bf43356c45 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnown.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnown.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnownBaseConfig.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnownBaseConfig.kt
index 76f1a2af4e..342cd43395 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnownBaseConfig.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalWellKnownBaseConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 9c1618f699..d3f57806b3 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
@@ -1,27 +1,18 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 io.element.android.libraries.wellknown.api.ElementWellKnown
-import io.element.android.libraries.wellknown.api.WellKnown
-import io.element.android.libraries.wellknown.api.WellKnownBaseConfig
 
 internal fun InternalElementWellKnown.map() = ElementWellKnown(
     registrationHelperUrl = registrationHelperUrl,
     enforceElementPro = enforceElementPro,
     rageshakeUrl = rageshakeUrl,
-)
-
-internal fun InternalWellKnown.map() = WellKnown(
-    homeServer = homeServer?.map(),
-    identityServer = identityServer?.map(),
-)
-
-internal fun InternalWellKnownBaseConfig.map() = WellKnownBaseConfig(
-    baseURL = baseURL,
+    brandColor = brandColor,
 )
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/WellknownAPI.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/WellknownAPI.kt
index d109aa7a43..54528f7c42 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/WellknownAPI.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/WellknownAPI.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 624370466a..4e384dbc0d 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
@@ -1,153 +1,25 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.libraries.androidutils.json.DefaultJsonProvider
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.wellknown.api.ElementWellKnown
-import io.element.android.libraries.wellknown.api.WellKnown
-import io.element.android.libraries.wellknown.api.WellKnownBaseConfig
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.json.Json
 import org.junit.Test
 
 class DefaultSessionWellknownRetrieverTest {
-    @Test
-    fun `get empty wellknown`() = runTest {
-        val getUrlLambda = lambdaRecorder<String, Result<ByteArray>> {
-            Result.success("{}".toByteArray())
-        }
-        val sut = createDefaultSessionWellknownRetriever(
-            getUrlLambda = getUrlLambda,
-        )
-        assertThat(sut.getWellKnown()).isEqualTo(
-            WellKnown(
-                homeServer = null,
-                identityServer = null,
-            )
-        )
-        getUrlLambda.assertions().isCalledOnce()
-            .with(value("https://user.domain.org/.well-known/matrix/client"))
-    }
-
-    @Test
-    fun `get wellknown with full content`() = runTest {
-        val sut = createDefaultSessionWellknownRetriever(
-            getUrlLambda = {
-                Result.success(
-                    """{
-                    "m.homeserver": {
-                        "base_url": "https://example.org"
-                    },
-                    "m.identity_server": {
-                        "base_url": "https://identity.example.org"
-                    }
-                }""".trimIndent().toByteArray()
-                )
-            }
-        )
-        assertThat(sut.getWellKnown()).isEqualTo(
-            WellKnown(
-                homeServer = WellKnownBaseConfig(
-                    baseURL = "https://example.org",
-                ),
-                identityServer = WellKnownBaseConfig(
-                    baseURL = "https://identity.example.org",
-                ),
-            )
-        )
-    }
-
-    @Test
-    fun `get wellknown with full content empty base_url`() = runTest {
-        val sut = createDefaultSessionWellknownRetriever(
-            getUrlLambda = {
-                Result.success(
-                    """{
-                    "m.homeserver": {
-                        "base_url": "https://example.org"
-                    },
-                    "m.identity_server": {}
-                }""".trimIndent().toByteArray()
-                )
-            }
-        )
-        assertThat(sut.getWellKnown()).isEqualTo(
-            WellKnown(
-                homeServer = WellKnownBaseConfig(
-                    baseURL = "https://example.org",
-                ),
-                identityServer = WellKnownBaseConfig(
-                    baseURL = null,
-                ),
-            )
-        )
-    }
-
-    @Test
-    fun `get wellknown with unknown key`() = runTest {
-        val sut = createDefaultSessionWellknownRetriever(
-            getUrlLambda = {
-                Result.success(
-                    """{
-                    "m.homeserver": {
-                        "base_url": "https://example.org"
-                    },
-                    "m.identity_server": {
-                        "base_url": "https://identity.example.org"
-                    },
-                    "other": true
-                }""".trimIndent().toByteArray()
-                )
-            }
-        )
-        assertThat(sut.getWellKnown()).isEqualTo(
-            WellKnown(
-                homeServer = WellKnownBaseConfig(
-                    baseURL = "https://example.org",
-                ),
-                identityServer = WellKnownBaseConfig(
-                    baseURL = "https://identity.example.org",
-                ),
-            )
-        )
-    }
-
-    @Test
-    fun `get wellknown json error`() = runTest {
-        val sut = createDefaultSessionWellknownRetriever(
-            getUrlLambda = {
-                Result.success(
-                    """{
-                    "m.homeserver": {
-                        "base_url": "https://example.org"
-                    },
-                    error
-                }""".trimIndent().toByteArray()
-                )
-            }
-        )
-        assertThat(sut.getWellKnown()).isNull()
-    }
-
-    @Test
-    fun `get wellknown network error`() = runTest {
-        val sut = createDefaultSessionWellknownRetriever(
-            getUrlLambda = {
-                Result.failure(AN_EXCEPTION)
-            }
-        )
-        assertThat(sut.getWellKnown()).isNull()
-    }
-
     @Test
     fun `get empty element wellknown`() = runTest {
         val getUrlLambda = lambdaRecorder<String, Result<ByteArray>> {
@@ -157,10 +29,13 @@ class DefaultSessionWellknownRetrieverTest {
             getUrlLambda = getUrlLambda,
         )
         assertThat(sut.getElementWellKnown()).isEqualTo(
-            ElementWellKnown(
-                registrationHelperUrl = null,
-                enforceElementPro = null,
-                rageshakeUrl = null,
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = null,
+                    enforceElementPro = null,
+                    rageshakeUrl = null,
+                    brandColor = null,
+                )
             )
         )
         getUrlLambda.assertions().isCalledOnce()
@@ -175,16 +50,20 @@ class DefaultSessionWellknownRetrieverTest {
                     """{
                     "registration_helper_url": "a_registration_url",
                     "enforce_element_pro": true,
-                    "rageshake_url": "a_rageshake_url"
+                    "rageshake_url": "a_rageshake_url",
+                    "brand_color": "#FF0000"
                 }""".trimIndent().toByteArray()
                 )
             }
         )
         assertThat(sut.getElementWellKnown()).isEqualTo(
-            ElementWellKnown(
-                registrationHelperUrl = "a_registration_url",
-                enforceElementPro = true,
-                rageshakeUrl = "a_rageshake_url",
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = "a_registration_url",
+                    enforceElementPro = true,
+                    rageshakeUrl = "a_rageshake_url",
+                    brandColor = "#FF0000",
+                )
             )
         )
     }
@@ -201,13 +80,16 @@ class DefaultSessionWellknownRetrieverTest {
                     "other": true
                 }""".trimIndent().toByteArray()
                 )
-            }
+            },
         )
         assertThat(sut.getElementWellKnown()).isEqualTo(
-            ElementWellKnown(
-                registrationHelperUrl = "a_registration_url",
-                enforceElementPro = true,
-                rageshakeUrl = "a_rageshake_url",
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = "a_registration_url",
+                    enforceElementPro = true,
+                    rageshakeUrl = "a_rageshake_url",
+                    brandColor = null,
+                )
             )
         )
     }
@@ -224,7 +106,7 @@ class DefaultSessionWellknownRetrieverTest {
                 )
             }
         )
-        assertThat(sut.getElementWellKnown()).isNull()
+        assertThat(sut.getElementWellKnown()).isInstanceOf(WellknownRetrieverResult.Error::class.java)
     }
 
     @Test
@@ -234,7 +116,7 @@ class DefaultSessionWellknownRetrieverTest {
                 Result.failure(AN_EXCEPTION)
             }
         )
-        assertThat(sut.getElementWellKnown()).isNull()
+        assertThat(sut.getElementWellKnown()).isInstanceOf(WellknownRetrieverResult.Error::class.java)
     }
 
     private fun createDefaultSessionWellknownRetriever(
@@ -244,6 +126,6 @@ class DefaultSessionWellknownRetrieverTest {
             userIdServerNameLambda = { "user.domain.org" },
             getUrlLambda = getUrlLambda,
         ),
-        parser = Json { ignoreUnknownKeys = true }
+        json = DefaultJsonProvider(),
     )
 }
diff --git a/libraries/wellknown/test/build.gradle.kts b/libraries/wellknown/test/build.gradle.kts
index 7c7f4a368b..0ce22348b3 100644
--- a/libraries/wellknown/test/build.gradle.kts
+++ b/libraries/wellknown/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeSessionWellknownRetriever.kt b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeSessionWellknownRetriever.kt
index 6c2c141622..3c675beed2 100644
--- a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeSessionWellknownRetriever.kt
+++ b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeSessionWellknownRetriever.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,18 +10,13 @@ package io.element.android.features.wellknown.test
 
 import io.element.android.libraries.wellknown.api.ElementWellKnown
 import io.element.android.libraries.wellknown.api.SessionWellknownRetriever
-import io.element.android.libraries.wellknown.api.WellKnown
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import io.element.android.tests.testutils.simulateLongTask
 
 class FakeSessionWellknownRetriever(
-    private val getWellKnownResult: () -> WellKnown? = { null },
-    private val getElementWellKnownResult: () -> ElementWellKnown? = { null },
+    private val getElementWellKnownResult: () -> WellknownRetrieverResult<ElementWellKnown> = { WellknownRetrieverResult.NotFound },
 ) : SessionWellknownRetriever {
-    override suspend fun getWellKnown(): WellKnown? = simulateLongTask {
-        getWellKnownResult()
-    }
-
-    override suspend fun getElementWellKnown(): ElementWellKnown? = simulateLongTask {
+    override suspend fun getElementWellKnown(): WellknownRetrieverResult<ElementWellKnown> = simulateLongTask {
         getElementWellKnownResult()
     }
 }
diff --git a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeWellknownRetriever.kt b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeWellknownRetriever.kt
index c8bbbde26d..139332667e 100644
--- a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeWellknownRetriever.kt
+++ b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeWellknownRetriever.kt
@@ -1,26 +1,22 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.wellknown.api.ElementWellKnown
-import io.element.android.libraries.wellknown.api.WellKnown
 import io.element.android.libraries.wellknown.api.WellknownRetriever
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import io.element.android.tests.testutils.simulateLongTask
 
 class FakeWellknownRetriever(
-    private val getWellKnownResult: (String) -> WellKnown? = { null },
-    private val getElementWellKnownResult: (String) -> ElementWellKnown? = { null },
+    private val getElementWellKnownResult: (String) -> WellknownRetrieverResult<ElementWellKnown> = { WellknownRetrieverResult.NotFound },
 ) : WellknownRetriever {
-    override suspend fun getWellKnown(baseUrl: String): WellKnown? = simulateLongTask {
-        getWellKnownResult(baseUrl)
-    }
-
-    override suspend fun getElementWellKnown(baseUrl: String): ElementWellKnown? = simulateLongTask {
+    override suspend fun getElementWellKnown(baseUrl: String): WellknownRetrieverResult<ElementWellKnown> = simulateLongTask {
         getElementWellKnownResult(baseUrl)
     }
 }
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 686026b78d..b5fd9f6020 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
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -13,8 +14,10 @@ fun anElementWellKnown(
     registrationHelperUrl: String? = null,
     enforceElementPro: Boolean? = null,
     rageshakeUrl: String? = null,
+    brandColor: String? = null,
 ) = ElementWellKnown(
     registrationHelperUrl = registrationHelperUrl,
     enforceElementPro = enforceElementPro,
     rageshakeUrl = rageshakeUrl,
+    brandColor = brandColor,
 )
diff --git a/libraries/workmanager/api/build.gradle.kts b/libraries/workmanager/api/build.gradle.kts
new file mode 100644
index 0000000000..b53ed40394
--- /dev/null
+++ b/libraries/workmanager/api/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.workmanager.api"
+}
+
+dependencies {
+    api(libs.androidx.workmanager.runtime)
+
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/WorkManagerRequest.kt b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/WorkManagerRequest.kt
new file mode 100644
index 0000000000..af49c3dc87
--- /dev/null
+++ b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/WorkManagerRequest.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.workmanager.api
+
+import androidx.work.WorkRequest
+
+interface WorkManagerRequest {
+    fun build(): Result<List<WorkRequest>>
+}
diff --git a/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/WorkManagerScheduler.kt b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/WorkManagerScheduler.kt
new file mode 100644
index 0000000000..b538486d35
--- /dev/null
+++ b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/WorkManagerScheduler.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.libraries.workmanager.api
+
+import io.element.android.libraries.matrix.api.core.SessionId
+
+interface WorkManagerScheduler {
+    fun submit(workManagerRequest: WorkManagerRequest)
+    fun hasPendingWork(sessionId: SessionId, requestType: WorkManagerRequestType): Boolean
+    fun cancel(sessionId: SessionId)
+}
+
+fun workManagerTag(sessionId: SessionId, requestType: WorkManagerRequestType): String {
+    val prefix = when (requestType) {
+        WorkManagerRequestType.NOTIFICATION_SYNC -> "notifications"
+        WorkManagerRequestType.DB_VACUUM -> "db_vacuum"
+    }
+    return "$prefix-$sessionId"
+}
+
+enum class WorkManagerRequestType {
+    NOTIFICATION_SYNC,
+    DB_VACUUM,
+}
diff --git a/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/di/MetroWorkerFactory.kt b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/di/MetroWorkerFactory.kt
new file mode 100644
index 0000000000..086d3baafa
--- /dev/null
+++ b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/di/MetroWorkerFactory.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.workmanager.api.di
+
+import android.content.Context
+import androidx.work.ListenableWorker
+import androidx.work.WorkerFactory
+import androidx.work.WorkerParameters
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import kotlin.reflect.KClass
+
+@ContributesBinding(AppScope::class)
+class MetroWorkerFactory(
+    val workerProviders: Map<KClass<out ListenableWorker>, WorkerInstanceFactory<*>>
+) : WorkerFactory() {
+    override fun createWorker(
+        appContext: Context,
+        workerClassName: String,
+        workerParameters: WorkerParameters,
+    ): ListenableWorker? {
+      return workerProviders[Class.forName(workerClassName).kotlin]?.create(workerParameters)
+    }
+
+    interface WorkerInstanceFactory<T : ListenableWorker> {
+      fun create(params: WorkerParameters): T
+    }
+}
diff --git a/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/di/WorkerKey.kt b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/di/WorkerKey.kt
new file mode 100644
index 0000000000..7202408da5
--- /dev/null
+++ b/libraries/workmanager/api/src/main/kotlin/io/element/android/libraries/workmanager/api/di/WorkerKey.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.workmanager.api.di
+
+import androidx.work.ListenableWorker
+import dev.zacsweers.metro.MapKey
+import kotlin.reflect.KClass
+
+/** A [MapKey] annotation for binding Worker in a multibinding map. */
+@MapKey
+@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class WorkerKey(val value: KClass<out ListenableWorker>)
diff --git a/libraries/workmanager/impl/build.gradle.kts b/libraries/workmanager/impl/build.gradle.kts
new file mode 100644
index 0000000000..878edb6fe2
--- /dev/null
+++ b/libraries/workmanager/impl/build.gradle.kts
@@ -0,0 +1,29 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.workmanager.impl"
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.libraries.workmanager.api)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.di)
+
+    testCommonDependencies(libs, false)
+    testImplementation(projects.libraries.sessionStorage.test)
+}
diff --git a/libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerScheduler.kt b/libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerScheduler.kt
new file mode 100644
index 0000000000..4f3806db62
--- /dev/null
+++ b/libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerScheduler.kt
@@ -0,0 +1,73 @@
+/*
+ * 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.workmanager.impl
+
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.sessionstorage.api.observer.SessionListener
+import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
+import io.element.android.libraries.workmanager.api.workManagerTag
+import timber.log.Timber
+
+@ContributesBinding(AppScope::class)
+@SingleIn(AppScope::class)
+class DefaultWorkManagerScheduler(
+    lazyWorkManager: Lazy<WorkManager>,
+    sessionObserver: SessionObserver,
+) : WorkManagerScheduler {
+    private val workManager by lazyWorkManager
+
+    init {
+        // Observe session removals to cancel associated work automatically
+        sessionObserver.addListener(object : SessionListener {
+            override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
+                val sessionId = SessionId(userId)
+                Timber.d("Session deleted for userId: $userId, cancelling associated workmanager requests")
+                cancel(sessionId)
+            }
+        })
+    }
+
+    override fun submit(workManagerRequest: WorkManagerRequest) {
+        workManagerRequest.build().fold(
+            onSuccess = { workRequests ->
+                workManager.enqueue(workRequests)
+            },
+            onFailure = {
+                Timber.e(it, "Failed to build WorkManager request $workManagerRequest")
+            }
+        )
+    }
+
+    override fun hasPendingWork(sessionId: SessionId, requestType: WorkManagerRequestType): Boolean {
+        val workInfos = workManager.getWorkInfosByTag(workManagerTag(sessionId, requestType)).get().orEmpty()
+        return workInfos.any { info ->
+            val isPeriodic = info.periodicityInfo != null
+            val isCancelled = info.state == WorkInfo.State.CANCELLED
+            // It has pending work if:
+            // - It's not periodic and is not finished.
+            // - It's periodic and is not cancelled - since it'll be run again in a next iteration otherwise
+            !isPeriodic && !info.state.isFinished || isPeriodic && !isCancelled
+        }
+    }
+
+    override fun cancel(sessionId: SessionId) {
+        Timber.d("Cancelling work for sessionId: $sessionId")
+        for (requestType in WorkManagerRequestType.entries) {
+            workManager.cancelAllWorkByTag(workManagerTag(sessionId, requestType))
+        }
+    }
+}
diff --git a/libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/WorkManagerModule.kt b/libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/WorkManagerModule.kt
new file mode 100644
index 0000000000..7df9e7f431
--- /dev/null
+++ b/libraries/workmanager/impl/src/main/kotlin/io/element/android/libraries/workmanager/impl/WorkManagerModule.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.workmanager.impl
+
+import android.content.Context
+import androidx.work.WorkManager
+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.di.annotations.ApplicationContext
+
+@BindingContainer
+@ContributesTo(AppScope::class)
+object WorkManagerModule {
+    @Provides
+    @SingleIn(AppScope::class)
+    fun providesWorkManager(
+        @ApplicationContext context: Context,
+    ): WorkManager {
+        return WorkManager.getInstance(context)
+    }
+}
diff --git a/libraries/workmanager/impl/src/test/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerSchedulerTest.kt b/libraries/workmanager/impl/src/test/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerSchedulerTest.kt
new file mode 100644
index 0000000000..b4f964ed12
--- /dev/null
+++ b/libraries/workmanager/impl/src/test/kotlin/io/element/android/libraries/workmanager/impl/DefaultWorkManagerSchedulerTest.kt
@@ -0,0 +1,105 @@
+/*
+ * 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.workmanager.impl
+
+import androidx.work.WorkManager
+import androidx.work.WorkRequest
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.workManagerTag
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultWorkManagerSchedulerTest {
+    @Test
+    fun `starts observing sessions on init to remove work for logged out sessions`() = runTest {
+        val sessionId = "@session1:matrix.org"
+        val sessionObserver = FakeSessionObserver()
+
+        val workManager = spyk<WorkManager>()
+
+        DefaultWorkManagerScheduler(
+            lazyWorkManager = lazy { workManager },
+            sessionObserver = sessionObserver,
+        )
+
+        // We remove the session
+        sessionObserver.onSessionDeleted(sessionId)
+
+        runCurrent()
+
+        // The session is now gone and work associated with the session is cancelled
+        verify { workManager.cancelAllWorkByTag("notifications-$sessionId") }
+    }
+
+    @Test
+    fun `submit builds the request and enqueues it`() = runTest {
+        val workManager = spyk<WorkManager>()
+
+        val scheduler = DefaultWorkManagerScheduler(
+            lazyWorkManager = lazy { workManager },
+            sessionObserver = FakeSessionObserver(),
+        )
+
+        scheduler.submit(FakeWorkManagerRequest())
+
+        verify { workManager.enqueue(any<List<WorkRequest>>()) }
+    }
+
+    @Test
+    fun `submit won't do anything if building the work request fails`() = runTest {
+        val workManager = spyk<WorkManager>()
+
+        val scheduler = DefaultWorkManagerScheduler(
+            lazyWorkManager = lazy { workManager },
+            sessionObserver = FakeSessionObserver(),
+        )
+
+        scheduler.submit(FakeWorkManagerRequest(result = Result.failure(IllegalStateException("Test error"))))
+
+        verify(exactly = 0) { workManager.enqueue(any<List<WorkRequest>>()) }
+    }
+
+    @Test
+    fun `cancel will cancel all pending work for a session id`() = runTest {
+        val workManager = spyk<WorkManager>()
+
+        val scheduler = DefaultWorkManagerScheduler(
+            lazyWorkManager = lazy { workManager },
+            sessionObserver = FakeSessionObserver(),
+        )
+
+        val sessionId = SessionId("@alice:matrix.org")
+        val tagToRemove = workManagerTag(sessionId, WorkManagerRequestType.NOTIFICATION_SYNC)
+        val mockSessionA = mockk<WorkRequest> {
+            every { tags } returns setOf(tagToRemove)
+        }
+        scheduler.submit(FakeWorkManagerRequest(result = Result.success(listOf(mockSessionA))))
+
+        scheduler.cancel(sessionId)
+
+        verify { workManager.cancelAllWorkByTag(tagToRemove) }
+    }
+}
+
+private class FakeWorkManagerRequest(
+    private val result: Result<List<WorkRequest>> = Result.success(listOf()),
+) : WorkManagerRequest {
+    override fun build(): Result<List<WorkRequest>> {
+        return result
+    }
+}
diff --git a/libraries/workmanager/test/build.gradle.kts b/libraries/workmanager/test/build.gradle.kts
new file mode 100644
index 0000000000..9885bdc55e
--- /dev/null
+++ b/libraries/workmanager/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.workmanager.test"
+}
+
+dependencies {
+    api(projects.libraries.workmanager.api)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/libraries/workmanager/test/src/main/kotlin/io/element/android/libraries/workmanager/test/FakeWorkManagerScheduler.kt b/libraries/workmanager/test/src/main/kotlin/io/element/android/libraries/workmanager/test/FakeWorkManagerScheduler.kt
new file mode 100644
index 0000000000..f2caa8c743
--- /dev/null
+++ b/libraries/workmanager/test/src/main/kotlin/io/element/android/libraries/workmanager/test/FakeWorkManagerScheduler.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.workmanager.test
+
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.workmanager.api.WorkManagerRequest
+import io.element.android.libraries.workmanager.api.WorkManagerRequestType
+import io.element.android.libraries.workmanager.api.WorkManagerScheduler
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeWorkManagerScheduler(
+    private val submitLambda: (WorkManagerRequest) -> Unit = { lambdaError() },
+    private val hasPendingWorkLambda: (SessionId, WorkManagerRequestType) -> Boolean = { _, _ -> false },
+    private val cancelLambda: (SessionId) -> Unit = { lambdaError() },
+) : WorkManagerScheduler {
+    override fun submit(workManagerRequest: WorkManagerRequest) {
+        submitLambda(workManagerRequest)
+    }
+
+    override fun hasPendingWork(sessionId: SessionId, requestType: WorkManagerRequestType): Boolean {
+        return hasPendingWorkLambda(sessionId, requestType)
+    }
+
+    override fun cancel(sessionId: SessionId) {
+        cancelLambda(sessionId)
+    }
+}
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index e40d1f5bbd..eb2f56e19e 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts
index 40327da593..7684f058de 100644
--- a/plugins/settings.gradle.kts
+++ b/plugins/settings.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/Enterprise.kt b/plugins/src/main/kotlin/Enterprise.kt
index b006595526..ab0185d07d 100644
--- a/plugins/src/main/kotlin/Enterprise.kt
+++ b/plugins/src/main/kotlin/Enterprise.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/Logger.kt b/plugins/src/main/kotlin/Logger.kt
index f449a47dd4..96f6dd6720 100644
--- a/plugins/src/main/kotlin/Logger.kt
+++ b/plugins/src/main/kotlin/Logger.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/ModulesConfig.kt b/plugins/src/main/kotlin/ModulesConfig.kt
index 57379a7fd6..b5360b42ca 100644
--- a/plugins/src/main/kotlin/ModulesConfig.kt
+++ b/plugins/src/main/kotlin/ModulesConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 52c09434d4..f00099753c 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -38,7 +39,7 @@ private const val versionYear = 25
  * 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 = 10
+private const val versionMonth = 12
 
 /**
  * Release number in the month. Value must be in [0,99].
diff --git a/plugins/src/main/kotlin/config/AnalyticsConfig.kt b/plugins/src/main/kotlin/config/AnalyticsConfig.kt
index 43f5fd8966..a485a08592 100644
--- a/plugins/src/main/kotlin/config/AnalyticsConfig.kt
+++ b/plugins/src/main/kotlin/config/AnalyticsConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/config/BuildTimeConfig.kt b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
index 0f0d05415c..8cfa533609 100644
--- a/plugins/src/main/kotlin/config/BuildTimeConfig.kt
+++ b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -28,6 +29,7 @@ object BuildTimeConfig {
     val SERVICES_POSTHOG_HOST: String? = null
     val SERVICES_POSTHOG_APIKEY: String? = null
     val SERVICES_SENTRY_DSN: String? = null
+    val SERVICES_SENTRY_DSN_RUST: String? = null
     val BUG_REPORT_URL: String? = null
     val BUG_REPORT_APP_NAME: String? = null
 
diff --git a/plugins/src/main/kotlin/config/PushProvidersConfig.kt b/plugins/src/main/kotlin/config/PushProvidersConfig.kt
index e041f94364..ac36c96707 100644
--- a/plugins/src/main/kotlin/config/PushProvidersConfig.kt
+++ b/plugins/src/main/kotlin/config/PushProvidersConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/extension/AssetCopyTask.kt b/plugins/src/main/kotlin/extension/AssetCopyTask.kt
index 16401531f3..c443b127ba 100644
--- a/plugins/src/main/kotlin/extension/AssetCopyTask.kt
+++ b/plugins/src/main/kotlin/extension/AssetCopyTask.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 251afafc3e..5f243f4319 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
index d46c54e1c3..5a4c4f9aeb 100644
--- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
+++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -89,6 +90,7 @@ fun DependencyHandlerScope.allLibrariesImpl() {
     implementation(project(":libraries:designsystem"))
     implementation(project(":libraries:matrix:impl"))
     implementation(project(":libraries:matrixui"))
+    implementation(project(":libraries:matrixmedia:impl"))
     implementation(project(":libraries:network"))
     implementation(project(":libraries:core"))
     implementation(project(":libraries:eventformatter:impl"))
@@ -118,6 +120,8 @@ fun DependencyHandlerScope.allLibrariesImpl() {
     implementation(project(":libraries:fullscreenintent:impl"))
     implementation(project(":libraries:wellknown:impl"))
     implementation(project(":libraries:oidc:impl"))
+    implementation(project(":libraries:workmanager:impl"))
+    implementation(project(":libraries:recentemojis:impl"))
 }
 
 fun DependencyHandlerScope.allServicesImpl() {
diff --git a/plugins/src/main/kotlin/extension/DependencyInjectionExtensions.kt b/plugins/src/main/kotlin/extension/DependencyInjectionExtensions.kt
index 01895c4000..b9cf87e233 100644
--- a/plugins/src/main/kotlin/extension/DependencyInjectionExtensions.kt
+++ b/plugins/src/main/kotlin/extension/DependencyInjectionExtensions.kt
@@ -1,12 +1,14 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 package extension
 
+import dev.zacsweers.metro.gradle.MetroPluginExtension
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
@@ -20,11 +22,18 @@ import org.gradle.plugin.use.PluginDependency
 fun Project.setupDependencyInjection(
     generateNodeFactories: Boolean = shouldApplyAppyxCodegen(),
 ) {
+    if (project.path.endsWith(":api")) {
+        error("api module should not use setupDependencyInjection(). Move the implementation to `:impl` module")
+    }
+
     val libs = the<LibrariesForLibs>()
 
     // Apply Metro plugin and configure it
     applyPluginIfNeeded(libs.plugins.metro)
 
+    val metroExtension = extensions.getByName("metro") as MetroPluginExtension
+    metroExtension.contributesAsInject.value(true)
+
     if (generateNodeFactories) {
         applyPluginIfNeeded(libs.plugins.ksp)
 
diff --git a/plugins/src/main/kotlin/extension/KoverExtension.kt b/plugins/src/main/kotlin/extension/KoverExtension.kt
index 04a647321e..4cb8398a39 100644
--- a/plugins/src/main/kotlin/extension/KoverExtension.kt
+++ b/plugins/src/main/kotlin/extension/KoverExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -158,7 +159,6 @@ fun Project.setupKover() {
                         "io.element.android.libraries.designsystem.swipe.SwipeableActionsState",
                         "io.element.android.libraries.designsystem.theme.components.bottomsheet.CustomSheetState",
                         "io.element.android.libraries.maplibre.compose.CameraPositionState",
-                        "io.element.android.libraries.maplibre.compose.SaveableCameraPositionState",
                         "io.element.android.libraries.maplibre.compose.SymbolState",
                         "io.element.android.libraries.matrix.api.room.RoomMembershipState",
                         "io.element.android.libraries.matrix.api.room.RoomMembersState",
diff --git a/plugins/src/main/kotlin/extension/Utils.kt b/plugins/src/main/kotlin/extension/Utils.kt
index 4d19505704..032aba3fac 100644
--- a/plugins/src/main/kotlin/extension/Utils.kt
+++ b/plugins/src/main/kotlin/extension/Utils.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/extension/VariantDimensionExtension.kt b/plugins/src/main/kotlin/extension/VariantDimensionExtension.kt
index a7589f02a9..ee43b88154 100644
--- a/plugins/src/main/kotlin/extension/VariantDimensionExtension.kt
+++ b/plugins/src/main/kotlin/extension/VariantDimensionExtension.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/extension/VersionCatalog.kt b/plugins/src/main/kotlin/extension/VersionCatalog.kt
index 4e3f2d677b..a2f4484c0d 100644
--- a/plugins/src/main/kotlin/extension/VersionCatalog.kt
+++ b/plugins/src/main/kotlin/extension/VersionCatalog.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/plugins/src/main/kotlin/extension/locales.kt b/plugins/src/main/kotlin/extension/locales.kt
index 93431455a5..1af7146681 100644
--- a/plugins/src/main/kotlin/extension/locales.kt
+++ b/plugins/src/main/kotlin/extension/locales.kt
@@ -12,13 +12,13 @@ val locales = setOf(
     "el",
     "en",
     "en-rUS",
-    "eo",
     "es",
     "et",
     "eu",
     "fa",
     "fi",
     "fr",
+    "hr",
     "hu",
     "in",
     "it",
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 060248d110..d8f754e8e6 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f1edbca9ae..8a1020a5c3 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 f267f85449..3ee5e2b603 100644
--- a/plugins/src/main/kotlin/io.element.android-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/screenshots/de/appnav.room.joined_LoadingRoomNodeView_Day_1_de.png b/screenshots/de/appnav.room.joined_LoadingRoomNodeView_Day_1_de.png
index ec1170a517..f7a5852846 100644
--- a/screenshots/de/appnav.room.joined_LoadingRoomNodeView_Day_1_de.png
+++ b/screenshots/de/appnav.room.joined_LoadingRoomNodeView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ced98c61dd5c65e3ea9037dd6f5989fb9fa3626744ffe02afe7ed21c75645717
-size 13009
+oid sha256:173c488c77b3ba1f0b8190c626e51d12d221e4b85aaa83b3fe5caf3e25fe458d
+size 10189
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 daaa90702b..fc8f13e941 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:d6ca3832f5bfd853eb8a46f229269292b41deea505946972f6c181d3f916487c
-size 85831
+oid sha256:04f10a69293c264deb83f19c3adc4b223e7f722f99154d86dac0743d30eebabe
+size 85812
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 7fac6ab0b0..53a3abcafa 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:1ae6e7a291307b66aa36e59bb8a0b0e1e06e030d87a21a134e25e60ab1aa78dd
-size 87419
+oid sha256:ab07d3cedec320578a200ac7e428b861198a09e54f68971a274c27c399d840c6
+size 87441
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
index 6c1f2b970f..2d59285f58 100644
--- a/screenshots/de/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_de.png
+++ b/screenshots/de/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:064b8f0aae8eefbac4b70f7836bbd41d27954f8c7c580f7f306fb8fad2ee1022
-size 69465
+oid sha256:0996d8aed1bd5cb8f99743adb77ea85ade9d65a02aefcc2032714d1b6d1f131d
+size 69468
diff --git a/screenshots/de/features.call.impl.ui_IncomingCallScreen_Day_0_de.png b/screenshots/de/features.call.impl.ui_IncomingCallScreen_Day_0_de.png
index b7aad0695a..b690bf51da 100644
--- a/screenshots/de/features.call.impl.ui_IncomingCallScreen_Day_0_de.png
+++ b/screenshots/de/features.call.impl.ui_IncomingCallScreen_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4589bdb8f0a2e14cc1588acb0f914f50b459bc4395f22d4a9303447773c59cfe
-size 68453
+oid sha256:cde6ab80c5e68ad7f9ce6911405f5abdc52994ad0829a6657bd8abdd7b7be22b
+size 68451
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_0_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_0_de.png
deleted file mode 100644
index 60e591d166..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b45f2dd9fa60e7f72b138e7e82d5a8cdc30467cdc5ea9c0afe09aa54c1686a7
-size 16120
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_10_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_10_de.png
deleted file mode 100644
index 0e4b5b1562..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_10_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12634dceaef537d5431771d900e476409d7efd4cca1d278c21ef424d609e0596
-size 53107
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_11_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_11_de.png
deleted file mode 100644
index 7f1cba04c2..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_11_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10ff5140b95d150a0541cc4d05eb415ccceccf82e797af1cd1074ee387def109
-size 55455
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_12_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_12_de.png
deleted file mode 100644
index a4b949a6da..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_12_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c50792d349bfd0cb583ba51f754102a25475375c498941a0d113581274c2b3a4
-size 55478
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_1_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_1_de.png
deleted file mode 100644
index caee19be3f..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfaee10346f165f2f27723494d1c2506fbd753e6876f98047059346815940ea5
-size 71902
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_2_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_2_de.png
deleted file mode 100644
index 311b2cd71c..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c505ae703366d52fa9e9b0c0ef723c9fc33b073b8bd84882f3fa5aa31f976de0
-size 65504
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_3_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_3_de.png
deleted file mode 100644
index 6aa02e515a..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b466cab816ec224a7434ec143bbc086941afd01a5370f7d0f8126af603a1634
-size 65339
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_4_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_4_de.png
deleted file mode 100644
index d351bb2ab9..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64ffef7fbc235b64797dfd89f96b75323f345115b63530aba97e1be8e75b9458
-size 59221
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_6_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_6_de.png
deleted file mode 100644
index 6739289e2e..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c485a47e58864cfa945c609cc53f3b2875623208f25505af4ac9338728e26f81
-size 66039
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_7_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_7_de.png
deleted file mode 100644
index f2a53e604e..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fce675e4f044f255c306e917d7473bad6a22c244629b9c5729d08ce3ec7dcd7
-size 66276
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_8_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_8_de.png
deleted file mode 100644
index 2b14561f41..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_8_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b822c8431d2e90a1c484b78edf3eda9db70485669dea0638c5f74c286f94cd20
-size 55755
diff --git a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_9_de.png b/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_9_de.png
deleted file mode 100644
index dfb0b4f039..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_ChangeRolesView_Day_9_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65594c19b36303f28c6580aa1d0861f65483f91fc69dfa97a9744895a1c910f9
-size 67794
diff --git a/screenshots/de/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Day_0_de.png b/screenshots/de/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Day_0_de.png
deleted file mode 100644
index fc9c3e2365..0000000000
--- a/screenshots/de/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:353deccaf44203d369a40c95032787afd5946b12b76c8fecde6a8b8028df7631
-size 15419
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 b44c8aff18..bd0e8752b4 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:c44e406f4576869def5292961e4201f68e9668d17bf79315e313fccacf58bc76
-size 34201
+oid sha256:bba0a8575b618446b61d69372af6b8c9a87aec8dd925066bea543c9bda4de758
+size 34195
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 dfc55ad0bf..d996235ee9 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:ef7d027bb08c6c74716f588ab90b41cbf21c8eadbdc5cfabc8c843a82e6647cc
-size 40227
+oid sha256:0a95826d38ba306dad54a21fea3f0c3b348bb388ce3f734d084fb36bb689678b
+size 40246
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 91a7ed7f55..dec36c9974 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:2e3188c26344223653bd7f8aa2b787d3a2fffebc7e4d9bf1c41d8d911dedac90
-size 61456
+oid sha256:caab417458e9798b4c338de667afc8e8fac9ee8a45168ee60e7e31ddf035f8cd
+size 61831
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 e255d8edc1..411a3ed5b8 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:07c35a8d865a5902ffb0c382ca4c8daa04e20865dddd669e5c28f49f68223ebc
-size 62218
+oid sha256:83e83f59efcff4f7a1d9b01eee242d3384c512f5a1d0623fa9dbfcfdc73a61e0
+size 62570
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 9d08205d11..d666f4e02a 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:36cfb0c3a753eb56e10384cd2228074d3303bb213fec06e654daf79d2dbaa8ae
-size 63630
+oid sha256:8f1ced6eb71c9009b54c408e7617d2b945071e64c88caf6eff10a4c8c482aa9a
+size 63985
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 91a7ed7f55..dec36c9974 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:2e3188c26344223653bd7f8aa2b787d3a2fffebc7e4d9bf1c41d8d911dedac90
-size 61456
+oid sha256:caab417458e9798b4c338de667afc8e8fac9ee8a45168ee60e7e31ddf035f8cd
+size 61831
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 99e09224b5..74ba252140 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:e0261e3244d154a88d9544821c3ec3517425553d311b06a7a586c225677ae01f
-size 35291
+oid sha256:bf37caa5c17b00d268041c4897b9b148f7d7d4e16dd4c0938c05b6e1b9fd0e84
+size 35289
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 c855175cb1..32acfffcc8 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:7dbbfaa3f7113abc3d7b3d2c6451f7b6c20bf3a28f64d7407682c88576c62300
-size 41590
+oid sha256:43586d8414cb23ab363491c57b7c4bb22a95d2bb55b8dc1d1507054a67a69f7f
+size 41598
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 86dfef35db..726a329f48 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:2cff0e19fb2f6f09a7173fde3612c55cc2cbe3028c5a8c09ac3efc623bd35da1
-size 63502
+oid sha256:27f2ddc3924cea4dfc4f7ee4b077dc2e9a3fb33122a4f0fb1fade3322f305815
+size 63881
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 4fc3002681..cdbed88a65 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:e4ff4eb745d680311927f55512cc24b04a87b28faf3845ab31b50fcc8749c382
-size 64292
+oid sha256:d2fd3ba9c6bfa6de0cb78195fdda1677408281f5c408996ef8d6ae3e1567f83b
+size 64670
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 fc4c6cbc45..99b5863d77 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:900c16973cf8d59b6ace320c848e07eb92056be8e4e14b148a852fd46abeaa69
-size 65817
+oid sha256:07e66f22455d1c79851b28807bab15ee114f45bca794c6405358c47d8a313bcc
+size 66193
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 86dfef35db..726a329f48 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:2cff0e19fb2f6f09a7173fde3612c55cc2cbe3028c5a8c09ac3efc623bd35da1
-size 63502
+oid sha256:27f2ddc3924cea4dfc4f7ee4b077dc2e9a3fb33122a4f0fb1fade3322f305815
+size 63881
diff --git a/screenshots/de/features.forward.impl_ForwardMessagesView_Day_3_de.png b/screenshots/de/features.forward.impl_ForwardMessagesView_Day_3_de.png
new file mode 100644
index 0000000000..c856f0e358
--- /dev/null
+++ b/screenshots/de/features.forward.impl_ForwardMessagesView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:506f037d7cce42ac09efc89bff5d74475a723321af4713ed54a7caf85bfcb297
+size 14382
diff --git a/screenshots/de/features.ftue.impl.notifications_NotificationsOptInView_Day_0_de.png b/screenshots/de/features.ftue.impl.notifications_NotificationsOptInView_Day_0_de.png
index 2aaf45271a..84017fc504 100644
--- a/screenshots/de/features.ftue.impl.notifications_NotificationsOptInView_Day_0_de.png
+++ b/screenshots/de/features.ftue.impl.notifications_NotificationsOptInView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72a797ea50aef8b2de09aaa54e9710a77ed7f696075be904d6b95032ccce44b6
-size 71406
+oid sha256:dea8fb3f80552e387fc8a0e1bb196b60a98e9c49e6a0c3e2f0e8fad75bbd44f9
+size 71400
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 ea50869a7d..1a8c87d2dd 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:8cc57222ee6166b3b415315497191cbc2b90ff4a41f11eb0f19fceb7e097a87a
-size 36917
+oid sha256:9838926418f0a3e9ac8f9d90558372f523a0eac63d456bfb711219c37212f7b9
+size 36911
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 e8e553710b..94c1100ea5 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:236c8f484745747889248205a566b313b98b35332271cd2c890aaafe2724a30d
-size 30272
+oid sha256:1840c34892a469caf8cc794d608b70edf437318b406e2bd6301966455af01515
+size 30266
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 7a1f14f76c..fd3afd132f 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:2193e2bab199ad3783eb3b4d524c099c35374ede78adf1ed49d1f04e5bd4d132
-size 43031
+oid sha256:781c324b5ec66937a82b0a59a3b31c8d242adc60c4b5628519ac57bba727d104
+size 43027
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 13be141568..ad0fdc98d8 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:23b34487e8c852788102c9bcd5a9eca498a2c4165678d8ae4ea7c21d3a62bde3
-size 36594
+oid sha256:3da672ece75f846bd08ce5ee6290059ac00f407d93123f026a59cb49a62987a9
+size 36588
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
new file mode 100644
index 0000000000..015381912e
--- /dev/null
+++ b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07812a245ea5c9aace355b56086ad386c0cb542f56f4913a8a9b1026fd6f8cec
+size 26519
diff --git a/screenshots/de/features.home.impl.components_BatteryOptimizationBanner_Day_0_de.png b/screenshots/de/features.home.impl.components_BatteryOptimizationBanner_Day_0_de.png
index 03a5750716..42a7a323cf 100644
--- a/screenshots/de/features.home.impl.components_BatteryOptimizationBanner_Day_0_de.png
+++ b/screenshots/de/features.home.impl.components_BatteryOptimizationBanner_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:670d308317209e4a8e64a34d0529ae96f313a7e18fbb3aad6ca85e68b3ed2eb6
-size 33325
+oid sha256:6a77c71e8acd0b1710b22958cfe5cc4f8f67445da635135dabbbd9b7e7871b07
+size 33329
diff --git a/screenshots/de/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_de.png b/screenshots/de/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_de.png
index be25e57899..e18604695f 100644
--- a/screenshots/de/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_de.png
+++ b/screenshots/de/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58cb364d4b03cc76ca2244bd59d844c3bf1133231d92c580229dc69bcb70b40f
-size 34442
+oid sha256:85785b8f45de2e378eb31538aaacc83e09ecb9e6284d2832ef32ac59f107761f
+size 34461
diff --git a/screenshots/de/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_de.png b/screenshots/de/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_de.png
deleted file mode 100644
index 6cfe101073..0000000000
--- a/screenshots/de/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baac8c8251f75553c31d68ab3c56435303fcf918ebdcbe5986f96222112f4b2c
-size 26452
diff --git a/screenshots/de/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_de.png b/screenshots/de/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_de.png
deleted file mode 100644
index 7693af2408..0000000000
--- a/screenshots/de/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6a48914499aafcd7f65c7f0adc9c9660742308317ed136e2f1a72aa9d7aea8d
-size 26794
diff --git a/screenshots/de/features.home.impl.components_DefaultRoomListTopBar_Day_0_de.png b/screenshots/de/features.home.impl.components_DefaultRoomListTopBar_Day_0_de.png
deleted file mode 100644
index c0ee6482c6..0000000000
--- a/screenshots/de/features.home.impl.components_DefaultRoomListTopBar_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96aa21d1c28dbfbc328a76c2f3fd0df12692b27905ff80274e04d11f8cfab04a
-size 26545
diff --git a/screenshots/de/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_de.png b/screenshots/de/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_de.png
index e35da5b224..c8ebd7d369 100644
--- a/screenshots/de/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_de.png
+++ b/screenshots/de/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00f0ef61028de8ad1c9886987872f1cf3dfe31f80f313a49099ab3017ccbbfd5
-size 33220
+oid sha256:83721f6cb5a98f7e67c62cc9b05dd3cc49f9701ba7ef2aefc6a220cf6b01f30b
+size 33237
diff --git a/screenshots/de/features.home.impl.components_HomeTopBarMultiAccount_Day_0_de.png b/screenshots/de/features.home.impl.components_HomeTopBarMultiAccount_Day_0_de.png
new file mode 100644
index 0000000000..b40ff588c7
--- /dev/null
+++ b/screenshots/de/features.home.impl.components_HomeTopBarMultiAccount_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82d4ec8dfa27a109e3b6e09a989b57540ee24beacc325c32707b3fd2b6310821
+size 21869
diff --git a/screenshots/de/features.home.impl.components_HomeTopBarWithIndicator_Day_0_de.png b/screenshots/de/features.home.impl.components_HomeTopBarWithIndicator_Day_0_de.png
new file mode 100644
index 0000000000..81f3d84947
--- /dev/null
+++ b/screenshots/de/features.home.impl.components_HomeTopBarWithIndicator_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e1492f5df9092f52dd9ecdc38d03aee7abda581bf7c12401561a6dea5a41f86
+size 22302
diff --git a/screenshots/de/features.home.impl.components_HomeTopBar_Day_0_de.png b/screenshots/de/features.home.impl.components_HomeTopBar_Day_0_de.png
new file mode 100644
index 0000000000..f47c2d2770
--- /dev/null
+++ b/screenshots/de/features.home.impl.components_HomeTopBar_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec8262321fea4ad6cf9b648e262c3359557fa8dcfd127f70e62bc705d7ec5cd4
+size 21962
diff --git a/screenshots/de/features.home.impl.components_NewNotificationSoundBanner_Day_0_de.png b/screenshots/de/features.home.impl.components_NewNotificationSoundBanner_Day_0_de.png
index cbaec95e4e..7bed6a049c 100644
--- a/screenshots/de/features.home.impl.components_NewNotificationSoundBanner_Day_0_de.png
+++ b/screenshots/de/features.home.impl.components_NewNotificationSoundBanner_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91a7fc2676cb7271eb85ffe1e8bf42892a0f40fa4b8310f3385afd790f28c17f
-size 25724
+oid sha256:f93ac9e09873a777bbfb1de4124b276c1a836af500500f0ff0d94c1a13707e48
+size 25734
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 718868cb85..ebed766b40 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:dc274e63a8428f432ae8ddb7d91cfabffef8d43f130c91c8927427194defb40b
-size 43970
+oid sha256:cd5a8bb187b96200fb85a79a57c6ad555324df7fd825615053adb15f4b7a07db
+size 44076
diff --git a/screenshots/de/features.home.impl.components_RoomListContentView_Day_3_de.png b/screenshots/de/features.home.impl.components_RoomListContentView_Day_3_de.png
index de59c20f97..73e75b9f21 100644
--- a/screenshots/de/features.home.impl.components_RoomListContentView_Day_3_de.png
+++ b/screenshots/de/features.home.impl.components_RoomListContentView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5520723fc98d5c041c5f13c445f8fe5ce456119ddda8c2eb6b5cdac036aeaa3f
-size 21532
+oid sha256:26aa60982538d671935f47c815ef13b55d36b1dc62b6bbd1cd18c09f5684d7cf
+size 21544
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 c2c5f858d7..3d3f7a3cd7 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:329befa1d030a76d8a772a69cea1296b31b7d2715c0d74553b26a63845a39caf
-size 56164
+oid sha256:92df0dc469ebbe7d631de2034588d5f19190519949d446965a34c90bfa4ff2d3
+size 56182
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 d1173d8bb1..537e7cd715 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:2ecfd2bb5f3fa6d1828dd63ffb6b97169b138d1899f999b3a40f8f45c6b74297
-size 64057
+oid sha256:59cf2e0b4094609c7748ca389c9afd0e84fcbeba22a9e435c890e94f164c8fe2
+size 64367
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 101ebd6709..b0a2c81647 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:4095db1fc771634666d8a741094154f0199057cc4f4826e834fa7979d9695b04
-size 39140
+oid sha256:b65bedce0b61249766d7e75ff74a8113a6bc5905f10b475118e924b9eb5a72ce
+size 39155
diff --git a/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_0_de.png b/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_0_de.png
index 60ffa078a5..5a0cedf904 100644
--- a/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_0_de.png
+++ b/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0faba67716fb88929d38d0148e23612d1a530b3af1824590506c65feee87ca83
-size 14364
+oid sha256:a93c8b953f4be3d369dde578889cd548a94fdd11403f720abfb926d7596be540
+size 13361
diff --git a/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_1_de.png b/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_1_de.png
index 1316133253..801882b9a0 100644
--- a/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_1_de.png
+++ b/screenshots/de/features.home.impl.filters_RoomListFiltersView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b59a077729a19c882de527df5d72c82e68d7a4afc0dfe1c29032b93ea7e23ab
-size 12342
+oid sha256:b374f82e8d12b325e775f5d35a779ab1a955155d8b626ce13e3363260be837f3
+size 12124
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
index f37924b4b0..c4742e5739 100644
--- a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_de.png
+++ b/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d368c5876bb66ee82422e0a896660d44f6106a1b81b06c0fe4af6a5475602f94
-size 23644
+oid sha256:1e4bca9f466aa446dca37659f33f1f31f3d98bff1fae33243ea00e987f050886
+size 23622
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
index 6b9d582870..1bb3353e61 100644
--- a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_de.png
+++ b/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29ce8b1546df7121cf3f28218b6c6d4c91a7888c22c02ebfe1aceb58b35dad2a
-size 23844
+oid sha256:7d9aaa7142e8d3d36be461f00e7d80e14c9960168199190208b54bd49dafccf3
+size 23838
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
index 908db1df3e..00e402cc2d 100644
--- a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_de.png
+++ b/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da9a37c55c9f569d29c5b28f6d7d59974296f69e6fb4d40f47f8cd1afc205118
-size 26032
+oid sha256:e322b890b936bebab3e5e2590aeffb7b4bcf82cc42e08b071ea6036b883dea15
+size 26028
diff --git a/screenshots/de/features.home.impl.search_RoomListSearchContent_Day_1_de.png b/screenshots/de/features.home.impl.search_RoomListSearchContent_Day_1_de.png
index 9edf04bc2a..1c4fb92e9c 100644
--- a/screenshots/de/features.home.impl.search_RoomListSearchContent_Day_1_de.png
+++ b/screenshots/de/features.home.impl.search_RoomListSearchContent_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c028b77f53da31957dcb04ba9201c2a9f7345994f628081569bbd0601cd689f
-size 46029
+oid sha256:f5ee7f6355bab9a287fdafcc62463798c82a4fd41a08b00a6cc7feb6e47de9a2
+size 46251
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 a6e961cacb..a75fe56c05 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:2f5dc2dfed0bc7951d5ddc45215fa7798157d5d807574ca4724549d706c56bea
-size 90925
+oid sha256:14e930dacc7ad385a0401556eb6be4fb59ba7801a5cb3b6f1222cab68938c1c6
+size 90986
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 5521655e1a..11761bef37 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:5a5878f4483056c91981bdaed225a5dfabb78ac3f55243c2f7323f259c00542e
-size 42026
+oid sha256:7a93222cebbc0bc6ba382b10bef1118edf67fdf520b37038d0c47725e3c9e831
+size 42115
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 5453ea83cc..d6e6402fea 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:bd4033b18eacdf206e2b9d39006626c9eac96b3dc57b8a8200454f4b8b544c5e
-size 68319
+oid sha256:bb38da7cb17bf60d3f65657d66a59cae1c282dea3a5855694eeb65486a0b89a9
+size 63760
diff --git a/screenshots/de/features.home.impl_HomeView_Day_10_de.png b/screenshots/de/features.home.impl_HomeView_Day_10_de.png
index eb7a71d593..069dd23b63 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_10_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:159c14c2f3aceed0993cda75af75d53cdcb7fe58b04a4412c768163328f95df5
-size 36852
+oid sha256:62d1ad64d8d096a34458c7845fb800fa0cd605461f3ef4fe0699d30ca03c7925
+size 33284
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 2d7a61f711..5b21661b2a 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:cdc61baac9b833fab3823e31910df8ef828848d673436c402113da92e4baf615
-size 92898
+oid sha256:66dc64fb12b3cc6e2e3953eef03b1615473fd58c9476bd2beec5f72753011076
+size 95190
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 5d5a764e7b..8a5d19579b 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:c3c1fc65c761d7fa0b44ce916aee2ce4af5725877620de2f33b6e03b2c54789e
-size 90356
+oid sha256:07b0d56ddeacc0c5d28ae7cfabb5ebe69fa96cc33207945a57c5f146d0d5879a
+size 89944
diff --git a/screenshots/de/features.home.impl_HomeView_Day_15_de.png b/screenshots/de/features.home.impl_HomeView_Day_15_de.png
index 040ac63243..6ac7326cdf 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_15_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c360d5a74cb9cdf48066d18fc68ab4f12caca7d4de079fae7a12f7e99fc7e513
-size 54846
+oid sha256:b7ab0fb505552504a2b069118818f82738f1c364e54f4a7298fecbfcee067f53
+size 55052
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 bfec21f772..d6e6402fea 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:ed1428c748522383c7f5c58cda95df6398a487d826188c53e285aa6ad3e9a16d
-size 69704
+oid sha256:bb38da7cb17bf60d3f65657d66a59cae1c282dea3a5855694eeb65486a0b89a9
+size 63760
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 5453ea83cc..d6e6402fea 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:bd4033b18eacdf206e2b9d39006626c9eac96b3dc57b8a8200454f4b8b544c5e
-size 68319
+oid sha256:bb38da7cb17bf60d3f65657d66a59cae1c282dea3a5855694eeb65486a0b89a9
+size 63760
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 c06b6ccbe6..0be04e92be 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:a9632d63be6dae2ccff6463cbc984b871223cab0cf044f10e453d871b6106d94
-size 63047
+oid sha256:79c556ec87626ccd24be0af20caa14593e526edd82e64b2a26e504618fbf008e
+size 62166
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 1c1734ceee..ffba89ca4f 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:2c6870cbb8fcca652d06ff492a900ef01f0272129ac6777e6f207c5c97dd5bfd
-size 56530
+oid sha256:8902154fddfa359e605cf95c715e080a5b027a79bac4ff0026464c20dd29311a
+size 55725
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 5453ea83cc..d6e6402fea 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:bd4033b18eacdf206e2b9d39006626c9eac96b3dc57b8a8200454f4b8b544c5e
-size 68319
+oid sha256:bb38da7cb17bf60d3f65657d66a59cae1c282dea3a5855694eeb65486a0b89a9
+size 63760
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 5dfec9dbe3..c0b27ca7bf 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:f12c3c149d1aaaee451bc771accdaf5af6825bd5b2d0203af66aa0138dd8514b
-size 55834
+oid sha256:0d1580df361ba18c688f51fbb60060ccc90699919d4bffd37b0e1bba710d69c7
+size 58347
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 b1566559b0..33bc050b3f 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:f2faaaec56e952f4e50517073fc023736740b5ea6f50fce6554de3d2ac2b6871
-size 55158
+oid sha256:f2cc760e43b919592b11023d054fbd3a2c767940b5990fb21857e9d3efbf84ce
+size 57691
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 fb430bd3b2..94e0c7a247 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:a9dd1a22036e65045c84979c6623d4fa8d7548963dc1958434586a30bf3b2687
-size 53369
+oid sha256:11f9e09290a4a4e078087f6eac764ae3cceb4052c9d75ee33f9036c83fdcb8c2
+size 55926
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 73d2cf5470..9c81fb4fb1 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:549c7644f0a20617bf8777175858ab08488d74871b8f027b44a34645a28148bc
-size 88335
+oid sha256:1790960b72437802d90f756b037565e0466e9088ca0205f3ebb269d56d22fd37
+size 90881
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png
index 06e1e4d73d..16603e1ad5 100644
--- a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14d48a5de0ed3ea22231f63e0c9505fa45b0ed49be9711ade65c3e971fdb90af
-size 38115
+oid sha256:4125ed409129b21fbd135be095406ef6067796ab51af14f0a03e4e976a12ef40
+size 38129
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png
index 84308ef475..a80a2921b4 100644
--- a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2663031de6e0be83865e6008f898ba06603132a03136c7f5c49959d883581828
-size 43019
+oid sha256:f117efb1ae1be195266ff14faf0223cf0e45ddfb881c2231aa166184145ec0e9
+size 43032
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png
index 32ad3592b3..57660288f1 100644
--- a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e479455f6c45247609af474edf795e40298614aae7b0d91d28829ca47eaab41
-size 38313
+oid sha256:f70a4e76d086ce61717c84da62781fb167366e0e1ce516c1d5fcf59ede2aecbf
+size 38333
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png
index 389639d215..96a1e1c954 100644
--- a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a8c6ea3cb57beacb3ca3ebdfccb0dfc945861a75cedc74e3fd37f7306fd39f2
-size 33609
+oid sha256:1d14ff5d63ee27149dc21ae1c2cedb58244237b5303bbf7f45c299e61cefaea3
+size 33573
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png
index 06c106589a..530e34a0cf 100644
--- a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47ea6d76991c1a9d4dcd017186fc226150fe7f6fb0c3f772d9fe81c655f671fd
-size 38622
+oid sha256:0b3568df86493ca9470dc99aa4f516f42d827fcadd1f9088d24749f777dd3193
+size 38583
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 9f56a2e6a3..0402613534 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:32511b8f5a32774defea03b7c9765ff08322a2a59083c14f3a8d9b8e5807340c
-size 9405
+oid sha256:2a5b7c5d7fa9a6f9156f25aa565944028149a7d2ab9f418a0b02a17d948a6768
+size 9415
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 15bfd49357..999bb266e8 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:8590b5fd61453580add2dc93262f621b1dbefcff45ed9ef1004d0c5606c35dad
-size 21730
+oid sha256:53643845f3b082175ed3a33e0d8fd6edc4006cbe74a0c9db7a7100c2351acc4d
+size 21744
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_4_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_4_de.png
index 89363fb05e..5472de64d6 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_4_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:656f746cc9dc58566372c0a958d13307d2dc8b5a3c28da0c66f84acbb64489fd
-size 9953
+oid sha256:51b14d3633dd614fcad706c714e93447dc3ac6039ef0cec6213f77a3c24cf2b3
+size 9984
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_5_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_5_de.png
index 37e477d72d..ba1c5b663c 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_5_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f289590cc23cf31013b55d95245d076bb37e6907a8b4409b57e0798847522859
-size 39288
+oid sha256:7402d0fb1b714f733d3929955fcbf0b096187cf70e3503acc21ffa089142610f
+size 38851
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_6_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_6_de.png
index 472cd1d139..d46d8971aa 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_6_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d531da522778d5692a2f15f05aa4d75e412c8afe8e64aadeacd34b53517d4f8f
-size 38254
+oid sha256:2457c74365a98c64974eeaf607879461d2cd9a1757096f330d913fb034816b31
+size 38734
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_7_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_7_de.png
index eea89a228e..988c8dd318 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_7_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:361ffdc21a6bbe6d1e4d460c74e9fd8a2058d489f5d0e716a71a6dd970d7d8fa
-size 30254
+oid sha256:045a5183f88a998968af1f1f8a02e864697add38b1259b6e40fda702dce82b48
+size 30661
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 15bfd49357..999bb266e8 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:8590b5fd61453580add2dc93262f621b1dbefcff45ed9ef1004d0c5606c35dad
-size 21730
+oid sha256:53643845f3b082175ed3a33e0d8fd6edc4006cbe74a0c9db7a7100c2351acc4d
+size 21744
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_10_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_10_de.png
index f0f67e6a31..af401c96b2 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_10_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcf5e51d91e309bfe97f696d45a0a3ef19c9139de30f3bbd0c1cd5cbb2aee22e
-size 46807
+oid sha256:ae3bd5c35597acdd08b98069a29988cb640b5e18f88987d494235417d542cc5f
+size 46833
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_11_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_11_de.png
index 4ae703b23e..7daf68489a 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_11_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9399942211a13c9d871692dfd1b421fcd923ddde9f5922979ebfff07c0824060
-size 41067
+oid sha256:89eae936d074d8dd4b85b1bf2cea79cdc2e836c86c1af0666f6f99ba5958a761
+size 41109
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_12_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_12_de.png
index 5dcd4a2ba3..08262a007a 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_12_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:296d74f3a3198f98599fd2c428268f67b4b70e09fdfbeead9f7c7436e9cf8758
-size 42259
+oid sha256:49e56a96b1484728cc32bbbf72aa1afb9a2832b9cc383b2f1c6196eaa6c106ba
+size 42303
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_13_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_13_de.png
index f38dfd26a6..53905be788 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_13_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81ae149fcf6f1a6a52bb90618b2bd6b79192221d2decadd3d78f34ac227a0e86
-size 34158
+oid sha256:8020ec9606c7abb83beea3655c0093ea031dc73cb4999689c6351cec41774b72
+size 34186
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_14_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_14_de.png
index 5637757b98..b8e3885756 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_14_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26c22c76a3a13cdda38f9069adef8d6f17e2b5bf6bfa952812bde3575f62281f
+oid sha256:40cc7f22caec6e0cea9d167d737f5320d68d628746283c928d4d8754d9fe8434
 size 31974
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_15_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_15_de.png
index 06bb84c272..5a8abf5f49 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_15_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe3ea3e63387d40e0314b702a0e08bba8bee8b63dac6758fec713a929715b92c
-size 35827
+oid sha256:969707f3c5e0989b2abf017f42887da3aed72393f0367ca4bb9b9ca713892100
+size 35839
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_16_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_16_de.png
index 5cd8ca5e77..2daa670c8e 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_16_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6367c2cb513ab5e26d3e16a1a7554251cd5051b55328cae99019eac84e6ef2bd
-size 49735
+oid sha256:1169fceea83ba87555d57e1b46e7638033415dfe327ccb4d6d62baea28b9263e
+size 49739
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_1_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_1_de.png
index 4cadf347c5..9193157c9d 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_1_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff18fe6020711f81385f8e9e54fb685d49f95dbb720fdab37de2acc35896647b
-size 41101
+oid sha256:1208ae724a5b274922aca200adca9245e5bcd8e8655f8cb47feacbc4d06e51f9
+size 41128
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_2_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_2_de.png
index 013b1aa259..ae737b2a00 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_2_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f96ada2da82b7265fc655e4826069b395e07dedb28ad86761f956e398ced79cf
-size 39667
+oid sha256:603d9de02688eda3d7de1c7af80473699656cb0b5e5e2f794c57acaa78946d46
+size 39701
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_3_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_3_de.png
index d822cfb9f7..19c210a15c 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_3_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a6338d8c9baed45e73eb8eab8f9b097a708f1b2c0864de80911d8ddc3f9c361
-size 29854
+oid sha256:13d148d82875b231dc056d23bff5851df6c00a5f98d708a8a0329f66ef38c2a2
+size 29877
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_4_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_4_de.png
index 6744cd39a9..e7bd9cc356 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_4_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0fb1a5fc06cd64bcdb5b75e56fdaeccad017bf17b11c8cb8f9714e9c7eaab2c
-size 46214
+oid sha256:292558f746830bbb4a4fe00282d2e3f8d6c99e57dd209568003a86af273759b7
+size 46246
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_5_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_5_de.png
index b3a4eeb0d5..5311b37ec0 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_5_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:428dfda0652172cc9e9a2392db535fc51de5280b060d969863d0299142c1f35d
-size 34643
+oid sha256:3f52fb45df883d18499a79d9c079b7eae379ebf358d71a507c9a97ea02191f2b
+size 34623
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_6_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_6_de.png
index 02b18e602d..c46327c62f 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_6_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1292c78624d48944ba94da85c8e56f2636d059458bbc330298dcca89131c143f
-size 34720
+oid sha256:c997939cd44bf4532c43156848f6ea1d5623fba2e20cfda978be96d26add8c16
+size 34723
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_7_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_7_de.png
index 5b96ed77a8..cdef83f98d 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_7_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d40fe4aa6b06f8b52ec5b4f94549c35613872b3c84843e814e400139c1ba1cd
-size 41872
+oid sha256:3b171d116d25cdaf87e3437c71d94e0792654f91cb5f39ac34d83a2a1c4c946d
+size 41874
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_8_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_8_de.png
index 799892693d..456f06de2b 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_8_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:287dc0a75daeafebb50f79ec327a02eb019d3016b2e52e28613edf9c6e252315
-size 35560
+oid sha256:01f6142803fdf3e4adc9ecd640dca111baece2099899482776c11bfa98747673
+size 35544
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 b7606cbfb3..c00fccb6a4 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:d097d473593e6cc6bd0cc7bc13ea40faaad312dde2450170c0bfaa7a96e7d2bd
-size 43139
+oid sha256:878c10e2f1ca1bdbf15c09d9b46eb329f54d115f58a96eec4384036beb9c8223
+size 43166
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_de.png
index afd3136705..6864e7af2d 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:175810c0046dfd28a9273ae6dbb9d4f89dc5bbfe719bf4a9dd4938b7e03d2e29
-size 32154
+oid sha256:d7320b17b7d09aedfb0af1d7a8cc63813cd11e9cbf94e6e3fc690f3d355ef24e
+size 32142
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_de.png
index ed3160dcf1..03ac3d6204 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:815272dff296fde43ba3cc8aaf6f7c8e763c8434a400ed2a9b09150f24614f1d
-size 37721
+oid sha256:740d9ef181124f879df48739f96c84e734094e0d98b8e3e03b88fff392ce4cf6
+size 37713
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_de.png
index cf38da1b6e..9bb9a4bb78 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30743c42e137b63960d18a76df1b488b055b62384e4d984320606ecf0f591e1c
-size 21452
+oid sha256:d1469dc66914be97971ea643eeb70ab20a902bea9eb9da5effb8e9c3b7219d5a
+size 21460
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_de.png
index bba069deb0..40941f17e0 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f921e04c544b858f02165d15b1bdc48e71fb9572a6717e52e7c7dcd556e5f64
-size 22488
+oid sha256:20fdd043d471b0ba14bd8809ff9769b10e02da8b9f00f30295385a86eaee2f0c
+size 22517
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_de.png
index de8a818e1a..6e6cfccb1a 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:183f893c3b7ff13533f6130c85b293547dd505ec2ac223ff5cf4c0c1407171b6
-size 28889
+oid sha256:9eb82a3189364f26aad7d96e8efc79e8baf08844c34fd40e53659c632f48a3ec
+size 28882
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_de.png
index 1fadd8530d..f3493f3cd9 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef454c29137f961510691af29ba49066eb25a59655cb565243a74a08b0678d8a
-size 35021
+oid sha256:c835567802dc08e802560d3740a7d6ce4e52ea74dc3bfd19a9a7a41b0b6069ca
+size 35028
diff --git a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_de.png b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_de.png
index 32dc93c205..034e4ee0f9 100644
--- a/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_de.png
+++ b/screenshots/de/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c01028c357b014744faa022ea93801a44d7f938b869a4db1c14992ea732665c
-size 42277
+oid sha256:94834b539f3bce5590d87f4a2ae2290984cbd50298dbe4e0f877616d3d7ff074
+size 42278
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_0_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_0_de.png
index 37057b18f4..c86d36691f 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_0_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbf0fa64351f2710f026b438753f426e4473bcdd3a71e8438013a1a1ee970699
-size 16357
+oid sha256:4e640f3696ef9ff12f1ce4cbdd4eb22294c3d97dcca419967df17d2ae8fb4631
+size 16370
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_10_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_10_de.png
index 90deee1a55..e4a1ea49f9 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_10_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:208cca1b73135011b969b6b1c7ef30497a4f645fb531f7d666f223233d766791
-size 32066
+oid sha256:cbd9d5be0a2b6bbc69cd1ee2f82e5d6ee024d523acbdc552effaa8217b35c4c5
+size 32077
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_1_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_1_de.png
index 05644c04d6..4acc94ba2f 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_1_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c76f2ea8f90917abce153e75fc162cd41856d122bf8958bc7b71bdc8107b167c
-size 28133
+oid sha256:ce88197751c51e1c354a0fd35ab6b885782f2b88242e56d2707ddc8c97466edb
+size 28114
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_2_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_2_de.png
index b5e2221a4b..08335e8580 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_2_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2265efa921451e40b9959e4fa2724978eb118eba074e0d039c6a1c66aee97a41
-size 35666
+oid sha256:2523831ad6a9774c5ccc3884a66daa8db842772b81963c518efb323a2066ac6d
+size 35677
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_3_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_3_de.png
index 1dee560633..139f9d1ab5 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_3_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a3f77248ac32c2a6a86f47b8b5d40a57d205949e4d8f673c4735d0af833c47a
-size 44390
+oid sha256:a8b78ec6109746d2ad7bc2e1fe6075bf1772e6ecd51cde4c445067fbc085e94e
+size 44401
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 f3891ed3d4..332e7fce13 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:77e42fe00de27f72afd6b7d2670f4dc72293eabfa800153052351d7cda20bbbf
-size 57917
+oid sha256:96c9b9bc65a75419b3100138c3761b3729ead674793bc147047a2d295009ec57
+size 57926
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_5_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_5_de.png
index f739c629e1..6776e58586 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_5_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb4b0c5968cf1859485f0a88e836017ce640e9e7ecc5a8db31df0cd51012da99
-size 48479
+oid sha256:9cd29f7afbbdbdb26a31156549fec3c969966076b35228c1777de7bfe060c09b
+size 48468
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_6_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_6_de.png
index fb5adf5e5f..15e8bb5ea6 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_6_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0948a04ca82c9826163898b5998e2a1e7e19a3e212a7718f4888b618aff0fad2
-size 37931
+oid sha256:b84f820edfb2283057f8e7d7fa2f7b1fda88dc166644d32a8b252b5eb6543330
+size 37921
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_7_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_7_de.png
index 60d8909107..c9945d8f52 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_7_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7f9908bb1a05de0c4e97e830f9ee543deb29d8664cad5ae5a29a5a6cb5284d1
-size 44367
+oid sha256:10017c00cf317eda5996aea05dca42a654a5f63c3394d7a44172640cf704a4f2
+size 44355
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_8_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_8_de.png
index 87ad6ef300..96bc96c8cd 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_8_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e961c29fe0c5fc1bb0fa8b15645f5ab4a48769b36a263261b1fff8ccbb141bba
-size 32506
+oid sha256:2497c033e5671544adb216393b0289115ae423552428259195b7eb7fde155344
+size 32516
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_9_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_9_de.png
index 0f2f3b1442..a4ec2367d6 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_9_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3271c2b087197cecd7efa3cf8b5f4c4a2190a1b41551004d2a9466d3b5b8cc1c
-size 28676
+oid sha256:42cef1b3e2ea03ee7fed2366b92b3c27ace1f404eb2538663ffbbfe3decc0c73
+size 28684
diff --git a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_0_de.png b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_0_de.png
index 7b4740fadf..23ba7638ff 100644
--- a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_0_de.png
+++ b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70176fa3a368a15308a8c22bcdda99b1670260b2ca7e6a5ffcc0595ae62178eb
-size 10737
+oid sha256:66752c0c42fb8f5d7f4a8b1c30fae0a74915ba10c9dacf3e105385d16723061b
+size 10746
diff --git a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_1_de.png b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_1_de.png
index 4764b6c076..19d2b6837d 100644
--- a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_1_de.png
+++ b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12761bf881ecc1787f48834d36f950d38d8dddbcb8fef8f21553cb695ba57e8c
-size 10222
+oid sha256:8c28b57b1c32f82d34ff5182bd4b38159009189f35da96286bb7b7161cdd3e6f
+size 10230
diff --git a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_2_de.png b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_2_de.png
index 4d332c73df..ef0c4e20a6 100644
--- a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_2_de.png
+++ b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04ad3a3f5f6e09d7f0e22509a22cbe0b7d252be9ec8bfcfc7208a6d7df1c76f5
+oid sha256:efde81467c111a977ce0bb7b5b170094e033eb12d258809bde0ae46f789069e5
 size 29235
diff --git a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_3_de.png b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_3_de.png
index efff44f56e..e7e8a3926c 100644
--- a/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_3_de.png
+++ b/screenshots/de/features.licenses.impl.list_DependencyLicensesListView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2230c0dc8f812a9eb06e54fa08e3f3299090a8f2073b8b589a641b7eccca54fb
-size 30494
+oid sha256:17f907c0005d8e818f74fd204799380350ec0a508c85365c763ba0195363746e
+size 30490
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
new file mode 100644
index 0000000000..1e1846298a
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c039b7577f65380d5c54ae7d9a82d62f8a43f4888c86c799fb5b982ba6817d8
+size 45019
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
new file mode 100644
index 0000000000..8dca9fed7d
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48e2d8fffea5b23d7894fc546dac33bb87d7df5267aa58d3f79a14f7f93ee85a
+size 44823
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_0_de.png
new file mode 100644
index 0000000000..65573d908f
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fc70436b6ccb1afd77bed07598c020796341aa100b1eab6dc5b00868297dca6
+size 24990
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_1_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_1_de.png
new file mode 100644
index 0000000000..c7cf5a7efa
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50c28eb8481b1101f75bf8341481ead0e77daf116207d27ddc5c95316daf8e41
+size 22035
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
new file mode 100644
index 0000000000..4468511356
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20558650fc6a3859569d52baaab1c8af2a68e2944fd772f0d62ced5c1aa44208
+size 29397
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
new file mode 100644
index 0000000000..3603b23b24
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba73d59bab19bc1263174c632f6ca3bfed98d11b1bb949e9340b02bb5c666580
+size 38741
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
new file mode 100644
index 0000000000..a11f674a7a
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14e81841b45d0400c65a3a052e8c0c15d48ce88f7f4b50d4e453f92bdb82bbb4
+size 33097
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_5_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_5_de.png
new file mode 100644
index 0000000000..33122e6dea
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b39882c9c6d9920d0f76f3b80599b7b41cc6eab4480c6a10f09cf0992acbf203
+size 68940
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_6_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_6_de.png
new file mode 100644
index 0000000000..8d47b730a2
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9bc94377c776271128fd411397d698539fdf74870b074988b8de1c86a4ecec0
+size 21798
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_7_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_7_de.png
new file mode 100644
index 0000000000..5f79162d1b
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c184323fa1b1d87f46be6f49bf983f7d4048b5547906531b452924ee89110d30
+size 23962
diff --git a/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_de.png
new file mode 100644
index 0000000000..bad5f73502
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:754f8340cc0f39b0c2e63065bf6d03b3716d74176973b0380f348a866c0b233f
+size 30062
diff --git a/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_de.png b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_de.png
new file mode 100644
index 0000000000..7021172235
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8884d4a3a61239a030dac21660f0cb6d9ed54d3db08c7b2a48e6b18894a0bbf
+size 30043
diff --git a/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_de.png b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_de.png
new file mode 100644
index 0000000000..97e470d460
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:101ae89accacc3707b71a091eaacb7676ffc24a92d4cfd48edcf077a414130fa
+size 30642
diff --git a/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_de.png b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_de.png
new file mode 100644
index 0000000000..3c9eff4eb0
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40b967dec26c18a3122b3a80f8e29bb0e7b3d16452f4f8061c729134ac5f9f53
+size 30819
diff --git a/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_de.png b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_de.png
new file mode 100644
index 0000000000..152fb7112b
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50a6ffd3a59bcf661d5e666736d1189c3c5eaa4bee573644f0a9255d0ffe3a3d
+size 34079
diff --git a/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_de.png b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_de.png
new file mode 100644
index 0000000000..da8006965a
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1f9958366956cc133eed94df188a51dacfdb3de4195d91cfdc16cf6cbdf412e
+size 33794
diff --git a/screenshots/de/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_de.png
new file mode 100644
index 0000000000..9cd8daefdb
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57f7c6b4d39222cf3e8e92777a0aa319f2654687dd298ce1f60cecdb3e2ce0c1
+size 32149
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
new file mode 100644
index 0000000000..2def92650e
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fca6a90b7a667ed9d4d5c0cf2616664468b3ff6dd59d6460651c3e3aa3fae08
+size 17847
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
new file mode 100644
index 0000000000..8582608925
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb7142589d7c830c72fa5b7bc853027b83a2b864e43c849107d35c0a849c4f02
+size 27470
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
new file mode 100644
index 0000000000..442f156ff0
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34243ec18f06c11de6103bf7787d80b366f12890f01ffe31674ae77ee113dbf1
+size 24679
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
new file mode 100644
index 0000000000..67228c7c86
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:437eda5bc2439120a5bca6b88e307d5f0ba1cdce4683e3bb946e7f174419c6e5
+size 34336
diff --git a/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_de.png
new file mode 100644
index 0000000000..153df13caa
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adda1a1a7c20d0eb54528f5f8c60e13c2e8428afc92d849f882f25d727136687
+size 15861
diff --git a/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_de.png b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_de.png
new file mode 100644
index 0000000000..d50a67ef38
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a12dbc4f2fb3d12b1848e2ac4e079522613df2493d0a416f2f47827eb0daa322
+size 16502
diff --git a/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_de.png b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_de.png
new file mode 100644
index 0000000000..b786292896
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e19add1c5894aa7dbad4bc1fff8f3789584946ca1069c3b39b17ed826f4a06c
+size 16673
diff --git a/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_de.png b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_de.png
new file mode 100644
index 0000000000..305f24b9d7
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6a773294a47272bcc0333e7a325e0609ef53d576eca1d40422b0855cc48dae7
+size 31739
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 2bea7fe6e7..897ab6acae 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:8096f14cd637ca3042c54d17c6201b633e3f631e637fa5f4060b5c4e56d4faaf
-size 440276
+oid sha256:819c1529fda6e1ccb661de3938ba24206164d92c7da38d186fe3c82eb7b66874
+size 440267
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
index e3b1a4d8f6..9423b39f9c 100644
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_0_de.png
+++ b/screenshots/de/features.location.impl.send_SendLocationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afd961db19f26c40b6811193b0f97130fd83cb7b06a4073666394c8d272c3d6c
-size 19312
+oid sha256:b6f1f50d040889a65379d67fce0c5613b898d6cb094acb1aaa4dc0b92a7f657e
+size 19347
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
index 3496a6c996..b3b8b971fa 100644
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_1_de.png
+++ b/screenshots/de/features.location.impl.send_SendLocationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ec028bee93f35e79e812ae3b6319c29bbb49e3f22184db437c9ae05546b9ace
-size 38189
+oid sha256:e7853a7f3e4df8122bda7f95a8f5c813b01ca4fc670e5529bee2df05d9f85ce1
+size 38178
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
index 864d79e548..00182b3b1c 100644
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_2_de.png
+++ b/screenshots/de/features.location.impl.send_SendLocationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:057899a5bd1686949708242e9b96ca798cf2d8710c65347934216f7f99e67f15
-size 34558
+oid sha256:5a76e4f8f281da0ffe84d87ca3020ec6c55bf44d0dade2fe0c7fa0873e454b12
+size 34548
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
index e3b1a4d8f6..9423b39f9c 100644
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_3_de.png
+++ b/screenshots/de/features.location.impl.send_SendLocationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afd961db19f26c40b6811193b0f97130fd83cb7b06a4073666394c8d272c3d6c
-size 19312
+oid sha256:b6f1f50d040889a65379d67fce0c5613b898d6cb094acb1aaa4dc0b92a7f657e
+size 19347
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
index d2f67e9133..e827e499df 100644
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_4_de.png
+++ b/screenshots/de/features.location.impl.send_SendLocationView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:104c572c42f9a3c02939446d74202f04fa7fe7f1319b906381051090b450ca35
-size 19509
+oid sha256:05358d74019ef180be62dab139701eb94e562108b56015b09f044a89f418ea7e
+size 19508
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 d2b37fa62d..a65b0a6525 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:a74ec7c80ca76d340b5677a43b54eb2f37366fb5fedbdb0309200f85817a46f0
-size 11185
+oid sha256:ac0a0c4a5f23f042f67689ddf63f9206e727fd59970589a82c5f07546646002c
+size 11188
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 b8dd2b8613..a801df51c3 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:b7e861fcd4411820176481f0286ef2761d315a4e360d1e11060c0ff81b79441d
-size 32748
+oid sha256:bccf267283f170756cd967a55c393c18cc5c74bd8bd0eabe2a238a3f32ff68f6
+size 32723
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 142072f53f..eeaf10476a 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:28ea4c839cdadaac893336a2a4d010049a16318ade2ada6bd47b836813d1549d
-size 29133
+oid sha256:bbe8b535438d0625174537e66afb33ec2448358d2de9aa3d34ec050471fbdf4a
+size 29110
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 d2b37fa62d..a65b0a6525 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:a74ec7c80ca76d340b5677a43b54eb2f37366fb5fedbdb0309200f85817a46f0
-size 11185
+oid sha256:ac0a0c4a5f23f042f67689ddf63f9206e727fd59970589a82c5f07546646002c
+size 11188
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 0fb5a74d8f..449afd5194 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:5ba7c229b92eff8bfb53cf729a8dfef6ea5287e83cd6037d1f66fbd9bcf0ad76
-size 11319
+oid sha256:f6732dc9ac50b55af934890c3d3c10bb028700926ce14a8cdfcbc667975a1e85
+size 11321
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 067f9b76a8..62c2b50868 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:fdc4c2ee2bcb430249a629cb53f0685c0aba380cc32e127bd2fc3c48bdf69d2e
-size 14918
+oid sha256:016b0b4fda7c09023987d6729eb426313d761ada684f3c2afad66eec0621618d
+size 14920
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 246df83592..ddd6b6584e 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:6dc9fe8e6ce13b5752b36507c583f75069eabbd8c27e06e53bee1579cb0cf2b9
-size 23540
+oid sha256:f3854cf1fde4705b74af01d2e4bd69a0a545bfa6972b6f29f7ed4823c0ede6f0
+size 23548
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 bee47c76cd..ac5be030e9 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:ff97bdc5defa5188b66fec26e4693aacae40d05c7a0f50b829a187383bce8cf1
-size 26315
+oid sha256:8a975bd93798de9600bb9053dbfaaf3da9d93d288d6ba06322b184a56b75b8fd
+size 26320
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 b00e3db6b2..f4d77a6957 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:6ed749c9e3b21e56071e611fb75aed1292a9b35e36e52fd86d2798b8d4271924
-size 19294
+oid sha256:34026e4f96c633b50a0a89e227f6067a21691973625db8bfb0acdd895c6dd354
+size 19304
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 1e7f9e3026..610d2a91af 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:2fad10b820bfc20ea81d2c33c756d8acebbf2b2e44f952145bbd21ba24dce633
-size 21629
+oid sha256:120d9d3783d3b127e42afd559523487bf467442ddf26e4d0b8503a0ccd69c0ac
+size 21638
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 73d3587019..254a8ca813 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:7415217e713fd3f3828942be2fefa87c9f743c484d50ec60ea1c0a04949bfb65
-size 32895
+oid sha256:c1a9677e805c288bdf53400a985fd6b627088b503ea19ad741bd02973263f167
+size 32875
diff --git a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_de.png b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_de.png
index 81d00f84b0..c79f74d6d7 100644
--- a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_de.png
+++ b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:417247c7f2485fb6f30cb3182b008d7f7c924c52930ad0db3b1113e5e641803a
-size 30799
+oid sha256:e4c89b14ceb38ef06608b66930004f79964f61f73c0ee1cd15897f96c6918a2b
+size 30819
diff --git a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_de.png b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_de.png
index c292b6e7c9..47a6946820 100644
--- a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_de.png
+++ b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8258316042dfcb5f43fdcecf484a0c920a5b5269baf29ba4f00103c89d5308e8
-size 30385
+oid sha256:676b3fd586f5e7fc23feafea118a5e6f32d8c864d75676ca7667e87402da8dcf
+size 30404
diff --git a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_de.png b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_de.png
index 3650e95272..490fdfc456 100644
--- a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_de.png
+++ b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ccc829c98481c9af5680b23b50dec0c8abd5ba7fa4bb13c2713822438a7d0bc
-size 32019
+oid sha256:5733b7e9ec399adf8ee44bff0766d15637b3570254fcc696cdaac93119dd62f9
+size 32038
diff --git a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_de.png b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_de.png
index e67751b3c7..99599de08f 100644
--- a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_de.png
+++ b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:339e4dc13f6074ca938d6752878b54752f6c9002c92ebf291136079579f85bd5
-size 27776
+oid sha256:5063256beed2a629b85311e76383b5ffd443f29493e35e3a3c5c4b08a921a506
+size 27754
diff --git a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_de.png b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_de.png
index a7a98fafb1..92b90f6150 100644
--- a/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_de.png
+++ b/screenshots/de/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa5cf8e3bbd7116f1c8c27ac29d956929ed6a52e7b2b9a0cc425709ed83c3c1f
-size 32583
+oid sha256:dcfd554e8853810fe9d6cf9acfea199e997f2ebd918b03cbb0994831b34848b1
+size 32563
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_de.png
index a41d3d7552..9017f4f468 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5b386b0228838abb900fa711998208c05f77dc87f760c43397058fcb3d02c19
-size 22679
+oid sha256:32025dce1538727710caf62b4b9bb2eb027eb639157ff09b7c478616ef38aac9
+size 22674
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_de.png
index 91bb9f0d72..4794d08d63 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee063246ef3d9f34f75806a5b6e772aaa9a60259d9d5fa19b1be5c0a932880f8
-size 22308
+oid sha256:6cbe5f05c4293284c0668baa8ede841abcbcdfbaf79227040e9a341ab95f3f55
+size 22302
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_de.png
index 1a29ac6b2f..8ec35e8d73 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dce56693ed4a6473f477e85ff548630bb72a0c1aa5f063d02abbb7c6c151013d
-size 23375
+oid sha256:261596f177bf0e1dec85a351faa140cccd08225fffb7e4418c3809929b561330
+size 23371
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 2c73a48c43..46a40b50a2 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:8d5c7d1a7aef1ccceaa1837fd3483bf1067158a9edd0fe7a03aac74d313c3874
-size 37439
+oid sha256:79d4ee84ccc1ecd11b1c3f7653bda15aaf27d572a2000936027a718b71675337
+size 37438
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_de.png
index 78c17a0adb..c4b3ee574a 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91e32f6186bf16d4880b31b0648b211b9ea228cfc4fc74e0cdfdb6e66d3d32bf
-size 20083
+oid sha256:ee69cce0a6a7e8a65f1c9d5901cbb73be21d23a0b6600312f0ae0b42218cb3b2
+size 20080
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 15bfc89256..7872dd1e63 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:9706510016738e2b74b143c97deba9c7cfe3ecf4735b9f033c0cf4d0522005b0
+oid sha256:9840735ba05fa48377151a0613a1951f0058be4ed7f471ed63dd1dac11f2b7c0
 size 34216
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 8c25e8ea0a..2e73dc9653 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:3ccaa6e9d59294afe6dbb65c2bb5e207bf81d3f14e71752518df78316434d706
+oid sha256:922c9e382f6cd0cda24766089320405d13a946c1f77052f088022128d7fb1d17
 size 23541
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_de.png
index 9e2974f594..ff67c21880 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02cbbc16f07b45feeb638195be476483d68dd652462f8b069a6e1492f66d0089
+oid sha256:240850064c8c692a722b08292c47746b6709c6b7a2e88ed720599c76e1044f54
 size 25068
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 019536128b..e09362dd03 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:007d4fbd2d36927ac9b27063b08cfbded0085b58bc4e5d9fbf1e4e1f84d2dd62
-size 38394
+oid sha256:fa4cf17898cfd78c295bcacb9df84a30e2bde4a3d819cce2a737c887976d1a7e
+size 38448
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 4cf461ffff..ed1ba7c97d 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:38dbf516ba28c75aa91b45e3e4f4e3afb1a6959038177bbbe5b0650aa42d1fd3
-size 38798
+oid sha256:8066d263a899ca57f633bd2d6792c249f6a5674ca523fd1afec337b074f854b3
+size 38849
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 35c9c8c261..0045d8f0c3 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:e77abcfd3e6c9214efe1ef6fa40cb0dbc19a4eb7da184d1b4084479fe7d0b57e
-size 39081
+oid sha256:b002741ad82c48b8b8e48303cf7473d1da596437809119093e004588a50e4bf7
+size 39136
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 f12bab73c8..f63895de69 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:727b36b17214000ed929f94b6bcbeb0da66278031e1ffee2fdf547201f542f2f
-size 44275
+oid sha256:60b61665c7356642f4775acb9968d01d43817dd67801afca9ad5b60d6b570b0f
+size 44321
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 35649b1c72..b2a0b0915b 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:1be354458cb21172f8d2e93aacc98228a074536f8dc3dce734fa81446f7f9c47
-size 35793
+oid sha256:27b58735f417e5883f45ff9a40fdffc8250f1db728ac0de7410d0f8d7021e5e0
+size 35846
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 78da42de5f..81789e7884 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:acc9e12a77d389bbcb17595e5d50f7efd99140eed5935f5c90d9ad82693446df
-size 41195
+oid sha256:ebe316bccee2ef6045a8a3e77d48c633ad6855dcbec3f7fd3f69071abddde135
+size 41246
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 7d8f9e851d..5405dde38b 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:63a908bfa15be2c537c5d1a20d3066fcfca4b5a60256696ad819fb45b59d7a76
-size 32088
+oid sha256:807ced3cff6d0a0f70738bd4723be16df848f61fb7a8c594c3c5261a4b9267a2
+size 32133
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 9f22132175..3368a795a0 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:88c5747df737c777ca3e1fb039e6507489d2db418d46d970f25b7380ff0dfb40
-size 32282
+oid sha256:014e8208a369fcc39f331a752f4c1f7039ef966d8af12cefb46fded6d7c07d28
+size 32326
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 c1f8569265..b25483cf6e 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:90228e7dcbd071862d9a57bf5b2701630327fc93303587b61abe61b55fde86fb
-size 6965
+oid sha256:2589bf106f1ded927f3c802e514af09d738f611f5eaa90f583e29efa17d11f87
+size 6974
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
new file mode 100644
index 0000000000..6777ba1d9d
--- /dev/null
+++ b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2a1a1fd4c356ab8b1ec5f98a81d9ef40a033b694378f03730a05341b4bde2b2
+size 30879
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 d8ed4858b8..6777ba1d9d 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:c0e1ea6e6a244f7b1329aaa4ef699d059e9fd137c58a8e78c0e5fc43f2d45832
-size 18149
+oid sha256:c2a1a1fd4c356ab8b1ec5f98a81d9ef40a033b694378f03730a05341b4bde2b2
+size 30879
diff --git a/screenshots/de/features.login.impl.login_LoginModeView_Day_6_de.png b/screenshots/de/features.login.impl.login_LoginModeView_Day_6_de.png
new file mode 100644
index 0000000000..d8ed4858b8
--- /dev/null
+++ b/screenshots/de/features.login.impl.login_LoginModeView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0e1ea6e6a244f7b1329aaa4ef699d059e9fd137c58a8e78c0e5fc43f2d45832
+size 18149
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 1c90dfe136..f5e194b762 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:ce9f67bc654d9248b1aa456ec2593c59b6a310ed946a665bce70b8b637004054
-size 55679
+oid sha256:5b4d9121e27dadf76263ecfeb97d799db3e96ed7f2b3bdafa45e6b2a4775514e
+size 55706
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 e85c13a22f..96a34d853b 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:cd69df898ead13a5db4c057bbdbf27ceaaea8666952f464ae75bd4c98e9f036e
-size 52760
+oid sha256:6f800532b259209d2ced3a0f7bc0ca7df3acfd9481ecc4982f93610ec7caccd7
+size 52790
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 1d0be7b05e..e6c059af42 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:02959fe7fd9afda6b339165eae70971bd007b9b3c5f3fb5a042c6a03b28b5571
-size 22391
+oid sha256:5427c0d2def74282d09a97ecf1c1f0d110a520d4defb5caa26e24c45a9cd62d6
+size 22399
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 c4f94e01a0..55531fbea5 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:89323d975ec3f4962317bb1763cc58e4e548f38538b6869cdd14b26f55b0698d
-size 23293
+oid sha256:3e67cdb2ec597cfd13554de0bc654c701606f489f01aeb6447db6b9f51b4a167
+size 23298
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 8b3a874a51..818e373c09 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:5f267018e1a5eb31f728a724b46a086b1117d28e71792364b2a9e90d5093c421
-size 23947
+oid sha256:63de22015cc395b9429ce03cf0f487520f39b294f267f873b11d7651c8dda4ee
+size 23952
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 d1f5a7496b..be6b282de4 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:7a9d211cfab821ec51870368af03d20cfbaa30c6a439bbfb27e1ce37c52533fb
-size 39101
+oid sha256:9af932ad48f8c3f79b993e6c08a4b86711fc50cdd970368ffa0c45d83fc67f6d
+size 39092
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 804bc0e00d..1dee6b69ea 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:4d0a901c662f5595c50485e40c212b66528f7e1ecf19ce844c8360a6b22d0572
-size 39965
+oid sha256:0c2b946fddee79fa6c0bf6de966e8bfcfdbaa1b5d2827dd597e7355f7cb8eb5d
+size 39950
diff --git a/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_de.png b/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_de.png
index 49eb1c3e50..aa1357c481 100644
--- a/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61d0f8e341e76fee533117b9724aec1e299519e7cff827d43b0977e7d6845ab9
-size 41284
+oid sha256:8f4994f2ebdf2f17efe55bad43cc3e5eb11596f7c70cbd06dc8314053b62b8e9
+size 41281
diff --git a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_0_de.png b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_0_de.png
index ecce48b330..4c3049a595 100644
--- a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c60958307eff3de5780e439eb7cc4251b3995629253a94fae00bd8a4c444fcc
-size 13398
+oid sha256:3dbb21dbcd474756d2f6ae7d8dafc76638d38758059d11224050484db5d563b3
+size 13421
diff --git a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_1_de.png b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_1_de.png
index fa83d7cd5f..e9df8b4415 100644
--- a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8904cd72552ae43c390aa8d488398aa6c5d5df6e3b4420bf10b217d0587ecb4f
-size 13513
+oid sha256:b454c821bd0825c76629230b4089c9b39d4f4b0239ed6236671eec226fe1b9f0
+size 13538
diff --git a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_2_de.png b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_2_de.png
index 640b102480..96589b8f00 100644
--- a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cbd1f46ac606ff3608b805c86651a676a8ebff6a74e946c6d6912417c572f69
-size 13484
+oid sha256:66fefc519b20374d3cf7e4bbee045733c2eb15df79a0cf54ffd0cc926d134679
+size 13465
diff --git a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_3_de.png b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_3_de.png
index 61d358271f..e8812b49cc 100644
--- a/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_3_de.png
+++ b/screenshots/de/features.login.impl.screens.createaccount_CreateAccountView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f55612c2279875c0d128d124097f6ed36378e16bf4d0a2ce27126e3f76b57147
-size 15587
+oid sha256:573bd2192b81bcd2c3d52f6367db452d2e3c10de55be107752b03cc1a199f58d
+size 15570
diff --git a/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_de.png b/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_de.png
index 5411eb86e6..f718eb02bc 100644
--- a/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5e226015f1d493ec4cbfb1b11d7112cd4826190a60df0f9286a0f9c0f51cfad
-size 38621
+oid sha256:23a64ef6fbb4578b07b7d50a9e78170343377d58484ce55491fb12ab8ee4fa38
+size 38637
diff --git a/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_de.png b/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_de.png
index aee1a55cd2..a7abfb9d84 100644
--- a/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92864d613ce5a68ed305bd0b1e337ae2b3fd9aa1c3ad1bdf625f062a25e50824
-size 39815
+oid sha256:1cf7ab528c61c3498d139eaaaa24c84a33b12279f27debd9ef0092ff95c6b010
+size 39825
diff --git a/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_de.png b/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_de.png
index 8c48a80d25..6b106a70e7 100644
--- a/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e73952f62b9f4addbf6c66e6929da91539a451660a6617ac53f995534726f52d
-size 30406
+oid sha256:83ca19990a58cd0859f5dd1aa9c2b8bb898870479fc021fa7d88c5e64c7809d2
+size 30370
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_7_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_7_de.png
index 247acb90dc..6c0221d4ca 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_7_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5dd50e66c81b2cdd21c7d3ebe9fa1ae1c56c43c271a9ffa57a6868b9e19d230e
-size 22756
+oid sha256:8049495bd9db420baa3303f0fbc69e97e2f35f1078f5e55c846e95ce5c960a96
+size 22768
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 7a4dd6c1b5..ace1448a65 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:36a937b32ea014cc94dc00b14da82549ab4d8cc2c2de89f5eb490170c87cd5d4
-size 38356
+oid sha256:ba54da623ad58165e81d7becf04a0214ea599cac9a2d4156a0badfbff591bd6f
+size 38354
diff --git a/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_de.png b/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_de.png
index d78df8c9e6..54d9eacc08 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9bf45b8d4d39d6b5fc70852b4da0b2e2d7db438303ce4471c396449f0317c46
-size 35373
+oid sha256:640f78e1a5164099db2310b47225a13ebfafab3805e9596f5aa42636d153bb84
+size 35372
diff --git a/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_de.png b/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_de.png
index 106d8548d6..beaaad553f 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db2df4d775b8b14a54e41e874d93d242d0e72fae3014e5c73b92fde96264e153
-size 37393
+oid sha256:8523e758a62b02b54a2d61cb1501c198ec47a21a1a89249433d6a6769c6b5dd0
+size 37387
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_de.png
index 8ae128b8bf..65573d908f 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de48b52dabae33b439d732cd6ffa5eda5013ff5118cdf12392565cbbe1d7b469
-size 24998
+oid sha256:3fc70436b6ccb1afd77bed07598c020796341aa100b1eab6dc5b00868297dca6
+size 24990
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_de.png
index f3855d5d23..c7cf5a7efa 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93a0d0551046745aa02e1529fe4f27fade32853e3ec7f8ed7573b0bde864feb5
-size 22041
+oid sha256:50c28eb8481b1101f75bf8341481ead0e77daf116207d27ddc5c95316daf8e41
+size 22035
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 031d4b02f8..4468511356 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:8ca8caeac8dc4d9e4e405daa0377aaab0cf3acaa9f3a744c284450e9f63f9deb
-size 29400
+oid sha256:20558650fc6a3859569d52baaab1c8af2a68e2944fd772f0d62ced5c1aa44208
+size 29397
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 ec0f4bbe6e..cc41086b2a 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:b5e20cccecd67e059b0f685f1716ac5f575b7d392ddb1fc752a61a04133565c7
-size 38714
+oid sha256:8b827b26498db3df6bf73b4a66b50be634d7c484c7078791c7a9caaf2f61eb9e
+size 38702
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_de.png
index 6cf5423d67..33122e6dea 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2b7da8d3fca41ce7908dcca66bc8ed5b4a00865e5999698267fcaa15f72ab41
-size 68949
+oid sha256:b39882c9c6d9920d0f76f3b80599b7b41cc6eab4480c6a10f09cf0992acbf203
+size 68940
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 c7b6fe4608..a5eae154ec 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:9a9f40df5c43f367b5851000f67a33093eb7d88772a8c0f7e698222aaec816d9
-size 21736
+oid sha256:dfa5cb9c32488940567a9db89a31b056095377a66a3c699e9137b42a5638b44f
+size 21727
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_de.png
index 4cba75915b..5f79162d1b 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df30cbbc9165d7b181d8b436a3922a63ded70642ea9e83a2027bd6425496d28d
-size 23972
+oid sha256:c184323fa1b1d87f46be6f49bf983f7d4048b5547906531b452924ee89110d30
+size 23962
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 80c19bbd5e..cda0b53b57 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:405463cb5f8c7a1fa1d05be06a392455644425a65656596c2dc804f1aa003a5a
-size 57424
+oid sha256:a1b930e7b4ebb1e55e812a851c62994b846fcfc204df812e24982205f7386f2a
+size 57447
diff --git a/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_de.png b/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_de.png
index 1c97360bff..fd58392211 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ae87ae2b64c271d0e43e9b51502eae24e5f3d917f765761e6840f04b3a417b5
-size 50945
+oid sha256:f4f08261d3e9dd275b271ab07cb9015547abd0cad6b90ed1e11e0c9d02fde4b2
+size 50926
diff --git a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_de.png b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_de.png
index 1aaea102cf..d50a67ef38 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23c87cc1e2c91d5fc1795006e59930beec147ae40a63a93431f3910ef09cf58c
-size 14509
+oid sha256:a12dbc4f2fb3d12b1848e2ac4e079522613df2493d0a416f2f47827eb0daa322
+size 16502
diff --git a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_de.png b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_de.png
index 9ad95d1102..c98fa292ed 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62ea7144b8df68b9af8671c96d8d726e7fdcf00a6187911bdc4d092dfc80534a
-size 19385
+oid sha256:1e6e8cd76fdbb3835b0622593e099ed61d526de35c6d20b6547cea83d6aa8e19
+size 20741
diff --git a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_de.png b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_de.png
index 03b1051f57..305f24b9d7 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fd74994f9ea6cf24a6e05ebf2e11b5b0bf3c13d33d43b4c923d428cf5761230
-size 30477
+oid sha256:a6a773294a47272bcc0333e7a325e0609ef53d576eca1d40422b0855cc48dae7
+size 31739
diff --git a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_de.png b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_de.png
index b81d99193a..877598f1e1 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e724cbb9eef1073e6dbbe542da5455cf1991f2520f85516ad5294d2ee2eb9e27
-size 38989
+oid sha256:500c0857431f0604b828e50751b6250e8349559a39b73f201ff5e7eb4fe0239c
+size 40262
diff --git a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_de.png b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_de.png
index 31bcf59ca2..46cb868856 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:464b9722b90078cbc7391592ed372655c9da484b1c7376f8a65587d79ef750fe
-size 34092
+oid sha256:60ee229ac4cc0712b8afba1d678cebc88bc1f0abfe133bf4e4311f05b0fa6c28
+size 35288
diff --git a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_de.png b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_de.png
index 653caec071..cef37f8936 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce738d099663f704b97259ac841dda2750f98d11670228a5e3b851a409d6499e
-size 32198
+oid sha256:848b24931a1da8f4e2b3dfdbb6b8e3f09d71dee356507eb5f46e08e74ffe94a5
+size 33464
diff --git a/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_de.png b/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_de.png
index e720188b16..2cedb5846a 100644
--- a/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:340b8755836b80fa0a0e19c01b1c454f0b5d3252deab7a21bac7426b94d041cf
-size 27400
+oid sha256:cc98a0c12fcbc1d672ea731ff6b219d11349f4c52d2faca460e7e6925b81169d
+size 27440
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 22192e8b92..d1025cd434 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:49001b1985590e67ee3db2fae8c221b4f11016d9a7806ed68eb48ce04c30ee75
-size 59981
+oid sha256:ae928b98d163bb95921fda90ea37df1bd5ab15b02216f98ef5b43d772648a4d0
+size 60034
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 6e765c4d2b..cd21f9ed18 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:f80d0892014051edb5e84dfe11c6ee389c7fe168143b209b8272c6426582063b
-size 91934
+oid sha256:d4749341fab25d56ceb80a838ae7769f2bc65f7640e39533c88ed1bdd480d824
+size 91956
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 978885749c..0e5669f7a2 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:58b9692e7ca3fe21d0b7d99d29a57d5561f0132cc8a051e58a15164f7d840f22
-size 91634
+oid sha256:ff0fd10d253cd4f21870541d2ac4738180267bb5a2ef4e96cded9e47b0923200
+size 91663
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 52bed8eca4..b111f01643 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:1a9978fc6a551e92d64880cebac69380fa57cd793e790529db023111ea1f407c
-size 79754
+oid sha256:2b2fec41e0b4a6f1e8bd8d4d4cdc6a0923c2df9f74e65f83b6ddab58fde6136a
+size 79733
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 1f348e63fb..58a213486c 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:11460a94377563f3d31bd808e562ced36f87768d2849624fc4f98fe2ab1ae46f
-size 70252
+oid sha256:164f3d77fb45dab07038149c6a7082e2fc6a81b4c445720cf66fc0b30e8c474f
+size 70219
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 f53bb77866..1abf890078 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:df52787c1b88af53738293ee058b67ddd08f78c857c2e3af3f006d12626cd250
-size 61807
+oid sha256:80eb9b831176e211b8bbf7651ef76111ae11bd34e6c71eb41727c46a3d6c17a9
+size 61787
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 f881738b4d..b8d08c2ade 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:3cff9a788308620d142f7feda91903d256520c7b86a8ff30e52fdb08454b2787
-size 11483
+oid sha256:53348dcb9da01db38dec34fc8b11893276a867aa84e18d5b0c1c87f0ab282be3
+size 11509
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 767dc73fe4..ee55736313 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:3faff786fbadbc9d1fb919c0c9bb079b035d2719eb9719801cd075509b06bfce
-size 31228
+oid sha256:85cfeed43ec40bb849282f25c63740903a4e373e26f7da97fe5e5df03b934065
+size 31252
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 ba34786195..ae73822529 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:b71f67aac5314063bed0e3cff4661a68fef37383df2525f67ccaef1aa28b45e2
-size 36602
+oid sha256:7b7487fceb9ad5cfc1625720cbcd651b123ea6639ff1d287cebc50bf7b2c1582
+size 36626
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 7a80f64d0b..d4906f3b2a 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:76aee99a5482ab0036faa55dfae992f219e41be53096266677aa65dd9cfce719
-size 47491
+oid sha256:58cc7cb5b8bd73fe4e27d50f9655f61b588e85ae8bc6c4475c98b65ca623f80e
+size 47519
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 7deccb7a51..d50789da96 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:c58d212eeb59ed0a17a8a38e886192a519ed6ea3d868d5894175a3ecb004ca72
-size 32851
+oid sha256:23eb7945c08addad25570f5429d8822d21a27a96f9e9dc36d319eae6e5286d69
+size 32875
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 7a80f64d0b..d4906f3b2a 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:76aee99a5482ab0036faa55dfae992f219e41be53096266677aa65dd9cfce719
-size 47491
+oid sha256:58cc7cb5b8bd73fe4e27d50f9655f61b588e85ae8bc6c4475c98b65ca623f80e
+size 47519
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 b3e323af1f..17d01e6734 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:a7eeac5aedd7c6de167cb96908a7b62f8dd066faca3ce33b6132df8c48dd1a97
-size 26021
+oid sha256:e485917141e850090ed9429510e83d31c532c14afce03d88bff5582f67d48c53
+size 26002
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 3fa995c42c..7a4db3321a 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:06e895ab0f6e19dfca98efdc6f2c32f8bba1b7c71f57b44eae9e5970528172cb
-size 17009
+oid sha256:89fdefeb662bdc04365a8a641764adc7e01c381b6b39de28f7a4b33cb4ba81c2
+size 16987
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 d97f248616..da900ef8ba 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:dbb085f18507ad5448a6614bf2823879e7e6497a52eb9feb4265a3e717030b8f
-size 27420
+oid sha256:6739f58e3cd8565be730d1e7a4c7afc470b1ae9dccd31f882cd9700c63623e79
+size 27404
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 b85e5272e8..515a75d8e5 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:c0d4b1c29b4130c1301634cda4ac0c9bcf6ec8f7ca4703b3265bd51a93e58a47
-size 41402
+oid sha256:2b90aa079163cc02c1718083e06370e35aacd83af23d62b24ded7953ab1ac67b
+size 41432
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 787d064a81..f6ec6c02f6 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:01fd6bc9a856e78ed09690d895527ade133e6efaabe98122be281644904c81ca
-size 42096
+oid sha256:41df9e71c5d0a8de4d6965e1b4dc353606c17b1c9d6ade7fec21cc2dc2cdab8f
+size 42125
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 c2375b4770..b058594a53 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:cf89f910c2d56965e0705b15f502e14073e569a0931e7ea5a2398a663b21ad57
-size 39801
+oid sha256:12a4f5d877a8a53b1e8e58b52c842aebca4c605e2c712d3b25bcff2dd398ac7d
+size 39849
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 8881e29e2b..a47381b147 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:16d6e109bee5e1e9aa989191d95ace9d9142ead6f529e7bdb02ad8d180bd6435
-size 35399
+oid sha256:27561f13f31accde09568df3918aa603e3b030b542534216f85729ba3e85a713
+size 35401
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 4632f2d972..c0bd9a510e 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:37b929271600ddab0836c758faeabf3a810fab4fc93b6fee1821cfd627aaf145
-size 55370
+oid sha256:d90a66dfe145cfa4d2ca46e0d82bb535b3c96381bffd9c5d3a56f04822718fab
+size 55353
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 bb7b2152e4..314e801bde 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:5c0cf0fe1a0dbeb9808fac60cae7a9303254f8004bd8809242a372a468a0a749
-size 55912
+oid sha256:73111984ac544ed3a33d63f4ec40935593d6f39b3b4c9df4221e1378454f87c6
+size 55872
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 d53e510d4f..f371592e9b 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:0231fe2d6f4d97ff35dea16c2cefbd19bde7e1a9d7814cb1bac5d43cb647ded6
-size 47281
+oid sha256:d12adb58ed0eb49922c0f6ad018efeadd58e2d288803e970b79422ae5aa9819e
+size 47266
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 698df60f9a..438a6a393b 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:1b29b1f2e1f8b339e608af09b9f49a6cb664c9a37130c312c75ca9ab29041665
-size 51544
+oid sha256:609ab3a3a4eaaf1d0b514e063f7182021b9a755452380ce5a3276a677048face
+size 51534
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 4d396b0f86..2917763d00 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:0f11362ebac1674b839f8adb9d749d9486b1bbd59c71a2ddae6c333cb0cc0a84
-size 49963
+oid sha256:d0232738667fda5ef6cf8cf6a29a3f975ca7e7d828c1fe0f4b8eaa3fdbeea6b6
+size 49943
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 7759741a6f..0117d650b7 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:18862f4d1303abde8f155f38d9057db7b9d990b288e7587dc58f94636f5927e0
-size 45504
+oid sha256:5c159a119a0b147139e08a0196f08b1e27386204bb6edb34fd41a5f5a9fbfc64
+size 45520
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 4b978064ec..572dab2bec 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:1882aaff8f678953c313b70ecc9d52d7b0e46ef29162b3cc8a24ced0704a7069
-size 50221
+oid sha256:241d8c77cf4c3f1176361a8b390dcad41998f0ae66ab298fa8fdd8c4c4a55edb
+size 50206
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 667c230b2a..52aed73f0c 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:17c547e8a275eefac0de72ca58f6ec3a81e80c8878900a63723c5ccc738270a6
-size 46267
+oid sha256:181294efa5385141906d780d2b2620a47cdb798609c68092e9798c6ceb70e6be
+size 46280
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 68a9eeb68f..764efc0d93 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:2299b225ffd05ed2e69e5f5c46c0623a0e54014cd1419ef1ce371b87b803e347
-size 49293
+oid sha256:a4f8b829c9cdf8aab81af22ce197e4540403f37505197857eed432f18a12250c
+size 49277
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 bb55ab2e0b..33b5a4b538 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:ed45f00f99eecca857ff85f235362b92a23a7aefcab2a3de5f9ee87bd4dfbc0c
-size 38619
+oid sha256:5e3caf4a808432fce325e11964c55ec220a1fa220253e822c0f55ef375be06b4
+size 38573
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
new file mode 100644
index 0000000000..0e811c2b60
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:013275dda1ccbcfea82e99623bc7b6558504711178e44a3b8c0dca7ff525f59e
+size 401898
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
new file mode 100644
index 0000000000..7e355c5e65
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50b9506be5b2110a67fb499be4d3e06d3745dc9eeb164e90d8c7c9aced9e971d
+size 400248
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
new file mode 100644
index 0000000000..fd4159921d
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a962547b7d7d4c8bde5e895328ee5b86ecc60828667e4c880443d9d0687f70f4
+size 63069
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
new file mode 100644
index 0000000000..0e811c2b60
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:013275dda1ccbcfea82e99623bc7b6558504711178e44a3b8c0dca7ff525f59e
+size 401898
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
new file mode 100644
index 0000000000..ba27dd1aa3
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab35fb3afeafba22816aa3f97f29b7e644994aa3d6e2b1e65fbf6f7e00cc8ea2
+size 62877
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
new file mode 100644
index 0000000000..6bebc241b9
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7bc279cec0778e772ec7eeaf679e2c1a7d781fb229fe4e7992f20a56cffe37b
+size 68251
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
new file mode 100644
index 0000000000..5a467d20db
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4824c960aeced8a1745c0beac52b406e83d24079eeac21bca78aa7ef0698a4f0
+size 72357
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
new file mode 100644
index 0000000000..f0c2fff715
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56182cde7b4d120ad6ee91943a38de5efff74d9a4c8fb457d47ad153906aa2ef
+size 409133
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
new file mode 100644
index 0000000000..9c80295727
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0afbea1b4ee5db426d45293cc3260cef6ebf7cbcf7aa387452b6433120e5c5e0
+size 89922
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_0_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_0_de.png
deleted file mode 100644
index 6db978f3e3..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34c898bbf9bb08717b446664f39a1afdda1aaba0527a92e75555db89e1e7032c
-size 401940
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_1_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_1_de.png
deleted file mode 100644
index ff47dd3148..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fa13a9ae160f9b22eb2a9d5117090759798b93cb8fd5a005c7acc2319a76e2b
-size 400282
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_2_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_2_de.png
deleted file mode 100644
index 89b6beb4b1..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa105ee550380e5ab6f78cb32211d25009717698c98b8de3dec21bc5beeea6f9
-size 63108
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_3_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_3_de.png
deleted file mode 100644
index 6db978f3e3..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34c898bbf9bb08717b446664f39a1afdda1aaba0527a92e75555db89e1e7032c
-size 401940
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_4_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_4_de.png
deleted file mode 100644
index 4561823c1e..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80b76fc36c84e48de46877503614cd6a6c289ee4defe1d57f3a4381a20560a6a
-size 62914
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_5_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_5_de.png
deleted file mode 100644
index f2979cc741..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c06481e9cc1787ac90268137a145790eab9929690e162ef22e7e0b1d4796d368
-size 68291
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_6_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_6_de.png
deleted file mode 100644
index 6d0ad528db..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a1c8211e71e899ee932c6016e1d44eceb340a55727b72f5055a7a57ade3e6e5
-size 72017
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_7_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_7_de.png
deleted file mode 100644
index 73fff5485d..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e696c95ee71094650c0008ea618d4688796e8c093c4878ba4735b70487f4e36d
-size 409171
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_8_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_8_de.png
deleted file mode 100644
index 0366e56484..0000000000
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsView_8_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c356dd8df9ef8b414c68458828b20a709d55c3ffcd9010482c07e5e0ad501461
-size 89714
diff --git a/screenshots/de/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_de.png b/screenshots/de/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_de.png
index f614e6eac7..8f9bad96f6 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c71d15c6788611ecc0be5f75d64696d7bf68673f9c75c91d692358fedf219ba6
-size 71872
+oid sha256:0346829dcefb0fa299a8ef834ca56e76fa258e49fa36aea425e0a2f074fde401
+size 71943
diff --git a/screenshots/de/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_de.png b/screenshots/de/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_de.png
new file mode 100644
index 0000000000..4bf92d9c4d
--- /dev/null
+++ b/screenshots/de/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae1141874f7bfefc4d2ed324f9606a2f68e35894cb7e34be28a299283e45fc6d
+size 26294
diff --git a/screenshots/de/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_de.png b/screenshots/de/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_de.png
new file mode 100644
index 0000000000..1d308c6908
--- /dev/null
+++ b/screenshots/de/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e5009998aeb9113c7572494c77b5c619a6f8ef31236eddda3e91ecfc5a34b5c
+size 67431
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 dca73ab6a1..12dbce8d1b 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:cddbda7a38afd3ba433487c88955402a6c69cff0ce04cb1be397ded7b0eb712e
-size 56147
+oid sha256:ab181e050382cd4dae2dea1c7ba8e93bf1d6ac6886de4cbbfc688f6f9e20ddf9
+size 56193
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 d533e50925..bdae0831d1 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:3757f005f6a53a56d76d73fd0f93050c8d8e7832ae1d79877a1ebfaa4c26263b
-size 66511
+oid sha256:8486cc5209df52dc0f5007f3d89dfbbe4e3d345a8aaf5be1585ef70d004afcc0
+size 66524
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 9c480b595c..d3700f9aee 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:28e84336963ef72fea96d5ddcb63534016af8ed918362b102323670c3c008166
-size 68121
+oid sha256:5b21056029f2b5d68a7dbfb4a027f4ee0a5f7f24b68ec12f13ae89769e25e1af
+size 68091
diff --git a/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_de.png b/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_de.png
index 62b61c2581..b216023c2f 100644
--- a/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba1b73e19da856bde24114be1d5429b4cd3cf32367dc168c93105221e550b580
-size 64379
+oid sha256:dcc4a38424e400b23cdf3718eeb1997764587973faafa973fdbcf347a3e9161c
+size 64389
diff --git a/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_de.png b/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_de.png
index 2f53d77bbf..03a2e0b878 100644
--- a/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e667e7a1db26d4f158930aedff0cf8c3215aeab6627ee6decc9785d5812f32af
-size 67868
+oid sha256:9266f42168bb0bf8972b12a5e84e790992b4a8ff66f94e0a19d2b8cca4ef5b73
+size 67873
diff --git a/screenshots/de/features.messages.impl.forward_ForwardMessagesView_Day_3_de.png b/screenshots/de/features.messages.impl.forward_ForwardMessagesView_Day_3_de.png
deleted file mode 100644
index 9f006b50ca..0000000000
--- a/screenshots/de/features.messages.impl.forward_ForwardMessagesView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:384eb7f0964c98a0f9f78085e7523086818f76c1d56e6750424cff515971e357
-size 8681
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
index fb59d26ce5..0f061d5ac6 100644
--- a/screenshots/de/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:734c8911e1c50f039c90ada55915ca651c1ec1b54ad221f1fefcacf9f5dee9bb
-size 26423
+oid sha256:c634bc40fa4169c85e426078d2ad104f939ec6825257a41a785c35025a57d654
+size 26396
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 b35ec70009..39770412c3 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:1c2fe9f97097034e54463d868244747f6970fbb739715330f147341dcaecb6a9
+oid sha256:7eacaee5806d3c4813aa44d5812a1b8e69ef6f4a0a1618fbe0a7e06d22de7829
 size 18215
diff --git a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_de.png b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_de.png
index 358c0dff18..82445cbee1 100644
--- a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd115b1d8b6b3d5c302d45110947cee2f9e5b1df9c6c6c7f24f750e1850e04af
-size 24976
+oid sha256:206e41045fa6bd767590f4639119b390c775915dcbbed8e59e4f3e36858519ae
+size 24950
diff --git a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_de.png b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_de.png
index 6b3c204ffe..eb287b98f6 100644
--- a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25cd5cb052d0a1c5ce508f03cb9617972850fdf07750c4b28c5409bbf56bb721
-size 10017
+oid sha256:d6d9e9b3820c234abdbcc727eafdbf0104470a1067a0861c1ab72470499c613b
+size 10035
diff --git a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_de.png b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_de.png
index 85c1ed7adc..0132a7017d 100644
--- a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4cceda9f53d1b6a8885bed10ec80b19474e5a587a4e1886553a8ae478ed919b
-size 35785
+oid sha256:8a6dfb3b0201d05ea5df163032f06a6480149d102543553df1fbcecca41a2a5c
+size 35811
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 8163d35770..414ab3fe1f 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:d375fc47b82ea9d857b3600957e5253ee67821f38a7f73b5a61fc1d94caf9993
-size 43879
+oid sha256:52f47d4d42f6ed7b8dbdde5cd2733828e91caa581c4a5010d06be742c6922edc
+size 43884
diff --git a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_0_de.png b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_0_de.png
index 2887180911..1460417a1e 100644
--- a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8429bd284e65e21590d48de7aef78a812aa825142e05768513e4111e2a6236f6
-size 48860
+oid sha256:bf7252eb8a333d7e5337c7cb14f993c4e262b4c4bc9a20d7d06ef104cc393725
+size 48867
diff --git a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_1_de.png b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_1_de.png
index 24e6f6293c..9a30f0e8bc 100644
--- a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b28017b6359af7fad86ed48ad680fe6db7f0369b21f4ea580769dd0f9e773fa
-size 49736
+oid sha256:36cc7438ba6ee69bd2d652580896d1c11f7822008c0c3d88627bc5d24255d217
+size 49750
diff --git a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_2_de.png b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_2_de.png
index c1641803c2..6d5d2b5e9f 100644
--- a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bc44ba7e3990ed13c1ba3bb546a32dbd32d87bbee9cb8de9e058619de541ba9
-size 49240
+oid sha256:923e6c9779583fd0ac073cbab61dc2dc386848c549a20bcfabcae7a8cc53bc59
+size 49255
diff --git a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_3_de.png b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_3_de.png
index 28018be9d5..fd5e9797c8 100644
--- a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17c1b20d0c2d94225d52bc95fc8ad2ee87f7e614fb69abc3320aa0443e585a33
-size 48925
+oid sha256:8202a96b5d29d1819d39f814f910fde41ea34aa837606f7bff27ee3a6d64c55e
+size 48944
diff --git a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_4_de.png b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_4_de.png
index 636abf3e9e..dc08c80114 100644
--- a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ff29d01ede74dd4bb73eaaf95969867ff27d25fc9123c81aa7746b4c660694c
-size 28941
+oid sha256:835a9fcef474419949eb3fbe275da2dcc45283e405ac69c97378c939c6c60246
+size 28912
diff --git a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_5_de.png b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_5_de.png
index c1641803c2..6d5d2b5e9f 100644
--- a/screenshots/de/features.messages.impl.report_ReportMessageView_Day_5_de.png
+++ b/screenshots/de/features.messages.impl.report_ReportMessageView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bc44ba7e3990ed13c1ba3bb546a32dbd32d87bbee9cb8de9e058619de541ba9
-size 49240
+oid sha256:923e6c9779583fd0ac073cbab61dc2dc386848c549a20bcfabcae7a8cc53bc59
+size 49255
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
index 49936a3ea5..35761fbc07 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ef8f25ec439986622c3ad9bf9a30ece6d3f7e17f264b7260203ee73da4051e7
-size 22243
+oid sha256:ad8fc597fb7c6674d5c9402f659ef163296d2131e80f7d0f89c6ac8a2e7201f9
+size 22266
diff --git a/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_de.png
index 4a867f7cd5..c1409acb77 100644
--- a/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fa8acc69378e1d8b354b14c8c4c4ed2d6e85e931d7f03be81b0e2453654a5c5
-size 6534
+oid sha256:6d907836e749f5d74713e58b7427cac9c3972919ccccb2c66f41a688e9367c67
+size 6653
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_de.png
index bbb46320a2..c01e42cc66 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08cd52b175bc76ea6e51571e24cc5287c14bd1b29128b83dba6b1e6c132b4944
-size 9112
+oid sha256:9b7d10fbfa59990a848a1c70cc56f55c60ee0ab9d5c3fc5e09ebcbebe50be062
+size 9102
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_de.png
index bbea5c1dd8..de792e6011 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7f2af2e1a184964c69e6c01199820f0fbf7d36734b0a76cb6e842c2027fd07a
-size 11469
+oid sha256:9a0e71b53b18d68898bc0ba544f5742015bd07ff87eb0d9b5c0ffcff2ec5138a
+size 11456
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 6926d126b0..b2867a5167 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:9da344db7e22f80be0ae181e92804d053fe1c120ce4cae2bbbad4f8700ee6746
-size 13097
+oid sha256:eb38fad2c7d507a34d8adaea9ddb9179dc7310d262337c3400aeac052e670f32
+size 13070
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_de.png
index 293ccdf251..afea4f205d 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3838c4a01a76b2eab8004332f31f71409b9667f72aa84535565f39895a72e03
-size 11242
+oid sha256:de76cb249605c4bc7abc62ab5533f3a9ce8b670cf39d63093784ea155c25a3bd
+size 11226
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_de.png
index 66ba06d334..e7feb40d17 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:346573be091144ec677f2bd3e26a19dbc0cac48b0b76c4509f0cf2644c7f5dcc
-size 14611
+oid sha256:6e307e6040dee0aa33943ea053b3c4e9252eacc646b4b1c0bb345467a496e959
+size 14594
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_de.png
index 0236701aee..a0ab545682 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbea44bca597ecdb6598dc082faba460bf339f0070024187e0f376b791421af8
-size 17045
+oid sha256:e0b44a50f701d43676d0c28c1c07cd10d561c965b0018f97e3c0ae774856d1ff
+size 17034
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 c8f4f21234..303c2f7f63 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:0fc6105449a2b5bca7085ba8ebd4766b0aeca4b812439a3bb6031876ec528a7d
-size 26267
+oid sha256:dd25812b220f8e046aa4549c0aa3c4d0ef7593519efdbc786f145158a086a930
+size 26271
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_de.png
index 4f74c87565..8fa50c1f04 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ef0cbaf695486ec46a9d451e2620557e6e9c536307e7e65e2298e4b053bb98b
-size 11464
+oid sha256:8d2d1b102c198c0e5ec8530d04c639acd45b0512a51a6d4d40408ae7afd248d6
+size 11459
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_de.png
index bbb46320a2..c01e42cc66 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08cd52b175bc76ea6e51571e24cc5287c14bd1b29128b83dba6b1e6c132b4944
-size 9112
+oid sha256:9b7d10fbfa59990a848a1c70cc56f55c60ee0ab9d5c3fc5e09ebcbebe50be062
+size 9102
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_de.png
index 5c6b0c1317..ad4a84509c 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19823a48ab2deb3d575b076f684d99a4aa22cafc514d8618d728be3066ea4c2a
-size 14939
+oid sha256:ba6bc62e27999afd28630ca606bdffdf15d745161d21539c60aefb786b8a49e3
+size 14938
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 7e3c3f8843..92397afa8b 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:6f822ac721fa7c0e129c787852e5d085713d4fdbc93d8475b48c50436fe58410
-size 48798
+oid sha256:f637dcf16dac07842061a0c3705527ddf481dddae403e76fa75094d690edbeae
+size 48784
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 f8ad513f05..7b028c084a 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:4276d64e4e150ef04080d1d7c2bbe372ccdd9a50cf67118163f9df630e5dad14
-size 51015
+oid sha256:09297602e9949d21f32aa92ff3a7709d7a6a0e4ca5837b63e1718e9757b681b1
+size 51000
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 7b454e20eb..f0c19d5a63 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:9de2142007e9b29f4418b2cd2e109ad696d397553dbe8ee720ab9e32fee21f05
-size 52612
+oid sha256:37ec62ff5de2fa0a8199c45eaee20339a203db7f767a587635e3a01dfbd2e007
+size 52601
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 f152e3821d..30846cb826 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:dd43b12b36a6a4e3e467ca8455316e347290e1b03b3f760877bd90d18c366ebc
-size 52991
+oid sha256:d26bf6994fb0f8b4757fca70dc9793da3b475fe465e1698361ab69fa3c656b8b
+size 52981
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_de.png
index d215d43fdf..5e74701d3a 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff5f2498323c6f0cb2c068ca23bff4e5af0b3bbde57c3cb8982284e2b8503fa9
-size 7553
+oid sha256:1a25765b56eef74392eea83fa6279950dc875a8158a18e7d1d58595f794d5c4f
+size 7548
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_de.png
index 0ce0c3f3aa..650a6535c6 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:826b030fbbaa23b05cd36ca3b072204f7b2cce6af0e2ef1398074d53e5bc6a6f
-size 9188
+oid sha256:c46b6ccf3331487e0cf73c1055c0831ac56943adae6160defd702b49c12ec822
+size 9177
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 2e4b967586..dbe86d6685 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:1a07d10aba2d12a4e664b4ff122f10434b5af4bb90fdaf57fc05a52c67bd47ff
-size 12207
+oid sha256:82f339bf796b1dd88bb2eb7bc20ea999402b83764c267fe70d91e69aacfd8365
+size 12199
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 d1d9065005..8f400cf087 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:212650482a277d51efb218af0485aa0e5d7c72a33bd5e8c482dd704299c975c6
-size 17684
+oid sha256:2267052cc5675747b74f096b308431c77356d1c8937d827fd1d0f29dafc39096
+size 17718
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 3a19f3bf86..1a0298e410 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:240798176e52148a905fb4beecd34e9ae962c5da9ba03324d3f3cf48ef9544ad
-size 22605
+oid sha256:a366fe4261a7a35cdcd357814d56361b3fe30d96b94984866e78b0fac0dec742
+size 22667
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 828befb6d1..4029a678d4 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:f875b3189dd12e945dd7128e1c826e4b17463d098d790f52a4932cf27b878b5b
-size 27015
+oid sha256:34d0a6f5093359b0f233d11152b1cb17905b11bfb71be11ce9ed3f41cd50e76e
+size 27084
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 edbda381af..95153ad95a 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:1cd78cd18060a2799221b3e6f3eb517bf6d597927fe4900d8c49349ca3a545d1
-size 32333
+oid sha256:836b4253c1846802ee4000455f91ba9a55195ab04f875cbece2bb57054456783
+size 32496
diff --git a/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_2_de.png b/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_2_de.png
index 58d6f9bc01..7a2830deae 100644
--- a/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0578cfc7d5459104f4c1027cd95f0155e8ddcd93d1436a748167a6bf3db02c64
-size 6746
+oid sha256:c686ca52ae5175226e12262fb8f4adc70e1403d8d755a14a37f7adf1534f5ebc
+size 6739
diff --git a/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_3_de.png
index c1df5aed64..7aebedf5a4 100644
--- a/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_CallMenuItem_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:533d2603d3b0c01a3960d575ef5cf551423e78364946f569549734afd8d5ee6a
-size 6275
+oid sha256:f34a79713b48c14bc96c3b1371c74cdf3703339af04bfa3cc90b022101b30abf
+size 6114
diff --git a/screenshots/de/features.messages.impl.timeline.components_MessageShieldView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_MessageShieldView_Day_0_de.png
index 4eccdf182f..a9a792c0df 100644
--- a/screenshots/de/features.messages.impl.timeline.components_MessageShieldView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_MessageShieldView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a93acf48045d16060cb04a02cd86c1fb474dc55c61d6f56e3fc35abc56d0736e
-size 57920
+oid sha256:7880e4b1e3dc8e2dc15b5f07ae82f5902145f35a9045af0f39feca4e1ce8cb00
+size 57904
diff --git a/screenshots/de/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_de.png
index 9f240daeae..958bd5275f 100644
--- a/screenshots/de/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18a7f4dbf3a56c49e5b1edbd0f419620dbfcd4485bfe25db5347968b8844973b
-size 9933
+oid sha256:aadadd01c5a31342a1d6eae9506c560a8710f1bc000f43dbe50fbce229da442a
+size 9926
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_de.png
index 92b543d8d7..8fc1fbb334 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:891730a3f18f34234fd27619c0a9bb711806ca4387c4280d4e43dfed343c8be9
-size 6788
+oid sha256:960fce914c44861940f72589da3a1a8280e890875b59e6e4b4a81248ee423c07
+size 6771
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 14a0ecd842..7522320c11 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:2fdad68b06bdb7af5da9f94561b5f5e3bff45bd3d8737d1404665951f7cbfb34
-size 42170
+oid sha256:37907f4f9f4f18857605e4e524793c0282100f07cf6e44fe8c8e4467c71bfca1
+size 42078
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_de.png
index 347dfa0fb6..202f5ac23d 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43b2ba805b9f810bdbb19b42f7a441a4b4e153013acdad2074bfbd4d3c832806
-size 35276
+oid sha256:526b8fe671e86c92f5477a425ddb02813bf8a7c8c2409df3785984b1ce7d8240
+size 35299
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_de.png
index 45e3897765..1f2564c932 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c69ef0b37148981bac622f3b5f0c7a6d19d8fc3ab25d0434921829e7ea47f129
-size 11436
+oid sha256:29af35960ea591304710cc3915ca7a97547122f6114f6b0fdb0013b8b936ffda
+size 11435
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 35a6ba8efe..2d74d8679d 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:3b75ff102cdeaf138ae9b5574391a348c0542c486a1e36f2bb83ef9e8c47ed30
-size 38097
+oid sha256:2ff3784acff9b538864301c13722291aa0b7fb957c124bc662fbff423d6be577
+size 38075
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_de.png
index 674871a9f9..7b24ad1475 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0465a9b4861a1d6e1f720089ebb975e7a01f112bad28ed5ebc2e3738d10ce7fc
-size 81087
+oid sha256:2583811fcad1f4960c040be87227714c94a1311c5dedb763e8abad5f0b737ebc
+size 81075
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 9950e567cd..78a683e9dd 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:a65dbd7a45d6304f6445060d2aeeb767791211f8a1eaaf86bb6f5079d1001663
-size 364885
+oid sha256:d4e206a9a8836609ec40e98f9d95b7b6d68e47523e243097228aeeba35f04be2
+size 364866
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 fc6e96c29d..7e69b98c75 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:18543bb2230f1e603be2a07eae29ab632698b8aa8d328b1363542a89ec5b15ed
+oid sha256:636f49cd6431b01fa72e92879db35522d35a7260a52d1d320efcf74fe5765358
 size 370534
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 120e53f129..107d88db38 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:5803e8615839f09e341de9cf167057cfcf26e5fc1e51e14b3da0e5024b741214
-size 364076
+oid sha256:fe3daf2cf97dee0cc6b67994ce7d3178d5f16fe50fe7a9e9ff5bf0d47d282b22
+size 364064
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 15b5693fed..5a62ac8096 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:985b04b170d3e13dabc86ab4ab0f496974403f84d4a550c971634da59756633a
+oid sha256:18d42f29dc43e05079e6964b8a97a2201898a8bff3ed1772cec5c18b137d87e3
 size 366116
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_de.png
index 0de6e5f19e..4a48c95806 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8b14f1fba1b0faa17b331d442e780456f7d0968e50d46d4c4352ff56d2a7bda
-size 68148
+oid sha256:19ab48b39fe02b510edded16f680e11c8f2ebbd6d1455d4b3c99d33c3e6e7842
+size 68132
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 c2458bec09..263cd017fc 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:d67fdbb9f411c1d4edf572a4cc9b10601081265adb69471fbfbf931cbade68f3
-size 57213
+oid sha256:54226aa0e9cbd3e3a4c43041178cd3dcd7587a3a6d6bd8eb7e2189b626543230
+size 57250
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_de.png
index 01dae86c2e..0fe736c756 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57d4ef7e08ddf1121f50c4840c074c7d0c6482697e0ad3a8528dc902e5716f54
-size 8788
+oid sha256:48aac469263e9d83a4b9b05411b247a2cb539cc08ec2e5cc25ebf4b562b76b64
+size 8782
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_de.png
index 18c7589459..2ef239d254 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4928b731a26c8119c34cd1d8423b1c91eacd6ae1eb3b6d50f928f3fd42ba31b3
+oid sha256:6f58e1cac3dede747ff20f0c3f52ccdebc780184bb615fc62dd629945b9aa567
 size 18222
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_de.png
index dd8dbc3529..1ef62bbc5f 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34e1ee1ae196702f6ab9c500b9b110a32fc84445a0bc42c8e8f92bb6e73ff952
-size 26047
+oid sha256:9eb35e5a76d5b83d4389ac7f30dca8cd2ff080b56286f9c80bbdba90da47c162
+size 26053
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_de.png
index 9e22bb90f2..efe8e7d212 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69eae7faacbdce88f13844359884f24bc8159c13752ca1ff65aa8aaf2c7f6e70
-size 25643
+oid sha256:18ee45f13ebcc1f288aed2d9b1ac2365e514a427debc5b50ac0afb746724075d
+size 25639
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_de.png
index 9c833955ca..1922ceeca8 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cf5c1518dbaf6952348815535c23e5291684857fab10314de23330d13c8c781
+oid sha256:9ffcca12721a8b7e9f4e3b012ab4cde97217d844734be03ae694198fe0e9dd28
 size 25661
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 83172bfcb7..49110f2c7e 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:dbd684f8e72f659abedd2a4a6fee985814145089ed4e167cac950119ff1d2aab
-size 38009
+oid sha256:bc45b7e1eeb26f0fc4db224924933b51a721fa14e99cbf5b36fd717f6e6dffc8
+size 38008
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 d1e96eb107..f5251ff844 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:4d098e36c94526f6b7d211cd7f7d094912f1148b4ff2f40e82c0d48b0633ac70
-size 51750
+oid sha256:76f20ec1110d42dfe8990342dc8f7b4486f58d91e112af568ee97739638345f8
+size 51772
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 649ee1b9a3..d7498d62da 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:ab3d9d6fb1f4a97372ab83bb075c0c139a8beab3b41974f4e0435dc620b12ab5
-size 88411
+oid sha256:d40d94c839c967c829af11ce71af08d82726a2d0b3bb60fabbe164d626cae8e7
+size 88428
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 154e729716..6c2b7233ba 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:9e9be49fb8ecbab397aa9ca1d608d576d2549924bc5be05c2a47d3a76c2e0ba5
-size 53186
+oid sha256:6af3614a4b2a16e11763bcd683a1fcb2417926fc73761103faa105862ee07666
+size 53226
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 f8ebb81541..38697a9ba0 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:ce663c192fdc65b91f61194904da3553eb605630c6f7bf47f9853d3945584a65
-size 65076
+oid sha256:127086e85b6c01eca7289b9b466f0bd733f12d188412536e23a25dc172227c3f
+size 65100
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 61c758aaa3..820d4c7800 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:14facefce7d332e13fbc67109b3b4fff22881bb64c4a419094f5fd2371b2d9fb
-size 49691
+oid sha256:d24935315c3d1c61ef4489699425195ec5cb9962e1dbb76244313ed2d307a081
+size 49729
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 03d2f3f77e..e9be31d888 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:a004d13252462f52a0f324cca838dc48d6d773e61c235fde33ac68ff5bac9e52
-size 73672
+oid sha256:995518b5ec90271f4eff1be312ed58401b7ee570d67870bff37c38b84ce1f07a
+size 73751
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 9f08b2943c..b9b9f2d0c2 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:5b705e80b55329df2d6786c8c619100880ba7de6a36602911857acf55fc2691b
-size 59323
+oid sha256:e0bf2572edc0a6fd4c9e6e3ea17dfb05ef0caa5b798fb45bc364f55f699de914
+size 59357
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 a8017a2f55..02fe0473ed 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:1548fa74ef4a3cd52599a467fe91d69e921559b24536ec4e258579ab853cb83d
-size 65828
+oid sha256:46e493339ea7dd187dd122f5f3bb892f209f79fde19c3a50baa71e1e0113c0ce
+size 65873
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 04239eb227..94d117cfee 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:21c6b7761c4453d3499d9841df292ba7e6f0703f41677351fe47bf9f3f038c33
-size 73626
+oid sha256:62d955f772483d8ede6d517a764b593baec2caa2ba09795a135b56d785119e9c
+size 73629
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 4511b92aa6..9e403ffde3 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:203290c665873113dd97089cc1b4a2eb169fe5f57ec55f968ff5f8f90b10e091
-size 72026
+oid sha256:0e628befc54944ae264dd102247b85d3c1d71748800ecd30ad5a3bde41aa7d5d
+size 72027
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 ba4030eb50..67b63337a8 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:a977db6aa54185e160ad87850205d317191d51aa8dc24839dda3b4f96a2f4c96
-size 75119
+oid sha256:6cc04814e771799188598bd9511f22bceb13bf5bd8484c4378137390bb2eed58
+size 75123
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_8_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_8_de.png
index 2139198bc9..65f68e3f9a 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_8_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cff768089c036e015d4e162f8e7a55b026a0b26e84d08fed85cb336adb8bd9f
-size 55396
+oid sha256:49a4829e1f8768ccf77c60ccd76853eb6bc24a545728fb80c75ed9fd900fd19b
+size 55427
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 d6e752b972..89b6968710 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:8348ac5ab0a32d80f7566bd734ace5ed549d55e1d003571e0e7fe3a68986f7dd
-size 42668
+oid sha256:9eee9b32dc1ebb91657140f277f4ef9f41167383b28d12a3b0d8137d8637fcf7
+size 41896
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 77c579fc16..a35ff56f17 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:f05ab027f2840e839337a59656cbf3b0f526e45ef8abcfb4677585a559e14fd7
-size 33920
+oid sha256:908b3602724e506773cf9b187755ed45a665646d02cff6af5b29a3b218427aa8
+size 33292
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 86bb6e2223..f7f3218bea 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:b8448b68bda8acd2582a076872af17625276a7d76fd81ae0a55886621f4251a6
-size 58941
+oid sha256:641522311897076eab5d1cf178e979624d86247883d6f5d929b097a5c377f2f5
+size 58956
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 92fb37b785..b4fd6a6ecb 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:5969d4a287e7a6f589639569da53d97c8adf7c190d05776f5342084d4344c886
-size 53839
+oid sha256:15f0e4899422bbc75362f91f67b1f25b61f7c1ba5885b9a186d62cf0fa1962d7
+size 68472
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..5782aa30b6
--- /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:696d10fb1ac5464bd89726955a1ae65fc70b1fd5dd03c74be808ef24abeb3ca1
+size 69375
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_12_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_12_de.png
new file mode 100644
index 0000000000..b4fd6a6ecb
--- /dev/null
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_12_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15f0e4899422bbc75362f91f67b1f25b61f7c1ba5885b9a186d62cf0fa1962d7
+size 68472
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 ad4ccaf62a..a6c79b0a59 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:af28ff85e055081974c119833e5ee32d2ebc1728ff687b341cb686af3aa83d6b
-size 58000
+oid sha256:48199bc8c630783e0c5cf6d4c9aa26a0955b90f052f745225ae2a11e53b72a6b
+size 41824
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 1641b39414..a5d62de535 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:5605bbc41c6270eb6cd44c3bf993a6b5e9907b5dccb9bbd3834e4d7eded97198
-size 41782
+oid sha256:311e90c57d42ddd23c9ba4ba225b12e40a1dac3406d66b21c154052262df2439
+size 61292
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 2282c34d85..cc94485260 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:73173fa138e715f2cb0f9f7950208b6d3ab5d1a56f054d514ad24ddf4780a77c
-size 61245
+oid sha256:1fbad6102fbb30e45eda90fd5eb193df15bbadaaaff1a0caaad0d8b0fd4ee09c
+size 57424
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 af8d121795..944617d227 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:3395537215d458bc647028d7b338e91fdf94cb242033afe063e165d9459c05af
-size 57444
+oid sha256:13a9d2ae79c61fc650e089f41ce4397f5845a33ae30beec04439169d144704e5
+size 55332
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 7c1807d837..0a8e3d020c 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:9803a08e9c42e821941c85f596e909755723680f75534104f297a6f2bcb37a7d
-size 55309
+oid sha256:99cc036c763c411b1946cb4aa9d7b0cd954145bc80cb14707fa4c6a0365df56f
+size 61802
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 9a48de10cb..05e168f79c 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:9ef54103492179e8003b304ec1554873ac031d18b1bb00aeb65767b403b58915
-size 61819
+oid sha256:630a7b5f681c081c52eb17edf8dc0d90cc1e81c0ddf1557592d720025b943e4f
+size 49239
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 93a2e19fca..f39a8180b8 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:ceff1004db2bbe6cbdf2c6d62e4521b89a9c63823b6cd1c709037e3bae306302
-size 49568
+oid sha256:69b3bae72db55066c0c3b4ae6eb7f75971a9c6a132adc2c2deecd42da3238efe
+size 62321
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 d0b40bab37..7a8454000c 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:12e6c4fa5f0fffd03a9ef247a41d64e3ac579b6a5b803fcf0fb89fcc71bee9c7
-size 62309
+oid sha256:586f28a39e9f30c5df5e0ea989366911a31fab6d2a3b3d055a830ace203b229e
+size 66261
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 ea6e3ef99b..0a4d0ee277 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:2439aecde9e9ad584cc7e06c6483d66af120d5abbb4915381be6b091f51168ca
-size 66206
+oid sha256:33b2ef146d0425a07ad8600732abb79815ea72df3421c31f08cd281e788fbffe
+size 53880
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 503edd0f00..b33fa90850 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:e4579f387dd478cd9f87c889e4594bd39ecee596a31c1a8059df711302932028
-size 22414
+oid sha256:9e6b6f0a7252526861cfa8726bf2edf5a537276e014a4849bc672e77f888925b
+size 22424
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 d43cbef044..1bcf4af9e1 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:6796633c10fd0c8e78ca0467533ff80adbfc55188583a7d48631eff075a2be40
-size 22166
+oid sha256:c208d059e2c143cb842a115d9b85fe2c9d98fa1b8add67811b190bf11762af83
+size 22161
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 109bbb1c2d..b7dc9cffda 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:0ea0b250b3ca6e36366eb59af5fe7dcaedcaef3a9135c0946a6fe93519101576
-size 22239
+oid sha256:4ac811497cc4e60d5f32a26edc0e9c320649163b412cbb7160c93c5a64659d8d
+size 22240
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 1507ee7439..325ae125ba 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:745abd2a67bb00bdf70082c4a8d42375e5d9b53b86558c187269e9bbd07aa237
-size 22294
+oid sha256:1edd7684b4441dc428e42116a24f24cd524365009485db94d4baed3a62a58c92
+size 22290
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 c5861c340d..8fd59fd41c 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:c38febc28cbb78ff8091c53c1b6ac5612c33292b01f6915b5cca6fb211ea0971
-size 22159
+oid sha256:26e2cecea8b7f730cc46ae2a80c6bd71f6caab54c4e37161864a12fa67211f54
+size 22169
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 12abdc7b74..20b98600f7 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:bc51ea75419925320bdf8a5bf02b7d20df56731bc50872fae3d1e69511ee4227
-size 52931
+oid sha256:7b652f6d097b68e7fdf440b2bf200ddbd6d7eeeab0db34f4640c575ebaefe321
+size 52907
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 edaaa84f5d..39be6df81c 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:c052f644f55628cd3e0f3b485df7da367741ce978a16867df60f50640ed95ac9
-size 49177
+oid sha256:fc6f30976bc29cb3bf164aed6d440c2e2605197a3de090c2cf94c6f1c1b89526
+size 49158
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 7b454e20eb..f0c19d5a63 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:9de2142007e9b29f4418b2cd2e109ad696d397553dbe8ee720ab9e32fee21f05
-size 52612
+oid sha256:37ec62ff5de2fa0a8199c45eaee20339a203db7f767a587635e3a01dfbd2e007
+size 52601
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 7e3c3f8843..92397afa8b 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:6f822ac721fa7c0e129c787852e5d085713d4fdbc93d8475b48c50436fe58410
-size 48798
+oid sha256:f637dcf16dac07842061a0c3705527ddf481dddae403e76fa75094d690edbeae
+size 48784
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 edaaa84f5d..39be6df81c 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:c052f644f55628cd3e0f3b485df7da367741ce978a16867df60f50640ed95ac9
-size 49177
+oid sha256:fc6f30976bc29cb3bf164aed6d440c2e2605197a3de090c2cf94c6f1c1b89526
+size 49158
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 4aebb5687f..3f52e4ed1a 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:64f208428eef599454b3a95986a921958020a9802957229c3ba06ae74ed541e7
-size 46575
+oid sha256:d169a48d14b04cf2023d75b5ead3fdd34c6a535ea4413e7d4214884a420b94b0
+size 46569
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 2258235f56..9334461e5f 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:c0c95659736547acb752eab919dc78c1a8f29ff048e85118dc52c1ad6eb5ea60
-size 39531
+oid sha256:87dd25a450d2cad91ae7c091d0494ad715fcf875c3e8dc1e20ab905cc5d6b5f6
+size 39535
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 c826880b23..e60f3a8ada 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:b47e907d51ff73ad68129233cea46102360a3f4ec246a7961583ac0be58d481b
-size 42357
+oid sha256:d582bb6555ee254cc885a2054c870daa5f665a7ecef85db6cfa58ecc2103d8bb
+size 42352
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 2500a47e29..41623d158d 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:2f7893ea8ec10b5a7fd2d335f498a637602e0a0e30fbf5a9368a5cad150bbede
-size 42554
+oid sha256:537fb0eec587e1f9e7b5f4095e9aa09c687f47e2b45025efa7dbc8cb4e030fd3
+size 42366
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 9c94ee1ef1..022add83af 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:a4a6fb11ea03e64872c258bd25f304bb955c3ff779e190cc7495de2e8d0cdf71
-size 50031
+oid sha256:af28f956876e0e02929e76dc11e36eb6d92db76aa57b255016e2916b38a3c7d7
+size 50039
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_4_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_4_de.png
index 7a0b301a20..219147d7e4 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_4_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5d9dd5feb7bda399c539ac68d9f57d4c4ac4a070245b121e1cda186c2774d41
-size 27942
+oid sha256:d15e1e2edc67cbcd5f52bb6e3f253519bc9829c8f00bacabc31f35ef24b0aa26
+size 27925
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_5_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_5_de.png
index e7ad0cf1f1..afc6e2ecdf 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_5_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65f83f62ae167d7794c5d049b4459d4d4ef2572185adbdd1ff929f9561cf1a0f
-size 118571
+oid sha256:0c609c8a701f5b8141b3c536a43b86c856f7692ade2033e04d82c1fdece2618f
+size 118602
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 ba48f2d1dd..de4c4abf0a 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:ee2e8c1cf237f2c4b0ae6ccd9dcef280c0d4c83b788e140b38a47ac099e69336
-size 43253
+oid sha256:4c1d36cf8727b12859d381c204992cbec4474c361c5fbbb5add0a1e58e570869
+size 43255
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 48641b50c0..72bc914c60 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:1fcf6e7dc35e868539efe503ed937d978ed75c5f3f46e4f19ab52dc3bec71303
-size 40813
+oid sha256:bd9b328260734764e74a551326cd19a4661ac9c68b869a0057c70bdb726957b4
+size 40801
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 b0887fba96..984b53aac9 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:07769008e1f31eba70a3800f040d43066f14a4e004afcff7093304a24929504d
-size 60145
+oid sha256:4d9309c049d6a06e4785cba0f715b3942bd5911caa5de8c6a8f7ed612f669df1
+size 60112
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 18922dc7ee..8cbf87260f 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:7e7dafa33354b3b8eb6cc287ef56d4cd5374d3f1060f0c95c32a0ba4c23c91b1
-size 64360
+oid sha256:1850dcd657c25a5af59df9dd4dd6ac69c2d572e3484447eca240c8c3c5486300
+size 64329
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_2_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_2_de.png
index 6ac61e0431..f832c07c37 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_2_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8f085fd176b3136ed1f75c29e03ee7ccffa0f1969b19f1951edf60da425e56c
-size 17233
+oid sha256:dbc35b4f12d99a4abca5ad4a67bdb5b88861c5bc3eb77bafe482d5f00ba2a18c
+size 17255
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_3_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_3_de.png
index fe440a1f2c..1d9f7dedf8 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_3_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bf68384e86515099a8d4b1430a6f03ff54829317bdd9ac949c77270e57d953a
-size 17451
+oid sha256:9d427e2b574d12eb8c14419e1f19d549c0f16b05ef3d66718e3e5622a52c9e32
+size 17472
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png
index dbe6078da1..4c7e7d0c5e 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5b13f60e9b9363d183f92d278a39ce49e59d31248de9e027fab6dd3287ce982
-size 21162
+oid sha256:68e27b3b8b5fa00102a16d83ca0b76b8a7de9024dc3fbf077e80b61940e7e482
+size 21184
diff --git a/screenshots/de/features.preferences.impl.about_AboutView_Day_0_de.png b/screenshots/de/features.preferences.impl.about_AboutView_Day_0_de.png
index 57b718d6e0..bd46afe3c6 100644
--- a/screenshots/de/features.preferences.impl.about_AboutView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.about_AboutView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:225e200388d0797309c165c7b92d2a6e63fb45314a9d98948d25076fbbb258ad
-size 19145
+oid sha256:b8537888f3449918d5a0b3c88c97e124ce00a9e6594d5e3cf52a99a948c71f11
+size 19170
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 18075624e5..d5247fa692 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:640fc6cb730521e831bc408c13fddcb16d7fc5767be0599bd14703e135cba673
-size 51711
+oid sha256:872a354ccbec2df1bc8cf8d5587b03a4e3a36020f6252f8fccc32bc4d2988bdd
+size 51814
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 7e8d30e121..29fc4e4e08 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:5e1147eb6941bac62236bf6b10cdb8f08f6338a89567916517112aa4b0f48939
-size 51577
+oid sha256:abb3d30cd0a680a1383920e5918e6c70c616c41a30eeafe9ebb227943cf86c25
+size 51678
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 029582be59..b16886817a 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:1d7d650a209b796acfa2dd8f5582de6792609136d9048a7ce6e87ec69a37e199
-size 51553
+oid sha256:43d6a942764ffb1769f7ff6069e4e4b47826fb4ad22aa411abe44c5acb8d00be
+size 51653
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 0ead90491a..a7f4a2828e 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:57e30dfd18e347b047328c73d011b70f65285fda4185a9ba8b1f4f0b5f33b81c
-size 51582
+oid sha256:87d053a521e81a094ce2cbd363405694826c1548dba5c8bab5d71491353f87b8
+size 51683
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 b1503ea24b..a21b372629 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:37f4cec6c62f23337bf8071bcd784a090cc3da0ae6d965bc303b489d5c3c857f
-size 51430
+oid sha256:20ecc3871970dfbb8cc5221ce99ffa3f35670960050c7f2b4f5b4849f6f0ffb7
+size 51533
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 bbeb292cf2..0480cc6ac0 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:9210fdc033816afc90cb87ed3805f7ef87f255b83059a330816efab67b421d20
-size 51705
+oid sha256:b91020943837a618e6928d517b58f2e10625074305712ece87e2a4652ef600b6
+size 51807
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 bffa4ec55c..5b7e996f7c 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:994c0459cf57b9cd03f666389c38e745e1885909d89ec26484b1482d465bfe00
-size 51387
+oid sha256:fafdd20518032eac934ddf2b41f549be080c9aa7d1ee48da70363ed52b3c3791
+size 51492
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 5fdde723c2..3a4c6eacf1 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:ba0513caef897e5f759f6b57d52204adaa4754741ba8677c6201cb45290cf258
-size 50932
+oid sha256:21bf02f826bd4ce099e674a6930136df14fa2d833beb75cd93023f7f75ea335a
+size 51034
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 6cfb8fa904..52b1cbde47 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:fa4223f158398f7e8318d2dccde9ad5f19c6ddbfbecd56195cb33ca31b611a65
-size 58877
+oid sha256:963908f17066a341b6f2169b1d2c986d0320821c0f26b2e45c3c96150a7aa59a
+size 58977
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 7c7382892c..081f5c2873 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:9aae1dc71cadb6e66f6e8e0442ba2930d763db9dc0b37ebc08bc1bb55ccc2769
-size 53769
+oid sha256:4ec9e68496f046e9fe19345ac4d4db4b41aabd3a2ec55393eebbd9323146e852
+size 53852
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 76b609e927..3ec9c9f529 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:d80855517f8b67231fe586bdf3b5f093fafd31473e1df26133691ceaccc7cc88
-size 53647
+oid sha256:4e44c054035d55d81eb2452ae5217891e8801a413b6220afebc87ecc94a426c9
+size 53731
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 1bd59b2eb5..e40d353565 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:37cee079ad400733cd5e79bf7cc2ca8e57bd3c943718e8a0141f40c05876d81f
-size 53651
+oid sha256:bf7795d8760b0ef10aaf69bafa3ff37ea0c47dc9f50ec6ccef8fd23674295509
+size 53737
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 96d13a3559..e93fc44323 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:93cbe7c58a35811ea6ede3b159eb423b450ffa0394ac7d55c334c3222a65c077
-size 53648
+oid sha256:1a26bb5d30d8957934bdd80ab6074770c4dee54cc239c26a815085f6114ac7fc
+size 53730
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 0893c5aeab..702360cfb6 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:9c34f1a555c5c4eec4aa836cdc2e51ae3e6af073b596b6759040e329a8d6a65b
-size 53551
+oid sha256:75bfc93470f5a29e5a0dd2143eeac5f84addd8a489c8dd971ff01bb09661f01f
+size 53610
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 caca68cc7e..9ea55ff156 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:61e20fdeccf23e529c4c88d008a259bb287bdc9d45d3fc79b14ec43e9f33b96d
-size 53791
+oid sha256:bc7f868e0f2284456c8a8d62ec2666ea53873253d335eb7bb5ab51ec79925b71
+size 53872
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 bc9745c65c..e6bca0c665 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:9cbb9fb883cc6763109ab6b8fa8a47f3d476301a98ae4d323124486612fdc50d
-size 53481
+oid sha256:2570f2ff5c676c75cd135e00508ee2a47cca82f163a3de6500ba82fe9e839fd0
+size 53560
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 b8f8f80b22..2cd0f19ecc 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:8caeef8ba4c9429da99219cd4384e2f73e4616599c7347de7f5d7a4988e9df6f
-size 52959
+oid sha256:b992e3aa729a10c5ff69441f79178ddd6c150fc83050fbeed4ec0e2340f47de2
+size 53043
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 faddbcf144..6530d2640f 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:b33cff6bed2dd649aea96274dd8f837488d966ff5e06ad5484521a096a269bac
-size 61633
+oid sha256:38cb8627784bf96336897f31f94aa1f80fb5a6d39ff05390ceb8940988a6964a
+size 61704
diff --git a/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png b/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png
index 0190896940..e5d4e0dd53 100644
--- a/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15a7e16b4731665934b7b7243fe08b226a6a8b1ab9210f6376f324c961cacca6
-size 28481
+oid sha256:cc005defab7bd844371e48c1511fd209ca8a3e8902e8e234dbcb1f409eb2deac
+size 28492
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_de.png
index 13d36736ba..871afe71ef 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc34cfac791c18b8bd35d080e3b79a6e172362b79f9ef416ab62bc00a95594dc
-size 59214
+oid sha256:e5a733462618eb242f77a46c18e66a3d98d7de1ff300441350a56bf59edcb63b
+size 53727
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_de.png
index d295317c9c..5fe49e4950 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5080309ae298b821d0460d64d93bb5aa924f474d3acb6d890d632f0ff91261bd
-size 58917
+oid sha256:4e1bb7419a82d26252fea05af5206635e64a1b64d4063ac51e5ff5c51fd3d655
+size 58261
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_de.png
index 63d0550a0f..26b99d52d0 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d88f009ac745a10ac86b4c0cbf4bfe319709e4c6af9cdfcb74bab3c2a7820c6
-size 7996
+oid sha256:1d15f230f5c476b0929da8f6a96e3c6be2a3c2697f4d2c7dc6a6252ba644be45
+size 8014
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_de.png
index 4c195668f4..e838aea107 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57af5d4ae6c2c278808a14a9d47f11d8e393d6c378ccfc37ee5dbccb29335668
-size 58752
+oid sha256:fb7f869a12d97b8890e582f378f6d6811d1cff943121d3513e964b89bd29bf9c
+size 58676
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_de.png
index 51f3c6ac32..3ca273fede 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac0473003635a3020b0834b6464f61ad1546ca8e4416415d3cd228bdfa8fdae2
-size 62788
+oid sha256:555e0b1dc3ad335956a9c9595ab074a8678b81a593d8d5789b64369be625b40e
+size 57370
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_de.png
index bd5eba6e6b..f3a824bcf6 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e83d8f329fc02c4e1d82dcf37e3ddaafccd61449ebb3a70fe54a54a07760645b
-size 61926
+oid sha256:a0d7f67c26cb32ed1d64ddf4abb629e9b72a6a38d74079c549a27b8c1ee9fca2
+size 56497
diff --git a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_de.png b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_de.png
index 13d36736ba..871afe71ef 100644
--- a/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_de.png
+++ b/screenshots/de/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc34cfac791c18b8bd35d080e3b79a6e172362b79f9ef416ab62bc00a95594dc
-size 59214
+oid sha256:e5a733462618eb242f77a46c18e66a3d98d7de1ff300441350a56bf59edcb63b
+size 53727
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 91da509ee5..ab9bd3641a 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:bea9c1167e5a43a86c8183d97ff97b8f99aa063799b1b127aa24f44e375eb31f
-size 50157
+oid sha256:0f2e04d19b48bc1926a59e583e1332057b7a5f49696c764134e3fa448d04747a
+size 50172
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 91da509ee5..c9e3d940f2 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:bea9c1167e5a43a86c8183d97ff97b8f99aa063799b1b127aa24f44e375eb31f
-size 50157
+oid sha256:7becc279d37731e7f48a98dc5b2bfcc46d5ff49c6defd2cfa4eb3700e2680817
+size 44887
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 27aeb2fde1..2bf5079ba3 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:daac79a6d57fdb849ae8ec8cf8dd404b13d0eb954ec2a5507423305da301c27c
-size 47867
+oid sha256:9723ad14c560fd385ce307f08c6ee8dac98b128111164ab0581941d774f89834
+size 47884
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
new file mode 100644
index 0000000000..5f2ffeb5a7
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f82358720031b51116b369477e74fe01cdb2ef67752aa6c63a6448b3124af79a
+size 40047
diff --git a/screenshots/de/features.preferences.impl.labs_LabsView_Day_0_de.png b/screenshots/de/features.preferences.impl.labs_LabsView_Day_0_de.png
index 972332f722..283d6a560f 100644
--- a/screenshots/de/features.preferences.impl.labs_LabsView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.labs_LabsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2170c55c31cc2065787a634fde443fea1f4f5acd1d7a7cce14f8255447b2e8bb
-size 48317
+oid sha256:36d6e179c0fdecb3b4ebc1233fd3543c19c2615adeba0db15917e5540111d1f5
+size 48335
diff --git a/screenshots/de/features.preferences.impl.labs_LabsView_Day_1_de.png b/screenshots/de/features.preferences.impl.labs_LabsView_Day_1_de.png
index b21729fa34..3edea046cf 100644
--- a/screenshots/de/features.preferences.impl.labs_LabsView_Day_1_de.png
+++ b/screenshots/de/features.preferences.impl.labs_LabsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a065f3e8983d7fd2cf363984ca07f69bd2e0841d5302e7b2ac2c60a259332e2
-size 39484
+oid sha256:eb2bf0d0f83c2125a34393713a9f385734ef16e02a14e93ea152125b59b0c66e
+size 39483
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 c2e54513f4..fcca3bd638 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:50738f74443668d50539e34bfd9581330b393ee1855462b392ae741f7dae9dd1
-size 50563
+oid sha256:1a9be1e5078fd9270518e95405d151a98a90f670d23e4bb01145b21b04a6b905
+size 50587
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 881b77d38a..d844d6c295 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:5da51224d52c42aff7bea1f0573194170933da0141021ca506c338ad6f68ddee
-size 51277
+oid sha256:492ef4165ef99a2410ad1925ef1990a923af733af09c5c1b8d94ccd3d31d3e20
+size 51286
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 c7b4a62bae..0b19442a96 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:229aaf6b2a92bcd43c97cfa9e77c4c75b294a587306cea1d92c5b65208b5a97b
-size 42261
+oid sha256:d59ce26ab11d829565dd9d0ca6c9bfd20296ceb5161e1adfb6064d666b77363f
+size 42244
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 b447e6eb76..f3b0172688 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:d5130de6e57ac0b4ada7b7a7de549cb08c1a1b48ac64cc05ab39f8d2efb41680
-size 41413
+oid sha256:84868285dd59f25fb9ba202f25a7ea84142f272584e50a740d50c1b1740eb9ea
+size 41392
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 3a9acf603a..150cf37c78 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:17d720145734aed7fea487a031712556382617ef60f97405569979f153e39af1
-size 69922
+oid sha256:0ee9a4755fced9f049b1e37e8f7600420fb07bc8bea623afb522da2bc9b13dae
+size 69944
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 1a072ef681..a7339b685a 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:8cbb924d55793c11e6d67fe80f447f354ec216a9b5684504342c51f65c5daa55
-size 68022
+oid sha256:d08d8768775583b81147a2ea91e978e0c1e0246d13b111bf535912d6ef8d24e9
+size 68034
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_10_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_10_de.png
index f38589684b..df7a47ab30 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_10_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f717fc891e9c7f5c5ec7a1ae5025242e4fca4c697c1e1d7a092da2c30b1180dc
-size 48666
+oid sha256:c753ca39238bd8e151d828497df7cffbc08df420adfcd2031c6ce06935cc2926
+size 48679
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_11_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_11_de.png
index 5837583cf1..7e0c79e38f 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_11_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc683b3b8b0b3ffa9da10e505559f98b2faef0dd85523d2bf21faa32956d9483
-size 42832
+oid sha256:17629241fc84abf7b59e66e87ca77b0c35cea81f6448b705ca691689674f6b57
+size 42812
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 217e001190..89fabeac02 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:34fd1153d2a1113ab211cdaaa4ab7a40a7683d2dc07cc63a5ee833c80e9fed7f
-size 72473
+oid sha256:9fc32c25f6fa620ea6386f9724207a1207ed834586caa1faf30d6c9858e95d5c
+size 72494
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_13_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_13_de.png
index 9c871496e8..3d6bfa81f6 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_13_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f5a50190d6b249f9eb0d8346f69a6492ae10d56fc24bfd5ae78458a753b65a5
-size 19617
+oid sha256:6f674d824e0f3370bdf12a05dfe0b75e74f30412c342e6effe04a2e96ddc45ee
+size 19623
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 606644fbd2..d0ee47d6a7 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:40b1622c11a7de63f2585946e6b066ff0dc482d69de3692a257c31374999090d
-size 54576
+oid sha256:eb5f2b7feb440a5eab44105522a9524b319ad56cffc40fd42f3e8ac5cf83ba9f
+size 54585
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 097a820851..a3cbf3b114 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:ddad47b9086ce793d7085eda8aa7847b120e7a8fcd58c45f803ea0549f202790
-size 48853
+oid sha256:b92ef498563e8e66ae16ba2df6a3ba6809e1995cdc019dba4b1392a5ecb32356
+size 48835
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 589bdcabc5..9540ddcad7 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:3b8df24928cda90d3e29186034cf088ebbe37a75b99e7ac8132f515e339a6bc2
-size 50019
+oid sha256:81869966ef4cf966a0890c5f54f56208803d9b925a817c7ac1300fd26bde4cd8
+size 50000
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 589bdcabc5..9540ddcad7 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:3b8df24928cda90d3e29186034cf088ebbe37a75b99e7ac8132f515e339a6bc2
-size 50019
+oid sha256:81869966ef4cf966a0890c5f54f56208803d9b925a817c7ac1300fd26bde4cd8
+size 50000
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 606644fbd2..d0ee47d6a7 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:40b1622c11a7de63f2585946e6b066ff0dc482d69de3692a257c31374999090d
-size 54576
+oid sha256:eb5f2b7feb440a5eab44105522a9524b319ad56cffc40fd42f3e8ac5cf83ba9f
+size 54585
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 0fc4259316..e34753f2b4 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:b83ce1b120f5eca77007f7f7d957bdd3c45135f5f3e454ec68c50564924373f3
-size 47163
+oid sha256:674a69f954886ca4623116a44263cde9a2b43de023b0e82bcd0935a8a7e20e5f
+size 47140
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 663000bae6..e4e29291f4 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:633b2df37189860357e7a98285f57c098e580d61cb82fdf274055e7559865a9b
-size 52264
+oid sha256:6e72182a76fd2e4568eb34dfa9bff5896952ff91779c61dd99e0cd408060e36f
+size 52238
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 606644fbd2..d0ee47d6a7 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:40b1622c11a7de63f2585946e6b066ff0dc482d69de3692a257c31374999090d
-size 54576
+oid sha256:eb5f2b7feb440a5eab44105522a9524b319ad56cffc40fd42f3e8ac5cf83ba9f
+size 54585
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 606644fbd2..d0ee47d6a7 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:40b1622c11a7de63f2585946e6b066ff0dc482d69de3692a257c31374999090d
-size 54576
+oid sha256:eb5f2b7feb440a5eab44105522a9524b319ad56cffc40fd42f3e8ac5cf83ba9f
+size 54585
diff --git a/screenshots/de/features.preferences.impl.root_MultiAccountSection_Day_0_de.png b/screenshots/de/features.preferences.impl.root_MultiAccountSection_Day_0_de.png
deleted file mode 100644
index 2ab16568a9..0000000000
--- a/screenshots/de/features.preferences.impl.root_MultiAccountSection_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2505c99e7ce75631696f09774c312363d414856bd2cdeece40a5bbfb04f38184
-size 59248
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 8b4e8902b2..9c1a6d041e 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:b63b8a1a2e1f6f3eb66d567103184177bd5fed9dafceb1e9d0900465a648d009
-size 42080
+oid sha256:bd194f574a10021900922b975c3168b16f52e6710e1630e53784f25466ad0be9
+size 41559
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 8bd32ee5ad..99ddb60522 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:f62deb4536b2b626505244590ce5d6531931f1cfbb87d5d97c2faa0db79d691f
-size 41904
+oid sha256:166e8fb118c62ddef9f92be1ae2ff427d60d8a3bc9a348b047c6d3a165afd730
+size 41377
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 e9d0333419..54daf8b831 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:d97d1234293a227f015f4eccc4adbe95fd97f2b28b9a0205ec558bd6ae287296
-size 43272
+oid sha256:7484ed26275f9b1198ff8ae6b9e1ccf149be88d43cce04bf4be7443abfac1f52
+size 42781
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 723e56cafb..546348fc80 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:95662f13be6b716b5d5c5682f4a3cc5ad822a8899c677fdafd818c24b0e0d7d8
-size 43313
+oid sha256:f3ca986d2446bb2920809b20c0be5ccb0adf21383782613720d44784c3c5bab5
+size 42822
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 8563770fd5..6d1d7aba15 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:1d0db62c839925a48b4487b2b7fa7b597dc8d57aedd81d2f5ea64593f8b66532
-size 22153
+oid sha256:98a2048354e01703cc5a3b63a273682176b45f39dc79432e75c5f2961e71e941
+size 22986
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 6f0ea07dd6..e11e0938c6 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:f6707f3df5000f8ee5150b1c6655a4c6ba36746547306435dffbe0e786ec18e1
-size 70520
+oid sha256:fbe3d66e2749b8af8e922fb75a723b5885d3909e7fdf94f913d9a73189f6cefa
+size 69959
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
new file mode 100644
index 0000000000..8c3409315d
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb4abd8d65e77aecba3d8fa4a4f5e0417b11b8b1b8e438da0b24e14fa5472bdf
+size 34714
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png
new file mode 100644
index 0000000000..069365f957
--- /dev/null
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ff1d538bebf4958452baf69c83fe1ee6227a71ba92cf1d6c78dc4f83f813d69
+size 50870
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png
new file mode 100644
index 0000000000..426b7883ec
--- /dev/null
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:baf5f387a778d4766d20c21f50717c97414af520bd430cace9a017df3fe53f2f
+size 116512
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png
new file mode 100644
index 0000000000..580cb1002f
--- /dev/null
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25f347841164816d5dad8b20747b64dfeab8668434bfc8b8620d2a5253cb79f9
+size 47761
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png
new file mode 100644
index 0000000000..069365f957
--- /dev/null
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ff1d538bebf4958452baf69c83fe1ee6227a71ba92cf1d6c78dc4f83f813d69
+size 50870
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png
new file mode 100644
index 0000000000..7cb5b53595
--- /dev/null
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86b159da39ab8f0b1a648d7ada22bb8e30b86a3cff21dc01148e0527e8f7abe8
+size 40307
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_0_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_0_de.png
deleted file mode 100644
index 2820191c87..0000000000
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:818aa8617bd3866d4643ded290119eb1324cfe011c5bea327828b02f09756d94
-size 79283
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_1_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_1_de.png
deleted file mode 100644
index e300e1fe4d..0000000000
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a8fc1f3081a7565abf7bb9c8d0d012ecc5981b86f3d60e77febeadb5dd2c46b
-size 98560
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_2_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_2_de.png
deleted file mode 100644
index 11b865af46..0000000000
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1939faffe9d5e8591462d4c5302c26d969be2560ec4e954913a59d9ec1f9601c
-size 74937
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_3_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_3_de.png
deleted file mode 100644
index 2820191c87..0000000000
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:818aa8617bd3866d4643ded290119eb1324cfe011c5bea327828b02f09756d94
-size 79283
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_4_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_4_de.png
deleted file mode 100644
index 66088d0cd9..0000000000
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bce0a946397aa0223be195fc0090b6bf009ed02a914879840bc445b271a37a32
-size 57646
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png
index 2b9365224e..539faa5f0d 100644
--- a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17152083f68f5db4b3badd5bc599456ff0f56e2e85baa3b26124b302ce4b52ce
-size 33635
+oid sha256:f7794082fc76e428fd7ee608440b491f405e1bb911fbe29bf8ed795e45defdcf
+size 33655
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png
index 822822882f..7cdb9874e1 100644
--- a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa4ea00e96212dae3bd8e87e96c0267624a3c63574dd6c279118916a38391860
-size 32194
+oid sha256:823991757597542fdacdc4d20b098025c2251a26de52dc605847eda4c7583061
+size 32213
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png
index 3ceca63e8d..2b1d55caa5 100644
--- a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:290d26a59077e059d04914ef3dfc8d5b19685c5fa447b54d2066fd8a901f5853
-size 33255
+oid sha256:9cb345cbc2f888396253602031a0bd38436a61f0d3f6dcf3345a1438a1b8e58a
+size 33274
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png
index b6378c2b9c..24c9aa5a40 100644
--- a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7341fbf53fbf1066bcf75691652782cb549b9ffb715c0b80d8c5bf7dedf33d1
-size 29213
+oid sha256:c563f1bb01d08dab1cb84e11357a05b6a1ef107ae4df426e3a70c94dbbcd77a4
+size 29190
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png
index dc2fd86233..b695a15cc2 100644
--- a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43c3083501e9fa128a2eab0896829f1a37ac673111d2ac7cbc3886ee1a02f884
-size 32001
+oid sha256:68d9fc89734c94e8aac18e547fc0c335522b800217fb7ff143732679b7eac8d7
+size 31975
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
new file mode 100644
index 0000000000..a4bc8d4e44
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39a79b789373312096c863a37afc548827a4d662571aa6c8efd62ff9c60b2a00
+size 65296
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
new file mode 100644
index 0000000000..875ef8326c
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d95bf342ddba5663a36a1f435351e7a3017cad73f7cd58504913681feced1ce2
+size 65157
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
new file mode 100644
index 0000000000..a04a0cd23a
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5ab43cd09460063624d2e583b71af3bb3a286890cbf07744d101042aa7c45f5
+size 56783
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
new file mode 100644
index 0000000000..7da0708b92
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41d2484c7ddee013f9cf001dc2eb0ff8a99ac22b7e70816752c97893d1db4c95
+size 54265
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
new file mode 100644
index 0000000000..6d24520c56
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3afe4b55dd9e11397b9f4b5a99cfc6f5a1a4cebcbdc8cdfb0f81f43eb6912f15
+size 63039
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
new file mode 100644
index 0000000000..c0656d9b7e
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ad55fc63c50a403a3218e9168df15c92f91430e60bd4adde45247080cf50543
+size 62971
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_de.png
new file mode 100644
index 0000000000..ce06429382
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70b9a96c4dff57091a091d74896aa85ae1d5ed3a45e58dd46e0e4e5cc758150f
+size 16149
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
new file mode 100644
index 0000000000..0446bc13ad
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bf22144267e8ebed2c074cfe017aebcd5c59f5ad55cf81775802654aa0f5450
+size 52254
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
new file mode 100644
index 0000000000..3fc5b0b10c
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea2b8ef893a86cff4960d16540a417d9c03b0c7c14952c0f798d95dabb2bcbd4
+size 55482
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
new file mode 100644
index 0000000000..9d47bfbbfb
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5061a9d86c7b222f7be0d61d2ff4ca4da7504f50d172189c9c9a8a70baa1a126
+size 55517
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
new file mode 100644
index 0000000000..09a60754b4
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a6779a089b642b924e927cdf0813dd25707dbaeaaab6bc0d4c255df3bc6f7c2
+size 66133
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
new file mode 100644
index 0000000000..6be2aa5649
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d768711fbfe3c3086657733175ad23601160ba9485365d1ed24b56e81c54061f
+size 70451
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
new file mode 100644
index 0000000000..e4b304c7a2
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ac6592c003e271d3578152b1c579b457fd64673789173ec37d1a73cd55422cb
+size 64133
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
new file mode 100644
index 0000000000..e5930b5c27
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf48c5af53b599814c1a43db660283f091e4a1948839e211eb117b931df79a77
+size 63967
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
new file mode 100644
index 0000000000..094c990d90
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3664e7b03b65c06d0e79fa2b6d690cb1e1bcb33df279ce2e01b15b447f1a41d
+size 57833
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
new file mode 100644
index 0000000000..1c27d4d4f9
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06b099b4780f03abf3a9e3a6417c7981a83276bc5c689f9508db3c8e54a4631b
+size 61079
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
new file mode 100644
index 0000000000..bc7cefa438
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdeb03d0a6a5edac44e9c9f6d27843ac86194d5791188c23d874ecbd5343f782
+size 65469
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
new file mode 100644
index 0000000000..fa0f3ecc71
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63856a50b0fa099695709dc720e600ae9b36b62cb3bfac28a940607c72efd5c5
+size 54966
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
new file mode 100644
index 0000000000..e5930b5c27
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf48c5af53b599814c1a43db660283f091e4a1948839e211eb117b931df79a77
+size 63967
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
new file mode 100644
index 0000000000..cd690a7726
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:673a833d5c5e9026b680a73017ca6e6dd9f3e33c0b13a0de4967133b85a13bfa
+size 33146
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
new file mode 100644
index 0000000000..bd1a2e7ac3
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc67b423cec2885955d8b9df9df2a0fae2767c9ab96be944824efcb07dc70b25
+size 35233
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_de.png
new file mode 100644
index 0000000000..e8fc49b273
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:943737f471cd135ed4e584bbf28159701453a5a85ac6fa2a23fae21f71192869
+size 63918
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
new file mode 100644
index 0000000000..98bfbf4ddf
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24961d4b8ba165e40edc46675151005c34ec7b6de8cb3755aaab3481e87ca9ac
+size 30661
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
new file mode 100644
index 0000000000..4982d7286a
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03f5a3ded714646cd1e316d8cf6bb9517931ce2d1407adcf55929a3a598f5a64
+size 28635
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
new file mode 100644
index 0000000000..c55a884523
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3004eae40ff8395952efbca378f2cd53afefb36156e8d8f77ee4b09ea0509914
+size 43327
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
new file mode 100644
index 0000000000..98bfbf4ddf
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24961d4b8ba165e40edc46675151005c34ec7b6de8cb3755aaab3481e87ca9ac
+size 30661
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
new file mode 100644
index 0000000000..198b0c2a5a
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e514066d66b1e868c7229302478e48fa5e9a72fdccbe54d9e179889544f73ea5
+size 28037
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
new file mode 100644
index 0000000000..8a01bb44d8
--- /dev/null
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66197931c626c563b2c6fcbf1fc8f57366bbc1b9a22c3d4dc18d64457e5a8d24
+size 31131
diff --git a/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_de.png b/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_de.png
index 16e8224c33..31c009ac75 100644
--- a/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_de.png
+++ b/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:544cbdde4d635c702e64c4279923527a10a5fc5bb199cc074e44d36208dcf1fb
-size 33946
+oid sha256:c78aa1de9893644d7b9baca2ce49773db19f94add4ccb9ef372a99e9a9e1bbc5
+size 33927
diff --git a/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_de.png b/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_de.png
index 05d32f6e21..b18d7c5563 100644
--- a/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_de.png
+++ b/screenshots/de/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46650e2769751b04dae2cc0edf05d628678dbfa73439d207f3cca75379dab8bd
-size 27744
+oid sha256:4a21f678e1eb53b46d47bd507c7093c5f6a72f56b4024d4427c27ca0ba2f80ad
+size 27725
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_de.png
deleted file mode 100644
index 6bf7743e5b..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db034b5bc00f6e71c37ed2f180d3030e7b0f98f5247eb3f538566b82a43c8687
-size 30026
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_de.png
deleted file mode 100644
index df7331e342..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:82bcb78fd3c9b508862c2494c94476e74ec666eb6ae1c096129e6375bbbbe65d
-size 24597
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_de.png
deleted file mode 100644
index 65ab5399fc..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:218769a104db9edf946f52ab66860e03fb032f5b3dddc1c95d1c0974466d64fa
-size 31158
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_de.png
deleted file mode 100644
index 3d7f71518e..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2f19bcc39caeaa1f88862149f53b375d78c7e56e1ce908a4d2188a55fed76a4
-size 55617
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_de.png
deleted file mode 100644
index 495cab10cf..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:062103c4a5ad33a859854da6c5634312abed1a9dc0b756cb23653c47606ba8e8
-size 30058
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_de.png
deleted file mode 100644
index 8fb76b2c20..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:192516d8448d0a5b65c8208a0eefcaae922913fe8d2e859cb7e0dbababe4079e
-size 30144
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_de.png
deleted file mode 100644
index 75be860ea6..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52effd0ee06fd2a7764974dada7fbbc93453eab2e17f58af4b004d7182598514
-size 27638
diff --git a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_de.png b/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_de.png
deleted file mode 100644
index 87677b8e2d..0000000000
--- a/screenshots/de/features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:445db5ce8ac1d90129d2e53be3074f0c8d4518374355833c0ce3579fa9ff3394
-size 29761
diff --git a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_de.png
index d47cbc1543..bee5244791 100644
--- a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_de.png
+++ b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93b580abe330752636e76451fa670ac637b6d365537a478c9ef9c8994d81550b
-size 8886
+oid sha256:f47cfee459a5724d907f03c295907bce04d9fb23e1f1472d87c9e2ac6ecc9368
+size 8897
diff --git a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_de.png
index e202093b7b..50a1c51bfc 100644
--- a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_de.png
+++ b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52aaf6c726ae33832da29cac4f301a682f1716fd0c4c5959bcf738eb4f6c5c3f
-size 8747
+oid sha256:76c81b27bab88665a6a109f3b876f6892f719e6417eeea16445c2b278d07d8dc
+size 8750
diff --git a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_de.png
index d47cbc1543..bee5244791 100644
--- a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_de.png
+++ b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93b580abe330752636e76451fa670ac637b6d365537a478c9ef9c8994d81550b
-size 8886
+oid sha256:f47cfee459a5724d907f03c295907bce04d9fb23e1f1472d87c9e2ac6ecc9368
+size 8897
diff --git a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_de.png
index 949ec34d43..a7da63a081 100644
--- a/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_de.png
+++ b/screenshots/de/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b580adefe5d563c71caaaf17639b84b7e6c8f5eda5c3d154cce9a5176ed7825e
-size 24822
+oid sha256:ba11832ef57b2827b42ddd8266edd7e6b9219c7942fbb0090f07e2a7214687e4
+size 24803
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_de.png
deleted file mode 100644
index 1818e969cd..0000000000
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a1c48e7b690b44d5e2fea3a6a0538899269a663497fd4247196fda09582c426
-size 12289
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_de.png
deleted file mode 100644
index e288ea7c25..0000000000
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44edbf94083aff6c3e43d58315ed1909fa826f779194b00dcf6174de781e1343
-size 12528
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_de.png
deleted file mode 100644
index 1818e969cd..0000000000
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a1c48e7b690b44d5e2fea3a6a0538899269a663497fd4247196fda09582c426
-size 12289
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_0_de.png
index 2922988155..17a0e0c2a1 100644
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_0_de.png
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63a9eab94985fec27378400856858dd2a6899e831919d57f3b0804254e521056
-size 46007
+oid sha256:344c0d1c9ac8e0b15b396b9bae16136db85a1b81b0cb9f959e2f27a8d6e36c6f
+size 13650
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_1_de.png
index d9707b6ac9..e6c3dab94a 100644
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_1_de.png
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ad3c2694bb93a5bcf3e1e2a48bb96e3cc4a60a41e1fcab0adebde63b9595006
-size 47203
+oid sha256:a762a5501000d41b1407045482440beb78742a9b671bdd2400d5c23dfb15586f
+size 22798
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_2_de.png
index e288ea7c25..bbd4881433 100644
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_2_de.png
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44edbf94083aff6c3e43d58315ed1909fa826f779194b00dcf6174de781e1343
-size 12528
+oid sha256:fb9f15f43fe78b8cb9683297c3adec0b8354f3afe9b7deb523e0c94964c2ca7c
+size 56601
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_3_de.png
index 918c13da80..3bfa26d702 100644
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_3_de.png
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3ac0f974d8d56b3ecc34ac6fbb0f033975c0ed513cb6e05f610d4a95ebccd8f
-size 13860
+oid sha256:be327333c430fe7de69ee8540ee2f499e2e02575e95c05fc54b5264fa79b8771
+size 31384
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_4_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_4_de.png
index e288ea7c25..4bded04dba 100644
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_4_de.png
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44edbf94083aff6c3e43d58315ed1909fa826f779194b00dcf6174de781e1343
-size 12528
+oid sha256:9070e72ccf6ba4553cd093f686f55329221b88df7b188716f20b2029ad639517
+size 57820
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_5_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_5_de.png
index 6a4ec71b9a..0ef6abe726 100644
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_5_de.png
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2297fbeb63dbbf5281266f90015e047528e3287c923e2207af061458fd12897e
-size 7929
+oid sha256:a9223b4e39ba96f63148d6b33ffb70cd3893926032bcf1b05e76193873f47716
+size 19654
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_6_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_6_de.png
new file mode 100644
index 0000000000..27e87d2a1f
--- /dev/null
+++ b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5989462acb327dea61c68b082349b9bba499bf98968563f8c144a04169e205e6
+size 29897
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_7_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_7_de.png
deleted file mode 100644
index 1e4316618c..0000000000
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a686e2024b1de0408f0d5920ac576b2822677dea98ab85cec11652edf3eb02b
-size 24681
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_8_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_8_de.png
deleted file mode 100644
index 8397efd92e..0000000000
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_8_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31de17fb1f44c06ffd9ce5d7e59c91b7da986720f90074802b1b566b55859186
-size 12303
diff --git a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_9_de.png b/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_9_de.png
deleted file mode 100644
index 425107966e..0000000000
--- a/screenshots/de/features.roomdetails.impl.members_RoomMemberListView_Day_9_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:736b973e4177726e15beee8377efc9e61db4e08198aef5d9c41873e653959f51
-size 21663
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 62440e7612..98c112d387 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:e0ae03eeb528590d37def020f34e8ab138e16be7118c8742ffb5e5b0401ca91c
-size 48185
+oid sha256:b5418e4c3ed3c02b1a78fc57e75b61182f6d230494aef7548f9d8305748b2bec
+size 48196
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 a0031de173..a80c3fba86 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:d6b27f6cf42ae88bb10a519096a3a6e469d6447a50996eeb61eb02b3bdbbfa26
-size 49895
+oid sha256:2c26e8b5415952aacd078ca4c02a851a65404ce87f1e0b756386d08dd111f527
+size 49908
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 874aa52144..5006c87051 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:f73fa94cd961c62d08d0abf046560c780fcadbf0ac412693e741fde8d093a3ee
-size 40690
+oid sha256:ebda49047af7040febf3bb5cae22521d9043dadd9e74700010e8ab8a45252bd1
+size 40663
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 8a3190e8a6..03be47ca26 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:bb7aae1df2a4cbfbda74c6c8812198140e54f12b7798af9a1a90500616b05595
-size 42653
+oid sha256:122f016a8ff5a1baf92bac5834189aca266ead157c4b5b4de8adf01994550f6d
+size 42631
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 874aa52144..5006c87051 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:f73fa94cd961c62d08d0abf046560c780fcadbf0ac412693e741fde8d093a3ee
-size 40690
+oid sha256:ebda49047af7040febf3bb5cae22521d9043dadd9e74700010e8ab8a45252bd1
+size 40663
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 8a3190e8a6..03be47ca26 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:bb7aae1df2a4cbfbda74c6c8812198140e54f12b7798af9a1a90500616b05595
-size 42653
+oid sha256:122f016a8ff5a1baf92bac5834189aca266ead157c4b5b4de8adf01994550f6d
+size 42631
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 62440e7612..98c112d387 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:e0ae03eeb528590d37def020f34e8ab138e16be7118c8742ffb5e5b0401ca91c
-size 48185
+oid sha256:b5418e4c3ed3c02b1a78fc57e75b61182f6d230494aef7548f9d8305748b2bec
+size 48196
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_de.png
index b3fd6da7c2..0276033b12 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02ee83247e54bb39de7b3bc5e69e3bec21f4b45e374c7e5002a4612104e34025
-size 26304
+oid sha256:1ea526df6ed53d1e82dced90952e03e87b6ff4abe5e4f1bbc86c7b7d366d092c
+size 26316
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_de.png
deleted file mode 100644
index 25b2d9076e..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5df79822c29afc140d67075460ebb3ac32acbb12bd48b422cddf2b7f30f0d5a7
-size 38677
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_de.png
deleted file mode 100644
index a1f7290ef4..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d5ad508b5d73947fa07f9d5f56ec49949bd4efb60ff239df245814e26925a60
-size 35579
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_de.png
deleted file mode 100644
index 75478ce4ad..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d73f8dcebed2575d4de00ebf9b44e19e46fabed0fd9b252c5df6f5c4e82753d
-size 47314
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_de.png
deleted file mode 100644
index d48bbf0afd..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02d9b9d5219a47dfd74a523f3e3b38e6273df6681686b086fef15187cde101d6
-size 38608
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_de.png
deleted file mode 100644
index 2f7500dd52..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be91a4e37639900c7d822b7922ebd3304e0cd6f33d69a8dc8797fbc898389f30
-size 36516
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_de.png
deleted file mode 100644
index 68d5d0381f..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6b9b30eecec15ac0adf1ba18dc578553770e228c944d928dc87bb308ad66a95
-size 38846
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_de.png
deleted file mode 100644
index e80ac211bd..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:630a97f988f05420ac8348c9f5a446970ce1c823b7157772b6a1294410a0a555
-size 48100
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_de.png
deleted file mode 100644
index 391ef68dc9..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:199d550dcc10ad32149be1e99aa8da10b0bf13f072e54a8e809e050f8cff2335
-size 48598
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_de.png
deleted file mode 100644
index 1a36865c33..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4973fd90ead80ac942ed9c7209ed309485d43b87cbd1ec89e4f0989f2a14e4c
-size 50550
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_de.png
deleted file mode 100644
index c64083082c..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c95fe5ff025b2690fcf4466ece56f41f0758e84004a41d00fda090c5bec0811
-size 63879
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_de.png
deleted file mode 100644
index 113372b8b1..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d52e4e8ebb9f92f23445be1374cb1c99a55ca4bc855566f7eca08e31ec419ee4
-size 45862
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_de.png
deleted file mode 100644
index 2540918855..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:638d958fa225877f475feb357c0d839fef8a05b876238522c9750a8b90b23358
-size 43922
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_de.png
deleted file mode 100644
index a61d4381bc..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89d4726d9deb408e2a7fac1a71ad487b154faa9735131bd1fcbd64d0587746bc
-size 56525
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_de.png
deleted file mode 100644
index 113372b8b1..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d52e4e8ebb9f92f23445be1374cb1c99a55ca4bc855566f7eca08e31ec419ee4
-size 45862
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_de.png
deleted file mode 100644
index 23571dc46c..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c60eaa6e529c230303960d0fa3ca03eec6c010bef06bb6a46db2d1241472a312
-size 43377
diff --git a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_de.png b/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_de.png
deleted file mode 100644
index 3ef980974f..0000000000
--- a/screenshots/de/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20c92b5c171e00018f7e5ae66e55706d2c264eae4d76db727241a5978d0b8d99
-size 46763
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_de.png
deleted file mode 100644
index 295c6141f3..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b17bdc28601b61df525fd8375dd83d79ef8963dc03a436979fba88564fb12318
-size 26476
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_de.png
deleted file mode 100644
index cf5a3e7dc4..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41607b403d6a0cf790db112ef3908df6f02ce1a2013647f667af8a539221888d
-size 31781
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_de.png
deleted file mode 100644
index 7d68ce8154..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0c1d9181d312dc01cceedd9fb446e7c4e704b20dad2eb00eb933dc0474167cd
-size 32512
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_de.png
deleted file mode 100644
index bffec9be0b..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c404ee0951b8f5102e6c4be33818eedde2b74c0dad4e9bcc3d1680a21ddba208
-size 26378
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_de.png
deleted file mode 100644
index 855fe194c6..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a840f0965ec9cf1a0bb10e0b6421682388ec9153489b1306ba21e34de67cab9
-size 28445
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_de.png
deleted file mode 100644
index 4cfdd1a2df..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10c9b3b2b60263b77aeac6a0a726200d82c89fb8ef3f9fc1c5d67eaf82748c0d
-size 49097
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_de.png
deleted file mode 100644
index 7ddf22af02..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7af5e98b0b15551c1c91fff4e5333dfdda2b0edc2b2c94b69a30ead3957f332
-size 66780
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_de.png
deleted file mode 100644
index f2a212c869..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0e0bca9a56eae0d774652862621c1dc33feb1dfae88f633726c0c795a1d2427
-size 66905
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_de.png
deleted file mode 100644
index 7de7d8ce2d..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57cd6df19cc7b61a1c528e7ed107f8f6006d8a9cf1b82946fd45acb78746644e
-size 67046
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_de.png
deleted file mode 100644
index f36a6399ed..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:921f770410cbb2d168bf8b1ad7c3297208d7ca7d8d610ab30b4b65ffbdb9897d
-size 66728
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_de.png
deleted file mode 100644
index e3f4fe168a..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19d8a60cf3c51f4ac26afd9dc8971d747c0ccf7ba49b3e8aedc3f06db54f6d2c
-size 48860
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_de.png
deleted file mode 100644
index e3f4fe168a..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19d8a60cf3c51f4ac26afd9dc8971d747c0ccf7ba49b3e8aedc3f06db54f6d2c
-size 48860
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_de.png
deleted file mode 100644
index c8d111b76e..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d685380e4b4ec9634ceab25bb989dda305000bbc63d388d308584ce9be41e900
-size 50034
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_de.png
deleted file mode 100644
index da38ec710f..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1711578b347285b594410d9c5bba9c5631fc930e45ccb78b25820b5f02a7a52f
-size 42777
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_de.png
deleted file mode 100644
index 21b2757a42..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d11b17b52172a2d8b98acb81c0659dc97d09ee75ab232557a8622bbcbde22c0
-size 51007
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_de.png
deleted file mode 100644
index 1bc76bf222..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec5fc09759b68d94af3e9cb9b8a049b4b09f9c5d2088014021bf662f45a89d03
-size 69361
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_de.png
deleted file mode 100644
index 9fcdbe91b4..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:016bfc7341d5a7811d02a3343b3d05caaf9c822b3a3d773385a7b4777644bf6f
-size 69581
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_de.png
deleted file mode 100644
index 403b3e6875..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e16d6e7dac990919c01f3a50dbad23de8122e9fce0f9ecb01cf392d2013dc037
-size 69597
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_de.png
deleted file mode 100644
index 566b4a29c2..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40e3e22e21b260c716f5d03a8630c9acfb8d84ee054fc996e952c71076682afb
-size 69241
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_de.png
deleted file mode 100644
index 4630cddbc0..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38cc47045d968a748f6b7abd6b4415b1df9daeae23ae3ab00cf6c9850be4e025
-size 50973
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_de.png
deleted file mode 100644
index 4630cddbc0..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38cc47045d968a748f6b7abd6b4415b1df9daeae23ae3ab00cf6c9850be4e025
-size 50973
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_de.png
deleted file mode 100644
index 63c9d2f2ec..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9322e1e84b86d8deeb0ff07ce296847c54d620901fa072fbe5321c1197fac16e
-size 52370
diff --git a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_de.png b/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_de.png
deleted file mode 100644
index afa28c596b..0000000000
--- a/screenshots/de/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc795edca25781362cab6a56ba73dd3ebde43544a82c94711b04add0fcde6760
-size 44368
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_0_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_0_de.png
index aa301e7388..898a72ea3f 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:157e55e65bc769b489076156cd387185857480b1da354303fab02084b2475085
-size 46422
+oid sha256:b8697c4c08bce7b3e51730641c438a88a61a86d0f4a0eee4945d1a8645cd229c
+size 46344
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_10_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_10_de.png
index fccdf986ff..027896e5db 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:57c333bda4ed242cc088ed897b10af0e46ddcb02a15d2703b99b3ed4c8655f65
-size 45292
+oid sha256:b50eb0bb60ecd651d06348e2aec20b3dd44666cca9102b0d2403471905bf47a6
+size 45238
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_11_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_11_de.png
index 31229a63c2..a24498e869 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:e9e86d6b2c035e2051a53443e389fb6f64bdfb9a8735d503e7fc15dd50572802
-size 43704
+oid sha256:548e6a8fd8f8fdb037f206412b765d89524f40711d1aa1e25fec7693761b098c
+size 43758
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_12_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_12_de.png
index 91a19d8b15..189a57b5f7 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:1e1b2535d2ba22a2fbdcfdfd2af2922fb823cf48e5543597ae495157d7c93de2
-size 47448
+oid sha256:5c4eec1f4dc41a34d4dcb6bb19f06e82df3af61d5502a1d69390c92a8dfe61ae
+size 45547
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_13_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_13_de.png
index b01e41e9bf..9e19611d2b 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:c21465a9222bd9c1e8ef4cd87dfca89f58a680a1159a41de59c5f235dad600d0
-size 45520
+oid sha256:aa53be2c34487dbd6d256ac08bc0472e5a9041fcdfd4312b41b1587e1ade02c9
+size 45460
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_14_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_14_de.png
index c8b623827d..d34c5f2d0e 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:2de1957ccfe09b93100ed61addcb8274d6f20c87a28759d11ab02ba8a1638804
-size 46104
+oid sha256:1b0f4b25c48f814d0f65a9ebb90e624fd063e85c38638c34b5c2112c26d0a19e
+size 46030
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_15_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_15_de.png
index dd58719400..daea8bdf49 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:7bbb4123dad65552f7a5ccd998b95c5adc2a31ac7102f3c6254f8eebb8d12db0
-size 46638
+oid sha256:694675fede76219bec32f4eb90778dd36a71c6949bbcb5b4e324ac95801dcbbe
+size 46564
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_16_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_16_de.png
index 666d8d0c47..8746083afc 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:1124f60a8b3018c53e1f4a5ab822e49fb6224859901f49957a61462e00f62a36
-size 45864
+oid sha256:26f73d4bc06ff2bb9f0e322964c1131dde1f6c546c5ff9b7209a6dbcb5dc7273
+size 45810
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_17_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_17_de.png
index 624318885c..af83349940 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:df9db0d4e17dedc02ff65dfced875fd454e8648b44147a059ae77da7fbffac86
-size 45099
+oid sha256:7ed62b88643773270a7a045e9c80c29fd3f939c312ec4752cbbfac0a7d001f4f
+size 45039
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_18_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_18_de.png
index 2f6f00a2ab..0f1444ad40 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:4aa3e3af5c19c99f5d4e602344631e3b146a06c76cef26e83e729cc2cc9cb310
-size 42265
+oid sha256:3c320a405aa9fdaaffa5ead648fa33d42f7c946c2a07fad2c803b084319f98bd
+size 42275
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_19_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_19_de.png
index 1f1fbb8c9c..9835d06f8b 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:09f77e0c5a383e988fff92c1ef940a6f74d824af05ef6a5740430899887cdc04
-size 42200
+oid sha256:11a4d98f789ff1ad1e941a3155b4043e02b06858b319c03c6f1d2b419ed5edb3
+size 42231
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
index 9e5cf2c548..58bf8b1e3a 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:8cf15623f94fb77ece859777a5d9f874e9e799afe61a181ebf7c231e198d9d6c
-size 41991
+oid sha256:432bd93e477130a98f2a4111de5051e0f19151594843365555d1428b03b991db
+size 41923
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
index a1fda78fee..0c18888edd 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:f7871c2de6d77425ba0ea7d773328a2a3272594b35a8602a01054fc2db1c1051
-size 39609
+oid sha256:8ff5afe13a98cec38fc19ff957fac1468ab440c8c2fca2e0d157e447a9739bc0
+size 39554
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_3_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_3_de.png
index 5e8dc32fce..8c4387fd4a 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:a867633de36bd2967ad0b2049cccfa3edef59f3eb732478be8bbdb03c6198a69
-size 45734
+oid sha256:a6e87fbf054dca331f6380f59fa40a1dbecc40c25bcb29ae09817360527a8f10
+size 45629
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
index 64e13fd312..89d60e7c71 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:01791e192c3cc7429544e4928e696a90b6a32a584dad5fedea8301f37b31ad79
-size 44840
+oid sha256:687e7b880a751047ec0cfffcb85b4c0cbfb04f52958cd731036f810b05d8784e
+size 44805
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_5_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_5_de.png
index a9e70a26b2..def514b66f 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:031a260a9859d77cf7a69fd2fe6c52f3bd694dc7c25c15fe2315e236ecc4eae5
-size 41891
+oid sha256:1343c24e5eea07d5f222d96fe7ee7dc6b5c42b3033c6b707758753d66489180c
+size 41916
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_6_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_6_de.png
index 77947d259d..42dadff2cd 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:03a08a3999039ff5ac3a696b26e778d3136b21b5f30b5dd0a49b077170d79869
-size 45361
+oid sha256:bfd031259f414e7bcda1934e152f47d062114b76b5e1b3b38329291f6086d999
+size 45315
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_7_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_7_de.png
index 3c026d6c15..206579177d 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:6967b9dbd4f79556952c527985e4cdab7c569253716a5d62eda24d46b33a703f
-size 46516
+oid sha256:2862e36d811b09539ef1fa6b80690c0dca99a845a599682087ee4df223c76308
+size 46436
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_8_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_8_de.png
index 72aadc6460..f6fe12c78a 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:51ff86136abb6f6d76ce6f51978aebd4d710fe7f1b753a7782146e28b5656d7a
-size 45573
+oid sha256:d78af3f2a5a18d43a2e2c7aef496b0a9e826448db27ca45f6aa2264385194aea
+size 45511
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
index 8138af4888..cd5134cc6b 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:3e338bc62994b247477cc169c0bcba1f8d428b590f2bba1966136f52ee7b7441
-size 44529
+oid sha256:49b6ff5a0187daf1902e3b79367edaf65a3cfb3a330bc7166914dbd9c8ca9606
+size 44460
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_0_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_0_de.png
index 104a5e4e1e..48b9496226 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:49a21b1f181bd32b9895763b045952332225e71dada7fc155203bf74b1419aa0
-size 47522
+oid sha256:6fe2a7ab133e43acdc59731090b26cc91393e246c45fcc55e8f38df6e1f17521
+size 47500
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_10_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_10_de.png
index e4504b8123..637ac4455f 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:4f588f9d3f51ba3ff764a9d4bb3b942e3ad396f939115f35da0a794a91b61aba
-size 46342
+oid sha256:9a106b162fbf7e67b0534b71140e34ebacf801c08d1ebe17bbeb760b460f03df
+size 46303
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_11_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_11_de.png
index 455f0d9723..a9a740f83b 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:3f3ccc11ecf31afd2caea6af382d0d3b1ae58e90fbc4e506df5a49713fd0f698
-size 44840
+oid sha256:4dda5a34c3e225141274c0452fc20d9519c14f34fad41e8dec50e786d8104918
+size 44838
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_12_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_12_de.png
index 9b95c8d176..f69d34b445 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:f4ed50b1b0eaa7dbf2e050f4e1f82f46626a3b3bc986bf633fe3f5337a610c32
-size 48061
+oid sha256:c3c749f1109ea691f01daaa4cce07f4c131c5d13bce64c4116fe8b848966e590
+size 46648
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_13_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_13_de.png
index 792e6f22fd..d87e06a028 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:3ffbe45a0a19c19ecc59259107b9f4acc58ed0b994abd0ac0603a7051d2188f4
-size 46596
+oid sha256:57053f9c361cf69db35174e3325b0b4753979f011b938648efc37500f0c1a185
+size 46560
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_14_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_14_de.png
index bf121f9929..fad796a3c0 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:5aa801587fef2a7131cd11e161969e028331be4b4a429a86d25bb3c777757144
-size 47119
+oid sha256:65382b546da02a6bd3cccfbaaf49eb08288448984a1d701587c8baf4fa538b74
+size 47093
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_15_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_15_de.png
index 5f1495fb1f..b524ebe3d9 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:86b0e4d70d7dc9f5093e301ca1a7e5364a99c2c6f5608aaaf2fced230356faff
-size 47703
+oid sha256:e770eb2039774eca98cbe08aa46af19cc72aab7ae764f969cd1cfa7fe23dc98a
+size 47687
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_16_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_16_de.png
index 67cb9400f5..6993668499 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:f00897f7d6cf5c6a9d319bb69390cc10d4be20451850846b14521361f46c9267
-size 46942
+oid sha256:762116046969a7126042982e89b1b79dc82a4d1ff8763dcbf5b8343cdeca4612
+size 46909
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_17_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_17_de.png
index 903e2989b7..0597569c93 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:4aabc001f2f14832f71dc331bd53f001f67d4f2d248768e79f41708b46d671e4
-size 46431
+oid sha256:c1c87b29315c1aec93f8c0c231f241deed8dbd37384468474c4db0b976d6dda4
+size 46395
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_18_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_18_de.png
index 9aefd7740d..97c48d314e 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:e2c2bd15e9a027430346841bfc040f99f4e5545138a09fd01e9af64f19a1172a
-size 43316
+oid sha256:d5033268749c18000be1899d82ebffdc412a0c810855dc542202bf39c354060a
+size 43327
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_19_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_19_de.png
index 7b51cdb172..49314777bc 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:bc24fd0400fefd433cff35b57599259e23bddf4bf24a884dca5194e4ec090eea
-size 43196
+oid sha256:82c7d37bdf17f5115f3e839e61085db472cbc2144e34b0c42db8f68c6868e269
+size 43215
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
index ebe6a3d972..008555c998 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:c1ff08b7776a8f9c772928d88028bb43da2854dbd140a16cae65b211bee05179
-size 43219
+oid sha256:4a79e3d57386eb05835352d931fd264bcf0303bd21fa15cf44e9a3690d1e537b
+size 43131
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
index c3b7fcf83a..ea3581bc36 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:d102c08371deb5252914ef656b0645a071422af8dd4b425de9b542fa4d6593ec
-size 40739
+oid sha256:5bcdcdad130bc08d5242a6f83286300455f7e42dd3eee37451dfb10d7b9d7655
+size 40708
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_3_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_3_de.png
index 680b42a906..6bce89b21b 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:73839237353e443c199c56b67aa4d51b1cdb9b6d08707bf31cc3376546f97cfd
-size 46673
+oid sha256:5bb57d0c50fb54e3cf145cc614312a4c165118dfbfd7795b7bbfc06f4d4713d4
+size 46610
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
index 55b3e290bd..0b00f96dc6 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:d32fb0f4761cded0b823b4e221b8d920cae8cae79e39895b91d1f861ef5f89b5
-size 45887
+oid sha256:fee173f492c24aa69a4c64afba1f4cb856d742ac089a2bf25526a28e8fdaedae
+size 45826
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_5_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_5_de.png
index 074167caed..6bf05b9e6b 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:b7e5e5ad50149ea60474d93498cf7a671779d1ccf75f89c091f864fac94a5335
-size 42858
+oid sha256:2ed7b3bb40e0dfb76872d85c07e147f55964622bf102435ae8e98524c52ede06
+size 42872
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_6_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_6_de.png
index b94d9ca17f..6649e7ee0c 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:ecdfe8dc5fc2fb547ceb0babda9856b2b0300c8794e9f9201f93f58693fa1532
-size 46517
+oid sha256:016e70e04d4fa9512a72ab00f33578b59b3cb5ef27881558cc4842cf5e89b025
+size 46503
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_7_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_7_de.png
index 8ae0e7bf9b..59d5e3ae1e 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:7decfaeb8bd1929d6232a5148b8b7a958eeacc1bf5baf779f6f633c44dfa53e8
-size 47787
+oid sha256:a15fae40d21bb7729f1a0dd383533d1941423d0812cf51e67adc56f5054f09d7
+size 47769
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_8_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_8_de.png
index 9096b37553..83df8713ae 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:a212f79364028820a27448e6fe3849bbcf9a10a66d918eb347e546c65280bfca
-size 46705
+oid sha256:908aa907fa85dc18825e3ecb5da8ad12916577df28045b256c95a21b524575a8
+size 46670
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
index 17d4a0a3c0..746f9ff2c7 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:58188951ba569cb9a9fafa778bbdf9f83f7a6d201975eb9c37c4f48473e8d331
-size 45567
+oid sha256:7776bbd14000795414995fc0428a80659cb6b45d06b35c6537eb66fd69b341c4
+size 45529
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png
new file mode 100644
index 0000000000..45d287b5ec
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7a8a805ff40cfc6194a414a2d1c1babc5dc2335fb5c96bb72f6f2f412c91346
+size 30052
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png
new file mode 100644
index 0000000000..91845d6b8f
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6ccfe1ff08087bd75a8e0017f5d12540cc567423801050dc091005722f3d9b1
+size 24575
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png
new file mode 100644
index 0000000000..16fde1067e
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55711397eb8fa3717a3891e56c078cca643520b2d0fefeede118b19db8676341
+size 31204
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png
new file mode 100644
index 0000000000..b366ffe07c
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89bcd852bb60044ba429d5c0a884b05d3a28403d985f95bd1582f1f45baca003
+size 54044
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png
new file mode 100644
index 0000000000..e8642f7bb8
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f8fde96567da32ec9a97eecfb1224b5ae23aa0c7608792036f452eebbad466a
+size 51217
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png
new file mode 100644
index 0000000000..f38d37867b
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e343b3df1a386702c6163393ff05d342abbc9c245ba93129d24e7be5acdaa39
+size 30079
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png
new file mode 100644
index 0000000000..60f40910a3
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ffebfde2aa3d3f3a7e9f7a3dbf8b9e6b8044657815735d2d8c401d2caa8ab51
+size 30225
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png
new file mode 100644
index 0000000000..faa2a0b84a
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4253142dd34410c924bfd0499042a05b9ad59afa7073957835a8d4afc6a7d5a6
+size 25470
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png
new file mode 100644
index 0000000000..534874b570
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4fae7c1d5e7bd4f10658bc1777af60ae110278e283a03ca52855e990448f8a4
+size 31022
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png
new file mode 100644
index 0000000000..e95bd5c15d
--- /dev/null
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da72832a3646008468a061de42964b7d98d563d3a2244f63d168c4a2f38247e6
+size 32513
diff --git a/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_de.png b/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_de.png
index eccb0ac039..564d2206f3 100644
--- a/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_de.png
+++ b/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad3b20348912fd6f6c3e4a8e68e2ea19a491f61239c59643b0b247cd5284ef9b
-size 13545
+oid sha256:b47ff7cc22cb1c7477cec1ba425feb97fa663af79455466a48a729cf13fb9445
+size 13544
diff --git a/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_de.png b/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_de.png
index 84fd62c0f9..0392e16c98 100644
--- a/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_de.png
+++ b/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fb71ee98f44955ac96021846d6e0a9e6f8dc6fd0a1175e7ce974fe3adf95613
-size 28485
+oid sha256:da4a6565f96d0a8a5d96c383745338ff6cf0c91e7b352382e1414ae79735b538
+size 28445
diff --git a/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_de.png b/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_de.png
index a332fab424..9533ef4fec 100644
--- a/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_de.png
+++ b/screenshots/de/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:362aa58b91f2ca04960fa1342f76ba28e28ddb8721acf92bf63ef0099d49c695
-size 30106
+oid sha256:dc7cab44849946fc957a8705046547355a9508b5a6e324a18b9c4848b29d4601
+size 30071
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 0b94bf888d..a5638d89f3 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:2b9f27b5742eb06ee518512a2bfd2e0e01d3e70ca248370e7e9155427c6f1aa8
-size 18466
+oid sha256:90712ac1929c94927172c10a09ed8c9955e44aa4d87d02020f9bc8781d87f30c
+size 18775
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 1c38d575cc..9c94b62b9c 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:ca13853e5ada913d20dba5e3eeb6965006d46b6d035498fd082afa4c78f12525
-size 22336
+oid sha256:e2871173d98a9add3a41617e6033ce4a293e7ee683997a2ffe9e60f4ecc5513b
+size 22477
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 29e3b32504..207a840978 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:84faad4490bfbf48481ba870bc34c5b99d72984292b3b33d2c6bd619e2b78621
-size 27786
+oid sha256:25800bbb0ebf715f7d8977ecd466c545c7b603703e145ba8d87e5572f4bf5421
+size 28052
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 5e828156fc..348bc07623 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:1937f15d45ff18da9b3203fe420aa6242114de82a9614e04eb99f5c36bc567a7
-size 28214
+oid sha256:3e3c9507e122bf1e90a459ec0a772baaf3811f7f7d41e9e48f20bc2528aee5d1
+size 28467
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 eb8f0f1e95..1c00e239fa 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:dfe0aa4dc149bda0330dd662708f243d3a99d05a2d419e02dd364d0898c29365
-size 34129
+oid sha256:1937d993e7d8ec140c11e205de51d2d6773ea993546ad2e169186289f162583e
+size 33529
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 9a626deaab..f0e3fc808b 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:5037873ed63f558691c06a63f93eca0d22dd2ec1f70aec2dcbf9481e73d16412
-size 32099
+oid sha256:3b301b181f1a295b4c1ee6bf60732e362f205249913b0b834dc2e4e1d06820b3
+size 31674
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png
new file mode 100644
index 0000000000..bfdf967dcc
--- /dev/null
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43ff00a7191d7b427fe54d1cdf0e193722ee50d9481fde1725510722768422e7
+size 36305
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 2c946bc23e..cdfb6208ce 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:e82a7124397546cb3c2293736b743cf2c5ef943ba010c6d7b73b2d70a368a2ac
-size 75425
+oid sha256:e3fef37fdd165e3d8a8bad0d2714e1902fa430e1fb5116fbfd98f0238a583951
+size 75446
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 2c946bc23e..cdfb6208ce 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:e82a7124397546cb3c2293736b743cf2c5ef943ba010c6d7b73b2d70a368a2ac
-size 75425
+oid sha256:e3fef37fdd165e3d8a8bad0d2714e1902fa430e1fb5116fbfd98f0238a583951
+size 75446
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 6912ac7984..90c4f96ac7 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:9e43d692e1cd54898f38019f50c0d36b9575d4c2db534d898999eb9ed167bf26
-size 76051
+oid sha256:f15436b9be3f69f7b9fdddda24587a223d9fa72d8bbc208bff04004ff5b6aaa9
+size 76072
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 ff25ff9a77..c962475c0f 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:e3f99c41bdd09088037a6fc0e7436f71867e679e2d4f829156cf774cf5c06ec8
-size 46051
+oid sha256:4c85326d9afc3e9fc8c0924640614185ce7f23e4d499923da65b133ecaa04637
+size 46031
diff --git a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_de.png b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_de.png
index f1c7d5fd03..39e20139cc 100644
--- a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82b6921b8e15336319f4ccc2a9f30f4e0f0bb8aac01bea84f2229d12eab87f22
-size 44547
+oid sha256:3c9d7b5a84939642a400c1e18429d3c1f8ae536487fc104caca1f385a4dea305
+size 44577
diff --git a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_de.png b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_de.png
index b86d0f8ff7..73c20a9bca 100644
--- a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6041785efd5e5f3551639d23ff6810169855efbc6de52343ff7bbdd5afc50db0
-size 53964
+oid sha256:1fa08f99a5a4e788be849ff982df1a1425dfaa9afbcb4bcbfbfcb95f2ffaf505
+size 53980
diff --git a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_de.png b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_de.png
index bec4d30b3f..f07a6e1bf4 100644
--- a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78438eb23e545b1ed8321502562eec75a720f8161ec96b80a45d2cf37e999a57
-size 53878
+oid sha256:31cf015c6ddd7d843a708a747e077e5c4f3c18e7571fa54281da42e7366be9a4
+size 53897
diff --git a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_de.png b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_de.png
index c2cfc1532c..0b40e621ef 100644
--- a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05096ace3fae4368464a78816164680ebecf5a65b03eb9bc6fc6eb06a0a43d81
-size 50930
+oid sha256:129bb03abd0a7ed366ad051da536d344466df5f42631ddaedea84d6117dea660
+size 50914
diff --git a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_de.png b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_de.png
index 7e90bb8d4c..66b33674a6 100644
--- a/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_de.png
+++ b/screenshots/de/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eddffdae8d6b515a4140ad716e52c965b082f0fb1425aed9846c9d9ca35334eb
-size 47357
+oid sha256:04820059ee8f505667f6647c63863777d525a1be0cbf77e5c61a615f721b7aef
+size 47390
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 21c587b71d..3603bafeb3 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:ce26976414de9975b52aab806a8ff3de282c9ae7e51999b5071d5e34be0c08bb
-size 30651
+oid sha256:26b5ad528a635e90d966ece5564fe8f4e5549a81192aec7fc3f669ed6765388b
+size 30667
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 f246e38806..fb6e1215fc 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:ba0700dea1c4dc744101290e093b205dc3f24b1dd0de8ac2ee14103d636b0d70
-size 29851
+oid sha256:22c266bd1863d9a30f26e88e93c9a6d3382f79180c370612e6c8b571fd640bd5
+size 29828
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 f246e38806..fb6e1215fc 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:ba0700dea1c4dc744101290e093b205dc3f24b1dd0de8ac2ee14103d636b0d70
-size 29851
+oid sha256:22c266bd1863d9a30f26e88e93c9a6d3382f79180c370612e6c8b571fd640bd5
+size 29828
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 2922220aac..50432f0f26 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:c710500bd2320a6df97c5d78d6fcf337e3ddd21115a2acc81e1de1fa477121e3
-size 44689
+oid sha256:80be84e4c2961dd852bda489e835d8458244d1e13ac3e7e15712133cd120b4a2
+size 44681
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 f97909d2f8..27dab886a1 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:7aaffb9298241bf42c8b31806e039f20ef585f8ff51466b39ccf2bd19f7723f2
-size 70384
+oid sha256:2de82320a66c4e314a5f0e949f38f2afddfd55c3d75469392ff08eaf8dd69cc0
+size 70404
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 45e32ffc99..57989727ce 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:a1468fd52b8e3448bd1f8e0f3791c574565adddeda13ea8a13b2332e132522d6
-size 50128
+oid sha256:f8d6f12969d9c00a53122c7f39981d86f924c920e043af3c8eb633f10fb2d0e1
+size 50114
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 e8832f5e11..00b17b50eb 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:8d3d2644cf615ad50bc8e38dc58da5598e248827a27f73f47967a05a392b31e5
-size 43560
+oid sha256:c201c990f9d5aea35722ed281a59e26516fd18281ef0c607fd14ffebf48d7e55
+size 43567
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 e8832f5e11..00b17b50eb 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:8d3d2644cf615ad50bc8e38dc58da5598e248827a27f73f47967a05a392b31e5
-size 43560
+oid sha256:c201c990f9d5aea35722ed281a59e26516fd18281ef0c607fd14ffebf48d7e55
+size 43567
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
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 b088028261..7ee66ef000 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:16caff51af4ff119b2497d40a3ccf28d6d5c042a905c089cabe956a4c7905ab9
-size 71290
+oid sha256:fb798e91bb9a8194f5789b22c61330d8a5c0928e2810ec403acc7b13794320df
+size 71293
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 24aa5c3831..9ea17a4acc 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:f32adae89e7356af6fa8396774184617a71e3ada252662ee4b993c29dc46f70d
-size 67033
+oid sha256:d1d050f330f40bfabd14506b88c297328f819018134340f739a4397cf1b94f77
+size 67036
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 8617b520b3..12a9c57dce 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:23b489947d0f9f3ece1aa514d1e74d9a2c355177052b48ea02a7d518955cd5a5
-size 57075
+oid sha256:2719dc35eef9ef31ed4d2a6a40b1efe50b58601725136d263842afd8d3a92a38
+size 57082
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 a3036d76b3..28809cee2b 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:47fcb7163ca9930ef299fe028821ae10f4d25baf2e09e8ed49a14a39c47738c0
-size 69177
+oid sha256:cce69137e95273283e21121fb737720010abf466d4b1abc27f7daa3e1772b751
+size 69182
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 92c9ac1578..fe6636b662 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:c60f76b4095bfab8c28ac4889af6b020d4d82eb73e2153d404a1f1229fe9c50c
-size 53093
+oid sha256:16428e15c36f2ed0767cc8500fbf9bfc3f07e84c73ebe43e8b64ec474ca0355d
+size 53056
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
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 3fc9c08e60..acad524964 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:54a67ca1f96e212760451beca08da149f5dd13d75a4fb5084088e09efb94f332
-size 44832
+oid sha256:4ed5300a2ac30da2c5d378ac49d3388a345798791dac6361e67895c6139bbc97
+size 44839
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 cab4f598f3..52ade5b6d9 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:ee4b0794963906b731f4991b23eeca85b2f19fc90634ab4917cb59d4fa65d8ad
-size 45555
+oid sha256:57297a3efae6260c4b7f46004591d24b5a4628201e35f35eb5582e466c570f8d
+size 45562
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 e8832f5e11..00b17b50eb 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:8d3d2644cf615ad50bc8e38dc58da5598e248827a27f73f47967a05a392b31e5
-size 43560
+oid sha256:c201c990f9d5aea35722ed281a59e26516fd18281ef0c607fd14ffebf48d7e55
+size 43567
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
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 f36902ec07..49a7385d22 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:818f5f1d73b601d026f513387d76e67628142609412c0afa055d530be94db263
-size 42157
+oid sha256:fa413e4bf0664d1e15f1a9378b51900f470282a815f8df44643caeac91e6aad2
+size 42120
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
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 f4b594d1fe..ccb9fe1548 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:5de424d81283d12e82c18a61ad3f3089181fecfaa0767e7bca93306e0b392c1d
-size 44472
+oid sha256:f634d1f0e2da9be8e1752dd79231e0e57abb0bfc42a5765caacdcaea02b3d50c
+size 44479
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_de.png
index 7359ced4e5..12eacfd76a 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:303a052955062e205dfb8eb9184e45623b3fdb2a2c7a5c07a951df5f10d6bfae
-size 29837
+oid sha256:6c8e18b81a18e00aac7a00ee212634149246cfae4e85d4183ceee0c82b1d6a45
+size 29844
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_de.png
index 8f943194b8..1c35d6eed8 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8afdae33c4e7d344eb018392bdae4d3d42f7373d07230c2368f26b4ac2d6e7d
-size 29444
+oid sha256:cdf1f3bdc8e5ba7312271de2aab3bca9888bfd649e9cd9f120fd2147c98cb24f
+size 29443
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_de.png
index 7359ced4e5..12eacfd76a 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:303a052955062e205dfb8eb9184e45623b3fdb2a2c7a5c07a951df5f10d6bfae
-size 29837
+oid sha256:6c8e18b81a18e00aac7a00ee212634149246cfae4e85d4183ceee0c82b1d6a45
+size 29844
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_de.png
index 1b3dfeeecd..f5fea2a9ef 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f288fa2dad455d1975650a1a6eccca2f2749540e77b5b89c836d69782db06719
+oid sha256:1c8c707aca707c711b256d0acdfbcb3a30718b7915d4360c3153ad09ea159384
 size 25694
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_de.png
index 4e7459f850..d5cbaebaeb 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa96943056b0df8b39a6e759fbbdee9a74e191fe72db78dd1ab7cfa8c0bc5f0d
-size 23406
+oid sha256:5671c6f3b693c3b62d7809cf4323ad7857fc60cd48f01fcfb820d05a33edbf47
+size 23412
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_de.png
index 62e3e51642..77a20ecf91 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19eca70164d75bad98c937f9dd6672fa318d1509d09f761b3be78c509e91edcc
-size 22005
+oid sha256:5a65cfccb5a24924986f03117f044b0df5df7038919ca09b5a13c78948ed386f
+size 22002
diff --git a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_de.png b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_de.png
index 023e49e1ad..0f66553b10 100644
--- a/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_de.png
+++ b/screenshots/de/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2c99a457047cab44c2c4b56d1e0c9a31950cc7ce5f904665dfaccfa79afc128
-size 21672
+oid sha256:0c92eec8dbddb38348f17074ceb4f3631c9aa2e2f590b508e815da39c1c16371
+size 21679
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 22a3dd4e1b..54c3c9e53c 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:01ba9ac649bf68d555d5d840428fee0266584b96ce5fe36c0f9e2e1d6d0c4de1
-size 51074
+oid sha256:ee6feecd5eb5ab8e4c84f1a684babc9fae3ca5fd45980170dd19d935c8741c2f
+size 51102
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 48b168dc44..2739203618 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:fcd83326c3c7f7b43243e904197e88e21bb8f128bdfbdce722e4b7daf6c9a31c
-size 47543
+oid sha256:9539949c15d87063a74b365ba792b8cd0b3a063ff65376fc11781f8e97d99b2c
+size 47571
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_de.png
index 6796840a99..7d8aab76e5 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cbfd2e861308c906dbb5df7949d10be226b6f2a7eecccd6387a1d2902b235c7
-size 63562
+oid sha256:351d3b0d759db267544bcf3d87a4e2e76db4d0b03931601a8396c12b3c6648e4
+size 63576
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_de.png
index 6796840a99..7d8aab76e5 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cbfd2e861308c906dbb5df7949d10be226b6f2a7eecccd6387a1d2902b235c7
-size 63562
+oid sha256:351d3b0d759db267544bcf3d87a4e2e76db4d0b03931601a8396c12b3c6648e4
+size 63576
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_de.png
index d58496d0b3..581db0065d 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edc3adcd73285dbaf217485d9e296a1af1ef592d65baca1fcf6ed75700d17eb3
-size 51568
+oid sha256:93c61f5c06e5805590a09c51c5c1d9fdfd5757061ca68069d83d8b8ba71ea925
+size 51584
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 66bc4a6c25..6d6128da51 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:b3d720a5a7bd70867d8096a06b70be72d612f86ad8cbcdfa5521a2c33cee0235
-size 40595
+oid sha256:c1e9c58cb2ef045ae08825f985f757999086327117feb23e233a530fdd87e9c3
+size 40575
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 cfd34858d6..c60f6bd523 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:c97aeaff0cd23f76604dcb60ae08ab50a48ef8249e83592327b84f8aefab0a52
-size 63490
+oid sha256:a7daa689a1e1ccd76aa353e7d2ae14380c63e2da3a838fcc5689dd55fb47d5e6
+size 63525
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 557a86b152..71a520d9f8 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:6b3faa64a17045745be5e724be01eaad17f3f73d01b9fd6eeafa04a3b55c983c
-size 60079
+oid sha256:da3ea533d43fe4103ac7209b374f6bc558ab4e033b2400bc95528429f00654d0
+size 60114
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_de.png
index 6796840a99..7d8aab76e5 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cbfd2e861308c906dbb5df7949d10be226b6f2a7eecccd6387a1d2902b235c7
-size 63562
+oid sha256:351d3b0d759db267544bcf3d87a4e2e76db4d0b03931601a8396c12b3c6648e4
+size 63576
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_de.png
index 6796840a99..7d8aab76e5 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cbfd2e861308c906dbb5df7949d10be226b6f2a7eecccd6387a1d2902b235c7
-size 63562
+oid sha256:351d3b0d759db267544bcf3d87a4e2e76db4d0b03931601a8396c12b3c6648e4
+size 63576
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_de.png
index d58496d0b3..581db0065d 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edc3adcd73285dbaf217485d9e296a1af1ef592d65baca1fcf6ed75700d17eb3
-size 51568
+oid sha256:93c61f5c06e5805590a09c51c5c1d9fdfd5757061ca68069d83d8b8ba71ea925
+size 51584
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 94bb8f0af8..6dc61fc33f 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:e6498b8afc9307a9276a8b767dd5b7275748c19da68827d034111f2a4690e7e7
-size 42653
+oid sha256:9e5cb38ad86656e98f1c2ca10b3542f6c6994626346c094aad0aeb1f637ae9ce
+size 42638
diff --git a/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_de.png b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_de.png
new file mode 100644
index 0000000000..92a9ecfc08
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4463c9d76c95a063e481cd12d8a5c8432b06acf4072927cbe1cf659ca22759e3
+size 26490
diff --git a/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_de.png b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_de.png
new file mode 100644
index 0000000000..1232360bfd
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16187cb579ae21c620fc41fc70b3ae17136ea423d7793263c4b943ca4b3e54cb
+size 31781
diff --git a/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_de.png b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_de.png
new file mode 100644
index 0000000000..6d9d44a999
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59c6624f279aaa202ae5e85488dfa28893c13f02d2e76b0fbe6586b35a55181d
+size 32515
diff --git a/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_de.png b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_de.png
new file mode 100644
index 0000000000..7451aa805a
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:805d79eefc2a5cb1dd4fbb7294301ad785bb9cfe04c8c80c102c4f8d6f51fa4d
+size 26384
diff --git a/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_de.png b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_de.png
new file mode 100644
index 0000000000..ab750ae07a
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4725f3d6a5c06f692fec640eddfd5f6ecd1cb3fb38c9f137ffbdd7df3cadc27
+size 28437
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_de.png
new file mode 100644
index 0000000000..bcdf552747
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31e3ddc060f3c87cd761dd58ff73ef00b0af8e2fba6bf06e27f0396e52a04df3
+size 54661
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_de.png
new file mode 100644
index 0000000000..d8e327cec9
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7cc7260e1f01727bc96317f278158a36cdb0a6ee544937e1f7b2b2e5aee9b71f
+size 51358
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_de.png
new file mode 100644
index 0000000000..f584c028e1
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:407a338096b8e758eb4663016fc1448fffc7756b5055c5be015782d4f9d34de7
+size 51832
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_de.png
new file mode 100644
index 0000000000..ff8e29ea59
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:044869f6f523e6ab43de53e7ff13a8c1771a929030f60a8191329f385be67835
+size 24752
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_de.png
new file mode 100644
index 0000000000..eafb1f2805
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9027ed5e27a1d640ab50b4c544d622c718d3bef6df477bf66b99ee605ccec7c
+size 51770
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png
new file mode 100644
index 0000000000..f584c028e1
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:407a338096b8e758eb4663016fc1448fffc7756b5055c5be015782d4f9d34de7
+size 51832
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png
new file mode 100644
index 0000000000..a7c70bf14d
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e771cd9a182dab3615661aebdeba6069cbf04218f60d709a529693e8ad6005e0
+size 52416
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png
new file mode 100644
index 0000000000..919ee0cbcd
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6df150ce5cdb2e3233444c122b6bbd0b71fcfb8819eccd15f7ddbafd7e2d4d6
+size 47665
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_de.png
new file mode 100644
index 0000000000..bab63e3455
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f53320f4b69908a32f3723a1d098eac5c993574e877dd1ce5faac9028ad4fb4e
+size 46743
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_de.png
new file mode 100644
index 0000000000..a62aca41d7
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12d639b33a6424d0807bff2545b874b16abb2c0147662d04f21df28d915fe2e4
+size 49225
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_de.png
new file mode 100644
index 0000000000..0cfbaa9762
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55626ae74436af585b326f621d6d5d75729d180c4d653882f81e1484dac753fe
+size 52976
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_de.png
new file mode 100644
index 0000000000..f7ed121780
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cbad28899d0c9f55f4abcd04e5ea3fcd896d7d7e1649ce52eb9b23bbe7b6e91
+size 65600
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_de.png
new file mode 100644
index 0000000000..a174686a2d
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f561351b6dbd13b6cd2f55f8df9f31c84453594acf511cdde27855639ba4ea7c
+size 65148
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_de.png
new file mode 100644
index 0000000000..44e0015abe
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d20dafcb3552d24835bbeec5a288cad29015ceaaee123d64fa32123a51c3cb4
+size 65727
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png
new file mode 100644
index 0000000000..04a8ae33bd
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd49f1b0f3dae2a57e4a63b54a2cb98dffab50ed3b2cb9d46f951eb1ea2f99c8
+size 51549
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png
new file mode 100644
index 0000000000..9a5f939b49
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92888d4d51a087f628d2c0604d0f02c3a58e2eca5c1e41d1dd01884afb1c1e6a
+size 65549
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png
new file mode 100644
index 0000000000..3a76a16c3e
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1998f0764fd6706169015fecbe7958f5ea88ccf6718c6fcc31b50259213eda69
+size 65612
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_de.png
new file mode 100644
index 0000000000..b307d30172
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dce718324779855609745640fccecda621d121e61186915c626b4f8cd4e8693e
+size 62663
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_de.png
new file mode 100644
index 0000000000..6432c76e48
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffb5c13b625568456542d7405e9f8f05ebe986de32587c68fbcd7c356cd30cb3
+size 27683
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_de.png
new file mode 100644
index 0000000000..5d8f1260f7
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57ba25b77977622a483522f5e360fb9763e4c089a8576d3b51b611a463e81d7c
+size 51821
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_de.png
new file mode 100644
index 0000000000..eb68edb577
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:851affa2b63b0c70a282c182bf1ce615283c6d0ed732ee3b3102d3dcb862349c
+size 57340
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_de.png
new file mode 100644
index 0000000000..510202c600
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8dc0ed7717de76041c6a5e9c32c3246039a8881ced121276b58b3012bbfb4096
+size 52718
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_de.png
new file mode 100644
index 0000000000..fbbf3768e6
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4919373598bd77b7aa9e3aebad6abf4f8ddcf0123894507d76ce63157d347ea7
+size 53335
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_de.png
new file mode 100644
index 0000000000..e0478af982
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b4a7e16a3c70933cc7f4ef68636df5d1669789500690f17a5a25f122f9f50b2
+size 25412
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_de.png
new file mode 100644
index 0000000000..98d9beba84
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65020e3887540431951a3e99ce31e19dc401b4bbc232b16ded6e59d51f1712c9
+size 53206
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png
new file mode 100644
index 0000000000..fbbf3768e6
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4919373598bd77b7aa9e3aebad6abf4f8ddcf0123894507d76ce63157d347ea7
+size 53335
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png
new file mode 100644
index 0000000000..579756c731
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73fa1e4a25773720a0e9999b293488017c854576f40cc738fb3b67b59f2b1f05
+size 54167
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png
new file mode 100644
index 0000000000..386a05f453
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:711800e228ac74d8971a383ecd85f560d050000f886d6107aa7ea0c9d6099d95
+size 49348
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_de.png
new file mode 100644
index 0000000000..ac8d242b19
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4624bd99900eb3d30256aa81dbe6c48f017480ebc4c97d3fbf47529ffd62e899
+size 49078
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_de.png
new file mode 100644
index 0000000000..f70a5bf36d
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:612ffe06d38570e32215b9f117f979382832a9aed3fddcde38b0a461bf1b653d
+size 51684
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_de.png
new file mode 100644
index 0000000000..867cb18108
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11ebd0e210579c60b07136685c82f3d73648a3742344d4d15a5ed3df9b48ced9
+size 55476
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_de.png
new file mode 100644
index 0000000000..d1ce6902de
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90db4ee471ec887f00a9e580ef839a4611216107ec615da90330b7d6be276b77
+size 68316
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_de.png
new file mode 100644
index 0000000000..1d2eff636f
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9488bea7d8ea64ac2d2987dcf69b4a51bfb6b81e33b1035195860cc90ae9f291
+size 67707
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_de.png
new file mode 100644
index 0000000000..6f1dca9c23
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbf7bda1bff05828fe71045a012b8bcc1f4c047256d8aea6f8f8579e08295dea
+size 68546
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png
new file mode 100644
index 0000000000..6ec398b86b
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00b2576dacba4388bb8259a7c6fbacbe713c805695efc4ea6e98c50f0cd28196
+size 53621
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png
new file mode 100644
index 0000000000..3f1bf5f183
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d32e9542eb673f6e4f0f05ad017615f0c3274683e48f3ec13277e2d98d4db0f
+size 68200
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png
new file mode 100644
index 0000000000..1b18135ef5
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4dd6427f42936ef21702492e5e96a7abaa6873edde04169603ed2124d76f4984
+size 68323
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_de.png
new file mode 100644
index 0000000000..e04844391b
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88d3cb4770828935c271cc10fc436c85f0af19bf77a5f58a6abd6fde1af367ec
+size 65168
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_de.png
new file mode 100644
index 0000000000..1e24950be3
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99ae8ce6973aeacb8d1054722038b9840365b239569f6dbee5c2f234e84c14d3
+size 28626
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_de.png
new file mode 100644
index 0000000000..fa87fbe737
--- /dev/null
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0c6701f9c4faa4495cd92e7414821f39f9adc3d3f755d21302a5c66cab6f5e3
+size 53331
diff --git a/screenshots/de/features.signedout.impl_SignedOutView_Day_0_de.png b/screenshots/de/features.signedout.impl_SignedOutView_Day_0_de.png
index 86d209de85..698a4fdaf2 100644
--- a/screenshots/de/features.signedout.impl_SignedOutView_Day_0_de.png
+++ b/screenshots/de/features.signedout.impl_SignedOutView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcd03c7d8135700d4253d498fbd6b72a6ddde58aefef8bff60b162e44acfb530
-size 61373
+oid sha256:1cda94993c1238192fd0887052f1e66952a2bbad4faca1a46b7ff14e29e365fb
+size 61365
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_0_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_0_de.png
index fd00f875fe..95ee3e178f 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_0_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe4e5c4f1defe3b99adcf563eb389c943f93d5417f2344eff2312f2b809991c7
-size 15572
+oid sha256:4948d0fbeea2e410b1a289ab92ecbfa792ae5f0980c860590e53860203bc2a69
+size 15601
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_1_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_1_de.png
index a56d30a522..72bb1a9ec8 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_1_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58812339f1ac01175b64421d0af685330c4bd95186eff5213194e573deeaa443
-size 18292
+oid sha256:eb862790afe9b86f7c100e4f24dc970cadd1e5bdd38020e97b7579984216069d
+size 18316
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_2_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_2_de.png
index 8a3fdd24f4..c3ae616678 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_2_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:565857c30ef349022e9cddfcd892a481858ba83bc3dacf884ae37be964fe327b
-size 46496
+oid sha256:220225ed71bf4be469bffdec3e9569a63bb22d43b9ba0e80001c3605c9ad8136
+size 46516
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_3_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_3_de.png
index 94f10f54ac..dd0e2b67bc 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_3_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5424035b81a1cf082a6a56450bfc444810ffb7d0af87d0803e99151c9cdb3cb4
-size 46000
+oid sha256:9fa10c7c7117706bdd362ccd8382f94ae7b2707b298ee5fd424f50f2c9102cd1
+size 46027
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_4_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_4_de.png
index 7f36068a32..74b7970d8e 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_4_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a39c417a6d8f4d8303d9b2d5c229ffbc55921bb706161816c5f774b1aa5739f
-size 36889
+oid sha256:3c39b35a474572085fce25aa0b7e2dbf1ac4b5a50d7cac7f5652eed45156c425
+size 36919
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_5_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_5_de.png
index a234c6588b..5938df709f 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_5_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fba6f766f3c7cc257d4e199389f03290e63dd2caa040329648969caabfbb5869
-size 43746
+oid sha256:3f92161016b5a3f6f57b5f896bef4e370fff2acb6ce4e5c5bb466dc1eb3a8bd0
+size 43774
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_6_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_6_de.png
index f942304d6f..dc0b528672 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_6_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:def46d1907ba93766cf6b4d465840820221800d2d4e34a14b757697d73b17623
-size 44009
+oid sha256:fc64b1af4a6fbef30bb36caa26a349885a3fdce232dbd7c9f00233e763dd352c
+size 43997
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_7_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_7_de.png
index bc853d286e..d257ee7942 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_7_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec8a73647a8cadd203006313fb3baa79e27f9e8faaef991d7e37c0faccc67281
-size 42259
+oid sha256:ce48faa7c7698832c8ef1d6e6aa1563981d2f0df9f49b01b8c7b64ae7477a193
+size 42250
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_8_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_8_de.png
index 01c57b8085..e7d0e2ba5f 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_8_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e86c1032701041744144e88185238129ed824b2e4cb0c4992d6cceae2322442
-size 20060
+oid sha256:68f100096a3f32591792e7816ce116e1e3bdb3b1eca7df6ab3a5473a29775e67
+size 20091
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_9_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_9_de.png
index 99d948fd8b..6b2e354a36 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_9_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79eceaf8ae38ae53f4e2736f64628b36d5f4201d42206cfe48b547334800165f
-size 30296
+oid sha256:2fb101aadb226cf66041f2abda6edc1fb9877765ad9d88607135503bdc2037dd
+size 37509
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 ee8e0d3535..66bcb88c50 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:776ffc78757ec0ed2863407e91d6c2071dc40e945ef9448bc405a35abfd1c925
-size 19403
+oid sha256:6efe4f355c6372ad031136f6f2de51c3c6132e18ddc70f558c16ee921befefa0
+size 34819
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 8ca4805dc7..71f98c9def 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:b63f17d6bf0d3b18c0e405a4c14a4a68a8351c192fa788fc5135d4fbe8269d85
-size 20383
+oid sha256:3af3d6c1c57c37f88f37624614a1bca7e9fcae0042482d293f2eef69a7350713
+size 35864
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 411c33cc5c..68e0fdf009 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:ba5eb40aa5ba4e2ebe6e68ad42d1b27080c3680a86a613d538344c2b8dadc6f6
-size 20710
+oid sha256:65fab252bd1c0920692404f0067323bfb33df9124ba5dc3ad5be5008295fbc0f
+size 36158
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 0cca59b427..1c22e938cb 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:95ef629af8452fe2576011db8c753b23d9b45b51d2a33bfa8a17c861474a99d2
-size 20869
+oid sha256:ecb9ad959737f80864480f7fa3cce8e31a1b0c2aa84d5b49ff8b119b1aa5bc1e
+size 65190
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 6b09249a34..52dd6c93a0 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:7fa009eca8f6308faeca75f3abfdae4e1a2cb6835e4f21ce08eec3464f8be187
-size 55502
+oid sha256:fcdf0489810fe2035f072cdb5cc5e3c78cb3ee4e5d220148ed2721dbf324d7e6
+size 65805
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 1899ad0987..ff45615538 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:b6c0d140d5bbf6d4478403b72bb379a0aedce3a71e212b38a65ff12053ac6030
-size 54644
+oid sha256:7a9166782d34d5388b8cdcdf270f8ac854bad44e24a30f35661af2a93cdbeb4a
+size 60269
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
new file mode 100644
index 0000000000..3247b48fde
--- /dev/null
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a032a5858b9d60a2da5007b56c9076933f69b1692f01b333f8288dc4f630c3d
+size 23115
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
new file mode 100644
index 0000000000..6c2b4de79a
--- /dev/null
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a53b1c137ad66aebdb9aea7b77535c632b1d78a828899249cf0298e08c5e77b
+size 19533
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
new file mode 100644
index 0000000000..01640f6aed
--- /dev/null
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e183f520739e31db29a8724dd5c916e6d3c60a174b7d17affaec48d897f7c3d6
+size 27943
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
new file mode 100644
index 0000000000..16e81d3cfe
--- /dev/null
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8beaa101ec1ca725d309725bed0f6da3b58baf41fe99e3959b2acb2ad0d6c07a
+size 28196
diff --git a/screenshots/de/features.startchat.impl.components_SearchMultipleUsersResultItem_de.png b/screenshots/de/features.startchat.impl.components_SearchMultipleUsersResultItem_de.png
index c1cf8833e4..28418751a5 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:3cc5e887a1de69fc216a215680104098f1a689e5db992c3e65e5b66b0891d1cc
-size 101103
+oid sha256:ecea6fc10d3d405e26f5ed488bc858b78e7dab1d6cafb76cc7a2feed3d3eddc6
+size 96954
diff --git a/screenshots/de/features.startchat.impl.components_SearchSingleUserResultItem_de.png b/screenshots/de/features.startchat.impl.components_SearchSingleUserResultItem_de.png
index 6ba2bd1cc4..0bae881bb1 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:108b4c1abb1f143171e35aebd055da2fd52a95e1df8fc8dab29a797da7288beb
-size 51250
+oid sha256:feab59ca75900214799f9a81f50a96a5622224bacf6c236857d7c7ae267108e8
+size 52398
diff --git a/screenshots/de/features.startchat.impl.components_UserListView_Day_0_de.png b/screenshots/de/features.startchat.impl.components_UserListView_Day_0_de.png
index 4484ebdad3..20761a5b3e 100644
--- a/screenshots/de/features.startchat.impl.components_UserListView_Day_0_de.png
+++ b/screenshots/de/features.startchat.impl.components_UserListView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9401507c454cdb4babcc0bee4faa09f7199a64c5af349ce15a9df82956e10642
-size 9261
+oid sha256:03ef449ecfe5699f1135a83e128d6efb93efc53a84036ff364c6ea489ef9a781
+size 9269
diff --git a/screenshots/de/features.startchat.impl.components_UserListView_Day_1_de.png b/screenshots/de/features.startchat.impl.components_UserListView_Day_1_de.png
index aaa5964462..1ff42f7afe 100644
--- a/screenshots/de/features.startchat.impl.components_UserListView_Day_1_de.png
+++ b/screenshots/de/features.startchat.impl.components_UserListView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac691a431d544e0e4c33c62b51c86f26efb9088a00a05cb9d3151256e2290eed
-size 21823
+oid sha256:058ac0f03151792e2a55090a4f170e5332e94339c56fbf029b05b6050c155549
+size 21841
diff --git a/screenshots/de/features.startchat.impl.components_UserListView_Day_2_de.png b/screenshots/de/features.startchat.impl.components_UserListView_Day_2_de.png
index 6a4ec71b9a..05a41f4fd0 100644
--- a/screenshots/de/features.startchat.impl.components_UserListView_Day_2_de.png
+++ b/screenshots/de/features.startchat.impl.components_UserListView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2297fbeb63dbbf5281266f90015e047528e3287c923e2207af061458fd12897e
-size 7929
+oid sha256:f29343d52eb4641591c6e1fba1d889e5ff5d39839708cf79697fc1745ed90c67
+size 8077
diff --git a/screenshots/de/features.startchat.impl.components_UserListView_Day_7_de.png b/screenshots/de/features.startchat.impl.components_UserListView_Day_7_de.png
index 8397efd92e..80bfc28b09 100644
--- a/screenshots/de/features.startchat.impl.components_UserListView_Day_7_de.png
+++ b/screenshots/de/features.startchat.impl.components_UserListView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31de17fb1f44c06ffd9ce5d7e59c91b7da986720f90074802b1b566b55859186
-size 12303
+oid sha256:dc767435f491d1700a220497c0cc6d73da3d823e9f042bb6e9c65eaa7fcc018c
+size 12375
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 34ff3e91f3..1f2c501d1a 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:fcd3d8e40e5d9f23c941efa17c37d0473df47d7924d2f51c94022a6c08f559a8
-size 37181
+oid sha256:59d6fcb404f29561e3e56ec4a76c07b8d88d813c790ce4badb54699415835a1d
+size 38127
diff --git a/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_de.png b/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_de.png
index ee46fd3751..dbdb084017 100644
--- a/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_de.png
+++ b/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09ab5d26a3b18d9bdd503cdd62d7fd767088e286c5f72479fb422e24e26f4824
-size 18520
+oid sha256:b53363dd62f0a851f8c5eb0d32b6a553313ec988c56e5378d0fe5085dc5f4008
+size 18509
diff --git a/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_de.png b/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_de.png
index 0ac0915508..3f6f4e2d8d 100644
--- a/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_de.png
+++ b/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad688fd9d4fd288022ec67b97fc1a73ccc769f7f8e5ef8622726543cf460ac82
-size 21516
+oid sha256:5ddb795a473f650502735a6831ff1ea849e5d97fb82e0f347abe63bd42acb886
+size 21513
diff --git a/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_de.png b/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_de.png
index e785272441..2ea58a5b0d 100644
--- a/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_de.png
+++ b/screenshots/de/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25aa162ebc1ac9bb3cf21e07414a0d405e7043b1f5acae646e1e57c9a63bd4d9
-size 21787
+oid sha256:da6faed3187b7a33f1955a6c0165838eb290d51e8e8b9acdf148d9c6f9055603
+size 21778
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 41c7fc6d86..bdc1faebb7 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:50fe94aba6e76e638cfa9b5ffb574c46ff1757a0547a5c8ead0b9179c457792b
-size 28100
+oid sha256:771be782de8b73b0bdb9ac6208102f2f773cee37e98fa614334c6ad9eb7f1299
+size 28118
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 cfab50e88e..eddbdd659b 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:b9c75cdedd4c36873fcd9c7666e17915d2167b3471777201e4e6bf20dc5a0010
-size 21031
+oid sha256:a535b503bd51307d37e81071e90e993b9197beddb771e6164525f5d4ea30421a
+size 21112
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 60aa2ae9c2..a970242e06 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:dbda304432217316c4cc028d98e6394619c9279a261a004466bd5ddf640f994f
-size 31853
+oid sha256:e7698997e24292a0faf338ccdd386c95c475f7d0bc835e94a82703fcf257bab4
+size 31951
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 a9d8d8ef9b..3e70e4d220 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:4b9f41e1cd105f2c7b96ec1b3dc68008912442378075a93126d8b83e9c153dcb
-size 55195
+oid sha256:16da63819524ef1e4535776caaa9e073731fe79f85ba798b57d8552999cc8789
+size 52219
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 84083f34cf..a0e0627c21 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:edf88808f904a3cffd4c53e2d374ab3be9af91002b450de40d0e76b3f93d837c
-size 45689
+oid sha256:f3a846c1d350efed3709f806d07983cf26fe9b6de78e4f3bce3df55002c2eb89
+size 45654
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
index ae5b3d5707..24e0ba7b39 100644
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_5_de.png
+++ b/screenshots/de/features.startchat.impl.root_StartChatView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6550e9568bf9360bdb33507122ac42220d4202cc691b01ed5f76ebe20beea12
+oid sha256:d81b395d52397f11e919d4f1de9cf64b4adb12a5c060c91ddbc91cce4bc71e2c
 size 32104
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 51436e8bbc..72323a22e6 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:17589eb4a584617876c67f4dc7c5009ebf119b0bcbc3c117fa04f8e5764ab71e
-size 16043
+oid sha256:cdb2f46dd809a4d8e28be46dcd84fed0cae4c734a5d4b65b0dd8a00849fd9df0
+size 16091
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 1b0c3f67bb..0802008049 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:5b193290d70ffa20cf5d4faac24d056a2d10e416d117ca29fbc007a5b1ad972e
-size 25349
+oid sha256:7ef5c9662cd8e2d1593d976d84301385058ab2db89184b921c960304241dd7aa
+size 25339
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 4f743b5b98..71f6a43819 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:fea501e631c2f1b84c1e8c61ad5267544f68e3c060a0fba575de8762fd7c8f8f
-size 23281
+oid sha256:3d777d22a954a1661eb5ada2ef477f0efd2bab4753217ea6d279102344737536
+size 23287
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 5783ca505d..0dd7f82cde 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:da774c8c49bd4eaf0266a1e14fc612385219d5c261dd8870d1738b0d2d6d6a53
-size 25152
+oid sha256:71063d31e200aa93ae2c966c7291d61bc325f1dc658afcf96150ccc7ad8e3322
+size 25238
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 eb117a1f8b..26c6df8f58 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:2fb468eee0edfe56d60c55532068ca3b538dee026dfde4fcf13ec7adef383070
-size 43518
+oid sha256:3a8dce781223c4b40a9c1757d29a368790545f790de0da65f2fa3002d629b9d7
+size 43489
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 35577c491e..d9628e0708 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:3cf73fa2cf91024cd576ccea663672257d5f9336b8ec41867e7bec87c96895cf
-size 37141
+oid sha256:68e68757338ec82ecbd630e800e76579c8cec60242a626a113c27e4231a02a76
+size 37117
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 6d117cdcbc..cab5fb1981 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:e13a9114fdb169a8e84a2ca016ff89a107b563867b23da61e3b095a4f49b9047
-size 23266
+oid sha256:5c84058d388a98b1efad5633f621d1c18cbaa49a2f6d9dfec87b144be8950986
+size 23268
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 0d726b86c0..7980de17eb 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:61a1d5027cce6975aacec3e0577b985180203ddeca950a8d9c4149138ece8a38
-size 25159
+oid sha256:f5691acea1598535fdaa00b0ae7fa1f8467597c70e96d4e9fe7c325d538e1f16
+size 25118
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 40f3a93772..513dc09244 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:b3812e73653f9c5f20b6a6ebb7710095567a7024e3a2ed7af25dd313994568df
-size 26456
+oid sha256:06b80ec5d10d83620bb3399a89c2f87682e223f46a276eaf57113fc600eb7188
+size 26450
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 f0650f7dd6..d02c6abd8a 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:c93e7f3b1a7e00fe70d42d9325245e04557fbd5be6752bda30ed0d845c8a7583
-size 37238
+oid sha256:7d1e09a242bdb428a1a9719e46f58a41cd3ebed75e1a368c4348093c6951f515
+size 37237
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 d726b2afae..97793bc9d0 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:11820e6256d97c57f26f39b904618ee02ccbaf5fb8d1eb8c319ffb1116c8ce67
-size 34232
+oid sha256:d1ec66a16e6e4ce8af15f52831d2eee19122adca60496054738e33f09d3eab0a
+size 34248
diff --git a/screenshots/de/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_de.png b/screenshots/de/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_de.png
index 9741448fa7..e6a578c2cc 100644
--- a/screenshots/de/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d4b8d2bb20ecf61d7f288b25b542d3441335c765d47d21282a9464a591da12b
-size 25133
+oid sha256:8603bccb22211bc691788e6b0a4b192182d0be431378f26981220807481a4b9b
+size 25137
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_de.png
index f5576fd8a3..f1620e0b31 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcc6e14373fd9da583310dbbc759d0286a3b8ae36ddb0284709e3b937eb82d45
-size 48300
+oid sha256:e9a4da42e5fb1bdd969d83c99f39bdd160fd277124499420b5f39f5e081a9f0c
+size 48298
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_de.png
index 88ce06753f..1d5e374608 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:684222c49ca9fc06a9e63fcd46736b4c68b2f23f16e77228f78349f926514e6c
-size 28094
+oid sha256:2afa86e0dc92132e23429bebe2d170977944012e3690d341e96c876e5ee8715a
+size 28087
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 f2f0404aad..73b5c74c39 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:8efa1d431472915948e96b97a6a1b77997359c8b7a2a11ca038dc25d36d7cdc4
-size 29436
+oid sha256:dad66c15257d320ba504995128924c88e7f121e0924ba66a5b789cd98819118b
+size 29432
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_de.png
index 5df6ba2298..95b75812c3 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:788f6e5a02171e885a321df9f523c9c0c87c86a183955936bfa1004027d1893a
-size 32069
+oid sha256:aa8c90bc239d9e5b47cb6096efe3e976566fa9f0ee45dc1613db93c307b1e0dd
+size 32088
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_de.png
index 5df6ba2298..95b75812c3 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:788f6e5a02171e885a321df9f523c9c0c87c86a183955936bfa1004027d1893a
-size 32069
+oid sha256:aa8c90bc239d9e5b47cb6096efe3e976566fa9f0ee45dc1613db93c307b1e0dd
+size 32088
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_de.png
index f5576fd8a3..f1620e0b31 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcc6e14373fd9da583310dbbc759d0286a3b8ae36ddb0284709e3b937eb82d45
-size 48300
+oid sha256:e9a4da42e5fb1bdd969d83c99f39bdd160fd277124499420b5f39f5e081a9f0c
+size 48298
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 f07f83f945..2c2febe8f0 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:92f2c1c5cac7875798293f1daff35c4753bc1aec81ec42101288bab269c633e2
-size 43345
+oid sha256:9c2f88235b71a5e8dc496b54ae3d6abf60ffd99372ad952b2588e4eb3d3a4104
+size 43338
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_de.png
index 18c2ef6331..54c412001b 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:261f85d80baf9785fc8df2c83ba9978b1ba422ff129d264e8126e649fc7b95a5
-size 42458
+oid sha256:28438f4a4ea6e9e101ecb016a96a6d8acffabe78531d140245aae599f170742d
+size 42487
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 aa41993ba1..ec4adfbf25 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:f309d9cdb5c9b5aec9f9736b045895c33a2db5873207c9b4f410b429e3cb4c2d
-size 36239
+oid sha256:89d0fb5b05db746127691b5cb40c88276d140a572122bb943e2dc80a1f8b8eb3
+size 36261
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_de.png
index 095e794a2c..36939df978 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:066c64055bc1034d2451d9d812b2b48692260062364424d2de5be2eca81d3922
-size 52848
+oid sha256:506ac23b74c38aa367f42dadad28fbbd8d1af9d6c7d460551d304f66136d2847
+size 52879
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_de.png
index 98f53283c1..e92ab5411b 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed6a28099f8902cf9174b3c9cdf4b7d154b623e7fe37b03c96813b708cb290b
-size 53922
+oid sha256:7ba72d82fe78861c420b21f5c67132b09b1eef6a4bc29de38282c0c655c9ccd1
+size 53948
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_de.png
index a6b85f2af9..eb202b9f3e 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:355c47c2dbed84f808637b0093e7245667ad2dbffeabf84ea7f1244d377beca6
-size 43916
+oid sha256:95807c82c054157fefd82e05648f5c099613c33d816280280f40a92479009cb2
+size 43937
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_de.png
index 956be93533..8854711555 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b86b0973f12c87c98f5fa626d8761bf02372fe0820a5decf4947876adf1a2048
-size 45006
+oid sha256:fe27d8667d4a0220b4f1cee7b131793dad65469b79f7dc3929c782c9025b9750
+size 45031
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 be0253d957..a556aaaea3 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:1f97f11e866e1615cb826cdb6feeffa8ff106c5f41d3c9db9a262df5432ea05f
-size 36929
+oid sha256:76825dbfb2e6c4aaf8111a16ba3811d0ca84cd970681ee9ae3e602bb98acdc83
+size 36962
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_de.png
index 49557625f5..2c61c2c6d8 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea3c6696b24362b472019ca6fcee0012b3fa49eea419b8f8de93f34d8180ebc6
-size 34232
+oid sha256:2bb815af912813460623ccc8d0ca07db315b1521fd2623371daa5f2ff8344fbe
+size 34267
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 badc9d4606..dad036e985 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:0c3c0a2ec93e0ccabcb1b529dfa6fb117ea572719670dec770a31789d32db131
-size 27229
+oid sha256:a44eb83631c42b8f0ed4a72aa7ccf0720484363b8b9dd45bc8b35908c94f0e0c
+size 27220
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 7d1347e719..7efb530cfd 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:3ccf15ad76ec6abb1da4f73efdc98ae0fa74dadb2dc250c48567d5bd5c24154d
-size 29551
+oid sha256:c035769839244b97f2bab01baa770c8b3cfa9f30eccf7e66187301ed984df318
+size 29546
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_de.png
index 3f36913215..d991096b7a 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9e4fd416b89d9c79d4c9413a45bcb9c455ed71d1e07184830bd7b91b61053a9
-size 41184
+oid sha256:6cabad8bafdf955fd6d82d8b14aaa1bea56ea6a73f51a2bd6a82538c527b2fb5
+size 41205
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_de.png
index cc63d4d5a6..8a415cf1db 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:842f46fe337f143251bd8c2ec1e58e0823bb46c89cf82ef7491310dbb066d253
-size 25439
+oid sha256:42a7336ec373fa8b8b92d75f13f9328dd3594017dda18096a4af1fddecb44484
+size 25461
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_de.png
index 66e03de18d..6ce10e25a8 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f83a6533053cead60f5bae4072546acefd5686a5f602b145bd9223626a8d8ee2
-size 21474
+oid sha256:2518686a8c0d1b3fc0a345b3d778c2b15cdabf645835a565e2c31ab027571bef
+size 21505
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_de.png
index 095e794a2c..36939df978 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:066c64055bc1034d2451d9d812b2b48692260062364424d2de5be2eca81d3922
-size 52848
+oid sha256:506ac23b74c38aa367f42dadad28fbbd8d1af9d6c7d460551d304f66136d2847
+size 52879
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_de.png
index 98f53283c1..e92ab5411b 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed6a28099f8902cf9174b3c9cdf4b7d154b623e7fe37b03c96813b708cb290b
-size 53922
+oid sha256:7ba72d82fe78861c420b21f5c67132b09b1eef6a4bc29de38282c0c655c9ccd1
+size 53948
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_de.png
index a6b85f2af9..eb202b9f3e 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:355c47c2dbed84f808637b0093e7245667ad2dbffeabf84ea7f1244d377beca6
-size 43916
+oid sha256:95807c82c054157fefd82e05648f5c099613c33d816280280f40a92479009cb2
+size 43937
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_de.png
index 425ec30050..3869f9c1a3 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf2239dea75e1981f0bd12c3dc0e1490b5ff9dadd29a12d605414d63bb4db6a6
-size 32068
+oid sha256:49a84ee8cce1ce9415e70f3641dcc0cfb95a7728cb4640fe38e3d1181f8d20ad
+size 32087
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_de.png
index bf8eac000d..a55a070617 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ab908e704aca311e6097d64c2bc8029c8921bd84538fc6df3c970640a9001a1
-size 21617
+oid sha256:84e144a3dc9c02eb3d7ddfaa244bb30af331f64acf41d73fdd780c8b24b53ad9
+size 21644
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 be0253d957..a556aaaea3 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:1f97f11e866e1615cb826cdb6feeffa8ff106c5f41d3c9db9a262df5432ea05f
-size 36929
+oid sha256:76825dbfb2e6c4aaf8111a16ba3811d0ca84cd970681ee9ae3e602bb98acdc83
+size 36962
diff --git a/screenshots/de/features.viewfolder.impl.file_ViewFileView_Day_3_de.png b/screenshots/de/features.viewfolder.impl.file_ViewFileView_Day_3_de.png
index b51de1e807..ca35124e38 100644
--- a/screenshots/de/features.viewfolder.impl.file_ViewFileView_Day_3_de.png
+++ b/screenshots/de/features.viewfolder.impl.file_ViewFileView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:839eef003e2f567c59fc8a8719ef3a862ab16760cc4ddc4d82b1a68620736924
-size 9219
+oid sha256:5c6452424f2e5702af749d126b402a6a2b8b6a6d089cd87f41c9ca6bcaaa5c38
+size 9247
diff --git a/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_0_de.png b/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_0_de.png
index 49108ddb0e..f112fc32bb 100644
--- a/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_0_de.png
+++ b/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fb3f21b9b6460403f30709bc3464c8f584af34e7ac27083827a5c2c6121a2b1
-size 8243
+oid sha256:696490cd2be6c6c63e7546dcc5af66038fed23d6a04feac841fc44eda88bce07
+size 8273
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 ce17201424..79b4891388 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:bf13a8c2d3b46a5f2e2b17b681b60ccc62dc886d137ec5464e35c80f4afe19fe
-size 49022
+oid sha256:1a107feebf22d62e559f7ea31951c6924f8991244efa2a032961a2808c432bf6
+size 43697
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_de.png
index c324e85343..25fd18d210 100644
--- a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_de.png
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b8fe687014ad3a25b2f3f4818a9f17cef25fba7b18dfd792374c1ee7f1dc14f
-size 19922
+oid sha256:5b80e05ab2c4c446d5f23f3e148299e14f03fa06440e128de4fac41e2c7fd5d5
+size 17475
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_de.png
new file mode 100644
index 0000000000..0a2a94ffa7
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd9153d4cda8258ca62a16acdeaba023d1c10ea74b7f9e22d401751f1d2deae9
+size 19597
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_de.png
new file mode 100644
index 0000000000..0414a20c94
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b869af5e094555bae21115ddd8e637c463bf8d0e1f1ac9a88d0e84a7c0c191b
+size 17324
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_de.png
new file mode 100644
index 0000000000..10531b43bf
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc23094f3d51c108e64490f9ecc1f10c3ba8cb86f3273cd990181d21133dce4e
+size 19320
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_de.png
new file mode 100644
index 0000000000..64a879ff74
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a4dc61d7b3fc791fe6362cabcbb67a15d85669d778c1b186c73fcd470df3b21
+size 19295
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_de.png
new file mode 100644
index 0000000000..4c9158442d
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a26d18042ebe6fab5385a3d93fd9492894461ad07388f9f4f73b7c3d735398f
+size 16996
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_de.png
new file mode 100644
index 0000000000..c324e85343
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b8fe687014ad3a25b2f3f4818a9f17cef25fba7b18dfd792374c1ee7f1dc14f
+size 19922
diff --git a/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_de.png b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_de.png
new file mode 100644
index 0000000000..7eae77df84
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab51c4dff0246b002f828381e04d331c98aab98f4581c566ac957515d64589a5
+size 19721
diff --git a/screenshots/de/libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_de.png b/screenshots/de/libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_de.png
new file mode 100644
index 0000000000..cd461a5e12
--- /dev/null
+++ b/screenshots/de/libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0406efd19b2e8c9d83708af8669b8d2e8aaafef335eaef972e363e85589ccc56
+size 22171
diff --git a/screenshots/de/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_de.png b/screenshots/de/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_de.png
index 2feea54379..504ec13509 100644
--- a/screenshots/de/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_de.png
+++ b/screenshots/de/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88f04fda2bd15ff245d888161f4e3dad21f550e6b2c7bd2a1026ca6e8eb450ca
+oid sha256:342c22811c50c595f1288c0a24ef51d35814c703691dc8fe5da6cd97da89ff25
 size 18763
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 d72b78ab4c..056bccc5b5 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:853edd40133d53f4109934cadfd7efd2cb6c6aeab6ad345b29a9008e902a9904
-size 36437
+oid sha256:ad5c8bbac1c770be5924fa44d79fb728b54593a6091b5a3fc78a69936668eab7
+size 34121
diff --git a/screenshots/de/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_de.png b/screenshots/de/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_de.png
index f91d67848f..026aa22f79 100644
--- a/screenshots/de/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_de.png
+++ b/screenshots/de/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a790bf2a4ddf074b1b040b8d3833fc3ccb7f37867e5ce98785cd6b80ed780ab4
-size 10421
+oid sha256:f846e8780ecc4d76c5623f67b1fb2637daa0dd3844464aa59ed122f553d6508f
+size 17214
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 5e98741cdd..f35e18a131 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:37e098e3e33c4b518c6cfe5358f3b79b1bce2117cd968103cf325e44da95fda2
-size 14163
+oid sha256:a8b9ee22c008b5075d9d194a2fd915e9dee08407b837a61f4135c661944052f3
+size 14182
diff --git a/screenshots/de/libraries.matrix.ui.components_CheckableUnresolvedUserRow_de.png b/screenshots/de/libraries.matrix.ui.components_CheckableUnresolvedUserRow_de.png
index b2f0e64495..262a2e6c45 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:fde26e4404bb2a324cc098fc0c16dbfeabaf40fad7fc59c279c756e200b3a03b
-size 127545
+oid sha256:d4450043c6ecfee5bdbd017027e5b20372b35f01ac3821d5a73cfbf807799424
+size 116244
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 64377be81c..5c9d040b9c 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:85f91b6c1665dba28fb428c0079a42b7ed3fc2f8e5f5b2f40df9c7f80bc47a3a
-size 28681
+oid sha256:c7efe3fbc80ebe43ffe85f8aff63dcc2cb9dd9efc8f9f40b656be1741ad071fe
+size 28679
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 41c764998a..fbfdbdbc67 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:bcb0503b81b31809515e2c38824813e99ab7f9bcc9b79ee5822796656955890c
-size 26977
+oid sha256:5bb75f313e62e4ceb97f86ca19eab72c46d351d43bb16c19970ea50304255186
+size 26964
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 7e5de34316..2392471c84 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:0095fd43138cfbc55518c6aeb4a9e578d2ea299e8f55c658e80120076402847d
-size 18263
+oid sha256:46aba86f8df1ba4cffab0a31b83df6ba5ff5cc04ba7ec636d50173160bee86a4
+size 18231
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
index 1f052f4c3d..45f40d68a3 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceHeaderView_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceHeaderView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0978f8363e8d5234bc19625156a572219a6cbab3573e2c024a1cf828d4446af9
-size 61237
+oid sha256:b599c588931b4cf33b2c2b501241d85618899abde7de94f369034d3b93e49ce3
+size 61245
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 1407cfcd80..b2b563a220 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:20ab8a876550e5536c89b8b3dc7028444a9430694f3fc97522fef4d601ec2f87
-size 24582
+oid sha256:caf8e89b4d906f0e1535f437ec056b51447a3fcddd0ec8078cb269c4b875eec6
+size 24616
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 738e01fe3f..56832f5fa1 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:f7d03c199e22eb0f0b6e34b42efc65d138ac32c743631f65553ba3497ded0362
-size 17452
+oid sha256:95cf04b7cedb5b2266587935fb3fc2a92b0260963c60115431faca31907c05e0
+size 17548
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 4f234befc6..733a6b5fd5 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:06ba4b65baf7638599ce0adefe25c3836c322168c5e0cdfe8f93162b2d3b3b8a
-size 13462
+oid sha256:37d159879b3a4d2d5c9f9465c6499de34c94e81960d6a528628c455c024f42b5
+size 13386
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 1c3fc7c033..982e1c0c77 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:59335d0ddefd6d4b668ce0004c992ef24f34268e3155ac8c41fe9418c700bf2b
-size 10782
+oid sha256:adbd52c4c086e50126a5dad0317cb8cfa9d47bbbc8e4be8cbfdfd666935d45af
+size 9001
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 388eaba735..848e75af76 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:96aef4e08d3d1d21701a8c18832f60eca0317c2ced0c4f06d8d9a71231434bbd
-size 24579
+oid sha256:cb274060c32afbbb140c124ee2ec4674883d8e9ef4106930d466d65499235f61
+size 24643
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 866b8156d9..4369dd3160 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:52beb69cc61ef5a526b371c28859e9fd290ef709d2ee01a60a5343f3397acf52
-size 19003
+oid sha256:e4d0aaadc6bb2ed7157af0b843b62c66a49ad531a35e9f46947c6dc2bf428196
+size 19179
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 fa8d622303..b704a287e8 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:5c913b95850bcd97e39dc415bfd130eddacb4b22119998eb083217804ed530d4
-size 14892
+oid sha256:4c295b1cc75ee1db2796b3b1586f2dbc7b56260ef1452bcf4cae751455a12a57
+size 14825
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 96ab4eec7d..048cb4eb18 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:7e79cc9e9d2cb0918afcc6ae3c4590b7d4d79ae3fc3d6480f88797ea93cf64b1
-size 34985
+oid sha256:3ff635ac9744c957753dcd714d18502073a3bd97900e605290b08d9407531e34
+size 34979
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 b74c0e675e..c7123ed2d8 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:8ce56146c048dc9739a59564e6b53dfe8857f02489817a7e7931b00870b197b5
-size 39827
+oid sha256:5b9c6b8bc294d78559eaa9d187ec96891a45d9d930138787e259e3e03285dfd8
+size 39759
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
new file mode 100644
index 0000000000..b7e0334ce2
--- /dev/null
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5403c6fc3ca15b7c2099772257b42c2528d78993e8c9d83e0e20ba0f3e64f2e
+size 11420
diff --git a/screenshots/de/libraries.matrix.ui.components_UnresolvedUserRow_de.png b/screenshots/de/libraries.matrix.ui.components_UnresolvedUserRow_de.png
index 7718515f1f..f6d4ee1516 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:c9e55c46d0f6633650ea00b79a97e79f140e2ecc27e4af979a4d7a8ce059d1f7
-size 73790
+oid sha256:a2bde77f49fd90f85c376daaf41346838c2d3e91a8cf52d734c61c2f419aa369
+size 74298
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 a63226c222..007cf090d8 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:ef21868f9e2a8438c344597e575aa4f73ccc110c648d463ecfcc9167a844e3fb
+oid sha256:5e8b2eac58fa493c2c7b91b064bacaffc6b942fc98defd9a348896e8b697973e
 size 8892
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 873c014b18..d53e274d51 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:5a9b70ccd2182c71f91a41c4c4563719995c2b1735c576df4607685617052cc5
-size 35704
+oid sha256:ff6c6c7414b42557f253a0ac9ded918f2ea3085806e5858f63d9f2491817677b
+size 35689
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 101f89bb83..eebead276c 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:aecba3d40603a4023dfcc8507cf19adc983e9993544c618d4bb3b5635bbbf921
-size 43059
+oid sha256:bea0bbfeeffc6e4fcfcf5c2802e415eec785f923f114afcb31f8e80f49b97f01
+size 45514
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_de.png
index d8ce49ed62..5ffc85b5e0 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8802d043fdcda3663a7703b1986a25043d299008b0eef8a220dad5ccfd164b4a
-size 64756
+oid sha256:70195806d10af6be3257be03cde5d9ed35c5f2672567bb8541a081abcb162d89
+size 64770
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_de.png
index 7e6337b642..943ab20818 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:471d9a1e70e019f373958aca834bf631874dc64fc8a2e04a5a8c36c11bf41770
-size 15256
+oid sha256:8749fa29c9d8d9f1672fad947dac4c48c694ef7827b5023bf691cdf458634a10
+size 15264
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_de.png
index e2168318d1..20488edc7c 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b19feb9904ba5128133c60af1d6ffe5755b4ef009b9611f3af83d3a25ae495a6
-size 61884
+oid sha256:989062a145069bea7054d9683ca4c1f1b4a4c0a216dd704ea95b092b4e44e7d0
+size 61894
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_de.png
index a8fd83c3db..63a3a14ce8 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdb11e06a185f48bc899582c6fe38630d5b9a887b1f0908b586a43b17c0485cc
-size 61885
+oid sha256:9f6fe12d0259d82919c721b9ed6239825e18723c04b501b270737e714ba46845
+size 61895
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_de.png
index e2168318d1..20488edc7c 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b19feb9904ba5128133c60af1d6ffe5755b4ef009b9611f3af83d3a25ae495a6
-size 61884
+oid sha256:989062a145069bea7054d9683ca4c1f1b4a4c0a216dd704ea95b092b4e44e7d0
+size 61894
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_de.png
index 7f5645467f..e4bba4e8f6 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c64b54d87184c26efafa8a527f4854251a08ebe099b80b8554baa5edd779dfe
-size 75346
+oid sha256:d4fdd3fdfbf5bb289234fb740beaa3cfd9a39c964c7eab18086b9f69ecc24102
+size 75349
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 81ab79ed90..5bdbee228b 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:fdd36f2537be1e2e5c32fcba86e53478d7e99ce152c59141f78e71917a181364
-size 529161
+oid sha256:a64d9659245052e31109fd2ca96dade3c01302ebd9d2b48375fd90df732ce4e9
+size 529167
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_de.png
index a8fd83c3db..63a3a14ce8 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdb11e06a185f48bc899582c6fe38630d5b9a887b1f0908b586a43b17c0485cc
-size 61885
+oid sha256:9f6fe12d0259d82919c721b9ed6239825e18723c04b501b270737e714ba46845
+size 61895
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_de.png
index a8fd83c3db..63a3a14ce8 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdb11e06a185f48bc899582c6fe38630d5b9a887b1f0908b586a43b17c0485cc
-size 61885
+oid sha256:9f6fe12d0259d82919c721b9ed6239825e18723c04b501b270737e714ba46845
+size 61895
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_de.png
index 779fd077ba..1831186d29 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e640ef7595216d2c9365141799e3b5f4c636a2892fb0c21280ca7a9a87c0144
-size 82118
+oid sha256:d56515e555fe3b67b7bc9966f1b6081dac08c026056040d98adc924bee96ef8b
+size 82125
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 2c9dbc4886..d286963ece 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:cfb983c7773607092a316ee712c0d50ec4e0bb2cc69e53d849d98b32c2037c99
-size 33321
+oid sha256:06e84aad3494762d9f82db6f89a1c82b29e9fac055ded4f92fe109a553eb7016
+size 33335
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 8b2ea46507..90ed906e03 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:2af40dcc68f10418ece9ebb6c5148bc2a3f339486f975dd2f6e82a3296554143
-size 45785
+oid sha256:be243fc9a55bd214187605b79226885382f0a92601ceeac4e6495179d982683d
+size 45443
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_de.png
index b1428db8bf..7c3707060c 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d422c54444ad386393580e35860ebb5a2e9121c5566b41455ab512cbb9042efb
-size 15264
+oid sha256:8c125e94a03f510377e19bd583f2f76299ac1770377f6a70b07b721c7a8d2b98
+size 15271
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 efe2112eca..212b565f9f 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:9035f7f5e0981bfec028980576ddf3cb25fd03fe3e9c824efbb6579ba4d5816b
-size 42671
+oid sha256:1b8297bd3c5532a327728b0d517e6a634bf4f689df3f3e8a039814eb26f659af
+size 43984
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 8d6b00f872..30cdca9a84 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:eb5df77727252a85aca9913b465026521178c9da77e27738df3bd0a99876676c
-size 35317
+oid sha256:19c61fdc86c8fbf8017c6f67fb9a99fb7d80a69e40ea92d3008918abce1c7b80
+size 35289
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_14_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_14_de.png
index a82c4fbb48..caa3ec4884 100644
--- a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_14_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7353634dec22f3c4112c3d71290e8959775e97f7f1c140b0ec69c71f675c13c8
-size 8862
+oid sha256:c49b02ae7e627f0cb4aa2f1c6a031892296ba73e3595d3fbe7a95e508d42dc0f
+size 8851
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 39dedcbc2a..2e686ea4ee 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:3d6bc0b609f19136a6bdf9752d399047aac63f26e88bea363d823b5273f1657d
-size 45992
+oid sha256:fd7994171f75b775cabe7e1be07a8b47a6ac502d9a4eaaded5696f446ca6c790
+size 46014
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_0_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_0_de.png
index c22f818b3b..6bfc8717fd 100644
--- a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_0_de.png
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a89366ca6bc6a19e2661466d43f883532a84ad129bdc6f0249be8a0215f38184
-size 14046
+oid sha256:a0326603669450bb553227feb450a83c2c4f8a83a0b45fc00a0439b5ae6cee40
+size 14087
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_1_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_1_de.png
index 67b221f32d..b62ad00757 100644
--- a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_1_de.png
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6388e6452d693c8675ef66e55c53aba8625c54ba3fa1667ee808f00a06259ef7
-size 12015
+oid sha256:4e1d912da6419dc1baec30171634ac9764862390d714191b71c2b94d896fa10a
+size 12058
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 b191e15948..5ce059f931 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:726e9c2aa1399e8aca167d4dfc20684cbfa5ab0dae29465f5702ab1998887246
-size 32556
+oid sha256:53f60adb0f0abafad2a18536e13a64b6a9115f78c51de81fcf87521e14de79e9
+size 32590
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 6e92d8729f..4354ba502c 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:1f5499db3bfde1f52df07f0378c506f45ba57bce0bcc5984627b9719d52efec8
-size 30902
+oid sha256:5171547f2ff09da353a6a2fb52a734930c165cdcf22b1dca58b89e47d2c3626d
+size 30933
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 b1e005c407..5704892c4a 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:08cd625decbc86790b9d3ffa4dd250ddc45ab5e83758bc365b53dcc028a1ceb1
-size 35167
+oid sha256:ad039c7af5726a980a586bd483c4aa938dde1cc2f116882ad7b6ca343495805d
+size 35196
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 6a53fe6dc6..30c7d47ede 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:d739c07ec0320b2f9cb5229cbe1f851548b60affd674ada974c38ae4f1e2efc4
-size 30220
+oid sha256:180014cd36d6721b426d212581f9cceb3ba55f6e3e11fd5357d9311f786526c0
+size 30257
diff --git a/screenshots/de/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_de.png b/screenshots/de/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_de.png
index fddd65714a..ee6761f945 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:36e21a9663aeed7a474d422ec0c67cd770bf0d68ffebadcd770d115cb361ed47
-size 21279
+oid sha256:c28a1a1ac113584aadf170b728574e4a34f888bf0220c2ce86a5911a94482371
+size 21284
diff --git a/screenshots/de/libraries.textcomposer_ComposerModeView_Day_0_de.png b/screenshots/de/libraries.textcomposer_ComposerModeView_Day_0_de.png
index 8a66f0d314..58618a746a 100644
--- a/screenshots/de/libraries.textcomposer_ComposerModeView_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_ComposerModeView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa9ab0bf9088d4d19738eb2606b1f3e0dcf3aded754ee3a3ca5956d4a6a9fcde
-size 6185
+oid sha256:4179ca2e2ea4337930c7d4fe0dac6f109488c33329742307aa9a1b56e55d7292
+size 6158
diff --git a/screenshots/de/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_de.png b/screenshots/de/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_de.png
index d127fc83d7..98454d33f7 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:60cc65fbeb8cda08f6ad79c30b0c67de60257a7993f9cf9a77a2e0b536ccf919
-size 55466
+oid sha256:4e9f5405a4d1174473d85c9fd83ed8637857a6871d74b3de5ba38e2365b8c001
+size 55433
diff --git a/screenshots/de/libraries.textcomposer_TextComposerAddCaption_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerAddCaption_Day_0_de.png
index 40b5e4fcdd..1bd7ba7633 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:fee1127041bff5a4047dac582bb8353d0b3bb4b2ef41f486d7bf7f646873591b
-size 61474
+oid sha256:f6223ae2ec69da18619d6b0e8ec672ef5039cf4f8b4d90dd7ab8fa8f62e09f67
+size 61498
diff --git a/screenshots/de/libraries.textcomposer_TextComposerCaption_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerCaption_Day_0_de.png
index 569d92dccb..b7d8a1c7b4 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:096a1828bc630757e6abd080624fd81b4d3e667f83ce428fbd7a9bc9f6c1f7b6
-size 46548
+oid sha256:dafda8e667309fc1ee09aeabc86332d1fc1aeb15000244239b5dc3db05a88fe0
+size 46550
diff --git a/screenshots/de/libraries.textcomposer_TextComposerEditCaption_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerEditCaption_Day_0_de.png
index fe75c2ca42..67c758b8f6 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:a6a9f4274e261724436a37c9ca59796c412e2f4ec4711bf2bbb8d8f7b3e01543
-size 59501
+oid sha256:aabbb0a33bea214075a6d1f7115ce24096b1c022c1cd50733d0816f8e6ebaefe
+size 59490
diff --git a/screenshots/de/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_de.png
index fa69690dc0..6e1dd6cf39 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:8acf506699000a01eb65fd8acab056d070c1599a59319a0aae6dd1e38023da83
-size 67973
+oid sha256:525aee31e2c09c8f7134e174de4e46f1913a5b4f3a88a4f2fba50dc615fdffc5
+size 68035
diff --git a/screenshots/de/libraries.textcomposer_TextComposerEdit_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerEdit_Day_0_de.png
index d127fc83d7..98454d33f7 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:60cc65fbeb8cda08f6ad79c30b0c67de60257a7993f9cf9a77a2e0b536ccf919
-size 55466
+oid sha256:4e9f5405a4d1174473d85c9fd83ed8637857a6871d74b3de5ba38e2365b8c001
+size 55433
diff --git a/screenshots/de/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_de.png
index fb8bea88f5..6dba6f2792 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:a4782b03a120bbb9c54ebd34bb5ee892686277301fb8f1f3131d86a987f42f8e
-size 66107
+oid sha256:53c40e5833c999c8e3d49bde6f565d32a4381a40e7c0bcba845d16363c6f3faf
+size 66163
diff --git a/screenshots/de/libraries.textcomposer_TextComposerFormatting_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerFormatting_Day_0_de.png
index 9136cb6afb..45edbb487d 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:187aa4b837fcd244f4cef929c9dc093defdba5315025e5ee2faea34d62aaa1b4
-size 53588
+oid sha256:a46aa7eb61ef981a252fd8f02797adc603590fa25499921a6c8185078f4f5a81
+size 53554
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_de.png
index a99064f50b..e56631e249 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:40592dd5b485f10fb6b180e676f59bc2ea3946b7966a7d3b82e0b5e2b6f8f53c
-size 75347
+oid sha256:68741be741a63204b1ea6099ae2833b0aeb5defc1367d97bada887d5b96a6531
+size 75368
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_de.png
index 2979c82d8d..e92eaf2597 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:717054f6cf1deaccc69e0f23587d4362b3f473c36abca4b08ea665affd1caf38
-size 61932
+oid sha256:8fabc114c60514f7eb512c8992a82bf1c946592c6e8187c87215cdfe7fe21a5f
+size 61956
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_de.png
index 784c0fd618..c07587a3be 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:e13c7bc1577ceb046e6eff0ae8750299ef7f652e5e8b8e4183bca5e9b5c3b225
-size 74758
+oid sha256:f3703422fb0a8c6fba5116f715743cfba7b4eb94139563e25d796ff51c6cbee7
+size 74797
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_de.png
index def666e030..aebf3f050c 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:51f6dfb47b2799974065516f6e111730da5d8b6e2c904e297e11c6acb2c2835c
-size 83409
+oid sha256:41d290c3153b85b1d97f2dbb087041c1dc57db31bd8904d3919dcf0b178b2286
+size 83439
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_de.png
index 543f397c18..1b83986771 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:1eb54ffc3ab7ec3689ffabc896cb96e447b02784a68fd8c387ed89c62b07208a
-size 64480
+oid sha256:4cccf5887c1fe53f317e6d1823e747e651d4b615e73f81a68e730ba1d3aacc6f
+size 64490
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_de.png
index ee37f89e24..f7a5b24bcc 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:09aa66b3c268caa5bc6b26192f27000be4a4894b1f54e4e659e2b215ae537a54
-size 63354
+oid sha256:0296e105d089b5afb565bbac72f7a3cdd92c0381ab867494114f2ec8067af18c
+size 63387
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_de.png
index 51f6c059ba..1864d91132 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:1c39ce41b357199a9e571f86b45f60f1dd42adcba243ead70b617723b01766f0
-size 69003
+oid sha256:e97005de9f3b1ae2873888c3258aa39c92fefa98194c55ed9d6abc7c8850af27
+size 69035
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_de.png
index 22eeb8d4b2..b5a3abc87e 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:237f46b3a247dfa29c545751d65a6a7317632edecd0daf81619912446b3900b2
-size 92282
+oid sha256:826550edf105257ff91ff2c9b798a128da4172125fc2d157bba6eaeb3f3cc60a
+size 92294
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_de.png
index dc35e95678..12a40cd0d9 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:1e1d7bb5df8b681b4f68ca7dc8d4405c35f6a36fd40da84dd3f6ead8d601f28e
-size 62803
+oid sha256:5d859305f9f78b7c969d2ea8a3f49fe00015d1dc3c49b24dcd3d228705688d4a
+size 62833
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_de.png
index ea7f60920a..95325575c3 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:9e3cfa1d4e2c6f5b9a3eb0a72a65c00b1ed94491b6d10ea589e9706d55d8c2e4
-size 63905
+oid sha256:4cab4d95d4466412843b716e27d43507c06a777aba77c9b3df3350a268c7597d
+size 63975
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_de.png
index 642fff5c6e..b42dec9211 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:7fdbb5f58bf14189d6d97269b70d31719c119598e9064f897a66b718d3b86a40
-size 71620
+oid sha256:b33f245c717a8c8865aafe9aa3a09ff1201a8532db5327c536410b11e4479f3c
+size 71660
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_de.png
index c60b586751..da763a7902 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:7373c877c6c447cc9f436bd959dfb8e1f71bd61177b6d152353a2f5b43aa2c8e
-size 62337
+oid sha256:6a9589f57428065452bcfa119b12d3d5ac37376771ab4c47378b458b470785a2
+size 62360
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_0_de.png
index 2d07064de8..db3424e835 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:60c4d9f1473045065241e3b0c09852671de07e1a31cd7eb696e6ac7fdfb09e51
-size 75722
+oid sha256:633eafbaca68ce66d4dc8d6f14f3b27c461bfc2ffd80dc390d667535e64c98e7
+size 75740
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_10_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_10_de.png
index 7f892e2d62..494d25ffd8 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:d92f14b72f92753cb46b4ad46d395412a7155c2a9074c57562ab00e6e3c73c03
-size 59288
+oid sha256:46def0920f70388300ded71846b5bb42fc4df6fe87547adefe089e4b6c83f0e9
+size 59293
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_11_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_11_de.png
index 4bde8bd861..90728f2c41 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:759ec0718213e6b6ee6fa41cbbce455687a353b98a3091cc3726007066cabd0f
-size 73946
+oid sha256:cf467fdb5211d4d4993b9ae83161ffeb90a5d910663eb4914eda60a391219d24
+size 73967
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_1_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_1_de.png
index ad5146d4cb..ee70c8765f 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:ff399c6e701123d42878b6a0ef382691d7087ec5bdafe15b1ec757d702a7ac5d
-size 85209
+oid sha256:024ac538e1778cf6c8fa3e489602e19efe64e2262c1b0b3f6988191a9483a500
+size 85227
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_2_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_2_de.png
index 60803e9382..79deb8e87f 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:9b47d98d581d278f6e7afaccb590056bafc306b6c92b2f05c7c284d132e819e0
-size 62301
+oid sha256:ab37052348d8d881d7bd6b41edc715db442cf726453df047b8c0fe0d9d55125d
+size 62309
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_3_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_3_de.png
index 34851b527b..83f104ba46 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:c407a602fc180ff841ae62405140da8978694b1b6f5f46c08a774607fbf3d3db
-size 61365
+oid sha256:dd08e08441c5b058f7d17c77a609ea118d2d10f7364b596dd18d161f2729d639
+size 61369
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_4_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_4_de.png
index d79e8b441d..693fec3170 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:195e435fcaebd76fedb1cf41f03776e1e68eb94f745c26b46d112d2d3fd86701
-size 68837
+oid sha256:f565b9afb2124d4dd215bc7c0971c5fe8010e19f5a6c21ebea05af1da1c9a4db
+size 68852
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_5_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_5_de.png
index 46158a9f2e..865c8c2504 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:e4937bac91e2ce148abd5b09699291ca700d976069df2d39e62c86ef5acce36f
-size 103915
+oid sha256:7a3335a970e8fbf1cae6573a258f8343db844c457a6abf202f0a03e9cb691557
+size 103914
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_6_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_6_de.png
index de116d7eaa..51c97c7187 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:6256e13d0a7fc9b7416a4c24fd0a6e807cbd26c50e5b3794ddfc88bc3477aa9e
-size 60552
+oid sha256:a52b25f13f88db723c0d397c9b76bec08cc29154b4b0802a365205c87caf0124
+size 60555
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_7_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_7_de.png
index 05cc000090..3fd37f9bdf 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:30eda7acc6b1f2bd984f8502ec88a0c9b8d79823e29b078228268a295efee748
-size 62485
+oid sha256:018c8fbff159cc5d5e5b356b1262f4ef50fae39536bcb8f57233a975ccc587b5
+size 62474
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_8_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_8_de.png
index 059aa4abb3..c23aaf541c 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:0a5b0960c05c047ae832a61fca7cf9593cc0ad24decd2eab363e652c1e3d962a
-size 70887
+oid sha256:4628c587c1a4f81fe55560e858ae006af3b9d59b87d224e6b5c35fb9e8963b64
+size 70891
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_9_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_9_de.png
index 19ef265ff6..7a88a63738 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:eda41a9560b0acdc6fcaace4d1bb274d5a65f1b5c95073ee86d828ad4b1fa33f
-size 59925
+oid sha256:3329174b443e45a350b10fd4424ab6cd7d918e461861b30a7bcc6f504d322f20
+size 59931
diff --git a/screenshots/de/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_de.png
index dad38da8c2..da1d3f39eb 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:53e771de4de90be6356b2a218d58ca658dc2895c32c63eafe8316557f259e8ac
-size 58303
+oid sha256:fc72269a07c163bc490a590d73dabb1d698e28298a69df89a058d20c8051d89f
+size 58391
diff --git a/screenshots/de/libraries.textcomposer_TextComposerSimple_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerSimple_Day_0_de.png
index cb60634ec8..777b608e19 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:52a0b4d220040f7115109ec3434f4d0067c753608b7cc4736c634752caf1cfe2
-size 46254
+oid sha256:0c0e5f446f2265f5eda7f381216c18d85b3eeed55b47e4a8617fe4234d49804d
+size 46264
diff --git a/screenshots/de/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_de.png
index 278db7b093..26cd7d10c5 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:83d2db1b20827de777296617927146c7142b21bf8efbfdf4aa40b21979b7aee7
-size 39694
+oid sha256:1656124036ba98fb559a863aba4d81fefcd9b4f52ab9cab852520dfa67bd5373
+size 38156
diff --git a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_de.png b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_de.png
index cbf965f243..42d9d2a4c8 100644
--- a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33421dbf0f3d14fee61a8cafc251ab1f84d81efcba9dfaadc07f80bb320aa607
-size 13136
+oid sha256:a73117e9f32d5c9cffafef70457d9941fb4d3c2aef864c518c68ce8ee9c370f6
+size 13163
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 0296d9668b..f5949c0da2 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:77b59c5016827c32d9c1e028050bfa662406cfe5df67d039a4b919c6e66a4b62
-size 45170
+oid sha256:639065890260286d563517940ef3d3f91e12d50724610893ebab3e84cb7c2d3b
+size 45206
diff --git a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_de.png b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_de.png
index 5c252f34f6..4ea936e138 100644
--- a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:036931ca88ce36585a3377476821ad5e61221354f16adea22738b2588bdafe88
-size 23452
+oid sha256:479aca0d8555e2f186ec34eb9d64561a720482d52c0734cdca275b4fa13bad7a
+size 23426
diff --git a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_de.png b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_de.png
index f4c4da3dc5..c82e51c493 100644
--- a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fe5fd358af75454841c8648f64bdece8225e4327f5ec0d3e112d7b38da97fb1
-size 23951
+oid sha256:ae5eefdea8c937d368fe04245c8b6c51280e15394463f885489ba10e8d6e6321
+size 23925
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_de.png
index 6911e830d7..48833748f2 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:292f03d853dc79b3cfdaf60383feb0bfb28621f2ca222f861e0b8545e949626d
-size 35608
+oid sha256:928ac6c2eb31b854990ab0c58b3e7eb16976eb747b7424b7935242663200df52
+size 35619
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_de.png
index 4d4dc2092b..0f953c700c 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9c5c2385a62311805385152b8986df99cdc7c0cc6558d774a01487c6591471b
-size 20399
+oid sha256:4f83b6f6ff8ab7bbbaffd39b21d9f9e4f830b520d82178ff6c6eb143b76bbf63
+size 20408
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_de.png
index 3b828cfa21..619cbb8f6e 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4143aa80f5e04d2eb1a150bcf2ffd54eee46662e2d142bf4931b7ec2e877a913
-size 25803
+oid sha256:1b5c8a957d70fa4b21002ce7801c55478744bc7563bc7e1605588680f042349b
+size 25815
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_de.png
index 00b513f519..3aab032174 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4994247b57d45a9129a3ff1ff7ffc4d325153a76024f8ab853f68494fabbb2b
-size 32984
+oid sha256:91258609ab9996464c8e77ababcc4e4b11f98c8eb1484c36fe4e615d7773d96f
+size 33005
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_de.png
index f338319996..0ee53f096d 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33e4eb4ceb6b959dc41aab717565b85fbd8837ed3318ffae42633d44ae9f0484
-size 25633
+oid sha256:18e255c2924df939b1889405d1c39f7a787b0465242c800f140b954aa7eb4518
+size 25644
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_de.png
index 4c9c562a35..d3d0c34a2a 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7e2ae21ea5a0ba84a46f04660ccbf6f6a7badbb6cd3e5ce3d00f2ab75ff33e9
-size 41747
+oid sha256:3998239c48f1ea84b0a0e327f39168ed5f5e541cec2526a77e24a57715be5085
+size 41768
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_de.png
index 3830d4d901..4e0b11ff6e 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:697be9acc98d36ebdc113f3f8ca05268c5fdf1ee19c9268abff5c37e284b19e4
-size 27473
+oid sha256:56fead606ebad9e08b1bd85a1c376881b5f88e30eaef776304faf5ca341d2868
+size 27461
diff --git a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_de.png b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_de.png
index 652a34b261..541ba1165b 100644
--- a/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d992f1d26392afd09825656106a004f7b50b4a03896138730a15ccaf45296106
-size 26586
+oid sha256:cb9ab2813c21190074f80f1128897064267b6922fc6bb70ffcec9dcb487a3c02
+size 26580
diff --git a/screenshots/html/data.js b/screenshots/html/data.js
index 2bdbeece94..42d529aec6 100644
--- a/screenshots/html/data.js
+++ b/screenshots/html/data.js
@@ -1,79 +1,80 @@
 // 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",20369,],
+["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20445,],
 ["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",20369,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20369,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20369,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20369,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20369,],
-["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20369,],
-["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20369,],
-["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20369,],
-["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20369,],
-["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20369,],
-["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20369,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20445,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20445,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20445,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20445,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20445,],
+["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20445,],
+["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20445,],
+["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20445,],
+["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20445,],
+["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20445,],
+["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20445,],
 ["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",20369,],
-["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20369,],
+["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20445,],
+["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20445,],
 ["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",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20369,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20445,],
 ["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",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20369,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20369,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20369,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20369,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20369,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20369,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20369,],
-["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20369,],
-["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20369,],
-["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20369,],
-["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20369,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20369,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20369,],
-["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20369,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20445,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20445,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20445,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20445,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20445,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20445,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20445,],
+["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20445,],
+["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20445,],
+["libraries.designsystem.theme.components_AllIcons_Icons_en","",0,],
+["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20445,],
+["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20445,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20445,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20445,],
+["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20445,],
 ["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",20369,],
+["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20445,],
 ["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",20369,],
+["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20445,],
 ["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",20369,],
+["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20445,],
 ["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",20369,],
+["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20445,],
 ["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",20369,],
+["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20445,],
 ["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,],
@@ -83,19 +84,19 @@ 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_AttachmentsView_0_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_6_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20369,],
-["features.messages.impl.attachments.preview_AttachmentsView_8_en","",20369,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en","",20445,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en","",20445,],
 ["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",20369,],
+["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20445,],
 ["libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en","",0,],
 ["libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Day_0_en","libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Night_0_en",0,],
 ["libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Day_1_en","libraries.designsystem.components.avatar_AvatarRowLastOnTopRtl_Night_1_en",0,],
@@ -117,272 +118,167 @@ export const screenshots = [
 ["libraries.designsystem.components.avatar_AvatarRow_Day_2_en","libraries.designsystem.components.avatar_AvatarRow_Night_2_en",0,],
 ["libraries.designsystem.components.avatar_AvatarRow_Day_3_en","libraries.designsystem.components.avatar_AvatarRow_Night_3_en",0,],
 ["libraries.designsystem.components.avatar_AvatarRow_Day_4_en","libraries.designsystem.components.avatar_AvatarRow_Night_4_en",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_0_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_100_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_101_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_102_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_103_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_104_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_105_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_106_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_107_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_108_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_109_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_10_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_110_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_111_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_112_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_113_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_114_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_115_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_116_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_117_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_118_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_119_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_11_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_12_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_13_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_14_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_15_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_16_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_17_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_18_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_19_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_1_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_20_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_21_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_22_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_23_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_24_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_25_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_26_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_27_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_28_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_29_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_2_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_30_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_31_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_32_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_33_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_34_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_35_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_36_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_37_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_38_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_39_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_3_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_40_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_41_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_42_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_43_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_44_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_45_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_46_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_47_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_48_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_49_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_4_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_50_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_51_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_52_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_53_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_54_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_55_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_56_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_57_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_58_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_59_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_5_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_60_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_61_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_62_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_63_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_64_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_65_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_66_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_67_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_68_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_69_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_6_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_70_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_71_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_72_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_73_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_74_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_75_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_76_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_77_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_78_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_79_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_7_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_80_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_81_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_82_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_83_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_84_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_85_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_86_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_87_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_88_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_89_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_8_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_90_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_91_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_92_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_93_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_94_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_95_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_96_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_97_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_98_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_99_en","",0,],
-["libraries.designsystem.components.avatar_Avatar_Avatars_9_en","",0,],
+["libraries.designsystem.components.avatar_Avatar_Avatars_en","",0,],
 ["libraries.designsystem.components.button_BackButton_Buttons_en","",0,],
 ["libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Night_0_en",0,],
-["libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_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",20369,],
+["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20445,],
 ["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",20369,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20369,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20369,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20369,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20369,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20369,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20369,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20445,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20445,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20445,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20445,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20445,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20445,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20445,],
 ["libraries.designsystem.theme.components_BottomSheetDragHandle_Day_0_en","libraries.designsystem.theme.components_BottomSheetDragHandle_Night_0_en",0,],
-["features.rageshake.impl.bugreport_BugReportView_Day_0_en","features.rageshake.impl.bugreport_BugReportView_Night_0_en",20369,],
-["features.rageshake.impl.bugreport_BugReportView_Day_1_en","features.rageshake.impl.bugreport_BugReportView_Night_1_en",20369,],
-["features.rageshake.impl.bugreport_BugReportView_Day_2_en","features.rageshake.impl.bugreport_BugReportView_Night_2_en",20369,],
-["features.rageshake.impl.bugreport_BugReportView_Day_3_en","features.rageshake.impl.bugreport_BugReportView_Night_3_en",20369,],
-["features.rageshake.impl.bugreport_BugReportView_Day_4_en","features.rageshake.impl.bugreport_BugReportView_Night_4_en",20369,],
+["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20445,],
+["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20445,],
+["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20445,],
+["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20445,],
+["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20445,],
+["features.rageshake.impl.bugreport_BugReportViewNight_0_en","",0,],
+["features.rageshake.impl.bugreport_BugReportViewNight_1_en","",0,],
+["features.rageshake.impl.bugreport_BugReportViewNight_2_en","",0,],
+["features.rageshake.impl.bugreport_BugReportViewNight_3_en","",0,],
+["features.rageshake.impl.bugreport_BugReportViewNight_4_en","",0,],
 ["libraries.designsystem.atomic.molecules_ButtonColumnMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ButtonColumnMolecule_Night_0_en",0,],
 ["libraries.designsystem.atomic.molecules_ButtonRowMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ButtonRowMolecule_Night_0_en",0,],
 ["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",20369,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20369,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20445,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20445,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_4_en","features.messages.impl.timeline.components_CallMenuItem_Night_4_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_5_en","features.messages.impl.timeline.components_CallMenuItem_Night_5_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",20369,],
-["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20369,],
-["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20369,],
-["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20369,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20369,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_0_en","features.changeroommemberroles.impl_ChangeRolesView_Night_0_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_10_en","features.changeroommemberroles.impl_ChangeRolesView_Night_10_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_11_en","features.changeroommemberroles.impl_ChangeRolesView_Night_11_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_12_en","features.changeroommemberroles.impl_ChangeRolesView_Night_12_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_1_en","features.changeroommemberroles.impl_ChangeRolesView_Night_1_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_2_en","features.changeroommemberroles.impl_ChangeRolesView_Night_2_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_3_en","features.changeroommemberroles.impl_ChangeRolesView_Night_3_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_4_en","features.changeroommemberroles.impl_ChangeRolesView_Night_4_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_5_en","features.changeroommemberroles.impl_ChangeRolesView_Night_5_en",0,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_6_en","features.changeroommemberroles.impl_ChangeRolesView_Night_6_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_7_en","features.changeroommemberroles.impl_ChangeRolesView_Night_7_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_8_en","features.changeroommemberroles.impl_ChangeRolesView_Night_8_en",20369,],
-["features.changeroommemberroles.impl_ChangeRolesView_Day_9_en","features.changeroommemberroles.impl_ChangeRolesView_Night_9_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_0_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_1_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_2_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_3_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_4_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_5_en",20369,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_6_en",20369,],
+["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20445,],
+["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20445,],
+["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20445,],
+["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20445,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20445,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20445,],
+["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",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20445,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en",20445,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en",0,],
 ["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",20369,],
-["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20369,],
-["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20369,],
-["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20369,],
+["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20445,],
+["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20445,],
+["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20445,],
+["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20445,],
+["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20445,],
 ["libraries.matrix.ui.components_CheckableResolvedUserRow_en","",0,],
-["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20369,],
+["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20445,],
 ["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",20369,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20369,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20369,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20369,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20369,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20369,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20369,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20445,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20445,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20445,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20445,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20445,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20445,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20445,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20445,],
 ["libraries.designsystem.theme.components_CircularProgressIndicator_Progress_Indicators_en","",0,],
 ["libraries.designsystem.components_ClickableLinkText_Text_en","",0,],
 ["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",20369,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20369,],
-["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20369,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en",20445,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en",20445,],
+["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20445,],
 ["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","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20369,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20369,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20369,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20369,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20369,],
-["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20369,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20445,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20445,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20445,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20445,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20445,],
+["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20445,],
 ["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_ConnectivityIndicatorView_Day_0_en","features.networkmonitor.api.ui_ConnectivityIndicatorView_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",20369,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20369,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20369,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20369,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20369,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20369,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20369,],
-["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20369,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20369,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20369,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20369,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20369,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20369,],
+["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20445,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20445,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20445,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20445,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20445,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20445,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20445,],
+["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20445,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20445,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20445,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20445,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20445,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20445,],
 ["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","",20369,],
-["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20369,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20369,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20369,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20369,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20369,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20369,],
+["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20445,],
+["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20445,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20445,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20445,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20445,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20445,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20445,],
 ["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",20369,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20369,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20369,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20445,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20445,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20445,],
 ["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",20369,],
-["features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_en","features.home.impl.components_DefaultRoomListTopBarMultiAccount_Night_0_en",20369,],
-["features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_en","features.home.impl.components_DefaultRoomListTopBarWithIndicator_Night_0_en",20369,],
-["features.home.impl.components_DefaultRoomListTopBar_Day_0_en","features.home.impl.components_DefaultRoomListTopBar_Night_0_en",20369,],
+["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20445,],
 ["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",20369,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20369,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20369,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20369,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20369,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20369,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20369,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20445,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20445,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20445,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20445,],
+["features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en","features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en",20445,],
+["features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en","features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en",20445,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20445,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20445,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20445,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_3_en","features.preferences.impl.developer_DeveloperSettingsView_Night_3_en",20445,],
 ["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,],
@@ -397,18 +293,19 @@ export const screenshots = [
 ["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",20369,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20369,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20369,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20369,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20369,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en",20369,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en",20369,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en",20369,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en",20369,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en",20369,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20369,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20369,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20445,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20445,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20445,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20445,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20445,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en",20445,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en",20445,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en",20445,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en",20445,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en",20445,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20445,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20445,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en",20445,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_0_en","libraries.matrix.ui.components_EditableAvatarView_Night_0_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_1_en","libraries.matrix.ui.components_EditableAvatarView_Night_1_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_2_en","libraries.matrix.ui.components_EditableAvatarView_Night_2_en",0,],
@@ -419,14 +316,28 @@ export const screenshots = [
 ["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",20369,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20369,],
+["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en",20445,],
+["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20445,],
 ["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.ui.common.nodes_EmptyView_Day_0_en","libraries.ui.common.nodes_EmptyView_Night_0_en",0,],
-["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20369,],
-["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20369,],
-["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20369,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en",20445,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en",20445,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en",20445,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en",20445,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en",20445,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en",20445,],
+["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20445,],
+["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20445,],
+["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_0_en","features.linknewdevice.impl.screens.error_ErrorView_Night_0_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_1_en","features.linknewdevice.impl.screens.error_ErrorView_Night_1_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_2_en","features.linknewdevice.impl.screens.error_ErrorView_Night_2_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_3_en","features.linknewdevice.impl.screens.error_ErrorView_Night_3_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_4_en","features.linknewdevice.impl.screens.error_ErrorView_Night_4_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_5_en","features.linknewdevice.impl.screens.error_ErrorView_Night_5_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_6_en","features.linknewdevice.impl.screens.error_ErrorView_Night_6_en",20445,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_7_en","features.linknewdevice.impl.screens.error_ErrorView_Night_7_en",20445,],
 ["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,],
@@ -445,41 +356,44 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_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",20369,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20369,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20369,],
-["features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en","features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en",0,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20445,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20445,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20445,],
 ["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.messages.impl.forward_ForwardMessagesView_Day_0_en","features.messages.impl.forward_ForwardMessagesView_Night_0_en",0,],
-["features.messages.impl.forward_ForwardMessagesView_Day_1_en","features.messages.impl.forward_ForwardMessagesView_Night_1_en",0,],
-["features.messages.impl.forward_ForwardMessagesView_Day_2_en","features.messages.impl.forward_ForwardMessagesView_Night_2_en",0,],
-["features.messages.impl.forward_ForwardMessagesView_Day_3_en","features.messages.impl.forward_ForwardMessagesView_Night_3_en",20369,],
-["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20369,],
+["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",20445,],
+["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20445,],
 ["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",20369,],
-["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20369,],
+["features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_en","features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Night_0_en",20445,],
+["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20445,],
+["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20445,],
+["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20445,],
+["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20445,],
+["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20445,],
 ["features.home.impl_HomeViewA11y_en","",0,],
-["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20369,],
-["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20369,],
+["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20445,],
+["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20445,],
 ["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",20369,],
-["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20369,],
-["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20369,],
-["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20369,],
-["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20369,],
-["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20369,],
-["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20369,],
-["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20369,],
-["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20369,],
-["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20369,],
-["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20369,],
-["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20369,],
+["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20445,],
+["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20445,],
+["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20445,],
+["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20445,],
+["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20445,],
+["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20445,],
+["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20445,],
+["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20445,],
+["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20445,],
+["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20445,],
+["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20445,],
+["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20445,],
 ["libraries.designsystem.theme.components_HorizontalDivider_Dividers_en","",0,],
 ["libraries.designsystem.ruler_HorizontalRuler_Day_0_en","libraries.designsystem.ruler_HorizontalRuler_Night_0_en",0,],
 ["libraries.designsystem.theme.components_IconButton_Buttons_en","",0,],
@@ -490,16 +404,10 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_IconToggleButton_Toggles_en","",0,],
 ["appicon.element_Icon_en","",0,],
 ["appicon.enterprise_Icon_en","",0,],
-["libraries.designsystem.icons_IconsCompound_Day_0_en","libraries.designsystem.icons_IconsCompound_Night_0_en",0,],
-["libraries.designsystem.icons_IconsCompound_Day_1_en","libraries.designsystem.icons_IconsCompound_Night_1_en",0,],
-["libraries.designsystem.icons_IconsCompound_Day_2_en","libraries.designsystem.icons_IconsCompound_Night_2_en",0,],
-["libraries.designsystem.icons_IconsCompound_Day_3_en","libraries.designsystem.icons_IconsCompound_Night_3_en",0,],
-["libraries.designsystem.icons_IconsCompound_Day_4_en","libraries.designsystem.icons_IconsCompound_Night_4_en",0,],
-["libraries.designsystem.icons_IconsCompound_Day_5_en","libraries.designsystem.icons_IconsCompound_Night_5_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",20369,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20369,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20445,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20445,],
 ["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,],
@@ -507,110 +415,115 @@ 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",20369,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20445,],
 ["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",20369,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20445,],
 ["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",20369,],
+["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20445,],
 ["features.verifysession.impl.incoming_IncomingVerificationViewA11y_en","",0,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20369,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20369,],
-["features.networkmonitor.api.ui_Indicator_Day_0_en","features.networkmonitor.api.ui_Indicator_Night_0_en",0,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20445,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20445,],
 ["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,],
 ["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",20369,],
-["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20369,],
-["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20369,],
+["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20445,],
+["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20445,],
+["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20445,],
 ["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",20369,],
-["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20369,],
-["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20369,],
-["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20369,],
+["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20445,],
+["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20445,],
+["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20445,],
+["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20445,],
 ["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",20369,],
-["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20369,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20369,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20369,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20369,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20369,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20369,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20369,],
+["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20445,],
+["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20445,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20445,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20445,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20445,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20445,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20445,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20445,],
 ["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",20369,],
-["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20369,],
-["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20369,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20369,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20369,],
+["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20445,],
+["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20445,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20445,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20445,],
 ["libraries.designsystem.components_LabelledCheckbox_Toggles_en","",0,],
-["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20369,],
-["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20369,],
+["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20445,],
+["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20445,],
 ["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",20369,],
-["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20369,],
-["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20369,],
-["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20369,],
-["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20369,],
-["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20369,],
-["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20369,],
-["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20369,],
+["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20445,],
+["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20445,],
+["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20445,],
+["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20445,],
+["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20445,],
+["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20445,],
+["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20445,],
+["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20445,],
 ["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",20445,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en",0,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_2_en",20445,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en",20445,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en",0,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en",20445,],
 ["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",20369,],
+["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20445,],
 ["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,],
@@ -665,37 +578,38 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en","",0,],
 ["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",20369,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20369,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20369,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20369,],
+["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20445,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20445,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20445,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20445,],
 ["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",20369,],
-["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20369,],
-["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20369,],
-["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20369,],
-["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20369,],
-["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20369,],
-["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20369,],
-["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20369,],
-["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20369,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20369,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20369,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20369,],
-["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20369,],
-["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20369,],
-["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20369,],
-["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20369,],
-["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20369,],
-["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20369,],
-["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20369,],
-["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20369,],
-["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20369,],
-["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20369,],
-["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20369,],
-["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20369,],
+["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20445,],
+["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20445,],
+["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20445,],
+["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20445,],
+["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20445,],
+["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20445,],
+["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20445,],
+["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20445,],
+["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20445,],
+["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20445,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20445,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20445,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20445,],
+["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20445,],
+["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20445,],
+["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20445,],
+["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20445,],
+["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20445,],
+["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20445,],
+["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20445,],
+["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20445,],
+["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20445,],
+["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20445,],
+["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20445,],
+["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20445,],
 ["libraries.designsystem.components.button_MainActionButton_Buttons_en","",0,],
-["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20369,],
+["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20445,],
 ["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,],
@@ -708,22 +622,22 @@ export const screenshots = [
 ["libraries.matrix.ui.components_MatrixUserRow_Day_1_en","libraries.matrix.ui.components_MatrixUserRow_Night_1_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",20369,],
-["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20369,],
+["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20445,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20445,],
 ["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",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20369,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20369,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20445,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20445,],
 ["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,],
@@ -731,14 +645,14 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en","libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_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","",20369,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20369,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20445,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20445,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_13_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20369,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20445,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_15_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_16_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_1_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20369,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20445,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_3_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_4_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_5_en","",0,],
@@ -752,7 +666,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",20369,],
+["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20445,],
 ["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,],
@@ -761,7 +675,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",20369,],
+["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20445,],
 ["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,],
@@ -769,138 +683,142 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_1_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_1_en",0,],
 ["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.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20369,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20369,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20369,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20369,],
-["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20369,],
-["features.messages.impl_MessagesView_Day_10_en","features.messages.impl_MessagesView_Night_10_en",20369,],
-["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20369,],
-["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20369,],
-["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20369,],
-["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20369,],
-["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20369,],
-["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20369,],
-["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20369,],
-["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20369,],
-["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20369,],
+["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20445,],
+["features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_en","features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Night_0_en",20445,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20445,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20445,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20445,],
+["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20445,],
+["features.messages.impl_MessagesView_Day_10_en","features.messages.impl_MessagesView_Night_10_en",20445,],
+["features.messages.impl_MessagesView_Day_11_en","features.messages.impl_MessagesView_Night_11_en",20445,],
+["features.messages.impl_MessagesView_Day_12_en","features.messages.impl_MessagesView_Night_12_en",20445,],
+["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20445,],
+["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20445,],
+["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20445,],
+["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20445,],
+["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20445,],
+["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20445,],
+["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20445,],
+["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20445,],
+["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20445,],
 ["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",20369,],
+["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20445,],
 ["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",20369,],
+["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",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20369,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20369,],
-["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20369,],
+["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20445,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20445,],
+["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20445,],
+["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",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20369,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20369,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20445,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20445,],
 ["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",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20369,],
+["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20445,],
 ["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",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20369,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20369,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20445,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20445,],
 ["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",20369,],
-["features.changeroommemberroles.impl_PendingMemberRowWithLongName_Day_0_en","features.changeroommemberroles.impl_PendingMemberRowWithLongName_Night_0_en",20369,],
-["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20369,],
-["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20369,],
-["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20369,],
-["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20369,],
+["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20445,],
+["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",0,],
+["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20445,],
+["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20445,],
+["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20445,],
+["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20445,],
 ["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",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20369,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20369,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20445,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20445,],
 ["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",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20369,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20369,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20369,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20369,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20369,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20369,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20445,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20445,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20445,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20445,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20445,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20445,],
 ["libraries.designsystem.atomic.atoms_PlaceholderAtom_Day_0_en","libraries.designsystem.atomic.atoms_PlaceholderAtom_Night_0_en",0,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20369,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20445,],
 ["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",20369,],
-["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20369,],
-["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20369,],
-["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20369,],
-["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20369,],
-["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20369,],
-["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20369,],
-["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20369,],
+["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20445,],
+["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20445,],
+["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20445,],
+["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20445,],
+["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20445,],
+["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20445,],
+["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20445,],
 ["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,],
@@ -914,208 +832,207 @@ 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","",20369,],
-["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20369,],
-["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20369,],
-["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20369,],
+["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20445,],
+["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20445,],
+["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20445,],
+["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20445,],
 ["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","",20369,],
-["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20369,],
+["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20445,],
+["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20369,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20369,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20369,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20369,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20369,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20369,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20369,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20369,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20369,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20369,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20369,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20369,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20369,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20369,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20369,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20369,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20369,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20369,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20369,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20369,],
+["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20445,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20445,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20445,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20445,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20445,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20445,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20445,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20445,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20445,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20445,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20445,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20445,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20445,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20445,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20445,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20445,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20445,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20445,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20445,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20445,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20445,],
+["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",20369,],
-["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20369,],
+["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20445,],
+["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20369,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20369,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20369,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20369,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20369,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20369,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20445,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20445,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20445,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20445,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20445,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20445,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20445,],
 ["libraries.designsystem.atomic.atoms_RedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_RedIndicatorAtom_Night_0_en",0,],
 ["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",20369,],
-["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20369,],
-["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20369,],
-["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20369,],
-["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20369,],
-["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20369,],
-["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20369,],
-["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20369,],
-["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20369,],
-["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20369,],
-["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20369,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20369,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20369,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20369,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20369,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20369,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20369,],
+["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20445,],
+["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20445,],
+["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20445,],
+["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20445,],
+["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20445,],
+["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20445,],
+["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20445,],
+["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20445,],
+["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20445,],
+["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20445,],
+["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20445,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20445,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20445,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20445,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20445,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20445,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20445,],
 ["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",20369,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20369,],
-["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20369,],
-["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_0_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_1_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_2_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_3_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_4_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_5_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_6_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_7_en",20369,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_8_en",20369,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20445,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20445,],
+["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20445,],
+["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20445,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20445,],
 ["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",20369,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20369,],
-["features.roomdetails.impl_RoomDetailsDark_0_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_10_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_11_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_12_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_13_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_14_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_15_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_16_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_17_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_18_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_19_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_1_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_2_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_3_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_4_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_5_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_6_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_7_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_8_en","",20369,],
-["features.roomdetails.impl_RoomDetailsDark_9_en","",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20369,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20369,],
-["features.roomdetails.impl_RoomDetails_0_en","",20369,],
-["features.roomdetails.impl_RoomDetails_10_en","",20369,],
-["features.roomdetails.impl_RoomDetails_11_en","",20369,],
-["features.roomdetails.impl_RoomDetails_12_en","",20369,],
-["features.roomdetails.impl_RoomDetails_13_en","",20369,],
-["features.roomdetails.impl_RoomDetails_14_en","",20369,],
-["features.roomdetails.impl_RoomDetails_15_en","",20369,],
-["features.roomdetails.impl_RoomDetails_16_en","",20369,],
-["features.roomdetails.impl_RoomDetails_17_en","",20369,],
-["features.roomdetails.impl_RoomDetails_18_en","",20369,],
-["features.roomdetails.impl_RoomDetails_19_en","",20369,],
-["features.roomdetails.impl_RoomDetails_1_en","",20369,],
-["features.roomdetails.impl_RoomDetails_2_en","",20369,],
-["features.roomdetails.impl_RoomDetails_3_en","",20369,],
-["features.roomdetails.impl_RoomDetails_4_en","",20369,],
-["features.roomdetails.impl_RoomDetails_5_en","",20369,],
-["features.roomdetails.impl_RoomDetails_6_en","",20369,],
-["features.roomdetails.impl_RoomDetails_7_en","",20369,],
-["features.roomdetails.impl_RoomDetails_8_en","",20369,],
-["features.roomdetails.impl_RoomDetails_9_en","",20369,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20369,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20369,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20369,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20369,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20369,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20369,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20369,],
-["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20369,],
-["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20369,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20445,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20445,],
+["features.roomdetails.impl_RoomDetailsDark_0_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_10_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_11_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_12_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_13_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_14_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_15_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_16_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_17_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_18_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_19_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_1_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_2_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_3_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_4_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_5_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_6_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_7_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_8_en","",20445,],
+["features.roomdetails.impl_RoomDetailsDark_9_en","",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_0_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_1_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_2_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_3_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_4_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_5_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_6_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_7_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_8_en",20445,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_9_en",20445,],
+["features.roomdetails.impl_RoomDetails_0_en","",20445,],
+["features.roomdetails.impl_RoomDetails_10_en","",20445,],
+["features.roomdetails.impl_RoomDetails_11_en","",20445,],
+["features.roomdetails.impl_RoomDetails_12_en","",20445,],
+["features.roomdetails.impl_RoomDetails_13_en","",20445,],
+["features.roomdetails.impl_RoomDetails_14_en","",20445,],
+["features.roomdetails.impl_RoomDetails_15_en","",20445,],
+["features.roomdetails.impl_RoomDetails_16_en","",20445,],
+["features.roomdetails.impl_RoomDetails_17_en","",20445,],
+["features.roomdetails.impl_RoomDetails_18_en","",20445,],
+["features.roomdetails.impl_RoomDetails_19_en","",20445,],
+["features.roomdetails.impl_RoomDetails_1_en","",20445,],
+["features.roomdetails.impl_RoomDetails_2_en","",20445,],
+["features.roomdetails.impl_RoomDetails_3_en","",20445,],
+["features.roomdetails.impl_RoomDetails_4_en","",20445,],
+["features.roomdetails.impl_RoomDetails_5_en","",20445,],
+["features.roomdetails.impl_RoomDetails_6_en","",20445,],
+["features.roomdetails.impl_RoomDetails_7_en","",20445,],
+["features.roomdetails.impl_RoomDetails_8_en","",20445,],
+["features.roomdetails.impl_RoomDetails_9_en","",20445,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20445,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20445,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20445,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20445,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20445,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20445,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20445,],
+["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20445,],
+["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20445,],
 ["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",20369,],
-["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20369,],
-["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20369,],
-["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20369,],
-["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20369,],
-["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20369,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20369,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20369,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20369,],
+["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20445,],
+["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20445,],
+["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20445,],
+["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20445,],
+["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20445,],
+["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20445,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20445,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20445,],
+["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20445,],
 ["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",20369,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",0,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_7_en","features.roomdetails.impl.members_RoomMemberListView_Night_7_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_8_en","features.roomdetails.impl.members_RoomMemberListView_Night_8_en",20369,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_9_en","features.roomdetails.impl.members_RoomMemberListView_Night_9_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20369,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20369,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20369,],
-["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20369,],
-["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20369,],
-["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20369,],
-["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20369,],
-["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20369,],
-["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20369,],
+["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20445,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20445,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20445,],
+["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",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20445,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20445,],
+["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20445,],
+["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20445,],
+["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20445,],
+["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20445,],
+["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20445,],
+["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20445,],
 ["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,],
@@ -1138,14 +1055,16 @@ 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",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20369,],
-["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20369,],
+["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20445,],
+["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20445,],
+["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",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,],
@@ -1153,80 +1072,109 @@ 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",20369,],
-["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20369,],
-["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20369,],
+["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20445,],
+["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20445,],
+["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20445,],
 ["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",20369,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20369,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20369,],
+["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20445,],
+["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20445,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_0_en",20445,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_1_en",20445,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_2_en",20445,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_3_en",20445,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20445,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20445,],
 ["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","",20369,],
+["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20445,],
 ["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,],
-["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20369,],
-["features.startchat.impl.components_SearchSingleUserResultItem_en","",20369,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20369,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20369,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20369,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20369,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20369,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20369,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20369,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20369,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20369,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20369,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en","",20369,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en","",20369,],
+["libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en","",0,],
+["libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en","",0,],
+["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20445,],
+["features.startchat.impl.components_SearchSingleUserResultItem_en","",20445,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20445,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20445,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20445,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20445,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20445,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20445,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20445,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20445,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20445,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20445,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en","",20445,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en","",20445,],
 ["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,],
@@ -1240,11 +1188,11 @@ 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_SendButton_Day_0_en","libraries.textcomposer.components_SendButton_Night_0_en",0,],
-["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20369,],
-["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20369,],
-["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20369,],
-["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20369,],
-["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20369,],
+["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20445,],
+["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20445,],
+["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20445,],
+["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20445,],
+["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20445,],
 ["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,],
@@ -1254,27 +1202,29 @@ 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",20369,],
-["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20369,],
-["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20369,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20369,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20369,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20369,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20369,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20369,],
+["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20445,],
+["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20445,],
+["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20445,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20445,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20445,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20445,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20445,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20445,],
 ["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",20369,],
-["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20369,],
-["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20369,],
-["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20369,],
+["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20445,],
+["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20445,],
+["features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en","features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en",20445,],
+["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20445,],
+["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,],
 ["libraries.designsystem.components.list_SingleSelectionListItemCustomFormattert_Single_selection_List_item_-_custom_formatter_List_items_en","",0,],
@@ -1283,97 +1233,102 @@ export const screenshots = [
 ["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.designsystem.theme.components_Sliders_Sliders_en","",0,],
-["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20369,],
+["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20445,],
 ["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",20369,],
+["features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en","features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en",20445,],
 ["libraries.designsystem.components.avatar.internal_SpaceAvatar_Avatars_en","",0,],
-["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20369,],
-["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20369,],
-["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20369,],
+["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20445,],
+["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20445,],
+["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20445,],
 ["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",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20369,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20369,],
-["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20369,],
-["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20369,],
-["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20369,],
-["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20369,],
-["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20369,],
-["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20369,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20445,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20445,],
+["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20445,],
+["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20445,],
+["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20445,],
+["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20445,],
+["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20445,],
+["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20445,],
+["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20445,],
+["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20445,],
+["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20445,],
+["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20445,],
 ["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",20369,],
-["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20369,],
-["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20369,],
-["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20369,],
-["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20369,],
-["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20369,],
-["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20369,],
+["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20445,],
+["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20445,],
+["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20445,],
+["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20445,],
+["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20445,],
+["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20445,],
+["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20445,],
 ["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",20369,],
+["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20445,],
 ["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",20369,],
+["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20445,],
 ["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",20369,],
-["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20369,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20369,],
-["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20369,],
-["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20369,],
-["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20369,],
+["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20445,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20445,],
+["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20445,],
+["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20445,],
+["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20445,],
 ["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",20369,],
-["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20369,],
+["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20445,],
+["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20445,],
 ["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,16 +1340,16 @@ 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",20369,],
-["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20369,],
-["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20369,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20369,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20369,],
+["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20445,],
+["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20445,],
+["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20445,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20445,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20369,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20445,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20445,],
 ["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,],
@@ -1404,18 +1359,18 @@ export const screenshots = [
 ["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",20369,],
+["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20369,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20445,],
 ["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,],
@@ -1423,18 +1378,18 @@ export const screenshots = [
 ["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",20369,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20369,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20445,],
 ["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,],
@@ -1443,41 +1398,41 @@ export const screenshots = [
 ["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_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",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20445,],
 ["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_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",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20445,],
 ["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",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20445,],
 ["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","",20369,],
+["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20369,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20445,],
 ["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",20369,],
+["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20369,],
-["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20369,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20369,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20445,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20445,],
 ["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",20369,],
+["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20445,],
 ["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,8 +1441,8 @@ 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",20369,],
-["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20369,],
+["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20445,],
+["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20445,],
 ["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.event_TimelineItemStickerView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_0_en",0,],
@@ -1502,8 +1457,8 @@ 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",20369,],
-["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20369,],
+["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20445,],
+["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20445,],
 ["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,],
@@ -1526,85 +1481,85 @@ export const screenshots = [
 ["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",20369,],
-["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20369,],
+["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20445,],
 ["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",20369,],
-["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20369,],
-["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20369,],
-["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20369,],
-["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20369,],
-["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20369,],
-["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20369,],
-["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20369,],
+["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20445,],
+["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20445,],
 ["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",20369,],
+["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20445,],
 ["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",20369,],
+["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20445,],
 ["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",20369,],
+["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20445,],
 ["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",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20369,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20369,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20445,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20445,],
 ["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",20369,],
-["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20369,],
-["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20369,],
-["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20369,],
-["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20369,],
-["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20369,],
+["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20445,],
+["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20445,],
+["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20445,],
+["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20445,],
+["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20445,],
+["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20445,],
 ["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","",20369,],
+["libraries.matrix.ui.components_UnresolvedUserRow_en","",20445,],
 ["libraries.matrix.ui.components_UnsavedAvatar_Day_0_en","libraries.matrix.ui.components_UnsavedAvatar_Night_0_en",0,],
 ["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",20369,],
-["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20369,],
-["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20369,],
-["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20369,],
+["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20445,],
+["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20445,],
+["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20445,],
+["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20445,],
 ["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",20369,],
+["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20445,],
 ["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",20369,],
+["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20445,],
 ["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",20369,],
-["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20369,],
-["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20369,],
+["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20445,],
+["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20445,],
+["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20445,],
 ["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.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20369,],
-["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20369,],
+["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20445,],
+["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20445,],
 ["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",20369,],
+["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20445,],
 ["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,],
@@ -1619,9 +1574,9 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_2_en","libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_2_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_3_en","libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_3_en",0,],
 ["libraries.textcomposer.components_VoiceMessageDeleteButton_Day_0_en","libraries.textcomposer.components_VoiceMessageDeleteButton_Night_0_en",0,],
+["libraries.textcomposer.components_VoiceMessagePreview_Day_0_en","libraries.textcomposer.components_VoiceMessagePreview_Night_0_en",0,],
 ["libraries.textcomposer.components_VoiceMessageRecorderButton_Day_0_en","libraries.textcomposer.components_VoiceMessageRecorderButton_Night_0_en",0,],
 ["libraries.textcomposer.components_VoiceMessageRecording_Day_0_en","libraries.textcomposer.components_VoiceMessageRecording_Night_0_en",0,],
-["libraries.textcomposer.components_VoiceMessage_Day_0_en","libraries.textcomposer.components_VoiceMessage_Night_0_en",0,],
 ["libraries.designsystem.components.media_WaveformPlaybackView_Day_0_en","libraries.designsystem.components.media_WaveformPlaybackView_Night_0_en",0,],
 ["libraries.designsystem.ruler_WithRulers_Day_0_en","libraries.designsystem.ruler_WithRulers_Night_0_en",0,],
 ];
diff --git a/screenshots/html/screenshots.css b/screenshots/html/screenshots.css
index 72e17f2e46..5d91c44352 100644
--- a/screenshots/html/screenshots.css
+++ b/screenshots/html/screenshots.css
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 html {
diff --git a/screenshots/html/script.js b/screenshots/html/script.js
index 95ce39b183..e581aa812b 100644
--- a/screenshots/html/script.js
+++ b/screenshots/html/script.js
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 import { screenshots } from './data.js';
diff --git a/screenshots/index.html b/screenshots/index.html
index 8bd61a6570..1a4d55528c 100644
--- a/screenshots/index.html
+++ b/screenshots/index.html
@@ -1,7 +1,8 @@
 <!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023-2024 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <!DOCTYPE html>
diff --git a/services/analytics/api/build.gradle.kts b/services/analytics/api/build.gradle.kts
index 676d27d339..1e1f0710f1 100644
--- a/services/analytics/api/build.gradle.kts
+++ b/services/analytics/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
new file mode 100644
index 0000000000..b318807a45
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsLongRunningTransaction.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.services.analytics.api
+
+sealed class AnalyticsLongRunningTransaction(
+    val name: String,
+    val operation: String?,
+) {
+    data object ColdStartUntilCachedRoomList : AnalyticsLongRunningTransaction("Cold start until cached room list is displayed", null)
+    data object FirstRoomsDisplayed : AnalyticsLongRunningTransaction("First rooms displayed after login or restoration", null)
+    data object ResumeAppUntilNewRoomsReceived : AnalyticsLongRunningTransaction("App was resumed and new room list items arrived", null)
+    data object NotificationTapOpensTimeline : AnalyticsLongRunningTransaction("A notification was tapped and it opened a timeline", null)
+    data object OpenRoom : AnalyticsLongRunningTransaction("Open a room and see loaded items in the timeline", null)
+    data object LoadJoinedRoomFlow : AnalyticsLongRunningTransaction("Load joined room UI", "ui.load")
+    data object LoadMessagesUi : AnalyticsLongRunningTransaction("Load messages UI", "ui.load")
+    data object DisplayFirstTimelineItems : AnalyticsLongRunningTransaction("Get and display first timeline items", null)
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkManager.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkManager.kt
new file mode 100644
index 0000000000..bf5e04509c
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkManager.kt
@@ -0,0 +1,28 @@
+/*
+ * 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.services.analytics.api
+
+/**
+ * Manager to handle SDK analytics (e.g., Sentry).
+ */
+interface AnalyticsSdkManager {
+    /**
+     * Enable or disable SDK analytics.
+     */
+    fun enableSdkAnalytics(enabled: Boolean)
+
+    /**
+     * Start a new span with the given [name], using [parentTraceId] to optionally attach it to a parent transaction.
+     */
+    fun startSpan(name: String, parentTraceId: String? = null): AnalyticsSdkSpan
+
+    /**
+     * Create a 'bridge' span optionally linking it to a parent trace via [parentTraceId].
+     */
+    fun bridge(parentTraceId: String? = null): AnalyticsSdkSpan
+}
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
new file mode 100644
index 0000000000..92f79da7f9
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkSpan.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.services.analytics.api
+
+/**
+ * Represents an analytics span in the Rust SDK.
+ */
+interface AnalyticsSdkSpan {
+    /** Enters the span and starts collecting metrics. */
+    fun enter()
+
+    /** Exit the span and stop collecting the metrics. A request should be sent shortly after. */
+    fun exit()
+}
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 589abf28fe..365300d679 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
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.analytics.api
 
 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
 import io.element.android.services.analyticsproviders.api.trackers.ErrorTracker
 import kotlinx.coroutines.flow.Flow
@@ -47,4 +49,76 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
      * Update analyticsId from the AccountData.
      */
     suspend fun setAnalyticsId(analyticsId: String)
+
+    /**
+     * Starts a transaction to measure the performance of an operation.
+     */
+    fun startTransaction(name: String, operation: String? = null): AnalyticsTransaction
+
+    /**
+     * Starts an [AnalyticsLongRunningTransaction], that can be shared with other components.
+     */
+    fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction? = null
+    ): AnalyticsTransaction
+
+    /**
+     * Gets an ongoing [AnalyticsLongRunningTransaction], if it exists.
+     */
+    fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction?
+
+    /**
+     * Removes an ongoing [AnalyticsLongRunningTransaction] so it's no longer shared.
+     */
+    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. */
+    fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan
+}
+
+inline fun <T> AnalyticsService.recordTransaction(
+    name: String,
+    operation: String,
+    parentTransaction: AnalyticsTransaction? = null,
+    block: (AnalyticsTransaction) -> T
+): T {
+    val transaction = parentTransaction?.startChild(name, operation)
+        ?: startTransaction(name, operation)
+    try {
+        val result = block(transaction)
+        return result
+    } finally {
+        transaction.finish()
+    }
+}
+
+/**
+ * Cancels a long running transaction. It behaves the same as [AnalyticsService.removeLongRunningTransaction],
+ * but it doesn't return the transaction so we can't finish it later.
+ */
+fun AnalyticsService.cancelLongRunningTransaction(
+    longRunningTransaction: AnalyticsLongRunningTransaction
+) = removeLongRunningTransaction(longRunningTransaction)
+
+/**
+ * Finishes a long running transaction if it exists. Optionally performs an [action] with the transaction before finishing it.
+ */
+fun AnalyticsService.finishLongRunningTransaction(
+    longRunningTransaction: AnalyticsLongRunningTransaction,
+    action: (AnalyticsTransaction) -> Unit = {},
+) {
+    removeLongRunningTransaction(longRunningTransaction)?.let {
+        action(it)
+        it.finish()
+    }
+}
+
+inline fun <T> AnalyticsService.inBridgeSdkSpan(parentTraceId: String?, block: (AnalyticsSdkSpan) -> T): T {
+    val span = enterSdkSpan(name = null, parentTraceId = parentTraceId)
+    return try {
+        block(span)
+    } finally {
+        span.exit()
+    }
 }
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/NoopAnalyticsSdkSpan.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/NoopAnalyticsSdkSpan.kt
new file mode 100644
index 0000000000..d4db9359e2
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/NoopAnalyticsSdkSpan.kt
@@ -0,0 +1,13 @@
+/*
+ * 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.services.analytics.api
+
+object NoopAnalyticsSdkSpan : AnalyticsSdkSpan {
+    override fun enter() {}
+    override fun exit() {}
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/NoopAnalyticsTransaction.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/NoopAnalyticsTransaction.kt
new file mode 100644
index 0000000000..914fac1b12
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/NoopAnalyticsTransaction.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.services.analytics.api
+
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
+
+object NoopAnalyticsTransaction : AnalyticsTransaction {
+    override fun startChild(operation: String, description: String?): AnalyticsTransaction = NoopAnalyticsTransaction
+    override fun putExtraData(key: String, value: String) {}
+    override fun putIndexableData(key: String, value: String) {}
+    override fun isFinished(): Boolean = true
+    override fun traceId(): String? = null
+    override fun attachError(throwable: Throwable) {}
+    override fun finish() {}
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/ScreenTracker.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/ScreenTracker.kt
index a0987eff17..29513f66ff 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/ScreenTracker.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/ScreenTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..67d3c5498b
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsColdStartWatcher.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.services.analytics.api.watchers
+
+/**
+ * Adds a performance check transaction measuring the time between a cold start (or, after we read the user consent after a cold start)
+ * until the cached room list is displayed. This check only takes place in a cold app start after the user is authenticated.
+ */
+interface AnalyticsColdStartWatcher {
+    fun start()
+    fun whenLoggingIn()
+    fun onRoomListVisible()
+}
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt
new file mode 100644
index 0000000000..2f6d4723a3
--- /dev/null
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/watchers/AnalyticsRoomListStateWatcher.kt
@@ -0,0 +1,17 @@
+/*
+ * 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.services.analytics.api.watchers
+
+/**
+ * This component is used to check how long it takes for the room list to be up to date after opening the app while it's on a 'warm' state:
+ * the app was previously running and we just returned to it.
+ */
+interface AnalyticsRoomListStateWatcher {
+    fun start()
+    fun stop()
+}
diff --git a/services/analytics/compose/build.gradle.kts b/services/analytics/compose/build.gradle.kts
index 4809bbb94b..fd01149dcb 100644
--- a/services/analytics/compose/build.gradle.kts
+++ b/services/analytics/compose/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/analytics/compose/src/main/kotlin/io/element/android/services/analytics/compose/LocalAnalyticsService.kt b/services/analytics/compose/src/main/kotlin/io/element/android/services/analytics/compose/LocalAnalyticsService.kt
index b5c59bac46..0a735869a3 100644
--- a/services/analytics/compose/src/main/kotlin/io/element/android/services/analytics/compose/LocalAnalyticsService.kt
+++ b/services/analytics/compose/src/main/kotlin/io/element/android/services/analytics/compose/LocalAnalyticsService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analytics/impl/build.gradle.kts b/services/analytics/impl/build.gradle.kts
index 83eebead5d..6ba2963853 100644
--- a/services/analytics/impl/build.gradle.kts
+++ b/services/analytics/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -24,14 +25,20 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.sessionStorage.api)
+    implementation(projects.services.appnavstate.api)
 
     api(projects.services.analyticsproviders.api)
     api(projects.services.analytics.api)
     implementation(libs.androidx.datastore.preferences)
 
     testCommonDependencies(libs)
+    testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.analyticsproviders.test)
+    testImplementation(projects.services.appnavstate.test)
+    testImplementation(projects.services.toolbox.test)
 }
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
index 04f0f6867a..5db1eb1b31 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.services.analytics.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import dev.zacsweers.metro.binding
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
@@ -17,32 +17,37 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.api.observer.SessionListener
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsSdkManager
+import io.element.android.services.analytics.api.AnalyticsSdkSpan
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.NoopAnalyticsSdkSpan
+import io.element.android.services.analytics.api.NoopAnalyticsTransaction
 import io.element.android.services.analytics.impl.log.analyticsTag
 import io.element.android.services.analytics.impl.store.AnalyticsStore
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class, binding = binding<AnalyticsService>())
-@Inject
 class DefaultAnalyticsService(
     private val analyticsProviders: Set<@JvmSuppressWildcards AnalyticsProvider>,
     private val analyticsStore: AnalyticsStore,
-//    private val lateInitUserPropertiesFactory: LateInitUserPropertiesFactory,
-    @AppCoroutineScope
-    private val coroutineScope: CoroutineScope,
+    @AppCoroutineScope private val coroutineScope: CoroutineScope,
     private val sessionObserver: SessionObserver,
-    private val sessionStore: SessionStore,
+    private val analyticsSdkManager: AnalyticsSdkManager,
 ) : AnalyticsService, SessionListener {
+    private val pendingLongRunningTransactions = ConcurrentHashMap<AnalyticsLongRunningTransaction, AnalyticsTransaction>()
+
     // Cache for the store values
     private val userConsent = AtomicBoolean(false)
 
@@ -65,6 +70,7 @@ class DefaultAnalyticsService(
     override suspend fun setUserConsent(userConsent: Boolean) {
         Timber.tag(analyticsTag.value).d("setUserConsent($userConsent)")
         analyticsStore.setUserConsent(userConsent)
+        analyticsSdkManager.enableSdkAnalytics(enabled = userConsent)
     }
 
     override suspend fun setDidAskUserConsent() {
@@ -77,14 +83,11 @@ class DefaultAnalyticsService(
         analyticsStore.setAnalyticsId(analyticsId)
     }
 
-    override suspend fun onSessionCreated(userId: String) {
-        // Nothing to do
-    }
-
-    override suspend fun onSessionDeleted(userId: String) {
+    override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
         // Delete the store when the last session is deleted
-        if (sessionStore.getAllSessions().isEmpty()) {
+        if (wasLastSession) {
             analyticsStore.reset()
+            analyticsSdkManager.enableSdkAnalytics(false)
         }
     }
 
@@ -145,4 +148,55 @@ class DefaultAnalyticsService(
             analyticsProviders.onEach { it.trackError(throwable) }
         }
     }
+
+    override fun addExtraData(key: String, value: String) {
+        if (userConsent.get()) {
+            analyticsProviders.onEach { it.addExtraData(key, value) }
+        }
+    }
+
+    override fun addIndexableData(key: String, value: String) {
+        if (userConsent.get()) {
+            analyticsProviders.onEach { it.addIndexableData(key, value) }
+        }
+    }
+
+    override fun startTransaction(name: String, operation: String?): AnalyticsTransaction {
+        return if (userConsent.get()) {
+            analyticsProviders.firstNotNullOfOrNull { it.startTransaction(name, operation) }
+        } else {
+            null
+        } ?: NoopAnalyticsTransaction
+    }
+
+    override fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction?,
+    ): AnalyticsTransaction {
+        val transaction = parentTransaction?.startChild(longRunningTransaction.name, longRunningTransaction.operation)
+            ?: startTransaction(longRunningTransaction.name, longRunningTransaction.operation)
+
+        pendingLongRunningTransactions[longRunningTransaction] = transaction
+        return transaction
+    }
+
+    override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return pendingLongRunningTransactions[longRunningTransaction]
+    }
+
+    override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return pendingLongRunningTransactions.remove(longRunningTransaction)
+    }
+
+    override fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan {
+        return if (userConsent.get()) {
+             if (name != null) {
+                analyticsSdkManager.startSpan(name, parentTraceId)
+            } else {
+                analyticsSdkManager.bridge(parentTraceId)
+            }.apply { enter() }
+        } else {
+            NoopAnalyticsSdkSpan
+        }
+    }
 }
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt
index 78ff13e554..1072d842ca 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultScreenTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,7 +16,6 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.Lifecycle
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.services.analytics.api.AnalyticsService
@@ -23,10 +23,9 @@ import io.element.android.services.analytics.api.ScreenTracker
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultScreenTracker(
     private val analyticsService: AnalyticsService,
-    private val systemClock: SystemClock
+    private val systemClock: SystemClock,
 ) : ScreenTracker {
     @Composable
     override fun TrackScreen(
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/log/AnalyticsLoggerTag.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/log/AnalyticsLoggerTag.kt
index 53314735ba..245c77c9ae 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/log/AnalyticsLoggerTag.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/log/AnalyticsLoggerTag.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/store/AnalyticsStore.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/store/AnalyticsStore.kt
index b6e1773be6..edac8b7d7a 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/store/AnalyticsStore.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/store/AnalyticsStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,7 +13,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
@@ -36,7 +36,6 @@ interface AnalyticsStore {
 }
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultAnalyticsStore(
     preferenceDataStoreFactory: PreferenceDataStoreFactory,
 ) : AnalyticsStore {
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
new file mode 100644
index 0000000000..c53e28918b
--- /dev/null
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
@@ -0,0 +1,63 @@
+/*
+ * 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.services.analytics.impl.watchers
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.cancelLongRunningTransaction
+import io.element.android.services.analytics.api.finishLongRunningTransaction
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
+class DefaultAnalyticsColdStartWatcher(
+    private val analyticsService: AnalyticsService,
+    @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
+) : AnalyticsColdStartWatcher {
+    private val isColdStart = AtomicBoolean(true)
+
+    override fun start() {
+        analyticsService.userConsentFlow
+            .onEach { hasConsent ->
+                if (hasConsent) {
+                    if (isColdStart.get()) {
+                        Timber.d("Starting cold start check")
+                        analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
+                    } else {
+                        error("The app is no longer in a cold start state")
+                    }
+                }
+            }
+            .catch { Timber.w(it.message) }
+            .launchIn(appCoroutineScope)
+    }
+
+    override fun whenLoggingIn() {
+        if (isColdStart.getAndSet(false)) {
+            analyticsService.cancelLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
+            Timber.d("Canceled cold start check: user is logging in")
+        }
+    }
+
+    override fun onRoomListVisible() {
+        if (isColdStart.getAndSet(false)) {
+            Timber.d("Room list is visible, finishing cold start check")
+            analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList)
+        }
+    }
+}
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
new file mode 100644
index 0000000000..97e438fcee
--- /dev/null
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcher.kt
@@ -0,0 +1,78 @@
+/*
+ * 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.services.analytics.impl.watchers
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.coroutine.childScope
+import io.element.android.libraries.core.coroutine.withPreviousValue
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.finishLongRunningTransaction
+import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
+import io.element.android.services.appnavstate.api.AppNavigationStateService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+
+@ContributesBinding(SessionScope::class)
+class DefaultAnalyticsRoomListStateWatcher(
+    private val appNavigationStateService: AppNavigationStateService,
+    private val roomListService: RoomListService,
+    private val analyticsService: AnalyticsService,
+    @SessionCoroutineScope sessionCoroutineScope: CoroutineScope,
+    dispatchers: CoroutineDispatchers,
+) : AnalyticsRoomListStateWatcher {
+    private val coroutineScope: CoroutineScope = sessionCoroutineScope.childScope(dispatchers.computation, "AnalyticsRoomListStateWatcher")
+    private val isStarted = AtomicBoolean(false)
+    private val isWarmState = AtomicBoolean(false)
+
+    override fun start() {
+        if (isStarted.getAndSet(true)) {
+            Timber.w("Can't start RoomListStateWatcher, it's already running.")
+            return
+        }
+
+        appNavigationStateService.appNavigationState
+            .map { it.isInForeground }
+            .distinctUntilChanged()
+            .withPreviousValue()
+            .onEach { (wasInForeground, isInForeground) ->
+                if (isInForeground && roomListService.state.value != RoomListService.State.Running) {
+                    analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived)
+                }
+
+                if (wasInForeground == false && isInForeground) {
+                    isWarmState.set(true)
+                }
+            }
+            .launchIn(coroutineScope)
+
+        roomListService.state
+            .onEach { state ->
+                if (state == RoomListService.State.Running && isWarmState.get()) {
+                    analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived)
+                }
+            }
+            .launchIn(coroutineScope)
+    }
+
+    override fun stop() {
+        if (isStarted.getAndSet(false)) {
+            coroutineScope.coroutineContext.cancelChildren()
+        }
+    }
+}
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt
index 1e5a54fb26..7de3d0ac53 100644
--- a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,9 +17,8 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.plan.PollEnd
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
-import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.matrix.test.analytics.FakeAnalyticsSdkManager
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
-import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.observer.NoOpSessionObserver
 import io.element.android.services.analytics.impl.store.AnalyticsStore
 import io.element.android.services.analytics.impl.store.FakeAnalyticsStore
@@ -33,6 +33,7 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -127,17 +128,20 @@ class DefaultAnalyticsServiceTest {
     }
 
     @Test
-    fun `setUserConsent is sent to the store`() = runTest {
+    fun `setUserConsent is sent to the store and the SDK`() = runTest {
+        val sdkAnalyticsEnabledLambda = lambdaRecorder<Boolean, Unit> {}
         val store = FakeAnalyticsStore()
         val sut = createDefaultAnalyticsService(
             coroutineScope = backgroundScope,
             analyticsStore = store,
+            sdkAnalyticsManager = FakeAnalyticsSdkManager(sdkAnalyticsEnabledLambda),
         )
         assertThat(store.userConsentFlow.first()).isFalse()
         assertThat(sut.userConsentFlow.first()).isFalse()
         sut.setUserConsent(true)
         assertThat(store.userConsentFlow.first()).isTrue()
         assertThat(sut.userConsentFlow.first()).isTrue()
+        sdkAnalyticsEnabledLambda.assertions().isCalledOnce().with(value(true))
     }
 
     @Test
@@ -170,6 +174,23 @@ class DefaultAnalyticsServiceTest {
 
     @Test
     fun `when the last session is deleted, the store is reset`() = runTest {
+        val resetLambda = lambdaRecorder<Unit> {}
+        val sdkAnalyticsEnabledLambda = lambdaRecorder<Boolean, Unit> {}
+        val store = FakeAnalyticsStore(
+            resetLambda = resetLambda,
+        )
+        val sut = createDefaultAnalyticsService(
+            coroutineScope = backgroundScope,
+            analyticsStore = store,
+            sdkAnalyticsManager = FakeAnalyticsSdkManager(sdkAnalyticsEnabledLambda),
+        )
+        sut.onSessionDeleted("userId", true)
+        resetLambda.assertions().isCalledOnce()
+        sdkAnalyticsEnabledLambda.assertions().isCalledOnce().with(value(false))
+    }
+
+    @Test
+    fun `when a session is deleted, the store is not reset if it was not the last session`() = runTest {
         val resetLambda = lambdaRecorder<Unit> { }
         val store = FakeAnalyticsStore(
             resetLambda = resetLambda,
@@ -178,8 +199,8 @@ class DefaultAnalyticsServiceTest {
             coroutineScope = backgroundScope,
             analyticsStore = store,
         )
-        sut.onSessionDeleted("userId")
-        resetLambda.assertions().isCalledOnce()
+        sut.onSessionDeleted("userId", false)
+        resetLambda.assertions().isNeverCalled()
     }
 
     @Test
@@ -221,7 +242,6 @@ class DefaultAnalyticsServiceTest {
     fun `when consent is provided, updateUserProperties is sent to the provider`() = runTest {
         val updateUserPropertiesLambda = lambdaRecorder<UserProperties, Unit> { _ -> }
         val sut = createDefaultAnalyticsService(
-            coroutineScope = backgroundScope,
             analyticsProviders = setOf(
                 FakeAnalyticsProvider(
                     initLambda = { },
@@ -238,7 +258,6 @@ class DefaultAnalyticsServiceTest {
     fun `when super properties are updated, updateSuperProperties is sent to the provider`() = runTest {
         val updateSuperPropertiesLambda = lambdaRecorder<SuperProperties, Unit> { _ -> }
         val sut = createDefaultAnalyticsService(
-            coroutineScope = backgroundScope,
             analyticsProviders = setOf(
                 FakeAnalyticsProvider(
                     initLambda = { },
@@ -251,8 +270,15 @@ class DefaultAnalyticsServiceTest {
         updateSuperPropertiesLambda.assertions().isCalledOnce().with(value(aSuperProperty))
     }
 
-    private suspend fun createDefaultAnalyticsService(
-        coroutineScope: CoroutineScope,
+    @Test
+    fun `startSdkSpan returns a span from the AnalyticsSdkManager`() = runTest {
+        val sut = createDefaultAnalyticsService()
+        val span = sut.enterSdkSpan("spanName", "parentTraceId")
+        assertThat(span).isNotNull()
+    }
+
+    private suspend fun TestScope.createDefaultAnalyticsService(
+        coroutineScope: CoroutineScope = backgroundScope,
         analyticsProviders: Set<@JvmSuppressWildcards AnalyticsProvider> = setOf(
             FakeAnalyticsProvider(
                 stopLambda = { },
@@ -260,13 +286,13 @@ class DefaultAnalyticsServiceTest {
         ),
         analyticsStore: AnalyticsStore = FakeAnalyticsStore(),
         sessionObserver: SessionObserver = NoOpSessionObserver(),
-        sessionStore: SessionStore = InMemorySessionStore(),
+        sdkAnalyticsManager: FakeAnalyticsSdkManager = FakeAnalyticsSdkManager(enableSdkAnalyticsLambda = {}),
     ) = DefaultAnalyticsService(
         analyticsProviders = analyticsProviders,
         analyticsStore = analyticsStore,
         coroutineScope = coroutineScope,
         sessionObserver = sessionObserver,
-        sessionStore = sessionStore,
+        analyticsSdkManager = sdkAnalyticsManager,
     ).also {
         // Wait for the service to be ready
         delay(1)
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultScreenTrackerTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultScreenTrackerTest.kt
new file mode 100644
index 0000000000..13e026eb31
--- /dev/null
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultScreenTrackerTest.kt
@@ -0,0 +1,62 @@
+/*
+ * 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.services.analytics.impl
+
+import androidx.lifecycle.Lifecycle
+import app.cash.molecule.RecompositionMode
+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.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.services.toolbox.api.systemclock.SystemClock
+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
+import io.element.android.tests.testutils.FakeLifecycleOwner
+import io.element.android.tests.testutils.withFakeLifecycleOwner
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultScreenTrackerTest {
+    @Test
+    fun `TrackScreen is working as expected`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val systemClock = FakeSystemClock(150)
+        val lifecycleOwner = FakeLifecycleOwner()
+        val sut = createDefaultScreenTracker(
+            analyticsService = analyticsService,
+            systemClock = systemClock,
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            withFakeLifecycleOwner(lifecycleOwner) {
+                sut.TrackScreen(MobileScreen.ScreenName.RoomMembers)
+            }
+        }.test {
+            // Screen resumes
+            lifecycleOwner.givenState(Lifecycle.State.RESUMED)
+            assertThat(awaitItem()).isEqualTo(Unit)
+            systemClock.epochMillisResult = 450
+            lifecycleOwner.givenState(Lifecycle.State.DESTROYED)
+        }
+        assertThat(analyticsService.screenEvents).containsExactly(
+            MobileScreen(
+                screenName = MobileScreen.ScreenName.RoomMembers,
+                durationMs = 300,
+            )
+        )
+    }
+}
+
+private fun createDefaultScreenTracker(
+    analyticsService: AnalyticsService = FakeAnalyticsService(),
+    systemClock: SystemClock = FakeSystemClock(),
+) = DefaultScreenTracker(
+    analyticsService = analyticsService,
+    systemClock = systemClock,
+)
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/store/FakeAnalyticsStore.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/store/FakeAnalyticsStore.kt
index 8cfa3649ec..7d9dbfb557 100644
--- a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/store/FakeAnalyticsStore.kt
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/store/FakeAnalyticsStore.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcherTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcherTest.kt
new file mode 100644
index 0000000000..325316b45c
--- /dev/null
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcherTest.kt
@@ -0,0 +1,107 @@
+/*
+ * 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.services.analytics.impl.watchers
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ColdStartUntilCachedRoomList
+import io.element.android.services.analytics.test.FakeAnalyticsService
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultAnalyticsColdStartWatcherTest {
+    @Test
+    fun `watch - until room list is visible`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // The user has given analytics consent, we can start tracking the cold start
+        analyticsService.setUserConsent(true)
+        runCurrent()
+
+        // The transaction is running
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNotNull()
+
+        // As soon as the room list is visible
+        watcher.onRoomListVisible()
+        runCurrent()
+
+        // The transaction is now finished
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    @Test
+    fun `watch - user is logging in, transaction is cancelled since it's not a cold start`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // The user has given analytics consent, we can start tracking the cold start
+        analyticsService.setUserConsent(true)
+        runCurrent()
+
+        // The transaction is running
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNotNull()
+
+        // If the user starts a login flow
+        watcher.whenLoggingIn()
+        runCurrent()
+
+        // The transaction is gone
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    @Test
+    fun `watch - user was logging in, transaction is never started since it's not a cold start`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // If the user starts a login flow
+        watcher.whenLoggingIn()
+
+        // The user has given analytics consent, we can start tracking the cold start
+        analyticsService.setUserConsent(true)
+        runCurrent()
+
+        // The transaction never starts
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    @Test
+    fun `watch - never gets consent so it does nothing`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsColdStartWatcher(analyticsService)
+
+        // Start watching
+        watcher.start()
+
+        // The user never gets the analytics consent, so we do nothing
+        runCurrent()
+
+        // The transaction is not running in that case
+        assertThat(analyticsService.getLongRunningTransaction(ColdStartUntilCachedRoomList)).isNull()
+    }
+
+    private fun TestScope.createAnalyticsColdStartWatcher(
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    ) = DefaultAnalyticsColdStartWatcher(
+        analyticsService = analyticsService,
+        appCoroutineScope = backgroundScope,
+    )
+}
diff --git a/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
new file mode 100644
index 0000000000..3b1f562c67
--- /dev/null
+++ b/services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsRoomListStateWatcherTest.kt
@@ -0,0 +1,170 @@
+/*
+ * 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.services.analytics.impl.watchers
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.ResumeAppUntilNewRoomsReceived
+import io.element.android.services.analytics.test.FakeAnalyticsService
+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.testCoroutineDispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultAnalyticsRoomListStateWatcherTest {
+    @Test
+    fun `Opening the app in a warm state tracks the time until the room list is synced`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService()
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Idle)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // Make sure it's warm by changing its internal state
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = false))
+        runCurrent()
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+        runCurrent()
+
+        // The transaction should be present now
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNotNull()
+
+        // And now the room list service running
+        roomListService.postState(RoomListService.State.Running)
+        runCurrent()
+
+        // And the transaction should now be gone
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNull()
+
+        watcher.stop()
+    }
+
+    @Test
+    fun `Opening the app in a cold state does nothing`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService().apply {
+            appNavigationState.emit(AppNavigationState(NavigationState.Root, false))
+        }
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Idle)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // The room list service running
+        roomListService.postState(RoomListService.State.Running)
+        runCurrent()
+
+        // The transaction was never present
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNull()
+
+        watcher.stop()
+    }
+
+    @Test
+    fun `The transaction won't be finished until the room list is synchronised`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService()
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Idle)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // Make sure it's warm by changing its internal state
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = false))
+        runCurrent()
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+        runCurrent()
+
+        // The transaction should be present now
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNotNull()
+
+        runCurrent()
+
+        // But without the room list syncing, it never finishes
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNotNull()
+
+        watcher.stop()
+    }
+
+    @Test
+    fun `Opening the app when the room list state was already Running does nothing`() = runTest {
+        val navigationStateService = FakeAppNavigationStateService()
+        val roomListService = FakeRoomListService().apply {
+            postState(RoomListService.State.Running)
+        }
+        val analyticsService = FakeAnalyticsService()
+        val watcher = createAnalyticsRoomListStateWatcher(
+            appNavigationStateService = navigationStateService,
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        watcher.start()
+
+        // Give some time to load the initial state
+        runCurrent()
+
+        // Make sure it's warm by changing its internal state
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = false))
+        runCurrent()
+        navigationStateService.appNavigationState.emit(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+        runCurrent()
+
+        // The transaction was never added
+        assertThat(analyticsService.getLongRunningTransaction(ResumeAppUntilNewRoomsReceived)).isNull()
+
+        watcher.stop()
+    }
+
+    private fun TestScope.createAnalyticsRoomListStateWatcher(
+        appNavigationStateService: FakeAppNavigationStateService = FakeAppNavigationStateService(),
+        roomListService: FakeRoomListService = FakeRoomListService(),
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    ) = DefaultAnalyticsRoomListStateWatcher(
+        appNavigationStateService = appNavigationStateService,
+        roomListService = roomListService,
+        analyticsService = analyticsService,
+        sessionCoroutineScope = backgroundScope,
+        dispatchers = testCoroutineDispatchers(),
+    )
+}
diff --git a/services/analytics/noop/build.gradle.kts b/services/analytics/noop/build.gradle.kts
index cd6d16d029..e1d3de2e65 100644
--- a/services/analytics/noop/build.gradle.kts
+++ b/services/analytics/noop/build.gradle.kts
@@ -1,9 +1,11 @@
 import extension.setupDependencyInjection
+import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -20,4 +22,5 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.di)
     api(projects.services.analytics.api)
+    testCommonDependencies(libs)
 }
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
index db03ca5553..004a472de3 100644
--- a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,20 +10,23 @@ package io.element.android.services.analytics.noop
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsSdkSpan
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.NoopAnalyticsSdkSpan
+import io.element.android.services.analytics.api.NoopAnalyticsTransaction
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
-@Inject
 class NoopAnalyticsService : AnalyticsService {
     override fun getAvailableAnalyticsProviders(): Set<AnalyticsProvider> = emptySet()
     override val userConsentFlow: Flow<Boolean> = flowOf(false)
@@ -36,4 +40,13 @@ class NoopAnalyticsService : AnalyticsService {
     override fun updateUserProperties(userProperties: UserProperties) = Unit
     override fun trackError(throwable: Throwable) = Unit
     override fun updateSuperProperties(updatedProperties: SuperProperties) = Unit
+    override fun startTransaction(name: String, operation: String?): AnalyticsTransaction = NoopAnalyticsTransaction
+    override fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction?,
+    ): AnalyticsTransaction = NoopAnalyticsTransaction
+    override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? = null
+    override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction) = NoopAnalyticsTransaction
+
+    override fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan = NoopAnalyticsSdkSpan
 }
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopScreenTracker.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopScreenTracker.kt
index fb193e115d..dced133ad1 100644
--- a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopScreenTracker.kt
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/NoopScreenTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,12 +11,10 @@ package io.element.android.services.analytics.noop
 import androidx.compose.runtime.Composable
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.services.analytics.api.ScreenTracker
 
 @ContributesBinding(AppScope::class)
-@Inject
 class NoopScreenTracker : ScreenTracker {
     @Composable
     override fun TrackScreen(screen: MobileScreen.ScreenName) = Unit
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/di/NoopAnalyticsModule.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/di/NoopAnalyticsModule.kt
new file mode 100644
index 0000000000..3c4b00c7a0
--- /dev/null
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/di/NoopAnalyticsModule.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.services.analytics.noop.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.di.identifiers.SentrySdkDsn
+
+@BindingContainer
+@ContributesTo(AppScope::class)
+object NoopAnalyticsModule {
+    @Provides
+    fun provideSentrySdkDsn(): SentrySdkDsn? = null
+}
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..c24c98ebfe
--- /dev/null
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsColdStartWatcher.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.services.analytics.noop.watchers
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+
+@ContributesBinding(AppScope::class)
+class NoopAnalyticsColdStartWatcher : AnalyticsColdStartWatcher {
+    override fun start() {}
+    override fun whenLoggingIn() {}
+    override fun onRoomListVisible() {}
+}
diff --git a/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt
new file mode 100644
index 0000000000..711947fb2c
--- /dev/null
+++ b/services/analytics/noop/src/main/kotlin/io/element/android/services/analytics/noop/watchers/NoopAnalyticsRoomListStateWatcher.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.services.analytics.noop.watchers
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.SessionScope
+import io.element.android.services.analytics.api.watchers.AnalyticsRoomListStateWatcher
+
+@ContributesBinding(SessionScope::class)
+class NoopAnalyticsRoomListStateWatcher : AnalyticsRoomListStateWatcher {
+    override fun start() {}
+    override fun stop() {}
+}
diff --git a/services/analytics/noop/src/test/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsServiceTest.kt b/services/analytics/noop/src/test/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsServiceTest.kt
new file mode 100644
index 0000000000..5e7ae06c0f
--- /dev/null
+++ b/services/analytics/noop/src/test/kotlin/io/element/android/services/analytics/noop/NoopAnalyticsServiceTest.kt
@@ -0,0 +1,68 @@
+/*
+ * 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.services.analytics.noop
+
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import im.vector.app.features.analytics.plan.CallStarted
+import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.SuperProperties
+import im.vector.app.features.analytics.plan.UserProperties
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class NoopAnalyticsServiceTest {
+    @Test
+    fun `getAvailableAnalyticsProviders returns emptySet`() {
+        val sut = NoopAnalyticsService()
+        assertThat(sut.getAvailableAnalyticsProviders()).isEmpty()
+    }
+
+    @Test
+    fun `didAskUserConsentFlow emits only true`() = runTest {
+        val sut = NoopAnalyticsService()
+        sut.didAskUserConsentFlow.test {
+            assertThat(awaitItem()).isTrue()
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `analyticsIdFlow emits only empty string`() = runTest {
+        val sut = NoopAnalyticsService()
+        sut.analyticsIdFlow.test {
+            assertThat(awaitItem()).isEmpty()
+            sut.setAnalyticsId("anId")
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `userConsentFlow emits only false`() = runTest {
+        val sut = NoopAnalyticsService()
+        sut.userConsentFlow.test {
+            assertThat(awaitItem()).isFalse()
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `test no op methods`() = runTest {
+        val sut = NoopAnalyticsService()
+        sut.setUserConsent(false)
+        sut.setUserConsent(true)
+        sut.setDidAskUserConsent()
+        sut.setAnalyticsId("anId")
+        sut.capture(CallStarted(true, 1, true))
+        sut.screen(MobileScreen(screenName = MobileScreen.ScreenName.RoomMembers))
+        sut.updateUserProperties(UserProperties())
+        sut.trackError(Exception("an_error"))
+        sut.updateSuperProperties(SuperProperties())
+    }
+}
diff --git a/services/analytics/noop/src/test/kotlin/io/element/android/services/analytics/noop/NoopScreenTrackerTest.kt b/services/analytics/noop/src/test/kotlin/io/element/android/services/analytics/noop/NoopScreenTrackerTest.kt
new file mode 100644
index 0000000000..e97ae39f5c
--- /dev/null
+++ b/services/analytics/noop/src/test/kotlin/io/element/android/services/analytics/noop/NoopScreenTrackerTest.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.services.analytics.noop
+
+import app.cash.molecule.RecompositionMode
+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 kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class NoopScreenTrackerTest {
+    @Test
+    fun `TrackScreen is no op`() = runTest {
+        val sut = NoopScreenTracker()
+        moleculeFlow(RecompositionMode.Immediate) {
+            sut.TrackScreen(MobileScreen.ScreenName.RoomMembers)
+        }.test {
+            assertThat(awaitItem()).isEqualTo(Unit)
+        }
+    }
+}
diff --git a/services/analytics/test/build.gradle.kts b/services/analytics/test/build.gradle.kts
index 01b0544694..61ed796d48 100644
--- a/services/analytics/test/build.gradle.kts
+++ b/services/analytics/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
index f8b250e37b..b9b33744e8 100644
--- a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeAnalyticsService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,8 +12,13 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
+import io.element.android.services.analytics.api.AnalyticsSdkSpan
 import io.element.android.services.analytics.api.AnalyticsService
+import io.element.android.services.analytics.api.NoopAnalyticsSdkSpan
+import io.element.android.services.analytics.api.NoopAnalyticsTransaction
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -27,6 +33,7 @@ class FakeAnalyticsService(
     val screenEvents = mutableListOf<VectorAnalyticsScreen>()
     val trackedErrors = mutableListOf<Throwable>()
     val capturedUserProperties = mutableListOf<UserProperties>()
+    val longRunningTransactions = mutableMapOf<AnalyticsLongRunningTransaction, AnalyticsTransaction>()
 
     override fun getAvailableAnalyticsProviders(): Set<AnalyticsProvider> = emptySet()
 
@@ -64,4 +71,23 @@ class FakeAnalyticsService(
     override fun updateSuperProperties(updatedProperties: SuperProperties) {
         // No op
     }
+
+    override fun startTransaction(name: String, operation: String?): AnalyticsTransaction = NoopAnalyticsTransaction
+    override fun startLongRunningTransaction(
+        longRunningTransaction: AnalyticsLongRunningTransaction,
+        parentTransaction: AnalyticsTransaction?
+    ): AnalyticsTransaction {
+        longRunningTransactions[longRunningTransaction] = NoopAnalyticsTransaction
+        return NoopAnalyticsTransaction
+    }
+
+    override fun getLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return longRunningTransactions[longRunningTransaction]
+    }
+
+    override fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? {
+        return longRunningTransactions.remove(longRunningTransaction)
+    }
+
+    override fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan = NoopAnalyticsSdkSpan
 }
diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt
index 021d377104..ce22a3dda7 100644
--- a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/FakeScreenTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt
new file mode 100644
index 0000000000..ad13c8422d
--- /dev/null
+++ b/services/analytics/test/src/main/kotlin/io/element/android/services/analytics/test/watchers/FakeAnalyticsColdStartWatcher.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.services.analytics.test.watchers
+
+import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
+
+class FakeAnalyticsColdStartWatcher : AnalyticsColdStartWatcher {
+    override fun start() {}
+    override fun whenLoggingIn() {}
+    override fun onRoomListVisible() {}
+}
diff --git a/services/analyticsproviders/api/build.gradle.kts b/services/analyticsproviders/api/build.gradle.kts
index 1df9377972..c357c14861 100644
--- a/services/analyticsproviders/api/build.gradle.kts
+++ b/services/analyticsproviders/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsProvider.kt b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsProvider.kt
index 46f5f3ef50..f90d924c81 100644
--- a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsProvider.kt
+++ b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,4 +20,6 @@ interface AnalyticsProvider : AnalyticsTracker, ErrorTracker {
     fun init()
 
     fun stop()
+
+    fun startTransaction(name: String, operation: String? = null): AnalyticsTransaction?
 }
diff --git a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsTransaction.kt b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsTransaction.kt
new file mode 100644
index 0000000000..b5f81ac67e
--- /dev/null
+++ b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsTransaction.kt
@@ -0,0 +1,60 @@
+/*
+ * 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.services.analyticsproviders.api
+
+interface AnalyticsTransaction {
+    /**
+     * Start a child span from this transaction.
+     */
+    fun startChild(operation: String, description: String? = null): AnalyticsTransaction
+
+    /**
+     * Adds extra data to the transaction. This data is not indexed, it's just listed.
+     */
+    fun putExtraData(key: String, value: String)
+
+    /**
+     * Similar to [putExtraData], adds extra data that *will be indexed* and can be used for filtering in the analytics portal.
+     *
+     * **Do not add numerical values using this function, use [putExtraData] instead.**
+     */
+    fun putIndexableData(key: String, value: String)
+
+    /**
+     * Whether the transaction has finished.
+     */
+    fun isFinished(): Boolean
+
+    /**
+     * The optional trace id which can be used for distributed tracing.
+     */
+    fun traceId(): String?
+
+    /**
+     * Attach a throwable to the transaction, so we can know it failed.
+     */
+    fun attachError(throwable: Throwable)
+
+    /**
+     * Finish the transaction. This will schedule an upload of the data.
+     */
+    fun finish()
+}
+
+/**
+ * Records a child span from this transaction.
+ */
+inline fun <T> AnalyticsTransaction.recordChildTransaction(operation: String, description: String? = null, block: (AnalyticsTransaction) -> T): T {
+    val child = startChild(operation, description)
+    try {
+        val result = block(child)
+        return result
+    } finally {
+        child.finish()
+    }
+}
diff --git a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsUserData.kt b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsUserData.kt
new file mode 100644
index 0000000000..28ae4a5668
--- /dev/null
+++ b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/AnalyticsUserData.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.services.analyticsproviders.api
+
+object AnalyticsUserData {
+    const val HOMESERVER = "homeserver"
+
+    const val STATE_STORE_SIZE = "state_store_size"
+    const val EVENT_CACHE_SIZE = "event_cache_size"
+    const val CRYPTO_STORE_SIZE = "crypto_store_size"
+    const val MEDIA_STORE_SIZE = "media_store_size"
+
+    const val FIRST_SYNC_STATE = "first_sync_state"
+    const val TIMELINE_ITEM_COUNT = "timeline_item_count"
+}
diff --git a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/AnalyticsTracker.kt b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/AnalyticsTracker.kt
index ceb1f68aa6..5bb63338a8 100644
--- a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/AnalyticsTracker.kt
+++ b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/AnalyticsTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -34,6 +35,18 @@ interface AnalyticsTracker {
      * Super properties are added to any tracked event automatically.
      */
     fun updateSuperProperties(updatedProperties: SuperProperties)
+
+    /**
+     * Adds extra data that will be sent with every event.
+     */
+    fun addExtraData(key: String, value: String) {}
+
+    /**
+     * Similar to [addExtraData], adds data that will be indexed in the analytics portal.
+     *
+     * **Do not add numerical values using this, use [addExtraData] instead.**
+     */
+    fun addIndexableData(key: String, value: String) {}
 }
 
 fun AnalyticsTracker.captureInteraction(name: Interaction.Name, type: Interaction.InteractionType? = null) {
diff --git a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/ErrorTracker.kt b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/ErrorTracker.kt
index fcb186f693..5277493b64 100644
--- a/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/ErrorTracker.kt
+++ b/services/analyticsproviders/api/src/main/kotlin/io/element/android/services/analyticsproviders/api/trackers/ErrorTracker.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/posthog/build.gradle.kts b/services/analyticsproviders/posthog/build.gradle.kts
index ffcb2ba590..966522e2f2 100644
--- a/services/analyticsproviders/posthog/build.gradle.kts
+++ b/services/analyticsproviders/posthog/build.gradle.kts
@@ -4,9 +4,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt
index 3cc842817e..95124529d2 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PostHogFactory.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt
index a8cfcc886b..9185b906c4 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -16,6 +17,7 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import io.element.android.services.analyticsproviders.posthog.log.analyticsTag
 import timber.log.Timber
 
@@ -121,6 +123,8 @@ class PosthogAnalyticsProvider(
         }
         return withSuperProperties.takeIf { it.isEmpty().not() }
     }
+
+    override fun startTransaction(name: String, operation: String?): AnalyticsTransaction? = null
 }
 
 private fun Map<String, Any?>.keepOnlyNonNullValues(): Map<String, Any> {
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt
index 6d14ab6b14..c45a0ee995 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt
index 67705d0a45..eb59579d79 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogEndpointConfigProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/extensions/InteractionExt.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/extensions/InteractionExt.kt
index 8446fa9302..8501db6902 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/extensions/InteractionExt.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/extensions/InteractionExt.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/log/AnalyticsLoggerTag.kt b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/log/AnalyticsLoggerTag.kt
index 137dec0595..eb55ba783e 100644
--- a/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/log/AnalyticsLoggerTag.kt
+++ b/services/analyticsproviders/posthog/src/main/kotlin/io/element/android/services/analyticsproviders/posthog/log/AnalyticsLoggerTag.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2021-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2021-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/posthog/src/test/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProviderTest.kt b/services/analyticsproviders/posthog/src/test/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProviderTest.kt
index f52852e09c..ce20a0d37a 100644
--- a/services/analyticsproviders/posthog/src/test/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProviderTest.kt
+++ b/services/analyticsproviders/posthog/src/test/kotlin/io/element/android/services/analyticsproviders/posthog/PosthogAnalyticsProviderTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/analyticsproviders/sentry/build.gradle.kts b/services/analyticsproviders/sentry/build.gradle.kts
index 149ffb55dd..02dde35ef4 100644
--- a/services/analyticsproviders/sentry/build.gradle.kts
+++ b/services/analyticsproviders/sentry/build.gradle.kts
@@ -2,11 +2,13 @@ import config.BuildTimeConfig
 import extension.buildConfigFieldStr
 import extension.readLocalProperty
 import extension.setupDependencyInjection
+import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
@@ -31,6 +33,16 @@ android {
             }
                 ?: ""
         )
+        buildConfigFieldStr(
+            name = "SDK_SENTRY_DSN",
+            value = if (isEnterpriseBuild) {
+                BuildTimeConfig.SERVICES_SENTRY_DSN_RUST
+            } else {
+                System.getenv("ELEMENT_SDK_SENTRY_DSN")
+                    ?: readLocalProperty("services.analyticsproviders.sdk.sentry.dsn")
+            }
+                ?: ""
+        )
     }
 }
 
@@ -40,5 +52,11 @@ dependencies {
     implementation(libs.sentry)
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
+    implementation(projects.libraries.matrix.api)
     implementation(projects.services.analyticsproviders.api)
+    implementation(projects.services.appnavstate.api)
+
+    testCommonDependencies(libs, false)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.services.appnavstate.test)
 }
diff --git a/services/analyticsproviders/sentry/src/main/AndroidManifest.xml b/services/analyticsproviders/sentry/src/main/AndroidManifest.xml
index 3fa2813e24..2663552b45 100644
--- a/services/analyticsproviders/sentry/src/main/AndroidManifest.xml
+++ b/services/analyticsproviders/sentry/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2023 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ 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">
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 c83d756b30..7545563736 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
@@ -1,13 +1,15 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.analyticsproviders.sentry
 
 import android.content.Context
+import androidx.annotation.VisibleForTesting
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesIntoSet
 import dev.zacsweers.metro.Inject
@@ -15,22 +17,34 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
 import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.libraries.core.data.ByteUnit
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.di.identifiers.SentryDsn
+import io.element.android.libraries.matrix.api.analytics.GetDatabaseSizesUseCase
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
+import io.element.android.services.analyticsproviders.api.AnalyticsUserData
 import io.element.android.services.analyticsproviders.sentry.log.analyticsTag
+import io.element.android.services.appnavstate.api.AppNavigationStateService
+import io.element.android.services.appnavstate.api.currentSessionId
 import io.sentry.Breadcrumb
 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)
 @Inject
 class SentryAnalyticsProvider(
     @ApplicationContext private val context: Context,
+    private val sentryDsn: SentryDsn?,
     private val buildMeta: BuildMeta,
+    private val getDatabaseSizesUseCase: GetDatabaseSizesUseCase,
+    private val appNavigationStateService: AppNavigationStateService,
 ) : AnalyticsProvider {
     override val name = SentryConfig.NAME
 
@@ -38,18 +52,21 @@ class SentryAnalyticsProvider(
         Timber.tag(analyticsTag.value).d("Initializing Sentry")
         if (Sentry.isEnabled()) return
 
-        val dsn = SentryConfig.DSN.ifBlank {
+        val dsn = sentryDsn?.value ?: run {
             Timber.w("No Sentry DSN provided, Sentry will not be initialized")
             return
         }
 
         SentryAndroid.init(context) { options ->
             options.dsn = dsn
-            options.beforeSend = SentryOptions.BeforeSendCallback { event, _ -> event }
+            options.beforeSendTransaction = SentryOptions.BeforeSendTransactionCallback { transaction, _ ->
+                prepareTransactionBeforeSend(transaction)
+            }
             options.tracesSampleRate = 1.0
             options.isEnableUserInteractionTracing = true
             options.environment = buildMeta.buildType.toSentryEnv()
         }
+        Timber.tag(analyticsTag.value).d("Sentry was initialized correctly")
     }
 
     override fun stop() {
@@ -83,13 +100,51 @@ class SentryAnalyticsProvider(
     override fun updateSuperProperties(updatedProperties: SuperProperties) {
     }
 
+    override fun addExtraData(key: String, value: String) {
+        Sentry.setExtra(key, value)
+    }
+
+    override fun addIndexableData(key: String, value: String) {
+        Sentry.setTag(key, value)
+    }
+
     override fun trackError(throwable: Throwable) {
         Sentry.captureException(throwable)
     }
+
+    override fun startTransaction(name: String, operation: String?): AnalyticsTransaction? {
+        return SentryAnalyticsTransaction(name, operation)
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    internal fun prepareTransactionBeforeSend(transaction: SentryTransaction): SentryTransaction {
+        // Ensure we'll never upload any session ids in extras or tags
+        val invalidExtras = transaction.extras?.filter { (it.value as? String)?.startsWith("@") == true }.orEmpty()
+        for (invalidExtra in invalidExtras) {
+            transaction.removeExtra(invalidExtra.key)
+        }
+        val invalidTags = transaction.tags?.filter { it.value.startsWith("@") }.orEmpty()
+        for (invalidTag in invalidTags) {
+            transaction.removeTag(invalidTag.key)
+        }
+
+        val sessionId = appNavigationStateService.appNavigationState.value.navigationState.currentSessionId()
+        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()
+
+            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)) }
+            databaseSizes?.mediaStore?.let { transaction.setExtra(AnalyticsUserData.MEDIA_STORE_SIZE, it.into(ByteUnit.MB)) }
+            databaseSizes?.cryptoStore?.let { transaction.setExtra(AnalyticsUserData.CRYPTO_STORE_SIZE, it.into(ByteUnit.MB)) }
+        }
+        return transaction
+    }
 }
 
 private fun BuildType.toSentryEnv() = when (this) {
     BuildType.RELEASE -> SentryConfig.ENV_RELEASE
-    BuildType.NIGHTLY,
+    BuildType.NIGHTLY -> SentryConfig.ENV_NIGHTLY
     BuildType.DEBUG -> SentryConfig.ENV_DEBUG
 }
diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt
new file mode 100644
index 0000000000..84314ee35f
--- /dev/null
+++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsTransaction.kt
@@ -0,0 +1,36 @@
+/*
+ * 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.services.analyticsproviders.sentry
+
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
+import io.sentry.ISpan
+import io.sentry.ITransaction
+import io.sentry.Sentry
+import timber.log.Timber
+
+class SentryAnalyticsTransaction private constructor(span: ISpan) : AnalyticsTransaction {
+    constructor(name: String, operation: String?) : this(Sentry.startTransaction(name, operation.orEmpty()))
+    private val inner = span
+
+    override fun startChild(operation: String, description: String?): AnalyticsTransaction = SentryAnalyticsTransaction(
+        inner.startChild(operation, description)
+    )
+
+    override fun putIndexableData(key: String, value: String) = inner.setTag(key, value)
+    override fun putExtraData(key: String, value: String) = inner.setData(key, value)
+    override fun traceId(): String? = inner.toSentryTrace().value
+    override fun isFinished(): Boolean = inner.isFinished
+    override fun attachError(throwable: Throwable) {
+        inner.throwable = throwable
+    }
+    override fun finish() {
+        val name = if (inner is ITransaction) inner.name else inner.operation
+        Timber.d("Finishing transaction: $name")
+        inner.finish()
+    }
+}
diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryConfig.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryConfig.kt
index 39ade3f9ff..993823a877 100644
--- a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryConfig.kt
+++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,6 +11,8 @@ package io.element.android.services.analyticsproviders.sentry
 object SentryConfig {
     const val NAME = "Sentry"
     const val DSN = BuildConfig.SENTRY_DSN
+    const val SDK_DSN = BuildConfig.SDK_SENTRY_DSN
     const val ENV_DEBUG = "DEBUG"
+    const val ENV_NIGHTLY = "NIGHTLY"
     const val ENV_RELEASE = "RELEASE"
 }
diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/di/SentryModule.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/di/SentryModule.kt
new file mode 100644
index 0000000000..74b7d56683
--- /dev/null
+++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/di/SentryModule.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.services.analyticsproviders.sentry.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.di.identifiers.SentryDsn
+import io.element.android.libraries.di.identifiers.SentrySdkDsn
+import io.element.android.services.analyticsproviders.sentry.SentryConfig
+
+@BindingContainer
+@ContributesTo(AppScope::class)
+object SentryModule {
+    @Provides
+    fun provideSentryDsn(): SentryDsn? = SentryConfig.DSN.takeIf { it.isNotBlank() }?.let(::SentryDsn)
+
+    @Provides
+    fun provideSentrySdkDsn(): SentrySdkDsn? = SentryConfig.SDK_DSN.takeIf { it.isNotBlank() }?.let(::SentrySdkDsn)
+}
diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/log/AnalyticsLoggerTag.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/log/AnalyticsLoggerTag.kt
index 0bdef84c96..698c29b9f4 100644
--- a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/log/AnalyticsLoggerTag.kt
+++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/log/AnalyticsLoggerTag.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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
new file mode 100644
index 0000000000..24b938d9a5
--- /dev/null
+++ b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
@@ -0,0 +1,233 @@
+/*
+ * 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.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+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
+import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
+import im.vector.app.features.analytics.plan.SuperProperties
+import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.libraries.core.data.megaBytes
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.di.identifiers.SentryDsn
+import io.element.android.libraries.matrix.api.analytics.GetDatabaseSizesUseCase
+import io.element.android.libraries.matrix.api.analytics.SdkStoreSizes
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.core.aBuildMeta
+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.sentry.Sentry
+import io.sentry.SentryTracer
+import io.sentry.protocol.SentryId
+import io.sentry.protocol.SentryTransaction
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SentryAnalyticsProviderTest {
+    @Test
+    fun `init enables Sentry if DSN is present`() {
+        createSentryAnalyticsProvider().run {
+            init()
+        }
+        assertThat(Sentry.isEnabled()).isTrue()
+    }
+
+    @Test
+    fun `init does nothing if DSN is not present`() {
+        createSentryAnalyticsProvider(sentryDsn = null).run {
+            init()
+        }
+        assertThat(Sentry.isEnabled()).isTrue()
+    }
+
+    @Test
+    fun `stop disables Sentry`() {
+        createSentryAnalyticsProvider().run {
+            init()
+            stop()
+        }
+        assertThat(Sentry.isEnabled()).isFalse()
+    }
+
+    @Test
+    fun `capture adds a breadcrumb`() {
+        createSentryAnalyticsProvider().run {
+            init()
+            capture(object : VectorAnalyticsEvent {
+                override fun getName(): String = "Test"
+                override fun getProperties(): Map<String, Any?>? = mapOf("foo" to "bar")
+            })
+        }
+        assertThat(Sentry.getCurrentScopes().scope.breadcrumbs.isNotEmpty()).isTrue()
+    }
+
+    @Test
+    fun `screen adds a breadcrumb`() {
+        createSentryAnalyticsProvider().run {
+            init()
+            screen(object : VectorAnalyticsScreen {
+                override fun getName(): String = "Test"
+                override fun getProperties(): Map<String, Any>? = mapOf("foo" to "bar")
+            })
+        }
+        assertThat(Sentry.getCurrentScopes().scope.breadcrumbs.isNotEmpty()).isTrue()
+    }
+
+    @Test
+    fun `updateUserProperties and updateSuperProperties do nothing`() {
+        createSentryAnalyticsProvider().run {
+            init()
+            updateUserProperties(UserProperties())
+            updateSuperProperties(SuperProperties())
+        }
+        val scope = Sentry.getCurrentScopes().scope
+        assertThat(scope.extras.isEmpty()).isTrue()
+        assertThat(scope.tags.isEmpty()).isTrue()
+        assertThat(scope.contexts.isEmpty()).isTrue()
+    }
+
+    @Test
+    fun `addExtraData adds a global extra`() {
+        createSentryAnalyticsProvider().run {
+            init()
+            addExtraData("foo", "bar")
+        }
+        val scope = Sentry.getCurrentScopes().scope
+        assertThat(scope.extras.get("foo")).isEqualTo("bar")
+    }
+
+    @Test
+    fun `addIndexableData adds a global tag`() {
+        createSentryAnalyticsProvider().run {
+            init()
+            addIndexableData("foo", "bar")
+        }
+        val scope = Sentry.getCurrentScopes().scope
+        assertThat(scope.tags.get("foo")).isEqualTo("bar")
+    }
+
+    @Test
+    fun `trackError adds a throwable to the global scope`() {
+        var initialLastId: SentryId? = null
+        createSentryAnalyticsProvider().run {
+            init()
+            initialLastId = Sentry.getLastEventId()
+            trackError(IllegalStateException("foo"))
+        }
+        assertThat(Sentry.getLastEventId()).isNotEqualTo(initialLastId)
+    }
+
+    @Test
+    fun `startTransaction starts a SentryAnalyticsTransaction`() {
+        val transaction = createSentryAnalyticsProvider().run {
+            init()
+            startTransaction("foo")
+        }
+        assertThat(transaction).isNotNull()
+        assertThat(transaction).isInstanceOf(SentryAnalyticsTransaction::class.java)
+    }
+
+    @Test
+    fun `prepareTransactionBeforeSend removes unwanted data and adds DB size extras`() {
+        createSentryAnalyticsProvider(
+            getDatabaseSizesUseCase = GetDatabaseSizesUseCase {
+                Result.success(
+                    SdkStoreSizes(stateStore = 10.megaBytes, eventCacheStore = 11.megaBytes, mediaStore = 12.megaBytes, cryptoStore = 13.megaBytes)
+                )
+            },
+            appNavigationStateService = FakeAppNavigationStateService(
+                MutableStateFlow(AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true))
+            )
+        ).run {
+            init()
+
+            val transaction = SentryTransaction(Sentry.startTransaction("foo", "bar") as SentryTracer)
+            // Add a user id value
+            transaction.setExtra("user", "@some:user")
+            transaction.setTag("user", "@some:user")
+
+            val result = prepareTransactionBeforeSend(transaction)
+
+            // The user id value should have been removed
+            assertThat(result.getExtra("user")).isNull()
+            assertThat(result.getTag("user")).isNull()
+
+            // The DB sizes should be included
+            assertThat(result.getExtra(AnalyticsUserData.STATE_STORE_SIZE)).isEqualTo(10)
+            assertThat(result.getExtra(AnalyticsUserData.EVENT_CACHE_SIZE)).isEqualTo(11)
+            assertThat(result.getExtra(AnalyticsUserData.MEDIA_STORE_SIZE)).isEqualTo(12)
+            assertThat(result.getExtra(AnalyticsUserData.CRYPTO_STORE_SIZE)).isEqualTo(13)
+        }
+    }
+
+    @Test
+    fun `prepareTransactionBeforeSend doesn't add DB info if no session id is provided`() {
+        createSentryAnalyticsProvider(
+            getDatabaseSizesUseCase = GetDatabaseSizesUseCase {
+                Result.success(
+                    SdkStoreSizes(stateStore = 10.megaBytes, eventCacheStore = 11.megaBytes, mediaStore = 12.megaBytes, cryptoStore = 13.megaBytes)
+                )
+            },
+            appNavigationStateService = FakeAppNavigationStateService(
+                MutableStateFlow(AppNavigationState(navigationState = NavigationState.Root, isInForeground = true))
+            )
+        ).run {
+            init()
+
+            val transaction = SentryTransaction(Sentry.startTransaction("foo", "bar") as SentryTracer)
+            val result = prepareTransactionBeforeSend(transaction)
+            // The DB sizes are missing since there was no session id to query them
+            assertThat(result.extras).isNull()
+        }
+    }
+
+    @Test
+    fun `prepareTransactionBeforeSend doesn't add DB info if no store sizes are available`() {
+        createSentryAnalyticsProvider(
+            getDatabaseSizesUseCase = GetDatabaseSizesUseCase {
+                Result.success(
+                    SdkStoreSizes(stateStore = null, eventCacheStore = null, mediaStore = null, cryptoStore = null)
+                )
+            },
+            appNavigationStateService = FakeAppNavigationStateService(
+                MutableStateFlow(AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true))
+            )
+        ).run {
+            init()
+
+            val transaction = SentryTransaction(Sentry.startTransaction("foo", "bar") as SentryTracer)
+            val result = prepareTransactionBeforeSend(transaction)
+
+            // The DB sizes are missing since there was no session id to query them
+            assertThat(result.extras).isNull()
+        }
+    }
+
+    private fun createSentryAnalyticsProvider(
+        sentryDsn: SentryDsn? = SentryDsn("https://1234@sentry.com/a"),
+        buildMeta: BuildMeta = aBuildMeta(),
+        getDatabaseSizesUseCase: GetDatabaseSizesUseCase = GetDatabaseSizesUseCase { Result.success(SdkStoreSizes(null, null, null, null)) },
+        appNavigationStateService: FakeAppNavigationStateService = FakeAppNavigationStateService(
+            MutableStateFlow(AppNavigationState(navigationState = NavigationState.Session("owner", A_SESSION_ID), isInForeground = true))
+        )
+    ) = SentryAnalyticsProvider(
+        context = InstrumentationRegistry.getInstrumentation().targetContext,
+        sentryDsn = sentryDsn,
+        buildMeta = buildMeta,
+        getDatabaseSizesUseCase = getDatabaseSizesUseCase,
+        appNavigationStateService = appNavigationStateService,
+    )
+}
diff --git a/services/analyticsproviders/test/build.gradle.kts b/services/analyticsproviders/test/build.gradle.kts
index 762222b8dc..455ee57f5e 100644
--- a/services/analyticsproviders/test/build.gradle.kts
+++ b/services/analyticsproviders/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/analyticsproviders/test/src/main/kotlin/io/element/android/services/analyticsproviders/test/FakeAnalyticsProvider.kt b/services/analyticsproviders/test/src/main/kotlin/io/element/android/services/analyticsproviders/test/FakeAnalyticsProvider.kt
index f38d0d25fe..9b0374bd9b 100644
--- a/services/analyticsproviders/test/src/main/kotlin/io/element/android/services/analyticsproviders/test/FakeAnalyticsProvider.kt
+++ b/services/analyticsproviders/test/src/main/kotlin/io/element/android/services/analyticsproviders/test/FakeAnalyticsProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
+import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeAnalyticsProvider(
@@ -31,4 +33,5 @@ class FakeAnalyticsProvider(
     override fun updateUserProperties(userProperties: UserProperties) = updateUserPropertiesLambda(userProperties)
     override fun trackError(throwable: Throwable) = trackErrorLambda(throwable)
     override fun updateSuperProperties(updatedProperties: SuperProperties) = updateSuperPropertiesLambda(updatedProperties)
+    override fun startTransaction(name: String, operation: String?): AnalyticsTransaction? = null
 }
diff --git a/services/apperror/api/build.gradle.kts b/services/apperror/api/build.gradle.kts
index 0996152de6..c0893bd7e8 100644
--- a/services/apperror/api/build.gradle.kts
+++ b/services/apperror/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorState.kt b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorState.kt
index 9da3b6547b..366c49b755 100644
--- a/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorState.kt
+++ b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateProvider.kt b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateProvider.kt
index ed7a28abcc..e0b8fec507 100644
--- a/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateProvider.kt
+++ b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateService.kt b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateService.kt
index 8070673804..7c592e2102 100644
--- a/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateService.kt
+++ b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorStateService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/impl/build.gradle.kts b/services/apperror/impl/build.gradle.kts
index 673468e99a..b72b54c198 100644
--- a/services/apperror/impl/build.gradle.kts
+++ b/services/apperror/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt b/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt
index ff10bd1970..3794234c79 100644
--- a/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt
+++ b/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateService.kt b/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateService.kt
index 7d4dc8d64e..1b11a42bfb 100644
--- a/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateService.kt
+++ b/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.services.apperror.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.services.apperror.api.AppErrorState
 import io.element.android.services.apperror.api.AppErrorStateService
@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.StateFlow
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultAppErrorStateService(
     private val stringProvider: StringProvider,
 ) : AppErrorStateService {
diff --git a/services/apperror/impl/src/test/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateServiceTest.kt b/services/apperror/impl/src/test/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateServiceTest.kt
index 6eb26c9c50..92bf6f6359 100644
--- a/services/apperror/impl/src/test/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateServiceTest.kt
+++ b/services/apperror/impl/src/test/kotlin/io/element/android/services/apperror/impl/DefaultAppErrorStateServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/test/build.gradle.kts b/services/apperror/test/build.gradle.kts
index c8ac902784..706fdc0a26 100644
--- a/services/apperror/test/build.gradle.kts
+++ b/services/apperror/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/apperror/test/src/main/kotlin/io/element/android/services/apperror/test/FakeAppErrorStateService.kt b/services/apperror/test/src/main/kotlin/io/element/android/services/apperror/test/FakeAppErrorStateService.kt
index 0783d08e02..1c78491567 100644
--- a/services/apperror/test/src/main/kotlin/io/element/android/services/apperror/test/FakeAppErrorStateService.kt
+++ b/services/apperror/test/src/main/kotlin/io/element/android/services/apperror/test/FakeAppErrorStateService.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/api/build.gradle.kts b/services/appnavstate/api/build.gradle.kts
index f25cf59764..c9849de20f 100644
--- a/services/appnavstate/api/build.gradle.kts
+++ b/services/appnavstate/api/build.gradle.kts
@@ -1,9 +1,8 @@
-import extension.setupDependencyInjection
-
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,8 +14,6 @@ android {
     namespace = "io.element.android.services.appnavstate.api"
 }
 
-setupDependencyInjection()
-
 dependencies {
     implementation(libs.coroutines.core)
     implementation(libs.androidx.lifecycle.runtime)
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/ActiveRoomsHolder.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/ActiveRoomsHolder.kt
index 07050d7bea..c1e84de079 100644
--- a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/ActiveRoomsHolder.kt
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/ActiveRoomsHolder.kt
@@ -1,69 +1,43 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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.api
 
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.Inject
-import dev.zacsweers.metro.SingleIn
 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 java.util.concurrent.ConcurrentHashMap
 
 /**
  * Holds the active rooms for a given session so they can be reused instead of instantiating new ones.
  */
-@SingleIn(AppScope::class)
-@Inject
-class ActiveRoomsHolder {
-    private val rooms = ConcurrentHashMap<SessionId, MutableSet<JoinedRoom>>()
-
+interface ActiveRoomsHolder {
     /**
      * Adds a new held room for the given sessionId.
      */
-    fun addRoom(room: JoinedRoom) {
-        val roomsForSessionId = rooms.getOrPut(key = room.sessionId, defaultValue = { mutableSetOf() })
-        if (roomsForSessionId.none { it.roomId == room.roomId }) {
-            // We don't want to add the same room multiple times
-            roomsForSessionId.add(room)
-        }
-    }
+    fun addRoom(room: JoinedRoom)
 
     /**
      * Returns the last room added for the given [sessionId] or null if no room was added.
      */
-    fun getActiveRoom(sessionId: SessionId): JoinedRoom? {
-        return rooms[sessionId]?.lastOrNull()
-    }
+    fun getActiveRoom(sessionId: SessionId): JoinedRoom?
 
     /**
      * Returns an active room associated to the given [sessionId], with the given [roomId], or null if none match.
      */
-    fun getActiveRoomMatching(sessionId: SessionId, roomId: RoomId): JoinedRoom? {
-        return rooms[sessionId]?.find { it.roomId == roomId }
-    }
+    fun getActiveRoomMatching(sessionId: SessionId, roomId: RoomId): JoinedRoom?
 
     /**
      * Removes any room matching the provided [sessionId] and [roomId].
      */
-    fun removeRoom(sessionId: SessionId, roomId: RoomId) {
-        val roomsForSessionId = rooms[sessionId] ?: return
-        roomsForSessionId.removeIf { it.roomId == roomId }
-    }
+    fun removeRoom(sessionId: SessionId, roomId: RoomId)
 
     /**
      * Clears all the rooms for the given sessionId.
      */
-    fun clear(sessionId: SessionId) {
-        val activeRooms = rooms.remove(sessionId) ?: return
-        for (room in activeRooms) {
-            // Destroy the room to reset the live timelines
-            room.destroy()
-        }
-    }
+    fun clear(sessionId: SessionId)
 }
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 6b96476376..d6effec06f 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationState.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationState.kt
index d50d44a876..54e18d8b9f 100644
--- a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationState.kt
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationStateService.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationStateService.kt
index 3db05d50e3..8387afca59 100644
--- a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationStateService.kt
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppNavigationStateService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt
new file mode 100644
index 0000000000..4851503984
--- /dev/null
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/IntentNavigationExtras.kt
@@ -0,0 +1,10 @@
+/*
+ * 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.services.appnavstate.api
+
+const val ROOM_OPENED_FROM_NOTIFICATION = "opened_from_notification"
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationState.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationState.kt
index e6cf041692..0ff606e051 100644
--- a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationState.kt
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationState.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationStateExtension.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationStateExtension.kt
index 45fb1803d7..bf336a38bf 100644
--- a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationStateExtension.kt
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/NavigationStateExtension.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/impl/build.gradle.kts b/services/appnavstate/impl/build.gradle.kts
index ba58e96f69..4b533a4ea1 100644
--- a/services/appnavstate/impl/build.gradle.kts
+++ b/services/appnavstate/impl/build.gradle.kts
@@ -2,9 +2,10 @@ import extension.setupDependencyInjection
 import extension.testCommonDependencies
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2022-2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultActiveRoomsHolder.kt b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultActiveRoomsHolder.kt
new file mode 100644
index 0000000000..871ec32d8a
--- /dev/null
+++ b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultActiveRoomsHolder.kt
@@ -0,0 +1,53 @@
+/*
+ * 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.services.appnavstate.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+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
+import java.util.concurrent.ConcurrentHashMap
+
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
+class DefaultActiveRoomsHolder : ActiveRoomsHolder {
+    private val rooms = ConcurrentHashMap<SessionId, MutableSet<JoinedRoom>>()
+
+    override fun addRoom(room: JoinedRoom) {
+        val roomsForSessionId = rooms.getOrPut(key = room.sessionId, defaultValue = { mutableSetOf() })
+        if (roomsForSessionId.none { it.roomId == room.roomId }) {
+            // We don't want to add the same room multiple times
+            roomsForSessionId.add(room)
+        }
+    }
+
+    override fun getActiveRoom(sessionId: SessionId): JoinedRoom? {
+        return rooms[sessionId]?.lastOrNull()
+    }
+
+    override fun getActiveRoomMatching(sessionId: SessionId, roomId: RoomId): JoinedRoom? {
+        return rooms[sessionId]?.find { it.roomId == roomId }
+    }
+
+    override fun removeRoom(sessionId: SessionId, roomId: RoomId) {
+        val roomsForSessionId = rooms[sessionId] ?: return
+        roomsForSessionId.removeIf { it.roomId == roomId }
+    }
+
+    override fun clear(sessionId: SessionId) {
+        val activeRooms = rooms.remove(sessionId) ?: return
+        for (room in activeRooms) {
+            // Destroy the room to reset the live timelines
+            room.destroy()
+        }
+    }
+}
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 9bd5004f13..c9fa31caca 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt
index 013ce5459f..e820bf9262 100644
--- a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt
+++ b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,6 @@ package io.element.android.services.appnavstate.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.annotations.AppCoroutineScope
@@ -35,7 +35,6 @@ private val loggerTag = LoggerTag("Navigation")
  */
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-@Inject
 class DefaultAppNavigationStateService(
     private val appForegroundStateService: AppForegroundStateService,
     @AppCoroutineScope
diff --git a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/di/AppNavStateModule.kt b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/di/AppNavStateModule.kt
index 326d4de059..4cf9c25b7b 100644
--- a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/di/AppNavStateModule.kt
+++ b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/di/AppNavStateModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/initializer/AppForegroundStateServiceInitializer.kt b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/initializer/AppForegroundStateServiceInitializer.kt
index 0e5487197e..b2e906e707 100644
--- a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/initializer/AppForegroundStateServiceInitializer.kt
+++ b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/initializer/AppForegroundStateServiceInitializer.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt b/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt
index c6ddff060e..56f9c5e986 100644
--- a/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt
+++ b/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/test/build.gradle.kts b/services/appnavstate/test/build.gradle.kts
index d2f708cb87..af4995eb22 100644
--- a/services/appnavstate/test/build.gradle.kts
+++ b/services/appnavstate/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/AppNavStateFixture.kt b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/AppNavStateFixture.kt
index e411e277b5..e9c2f6d2fa 100644
--- a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/AppNavStateFixture.kt
+++ b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/AppNavStateFixture.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 b8bb7b8a20..a61733cc22 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt
index aec2e9eb00..d01bc4f34b 100644
--- a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt
+++ b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppNavigationStateService.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/api/build.gradle.kts b/services/toolbox/api/build.gradle.kts
index 2a45c980d5..86829c0132 100644
--- a/services/toolbox/api/build.gradle.kts
+++ b/services/toolbox/api/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/intent/ExternalIntentLauncher.kt b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/intent/ExternalIntentLauncher.kt
index 5aeebcaaa9..ba34a6a716 100644
--- a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/intent/ExternalIntentLauncher.kt
+++ b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/intent/ExternalIntentLauncher.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/sdk/BuildVersionSdkIntProvider.kt b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/sdk/BuildVersionSdkIntProvider.kt
index bbbbec7fd8..26bbe23548 100644
--- a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/sdk/BuildVersionSdkIntProvider.kt
+++ b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/sdk/BuildVersionSdkIntProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 6c3ea5ce12..9a8ff23eb5 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/systemclock/SystemClock.kt b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/systemclock/SystemClock.kt
index 8cab823e9f..5436b44354 100644
--- a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/systemclock/SystemClock.kt
+++ b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/systemclock/SystemClock.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/impl/build.gradle.kts b/services/toolbox/impl/build.gradle.kts
index f436771591..d69e421839 100644
--- a/services/toolbox/impl/build.gradle.kts
+++ b/services/toolbox/impl/build.gradle.kts
@@ -1,9 +1,10 @@
 import extension.setupDependencyInjection
 
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2023, 2024 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/intent/DefaultExternalIntentLauncher.kt b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/intent/DefaultExternalIntentLauncher.kt
index 431bb49e57..d5cdad904b 100644
--- a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/intent/DefaultExternalIntentLauncher.kt
+++ b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/intent/DefaultExternalIntentLauncher.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -11,12 +12,10 @@ import android.content.Context
 import android.content.Intent
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.services.toolbox.api.intent.ExternalIntentLauncher
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultExternalIntentLauncher(
     @ApplicationContext private val context: Context,
 ) : ExternalIntentLauncher {
diff --git a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/sdk/DefaultBuildVersionSdkIntProvider.kt b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/sdk/DefaultBuildVersionSdkIntProvider.kt
index 75904f4dea..df08f672bd 100644
--- a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/sdk/DefaultBuildVersionSdkIntProvider.kt
+++ b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/sdk/DefaultBuildVersionSdkIntProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,11 +11,9 @@ package io.element.android.services.toolbox.impl.sdk
 import android.os.Build
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultBuildVersionSdkIntProvider :
     BuildVersionSdkIntProvider {
     override fun get() = Build.VERSION.SDK_INT
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 1e07f77f20..b095348c41 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,11 +13,9 @@ import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.services.toolbox.api.strings.StringProvider
 
 @ContributesBinding(AppScope::class)
-@Inject
 class AndroidStringProvider(private val resources: Resources) : StringProvider {
     override fun getString(@StringRes resId: Int): String {
         return resources.getString(resId)
diff --git a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/DefaultSystemClock.kt b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/DefaultSystemClock.kt
index 74c5094868..169518f80c 100644
--- a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/DefaultSystemClock.kt
+++ b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/DefaultSystemClock.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,11 +10,9 @@ package io.element.android.services.toolbox.impl.systemclock
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Inject
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 
 @ContributesBinding(AppScope::class)
-@Inject
 class DefaultSystemClock : SystemClock {
     /**
      * Provides a UTC epoch in milliseconds
diff --git a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/TimeModule.kt b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/TimeModule.kt
index c1aa2c8be4..766a63ebfd 100644
--- a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/TimeModule.kt
+++ b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/systemclock/TimeModule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/test/build.gradle.kts b/services/toolbox/test/build.gradle.kts
index 8d2f2b8a2d..6976646bfc 100644
--- a/services/toolbox/test/build.gradle.kts
+++ b/services/toolbox/test/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt
index a8e9589b6d..21f618ebc5 100644
--- a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt
+++ b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/intent/FakeExternalIntentLauncher.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/sdk/FakeBuildVersionSdkIntProvider.kt b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/sdk/FakeBuildVersionSdkIntProvider.kt
index a09766b6f7..75a8b424e8 100644
--- a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/sdk/FakeBuildVersionSdkIntProvider.kt
+++ b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/sdk/FakeBuildVersionSdkIntProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 e6b33d3785..c2867dca3b 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt
index 444502aea8..648e19ad22 100644
--- a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt
+++ b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/systemclock/FakeSystemClock.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9245034508..8c7b608465 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,15 +1,14 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-import java.net.URI
-
 pluginManagement {
     repositories {
-                includeBuild("plugins")
+        includeBuild("plugins")
         gradlePluginPortal()
         google()
         mavenCentral()
@@ -18,14 +17,17 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-                google()
-        mavenCentral()
         maven {
-            url = URI("https://www.jitpack.io")
+            url = uri("https://www.jitpack.io")
             content {
                 includeModule("com.github.matrix-org", "matrix-analytics-events")
             }
         }
+        google()
+        mavenCentral()
+        maven {
+            url = uri("https://repo1.maven.org/maven2/")
+        }
         flatDir {
             dirs("libraries/matrix/libs")
         }
diff --git a/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ByPreferencesDataStoreRule.kt b/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ByPreferencesDataStoreRule.kt
index cb00dc18b1..eb33f89f1d 100644
--- a/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ByPreferencesDataStoreRule.kt
+++ b/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ByPreferencesDataStoreRule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ElementRuleSetProvider.kt b/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ElementRuleSetProvider.kt
index 9a7ba55dc6..1a0955c6c7 100644
--- a/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ElementRuleSetProvider.kt
+++ b/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/ElementRuleSetProvider.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/RunCatchingRule.kt b/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/RunCatchingRule.kt
index 094de51be3..e640318890 100644
--- a/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/RunCatchingRule.kt
+++ b/tests/detekt-rules/src/main/kotlin/io/element/android/detektrules/RunCatchingRule.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/detekt-rules/src/test/kotlin/io/element/android/detektrules/RunCatchingRuleTest.kt b/tests/detekt-rules/src/test/kotlin/io/element/android/detektrules/RunCatchingRuleTest.kt
index c11d4d8868..23fcf15f18 100644
--- a/tests/detekt-rules/src/test/kotlin/io/element/android/detektrules/RunCatchingRuleTest.kt
+++ b/tests/detekt-rules/src/test/kotlin/io/element/android/detektrules/RunCatchingRuleTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/build.gradle.kts b/tests/konsist/build.gradle.kts
index d920416193..5558b1a564 100644
--- a/tests/konsist/build.gradle.kts
+++ b/tests/konsist/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FailingComposableWithNonImmutableSealedInterface.kt b/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FailingComposableWithNonImmutableSealedInterface.kt
index 43d682d55e..ee5266da4f 100644
--- a/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FailingComposableWithNonImmutableSealedInterface.kt
+++ b/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FailingComposableWithNonImmutableSealedInterface.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FakeWrongClassName.kt b/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FakeWrongClassName.kt
index 599343e56f..ea78c93356 100644
--- a/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FakeWrongClassName.kt
+++ b/tests/konsist/src/main/kotlin/io/element/android/tests/konsist/failures/FakeWrongClassName.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 a01c37ea6c..fe303f360c 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistCallbackTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistCallbackTest.kt
index 57a9db4a20..9819bc9254 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistCallbackTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistCallbackTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 234a9c30ff..631def9f75 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -62,6 +63,7 @@ class KonsistClassNameTest {
             .withAllParentsOf(PreviewParameterProvider::class)
             .withoutName(
                 "AspectRatioProvider",
+                "EditableAvatarViewUriProvider",
                 "LoginModeViewErrorProvider",
                 "OverlapRatioProvider",
                 "TextFileContentProvider",
@@ -97,8 +99,11 @@ class KonsistClassNameTest {
             .classes()
             .withNameContaining("Fake")
             .withoutName(
+                "FakeAesKeyGenerator",
                 "FakeFileSystem",
                 "FakeImageLoader",
+                "FakeKeyStore",
+                "FakeListenableFuture",
             )
             .assertTrue {
                 val interfaceName = it.name
@@ -148,6 +153,7 @@ class KonsistClassNameTest {
                 "Factory",
                 "TimelineController",
                 "TimelineMediaGalleryDataSource",
+                "MetroWorkerFactory",
             )
             .withoutNameStartingWith(
                 "Accompanist",
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistComposableTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistComposableTest.kt
index 181c63350b..b3db2afd38 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistComposableTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistComposableTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistConfigTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistConfigTest.kt
index bd967bf13b..bd8c4b593d 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistConfigTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistConfigTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt
index a63eb1d925..b7403f4e4b 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt
index 093cfd4488..a5b2f1572c 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -10,8 +11,10 @@ package io.element.android.tests.konsist
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.withAnnotationOf
 import com.lemonappdev.konsist.api.ext.list.withParameter
+import com.lemonappdev.konsist.api.verify.assertFalse
 import com.lemonappdev.konsist.api.verify.assertTrue
 import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
 import org.junit.Test
 
@@ -32,4 +35,15 @@ class KonsistDiTest {
                     .isEmpty()
             }
     }
+
+    @Test
+    fun `class annotated with @ContributesBinding does not need to be annotated with @Inject anymore`() {
+        Konsist
+            .scopeFromProject()
+            .classes()
+            .withAnnotationOf(ContributesBinding::class)
+            .assertFalse { classDeclaration ->
+                classDeclaration.hasAnnotationOf(Inject::class)
+            }
+    }
 }
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
index c9b67854c1..bfbe76d358 100644
--- 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFlowTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFlowTest.kt
index b9cca40740..4aa5e5db81 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFlowTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFlowTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImmutableTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImmutableTest.kt
index 0aa68503e5..ceb0058124 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImmutableTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImmutableTest.kt
@@ -1,14 +1,19 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-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 androidx.compose.runtime.Immutable
 import com.lemonappdev.konsist.api.Konsist
+import com.lemonappdev.konsist.api.ext.list.withAnnotationOf
+import com.lemonappdev.konsist.api.ext.list.withNameEndingWith
 import com.lemonappdev.konsist.api.ext.list.withoutName
+import com.lemonappdev.konsist.api.verify.assertEmpty
 import com.lemonappdev.konsist.api.verify.assertFalse
 import org.junit.Test
 
@@ -60,4 +65,14 @@ class KonsistImmutableTest {
                 it.text.contains(".toPersistentMap()")
             }
     }
+
+    @Test
+    fun `Immutable annotation is not used on sealed interface for Presenter Events`() {
+        Konsist
+            .scopeFromProduction()
+            .interfaces()
+            .withNameEndingWith("Events")
+            .withAnnotationOf(Immutable::class)
+            .assertEmpty()
+    }
 }
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImportTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImportTest.kt
index c921f3fd60..10a1903bd4 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImportTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistImportTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 c3a3d3e9e2..f47621da0e 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -15,16 +16,18 @@ import org.junit.Test
 class KonsistLicenseTest {
     private val publicLicense = """
         /\*
-        (?:.*\n)* \* Copyright 20\d\d((, |-)20\d\d)? New Vector Ltd.
+        (?:.*\n)* \* Copyright \(c\) 20\d\d((, |-)20\d\d)? Element Creations Ltd\.
         (?:.*\n)* \*
-         \* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-         \* Please see LICENSE files in the repository root for full details.
+         \* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\.
+         \* Please see LICENSE files in the repository root for full details\.
          \*/
         """.trimIndent().toRegex()
 
     private val enterpriseLicense = """
         /\*
-         \* © 20\d\d New Vector Limited, Element Software SARL, Element Software Inc\.,
+         \* © 20\d\d((, |-)20\d\d)? Element Creations Ltd\.
+        (?:.*\n)* \*
+         \* Element Creations Ltd, Element Software SARL, Element Software Inc\.,
          \* and Element Software GmbH \(the "Element Group"\) only make this file available
          \* under a proprietary license model\.
          \*
@@ -80,7 +83,7 @@ class KonsistLicenseTest {
                     it.name.startsWith("Template ").not()
             }
             .assertTrue {
-                it.text.count("New Vector") == 1
+                it.text.count("Element Creations Ltd.") == 1
             }
     }
 }
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistMethodNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistMethodNameTest.kt
index 2b0e32186d..096885f976 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistMethodNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistMethodNameTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 340b5f3703..f202148464 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPresenterTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPresenterTest.kt
index 2b92d9bd07..de8b960654 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPresenterTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 082a106be2..32f2908cf7 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -79,16 +80,13 @@ class KonsistPreviewTest {
         "AsyncIndicatorFailurePreview",
         "AsyncIndicatorLoadingPreview",
         "BackgroundVerticalGradientDisabledPreview",
-        "BackgroundVerticalGradientEnterprisePreview",
         "BackgroundVerticalGradientPreview",
         "ColorAliasesPreview",
-        "DefaultRoomListTopBarMultiAccountPreview",
-        "DefaultRoomListTopBarWithIndicatorPreview",
-        "FocusedEventEnterprisePreview",
         "FocusedEventPreview",
         "GradientFloatingActionButtonCircleShapePreview",
         "HeaderFooterPageScrollablePreview",
-        "IconsCompoundPreview",
+        "HomeTopBarMultiAccountPreview",
+        "HomeTopBarWithIndicatorPreview",
         "IconsOtherPreview",
         "MarkdownTextComposerEditPreview",
         "MatrixBadgeAtomInfoPreview",
@@ -99,6 +97,7 @@ class KonsistPreviewTest {
         "MessageComposerViewVoicePreview",
         "MessagesReactionButtonAddPreview",
         "MessagesReactionButtonExtraPreview",
+        "MessagesViewWithHistoryVisiblePreview",
         "MessagesViewWithIdentityChangePreview",
         "PendingMemberRowWithLongNamePreview",
         "PinUnlockViewInAppPreview",
@@ -118,7 +117,6 @@ class KonsistPreviewTest {
         "ProgressDialogWithContentPreview",
         "ProgressDialogWithTextAndContentPreview",
         "ReadReceiptBottomSheetPreview",
-        "RoomMemberListViewBannedPreview",
         "SasEmojisPreview",
         "SecureBackupSetupViewChangePreview",
         "SelectedUserCannotRemovePreview",
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
index f480a0bb62..2e3fe383d1 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/build.gradle.kts b/tests/testutils/build.gradle.kts
index 8a7730095a..4acb06305f 100644
--- a/tests/testutils/build.gradle.kts
+++ b/tests/testutils/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/AssertThrowInDebug.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/AssertThrowInDebug.kt
index 2626f48036..88ae13a29e 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/AssertThrowInDebug.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/AssertThrowInDebug.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureCalledOnce.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureCalledOnce.kt
index 15d09e17a9..520bc22a7a 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureCalledOnce.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureCalledOnce.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fe45364f49..7c3d4ec600 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EventsRecorder.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EventsRecorder.kt
index 6437894074..18db0d7d2c 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EventsRecorder.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EventsRecorder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 fd73c3931f..75d91c4a88 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/LongTask.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/LongTask.kt
index b8305e6f81..bbaa1cf741 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/LongTask.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/LongTask.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -33,7 +34,7 @@ suspend fun awaitWithLatch(timeout: Duration = 300.milliseconds, block: (Complet
         withTimeout(timeout) {
             latch.also(block).await()
         }
-    } catch (exception: TimeoutCancellationException) {
+    } catch (_: TimeoutCancellationException) {
         latch.complete(Unit)
     }
 }
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/MutablePresenter.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/MutablePresenter.kt
index 9ad6a2cc29..ae8768e0b0 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/MutablePresenter.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/MutablePresenter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/PresenterTest.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/PresenterTest.kt
index c5acc9d510..d7c53f6976 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/PresenterTest.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/PresenterTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,6 +13,7 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.TurbineTestContext
 import app.cash.turbine.test
 import io.element.android.libraries.architecture.Presenter
+import org.junit.Assert.fail
 import kotlin.time.Duration
 
 suspend fun <State> Presenter<State>.test(
@@ -19,7 +21,20 @@ suspend fun <State> Presenter<State>.test(
     name: String? = null,
     validate: suspend TurbineTestContext<State>.() -> Unit,
 ) {
-    moleculeFlow(RecompositionMode.Immediate) {
-        present()
-    }.test(timeout, name, validate)
+    try {
+        moleculeFlow(RecompositionMode.Immediate) {
+            present()
+        }.test(timeout, name, validate)
+    } catch (t: Throwable) {
+        if (t::class.simpleName == "KotlinReflectionInternalError") {
+            // Give a more explicit error to the developer
+            fail("""
+                It looks like you have an unconsumed event in your test.
+                    If you get this error, it means that your test is missing to consume one or several events.
+                    You can fix by consuming and check the event with `awaitItem()`, or you can also invoke
+                    `cancelAndIgnoreRemainingEvents()`.
+                """.trimIndent())
+        }
+        throw t
+    }
 }
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
index fe574796ec..80e8a03f75 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 620b5def40..12cfe44b44 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
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 55371a960d..6502882d7d 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
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,34 +10,33 @@ package io.element.android.tests.testutils
 
 import androidx.activity.ComponentActivity
 import androidx.annotation.StringRes
+import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
+import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasClickAction
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.isDialog
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import io.element.android.libraries.ui.strings.CommonStrings
 import org.junit.rules.TestRule
 
-fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.clickOn(@StringRes res: Int) {
+val trueMatcher = SemanticsMatcher("true matcher") { true }
+
+fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.clickOn(
+    @StringRes res: Int,
+    inDialog: Boolean = false,
+) {
     val text = activity.getString(res)
-    onNode(hasText(text) and hasClickAction())
+    onNode(
+        hasText(text) and hasClickAction() and if (inDialog) hasAnyAncestor(isDialog()) else trueMatcher
+    )
         .performClick()
 }
 
-fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.clickOnFirst(@StringRes res: Int) {
-    val text = activity.getString(res)
-    onAllNodes(hasText(text) and hasClickAction()).onFirst().performClick()
-}
-
-fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.clickOnLast(@StringRes res: Int) {
-    val text = activity.getString(res)
-    onAllNodes(hasText(text) and hasClickAction()).onFirst().performClick()
-}
-
 /**
  * Press the back button in the app bar.
  */
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestComposable.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestComposable.kt
index 673fb70bd5..a4f38cc6e8 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestComposable.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestComposable.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt
index 84d5e1aebb..c4773bf21d 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/Timber.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/Timber.kt
index 2aad499698..e1e4218b8c 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/Timber.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/Timber.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WaitingForAssertion.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WaitingForAssertion.kt
index 1ffba02d4d..701542cd11 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WaitingForAssertion.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WaitingForAssertion.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WarmUpRule.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WarmUpRule.kt
index e2bd73b5d5..d902eaa824 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WarmUpRule.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WarmUpRule.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WithFakeLifecycleOwner.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WithFakeLifecycleOwner.kt
index 16d4cfb2fd..5ff2bf06a3 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WithFakeLifecycleOwner.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/WithFakeLifecycleOwner.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -12,8 +13,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.currentComposer
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
@@ -26,8 +25,6 @@ import io.element.android.libraries.architecture.Presenter
 
 /**
  * Composable that provides a fake [LifecycleOwner] to the composition.
- *
- * **WARNING: DO NOT USE OUTSIDE TESTS.**
  */
 @OptIn(InternalComposeApi::class)
 @Stable
@@ -44,19 +41,16 @@ fun <T> withFakeLifecycleOwner(
 
 /**
  * Test a [Presenter] with a fake [LifecycleOwner].
- *
- * **WARNING: DO NOT USE OUTSIDE TESTS.**
  */
 suspend fun <T> Presenter<T>.testWithLifecycleOwner(
     lifecycleOwner: FakeLifecycleOwner = FakeLifecycleOwner(),
     block: suspend TurbineTestContext<T>.() -> Unit
 ) {
     moleculeFlow(RecompositionMode.Immediate) {
-        val ret = withFakeLifecycleOwner(lifecycleOwner) {
+        withFakeLifecycleOwner(lifecycleOwner) {
             present()
         }
-        ret
-    }.test<T>(validate = block)
+    }.test(validate = block)
 }
 
 @SuppressLint("VisibleForTests")
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeAndroidKeyStore.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeAndroidKeyStore.kt
new file mode 100644
index 0000000000..9edbec9795
--- /dev/null
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeAndroidKeyStore.kt
@@ -0,0 +1,71 @@
+/*
+ * 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.tests.testutils.fake
+
+import java.io.InputStream
+import java.io.OutputStream
+import java.security.Key
+import java.security.KeyStore
+import java.security.KeyStoreSpi
+import java.security.Provider
+import java.security.SecureRandom
+import java.security.Security
+import java.security.cert.Certificate
+import java.security.spec.AlgorithmParameterSpec
+import java.util.Date
+import java.util.Enumeration
+import javax.crypto.KeyGenerator
+import javax.crypto.KeyGeneratorSpi
+import javax.crypto.SecretKey
+
+// Source - https://stackoverflow.com/questions/38213748/using-the-android-keystore-in-robolectric-tests/75763240#75763240
+// Posted by Victor Oliveira
+// Retrieved 2025-12-19, License - CC BY-SA 4.0
+
+object FakeAndroidKeyStore {
+    val setup by lazy {
+        Security.addProvider(object : Provider("AndroidKeyStore", 1.0, "") {
+            init {
+                put("KeyStore.AndroidKeyStore", FakeKeyStore::class.java.name)
+                put("KeyGenerator.AES", FakeAesKeyGenerator::class.java.name)
+            }
+        })
+    }
+
+    class FakeKeyStore : KeyStoreSpi() {
+        private val wrapped = KeyStore.getInstance(KeyStore.getDefaultType())
+
+        override fun engineIsKeyEntry(alias: String?): Boolean = wrapped.isKeyEntry(alias)
+        override fun engineIsCertificateEntry(alias: String?): Boolean = wrapped.isCertificateEntry(alias)
+        override fun engineGetCertificate(alias: String?): Certificate = wrapped.getCertificate(alias)
+        override fun engineGetCreationDate(alias: String?): Date = wrapped.getCreationDate(alias)
+        override fun engineDeleteEntry(alias: String?) = wrapped.deleteEntry(alias)
+        override fun engineSetKeyEntry(alias: String?, key: Key?, password: CharArray?, chain: Array<out Certificate>?) =
+            wrapped.setKeyEntry(alias, key, password, chain)
+
+        override fun engineSetKeyEntry(alias: String?, key: ByteArray?, chain: Array<out Certificate>?) = wrapped.setKeyEntry(alias, key, chain)
+        override fun engineStore(stream: OutputStream?, password: CharArray?) = wrapped.store(stream, password)
+        override fun engineSize(): Int = wrapped.size()
+        override fun engineAliases(): Enumeration<String> = wrapped.aliases()
+        override fun engineContainsAlias(alias: String?): Boolean = wrapped.containsAlias(alias)
+        override fun engineLoad(stream: InputStream?, password: CharArray?) = wrapped.load(stream, password)
+        override fun engineGetCertificateChain(alias: String?): Array<Certificate> = wrapped.getCertificateChain(alias)
+        override fun engineSetCertificateEntry(alias: String?, cert: Certificate?) = wrapped.setCertificateEntry(alias, cert)
+        override fun engineGetCertificateAlias(cert: Certificate?): String = wrapped.getCertificateAlias(cert)
+        override fun engineGetKey(alias: String?, password: CharArray?): Key = wrapped.getKey(alias, password)
+    }
+
+    class FakeAesKeyGenerator : KeyGeneratorSpi() {
+        private val wrapped = KeyGenerator.getInstance("AES")
+
+        override fun engineInit(random: SecureRandom?) = Unit
+        override fun engineInit(params: AlgorithmParameterSpec?, random: SecureRandom?) = Unit
+        override fun engineInit(keysize: Int, random: SecureRandom?) = Unit
+        override fun engineGenerateKey(): SecretKey = wrapped.generateKey()
+    }
+}
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeTemporaryUriDeleter.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeTemporaryUriDeleter.kt
index 2493167eb9..e6fc1c2d8c 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeTemporaryUriDeleter.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/fake/FakeTemporaryUriDeleter.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Assertions.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Assertions.kt
index af43e4fbd8..db4e381456 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Assertions.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Assertions.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Error.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Error.kt
index f9e2ec0cbb..95140b942d 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Error.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/Error.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/LambdaRecorder.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/LambdaRecorder.kt
index 0966dd1cb7..e90518dee4 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/LambdaRecorder.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/LambdaRecorder.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/ParameterMatcher.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/ParameterMatcher.kt
index 2b16b099bf..7b15c29bc8 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/ParameterMatcher.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/lambda/ParameterMatcher.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt
index 79def028f7..c994733340 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/node/TestParentNode.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts
index 6893a780b4..466167981c 100644
--- a/tests/uitests/build.gradle.kts
+++ b/tests/uitests/build.gradle.kts
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -19,6 +20,11 @@ android {
     namespace = "ui"
 }
 
+tasks.withType(Test::class) {
+    // Don't fail the test run if there are no tests, this can happen if we run them with screenshot test disabled
+    failOnNoDiscoveredTests = false
+}
+
 dependencies {
     // Paparazzi 1.3.2 workaround (see https://github.com/cashapp/paparazzi/blob/master/CHANGELOG.md#132---2024-01-13)
     constraints.add("testImplementation", "com.google.guava:guava") {
diff --git a/tests/uitests/src/test/kotlin/base/BaseDeviceConfig.kt b/tests/uitests/src/test/kotlin/base/BaseDeviceConfig.kt
index 56cbc41e65..486fb8e1e4 100644
--- a/tests/uitests/src/test/kotlin/base/BaseDeviceConfig.kt
+++ b/tests/uitests/src/test/kotlin/base/BaseDeviceConfig.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2022-2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt b/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt
index 477e6a2da2..5ae7c75d71 100644
--- a/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt
+++ b/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -9,7 +10,7 @@
 
 package base
 
-import com.google.testing.junit.testparameterinjector.TestParameter
+import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
 import sergio.sastre.composable.preview.scanner.android.AndroidComposablePreviewScanner
 import sergio.sastre.composable.preview.scanner.android.AndroidPreviewInfo
 import sergio.sastre.composable.preview.scanner.core.preview.ComposablePreview
@@ -24,8 +25,8 @@ private val PACKAGE_TREES = arrayOf(
     "io.element.android.x",
 )
 
-object ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
-    private val values: List<IndexedValue<ComposablePreview<AndroidPreviewInfo>>> by lazy {
+object ComposablePreviewProvider : TestParameterValuesProvider() {
+    val values: List<IndexedValue<ComposablePreview<AndroidPreviewInfo>>> by lazy {
         AndroidComposablePreviewScanner()
             .scanPackageTrees(*PACKAGE_TREES)
             .getPreviews()
@@ -34,10 +35,10 @@ object ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
             .toList()
     }
 
-    override fun provideValues(): List<IndexedValue<ComposablePreview<AndroidPreviewInfo>>> = values
+    override fun provideValues(context: Context): List<IndexedValue<ComposablePreview<AndroidPreviewInfo>>> = values
 }
 
-object ComposableA11yPreviewProvider : TestParameter.TestParameterValuesProvider {
+object ComposableA11yPreviewProvider : TestParameterValuesProvider() {
     private val values: List<ComposablePreview<AndroidPreviewInfo>> by lazy {
         AndroidComposablePreviewScanner()
             .scanPackageTrees(*PACKAGE_TREES)
@@ -46,25 +47,25 @@ object ComposableA11yPreviewProvider : TestParameter.TestParameterValuesProvider
             .toList()
     }
 
-    override fun provideValues(): List<ComposablePreview<AndroidPreviewInfo>> = values
+    override fun provideValues(context: Context): List<ComposablePreview<AndroidPreviewInfo>> = values
 }
 
-object Shard1ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
-    override fun provideValues(): List<ComposablePreview<AndroidPreviewInfo>> =
-        ComposablePreviewProvider.provideValues().filter { it.index % 4 == 0 }.map { it.value }
+object Shard1ComposablePreviewProvider : TestParameterValuesProvider() {
+    override fun provideValues(context: Context): List<ComposablePreview<AndroidPreviewInfo>> =
+        ComposablePreviewProvider.values.filter { it.index % 4 == 0 }.map { it.value }
 }
 
-object Shard2ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
-    override fun provideValues(): List<ComposablePreview<AndroidPreviewInfo>> =
-        ComposablePreviewProvider.provideValues().filter { it.index % 4 == 1 }.map { it.value }
+object Shard2ComposablePreviewProvider : TestParameterValuesProvider() {
+    override fun provideValues(context: Context): List<ComposablePreview<AndroidPreviewInfo>> =
+        ComposablePreviewProvider.values.filter { it.index % 4 == 1 }.map { it.value }
 }
 
-object Shard3ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
-    override fun provideValues(): List<ComposablePreview<AndroidPreviewInfo>> =
-        ComposablePreviewProvider.provideValues().filter { it.index % 4 == 2 }.map { it.value }
+object Shard3ComposablePreviewProvider : TestParameterValuesProvider() {
+    override fun provideValues(context: Context): List<ComposablePreview<AndroidPreviewInfo>> =
+        ComposablePreviewProvider.values.filter { it.index % 4 == 2 }.map { it.value }
 }
 
-object Shard4ComposablePreviewProvider : TestParameter.TestParameterValuesProvider {
-    override fun provideValues(): List<ComposablePreview<AndroidPreviewInfo>> =
-        ComposablePreviewProvider.provideValues().filter { it.index % 4 == 3 }.map { it.value }
+object Shard4ComposablePreviewProvider : TestParameterValuesProvider() {
+    override fun provideValues(context: Context): List<ComposablePreview<AndroidPreviewInfo>> =
+        ComposablePreviewProvider.values.filter { it.index % 4 == 3 }.map { it.value }
 }
diff --git a/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt
index 114b2775f0..0b088b5de0 100644
--- a/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt
+++ b/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
@@ -82,7 +83,7 @@ private fun Paparazzi.fixScreenshotName(preview: ComposablePreview<AndroidPrevie
         .joinToString(".")
     val testName = TestName(
         packageName = packageName,
-        className = preview.methodName.replace("Preview", ""),
+        className = preview.methodName.removeSuffix("Preview"),
         methodName = id
     )
     testNameField.set(this, testName)
diff --git a/tests/uitests/src/test/kotlin/translations/TranslationsScreenshotTest.kt b/tests/uitests/src/test/kotlin/translations/TranslationsScreenshotTest.kt
index 3a9de48ff4..4f7db75351 100644
--- a/tests/uitests/src/test/kotlin/translations/TranslationsScreenshotTest.kt
+++ b/tests/uitests/src/test/kotlin/translations/TranslationsScreenshotTest.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt b/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt
index d742db08b2..6f8fe2f506 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt
@@ -1,7 +1,8 @@
 /*
+ * Copyright (c) 2025 Element Creations Ltd.
  * Copyright 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt
index cd6ce50e8e..efb1a82cba 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt
index 6af2b046ba..c3312bad3b 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt
index 23c3b27bf7..d4508fb821 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt
index b9c4f36ea2..c0e3b807b7 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt
@@ -1,7 +1,8 @@
 /*
- * Copyright 2024 New Vector Ltd.
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
  *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
diff --git a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_0_en.png
index f9892e9de2..13b726fefb 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:584b66997ed296ce9621eca13b08aa3ac85afcba1487eea0daca8a261b4e138f
-size 8367
+oid sha256:071914fc3e7bbc2fc6ef8a1b4544b9126c05dd08b2123666d320223582423226
+size 5632
diff --git a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_1_en.png
index c2d7023c2c..db2c45090b 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5ce0fc2ee86d7fae4b068ff1a9bf589210d70829d8b15650b6a3f0e14f580ac
-size 10492
+oid sha256:5e9df6017bd0771e1337f82b75d13a0a8a572156e6900ae72f208e9bb2aaddb7
+size 7717
diff --git a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_0_en.png
index 89f1fa7ae7..1dddbda28f 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:daadc3dc7f9ce731f2fcc0d2556e6088c00c4eac827c57ebe3f56348de7d9229
-size 8014
+oid sha256:811bd4534f4f16530cea1489b62d393e2fe7bf1b18b859a924333cd9d309f8dd
+size 5566
diff --git a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_1_en.png
index e7b27e4f38..53f10d4bd4 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.room.joined_LoadingRoomNodeView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa9a211995c335fd146f7be29101c92bc40cc242390b76ed0195274f7d67e5a2
-size 10040
+oid sha256:030971f2c5f8c19f47fed2fa207c6d84d536c603fa7705ea6c288736684b7868
+size 7553
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 4d82afcbb8..5840286da4 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:a0c86d045750812e3de843f85b1d765cc1bd12049c900ef4f3f865a3c05ee09d
-size 83220
+oid sha256:0297e771c4370ede91623c024d63cf750826578381d2f08885e8246fc4c8c82f
+size 83236
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 a56c84e108..46ebb6db05 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:d9ced33be666212eefdfd8c60b6b4f5437b0d6b6a5871c526029cd8a7db11fb9
-size 82067
+oid sha256:407a886dee6739c1075f8865603250ab0a2a7c79d4b8cdf8ed2f7617c8cdd9aa
+size 82078
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 e844f45ccb..d7ac2cba9d 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:698d7c9c8cee25b3bbae6ff113fa651028e889edc9d66816890f35f868139ca7
-size 76342
+oid sha256:b5cfe3523c7a0fe50dbac6fe6ce842999c60b205d7347697c72b89074bf29c56
+size 76369
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 9f813e29df..7f29e70c79 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:33de9fdcd218a71f374a436e330d7a3117aeafeb6594a253363914c88a0a8fd3
-size 74534
+oid sha256:4bdb9e6d6d8423e9d7a847095b2a96fb47b2ed6fee977c6e163682b5f20e43db
+size 74563
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
index e74a44bc85..e68a69090d 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:780559f9a0677b007c93f0c24bef94ab63c89f2d8c124084557c5c8dec0ea3d6
-size 60500
+oid sha256:8397ea9df5871ea2c71183f59030c73ef7ba102aa75e5609459bae06b662847a
+size 60474
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
index 3634085549..ff9a4d740e 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97e068729df68971b35727236873cc7954ae5e63890f255948fb4ccd98b3ae2f
-size 59572
+oid sha256:87029fb2522ab31001a5b1efb12b8f99d0a5217d838d7531894875c44aaced76
+size 59531
diff --git a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Day_0_en.png
index 0a8fde8d9b..4b009d650c 100644
--- a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80252fdf997b3189af014f4606ee8ba60e6576feb1b3bfd6a2a551eafefba78c
-size 66409
+oid sha256:a17c98fc02077a91853cefa1ad7865ba8dd8fb399e58b9bea81617b797cf373f
+size 66410
diff --git a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Night_0_en.png
index 7aa315a611..d4d3d5510e 100644
--- a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_IncomingCallScreen_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30ae50e1f771deb025c456623019749a19cf08663cc2fa531d0865ea3b90e2b1
-size 58497
+oid sha256:baf0dbd830742e896f33c47254d0cc48598916758f6ea332710dc0d761002f36
+size 58503
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_0_en.png
deleted file mode 100644
index ce5f59afc4..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fe1781052c62eb808e6b53972238f46626282053c15630f76fe99294614180d
-size 13366
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_10_en.png
deleted file mode 100644
index 1b1dc0480b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_10_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68fcdde40d2f2f1fa66186b0850b4ac70066314f9ebb6e515d4a0af528ac25cb
-size 50316
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_11_en.png
deleted file mode 100644
index 223d3ae94a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_11_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a0bf177f0f5fd5a939bbc51c922487614e3a8902f6d19327ee34f3654794053
-size 52657
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_12_en.png
deleted file mode 100644
index ebe4ad0b9a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_12_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:997f0b0adc3e503cae7420dfbcfe7358b0597dc3f2d9325228a5f5f4feda76b1
-size 54407
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_1_en.png
deleted file mode 100644
index 79d8a34307..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3776c6e147cf70af109a8de76dc19575788f98afd55321601eaaf179f76b48c
-size 67448
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_2_en.png
deleted file mode 100644
index b7e915c94b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76630125c828f4b7d34632e21ec5615a425f3eb5f17b15c963495e0247dcf820
-size 61249
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_3_en.png
deleted file mode 100644
index 54a11c5829..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63ab147dd015d8dc1f3473749c0c1be34876610ca699e54c6f207624e14cf32c
-size 61201
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_4_en.png
deleted file mode 100644
index aa65e67974..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b62c47c4ae5f1d6a25fc5cdaa5e48c4815ae0de089f5e7b4770317281dc77258
-size 55033
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_5_en.png
deleted file mode 100644
index fe790d6f38..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4586403fc98b395696d938889d594ae6c7d20ec328319c372734a750191dca38
-size 12464
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_6_en.png
deleted file mode 100644
index af622b1d7a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c08f5d276bdf222ec98929baa53275e40a76282c9bd15bbf3dce231223ea863
-size 59021
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_7_en.png
deleted file mode 100644
index c6e3982793..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de42de69f32f5b1657cb703028d7cce38e8d427360e92c1786d317013f17323d
-size 61473
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_8_en.png
deleted file mode 100644
index 599e05ca89..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12a5a89c57cf315b9a2a753cdd43e6721d8565ff794b4fc31a9ef7b1b643ad1c
-size 52704
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_9_en.png
deleted file mode 100644
index edc3c60b54..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Day_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ad3480ab59df477aef94e2a1b57d247f09ae4a3beedf917ea445df0fb1dbd8d
-size 65037
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_0_en.png
deleted file mode 100644
index 0bdc12d42d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b896caea7163d9e66bab518afbb8d59fbb492bc67677de6fdf4aee73f2909459
-size 12642
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_10_en.png
deleted file mode 100644
index f463ab8857..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_10_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ad0df06cade954de31bc7e6e5d5e14c1ed9590e70f425da6b82104839fe54eb
-size 48592
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_11_en.png
deleted file mode 100644
index 4ef1339489..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_11_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:800600290cbb91a528273e2c88f6d73bc5c71b9d395315aa280277861b74c035
-size 53461
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_12_en.png
deleted file mode 100644
index 9f022eed6a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_12_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae2f05609d543bb6bb99df4f371d81b5d7c5040c66003afb30e6217395c51d0b
-size 55040
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_1_en.png
deleted file mode 100644
index 166bc7e714..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be065a6d9b0b6f24ae9f773b70f7c36d96939978ddaeee5da889e3d00388cc0e
-size 68006
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_2_en.png
deleted file mode 100644
index f5b8ab7002..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:82438000e7b5369d1cb45ca3f1b67599c77bcfac54fe50335509c144c7df33b4
-size 61968
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_3_en.png
deleted file mode 100644
index ed9e1167f0..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99628f108a0c165316d77b1189a70ebb8b4754ae3f96960b616d1305879324fd
-size 61907
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_4_en.png
deleted file mode 100644
index 1a2eb9ea44..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63639bf715af2a18f888a9fe54ea18403a13babdbd45fd86242253333cf1c5e8
-size 55372
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_5_en.png
deleted file mode 100644
index 9df27a7f9d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a42ac1076451395c040f96f1fffd20f3cd851f2272a6346ef83bc6661f21ced
-size 12475
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_6_en.png
deleted file mode 100644
index 91bcf2c395..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ded460697c44b23c47534b786d5f259d2ee87bbb6cffb8c6cbd6777bd40090c4
-size 56849
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_7_en.png
deleted file mode 100644
index 42f0ff8d98..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76cb14f12f0d8304d3f3125026d79ac8b2012d00067578bee261dcba864e627e
-size 59439
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_8_en.png
deleted file mode 100644
index ca3f9b212b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52f1de6e6bc921fd5b1862eb4804bd9a84474aa6e02bd34e2dfd8492a8f85fe7
-size 51790
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_9_en.png
deleted file mode 100644
index e5783a2ca3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_ChangeRolesView_Night_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2973248a09cc824af7545f1209720e235e5dcdbde3b4f863d50c96c67e19dd7f
-size 64709
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 88a6681247..01986a9c5f 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:67b2982aebfe50751bf282f44f4b209cbf246f04708b9e5564843f1b926cc804
-size 29575
+oid sha256:61d96e2f91d217a1112421633426692fc5a2c35e9756d4980bd75fb3088a4b8f
+size 29568
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 933f4d0185..2f8038140b 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:e7a0b233fa704f80e06b4e5ed3b787722545e30b0adf3729b1618785169c8511
-size 35832
+oid sha256:4cf57997e6ca0c7244811154564f27c2af135f0a85dc4598e16df51251096b65
+size 35844
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 867eb9e084..07a00b2546 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:dc153a3db10441cb166f2cf1d767f59bd77f4b45ff3f6a2dce02324f265626b1
-size 56368
+oid sha256:6f8f4593373a4229d852a8b4e2e3b937796e45135a032afbbd0563a4fa5e651c
+size 56375
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 c5b033d1be..4a562be62c 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:8210b16c986cd409f1be925c0d6b69043fcf8274cbdd6acd92db1b158dce20b2
-size 56751
+oid sha256:5c80c8f9ee81b35b6054a10872e14d4fc4d8654b7747a620ea4b9a79d3595265
+size 56756
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 cd8f4067be..d2d4c19999 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:c63bb93bfe96508f749f0640d0f617709afb6ede6ed1b1a8ee6d9f4f013db2d0
-size 58453
+oid sha256:27c31889281d6ba95448b033a07f1e41bc1c55bed26840cc796283a0f9368bf0
+size 58454
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 867eb9e084..07a00b2546 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:dc153a3db10441cb166f2cf1d767f59bd77f4b45ff3f6a2dce02324f265626b1
-size 56368
+oid sha256:6f8f4593373a4229d852a8b4e2e3b937796e45135a032afbbd0563a4fa5e651c
+size 56375
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 e5c55a3f59..e6a51b3035 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:86dde79666a45917d0e0dba67494d1c8173add8411753d533bc745d29ad18414
+oid sha256:f3e9fb42af90f7db14c02d572366ce59808ebd551cac7cc8552ee308d65f7c83
 size 30607
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 0d444e8f35..0bbe373b9d 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:686dd48e4b76b6f5bc06c8b2751b981a5a53dfba9821a138d2c64a9a9aacdd3c
-size 36979
+oid sha256:3b9bb30aec0b92dd5d352dd9dec4d26177ecb38a10c2984bab5c4bd4584b9b2d
+size 36992
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 661406ac93..dd9a8c8bf5 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:6c24eec8e26ba06ddb216e3d5335a139f947d9ff576dc8737af0bb713e0d68a1
-size 58216
+oid sha256:0c7b44d045dbea3f47c774465be245046e972ade8ad6b9240df956c685dcbd59
+size 58228
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 df682abb60..7067367b4d 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:749645226d6edf24bb3ee411a5986631a5cc0c4139991fe5d0223a34af1014fd
-size 58570
+oid sha256:3ee8385caada3a2739834bbabe1411d2f6da4d645d5b99cf07a6da96fe5eabb9
+size 58584
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 1e074c8a8a..152991f1ef 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:399eb564ed9afc3bb5a149f2b6f5abdc2e202ea476a9bc3dcc6cdc85e23b73bf
-size 60361
+oid sha256:fb1bff539ab70b3d8bb8ae5f5490374e855c9b7807d1868b0aa1cffacc10e1f5
+size 60382
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 661406ac93..dd9a8c8bf5 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:6c24eec8e26ba06ddb216e3d5335a139f947d9ff576dc8737af0bb713e0d68a1
-size 58216
+oid sha256:0c7b44d045dbea3f47c774465be245046e972ade8ad6b9240df956c685dcbd59
+size 58228
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_1_en.png
rename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_2_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_2_en.png
rename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_3_en.png
new file mode 100644
index 0000000000..7866726430
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bd3fe043d7fffab7b19b5af9de7ef58ce8d2d97018a058b5b3c94cb55b277b9
+size 11273
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_1_en.png
rename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_2_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_2_en.png
rename to tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_3_en.png
new file mode 100644
index 0000000000..ff6610c109
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.forward.impl_ForwardMessagesView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97bc2d4c9621a21533da2d35abe90a5e1c1ef1bc356a6342736b61f7be8d8e3b
+size 10357
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Day_0_en.png
index df14d11ae1..01a2a1581f 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:103e79c8b65f05b98d117c41d0061b433c26993baf9b632c41618e11653577d1
-size 69003
+oid sha256:17869867557671ffd51eb97d007e4ce5a8e4f748d36de9a6239dd8d98b42b8c8
+size 68998
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Night_0_en.png
index 356a0c3d35..0aecf53c24 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.notifications_NotificationsOptInView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75c6db71dfeae4a88096fc990b4bf47f00e398d38794c4792af229678030559d
-size 60075
+oid sha256:aa92893b8828f832cda6b5b06252630c79d401385bec853aaadd9e64d0ea3f2e
+size 60072
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png
index 65b47e6787..d2d440361b 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94745803f0bc578f7973f0d3ca3c28d9b2d430fdca9a0e458c3c8a23e821a1a3
-size 29589
+oid sha256:bd21306e6755dc6ef85503d6452bc0b00e4a171f9c4980ae78149eadc4804ec6
+size 29584
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en.png
index 4a2f90aadf..53e85fbcaf 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1e8e8233349788b0e2033a067b6678278b10b0e7eef8d7121219cbfd727513d
-size 24679
+oid sha256:956bba0f418cf63f820765aebd07c1ade321694ad0a94fdf80d49afe7fc203b6
+size 24673
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png
index 546c0a3811..0511248555 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24426371659a7ff4848d5687d6ea83d840218399f3e9976d9b300a68365062e5
-size 34389
+oid sha256:82e281fb8a4393950447717fe6ddfde12b484c27897cae9c9b0381072fb0e5e6
+size 34386
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en.png
index a395192832..a5a91a0fd9 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:195206366f922f94e2386ff174d09d27352a13d4c2ac569607e33742cfce52fd
-size 29629
+oid sha256:223b1fbad4d64dbf60d875244a8e27d11aa0cded90b765bd4c894cd5c3aac541
+size 29622
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en.png
new file mode 100644
index 0000000000..7bf8eee433
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd6ddafdb4bf56b2d79958fbff2cc6afb384d612bc3850a0fd4c0f4e9368abea
+size 23346
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png
index 69a3223608..d0bf369aac 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:404d1a95f160d47feeeb5f6064881e5860a07720cfdfc65cd2cf28891175cab9
-size 28781
+oid sha256:4a6f8a6dd408633bc26c447b8c7c2ed8456091ba575c3622d2f5c4fc3c006ebf
+size 28770
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en.png
index d9c92bbff7..cb5f8a11bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:626b8419602226fb772ea9fc30baebb2a68f1761995d7806ad57030b158805b4
-size 24161
+oid sha256:1493a5469e99dfac63d6b550d53b7f63292d4812780f69a4593ba7da772493dd
+size 24149
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png
index 9cd3e22312..142a18a8f1 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3ae4f2b557ca5a14511c7300dc9d6fa430f249926a016ec9051e736383d0c13
-size 33401
+oid sha256:d4e8418722ddef821df6b4413547c2bd833f9d3736b9b51f9113b464a8296935
+size 33392
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en.png
index 05c004aea9..d7723e7b07 100644
--- a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:566100d5e755cf7d64271123decacdf5bfc6bb4f305f95b00b384a14a6921945
-size 28862
+oid sha256:4255ae26dae22d495b6a4e027bda4fefb1eeb6182d2f945eaebf8258982cb404
+size 28853
diff --git a/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en.png
new file mode 100644
index 0000000000..3ff036987d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cf3c48bc7e54774134d819053e2e63d7e0a0b053c2364d54a39452d3c77b794
+size 22896
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Day_0_en.png
index aba4e77ed2..5a4567e334 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f22d990245fd9dd182545e728aeef8ab341ffef4b15a4f7dd946ab57291d5165
-size 26043
+oid sha256:b8a79530bbf328c00921ab51a5b8cdee70e2e40b55cdadf1a68a32265c2b5e0c
+size 26052
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Night_0_en.png
index c07157261b..8bd3902c3a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_BatteryOptimizationBanner_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4f770f851e0387e45ded5c03c8d2d6a48906200e2679951d882b7839053879a
-size 25335
+oid sha256:32392022d54581bdab6476f2af54d55ad36864d403d801ce8302ece77066445c
+size 25336
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en.png
index 1d64f0f4a8..957ab01612 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db71ec762f862f221b69d698f3d3aef293fc48796ffb42c449b9cca4644d158b
-size 25880
+oid sha256:11db35a1a77ebc1699ed5f9bebf6995dd99b3cc0f750d052778c08250c973169
+size 25891
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en.png
index 715208e8f2..1d973d36f0 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:886ca25c790b327e009374b221c459522aa74b552112044016b9fb951f9eeebe
-size 25232
+oid sha256:d3e65aa2bf0d012ee4189d4ee8400579c4681e5a9875e8992a928ce9e021c776
+size 25241
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_en.png
deleted file mode 100644
index dd337cac3b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b289624c8461e08c945a254eb629ea536552e2652c7182be21a7bd9f183da022
-size 26185
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Night_0_en.png
deleted file mode 100644
index 640aebb723..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarMultiAccount_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b86aaf39367bd454a913c4ed6cd17bbaff52e54349e0e6d363d6f84ccdc43c5f
-size 23678
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_en.png
deleted file mode 100644
index df54400774..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5052046774204a99f56206efce6283445bd7ee6ec242b274b6f46416d8b59500
-size 26526
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Night_0_en.png
deleted file mode 100644
index 9b1fe1d49d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBarWithIndicator_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc35300187ee623de17bef9ec8697ff1f3eb1fd3edef2f33e397f6ca420ea568
-size 24041
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBar_Day_0_en.png
deleted file mode 100644
index 839bb05b9c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBar_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ca6085c7c569bb0a818390f13d0a541f1ff991fc175b6982ef5024b39ef6107
-size 26277
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBar_Night_0_en.png
deleted file mode 100644
index 73b1151326..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_DefaultRoomListTopBar_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07d516b7faf26586afedc0abe089adea55dc89604969f1e2356c1702bba366a1
-size 23741
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en.png
index 9ad2742b28..1bf3f9ed44 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3889357c2c9c062b8180a046b65e12f17fc3463d4f3c76e4957b9fa34dc8cece
-size 29857
+oid sha256:2274f1a397290c8a4a86a590ec98e1daff17870f0f1f65d51865345e3c328643
+size 29864
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en.png
index 1a1e151787..f69b2457b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d93238b171ce6ccb528b871cb90d696a01b2e711984011a1fa74cf82755858a6
-size 29249
+oid sha256:2326d7a97051edef38db9dea0904b70209009fd8da4cc2cbef9e4a5f6743329a
+size 29259
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarMultiAccount_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarMultiAccount_Day_0_en.png
new file mode 100644
index 0000000000..ea9abe74c0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarMultiAccount_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6992a2fbaebed88e22c58e393d086bbcba50afd822ac869b9e27dc68ed3a493e
+size 22007
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarMultiAccount_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarMultiAccount_Night_0_en.png
new file mode 100644
index 0000000000..e3f6f0ea4e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarMultiAccount_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67a87f2231268e26e06e62aada18c4c62e8ee53e1eb1ddc538f8c7e98881acbc
+size 20256
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarWithIndicator_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarWithIndicator_Day_0_en.png
new file mode 100644
index 0000000000..93b29cd67f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarWithIndicator_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fdbe7e7ab22f44cc60a04582d5a5159055d4af3af0d3d2a7cd012f48abd9592
+size 22443
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarWithIndicator_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarWithIndicator_Night_0_en.png
new file mode 100644
index 0000000000..a796c3a10e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBarWithIndicator_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96942af60064898a853268f8aa8103f04a836332fef09fbfa83ad01cccae54d3
+size 20651
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBar_Day_0_en.png
new file mode 100644
index 0000000000..1df7a1d9ec
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBar_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e38f16c942bcfb31103b5e80d168a5425f181632ea4440a054aa4d0985bd335a
+size 22106
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBar_Night_0_en.png
new file mode 100644
index 0000000000..ef2d6e3500
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_HomeTopBar_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:677c21f745e4b9c7984f6c8fe3f84a27fabe6aeaf5f8cac82bb5ac692bd6a797
+size 20308
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Day_0_en.png
index dbfe7bfa4a..02d77810f0 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:367bec41d3cf5e7d0e369a4610584c5a11ca7a69fe26b794290c49027de465a4
-size 23221
+oid sha256:6822d3eda2c6508fec9932d351694f438abc3543caade47da894663270869a7e
+size 23233
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Night_0_en.png
index 0d2f51d4c1..ee271f0f5b 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_NewNotificationSoundBanner_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e666d80cb22b979a075ee9b749a36c4f9a4874149ba4d736d745c8311f6e0e85
-size 22563
+oid sha256:eb0ad26e57fa61962cd27e74f49632f90aa6275bb5e32a2f10aa7ff3fdc610ea
+size 22569
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 a3abd4937d..2b4bab0904 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:4013ad25e9f4e38109e7ee49921814adc8ec5e4952c8f8d4d6946a4badf67081
-size 41513
+oid sha256:5ad4cbbad7f8d12579ea2336dbe90519d164baf1ba5ca1d1398f598c699a37b3
+size 41814
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_3_en.png
index 94f2ca7779..931d67ab51 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:946362107e6dd59fcacc96c30181d26891d0fad62d1461f4293800a61bac5064
-size 18122
+oid sha256:f6ec9b70fac0c97ab1ba5fa4e14e531f04db52d390baa99f149b34ec125772ec
+size 18094
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_4_en.png
index a5dc0183d4..86498c0220 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89f53b18a0ace95a1b693c20bf497f4b3930872408bdb3b25fead23f5eb7515e
-size 47075
+oid sha256:f5c9a151450647781316f44623c4385c955977b3049adb6cb940a54e72f9ad00
+size 47060
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 e1efabe407..bbf55e44a9 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:bf85a6a94ee3eed576e91c7a3a55e45571dff4a6dce1f6c6bbd22845fb01a76b
-size 59896
+oid sha256:b9a6f816acf13335c15e188cb6d9d240aa9f19e76f80c65cb6ce5d02036b4d92
+size 60017
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 dd6b0742fd..2721654be9 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:1720068dd3f0b75076ef81642d680f00e52f7162247beb30dc515fb74c25cf2a
-size 41164
+oid sha256:2cffbce8a793651437dc5ff93c697d859df047a71a6a128996c41af918ad18fc
+size 41499
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_3_en.png
index dcda788683..1f16609123 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdfd9e4a398d6b302f03fd97dd2ddb0cb3f0c04b20f5ce1d9eb25d6478a97939
-size 17718
+oid sha256:7b8aad46ee1d58add3d6ce01f1b5c8bb8fd2e73be676dd33f9b827bfff858204
+size 17703
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_4_en.png
index da67dff868..a8390799b1 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f764a6ed1226e2f1c92b92aa426fda4c4bbc97b34cf8e7a6634a1cd6fd15dee7
-size 45529
+oid sha256:7db2a27e55122e0bdb24d58bc02e6154346fbe4d0845d29063b634544debbaf6
+size 45513
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 70f3c084fe..53fc2dba28 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:f4646f1622c26a45208fa8ad59c9f531c1794e1874e31e50942f459bf3be3de2
-size 58927
+oid sha256:ca660f44ee031e98540134d3b37743dbb893566a6a8359dfbd4dd4da87bc2e83
+size 59128
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png
index 0409089568..164dbf2c57 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ade89eec1d95966f96987d06f176072241e2fbcd130a086cf859f0f52b189e4
-size 17576
+oid sha256:f388fc1e836916c906c31c9d691d2ff3f1a29e12cbab297c4c551c491906aecc
+size 17571
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png
index 2113cf2193..7fd9c49d16 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da5e1d56e214382319a2cb67208be39e6207c871df2aef0beb3cccf5dc75c54f
-size 15777
+oid sha256:ac6b4708f56c5b76300f0c50182d9f1e13fb8c772c6e606447b204c391bd0ea1
+size 15767
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png
index 159ae4b305..e1e2d4d27e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dec3176140a55c1ad7db0b6170c0b77a3a053c84a805bdd5156f14b9518ce3ba
+oid sha256:fb15fa95148cfb77111e39cb1e1591fe81c4857f210cb7863346b9dd2aff22ac
 size 10432
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png
index 16d36bcf46..adb7609d1f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a63f35d985659577a36a2b8abc3f61cb2b2caace25f6028fc0946aff6311f90
-size 11627
+oid sha256:25b0acdecc9ae9c78f70ab0950f5ab9dd873ebfeb4c4ef5d10b49cde7ecf205b
+size 11640
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png
index 0213f0cc9f..6a0afa7ad4 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c4ca5a787d0e47eae1ac04eb58c8d1b67bd2cc088f57127001ef83e88648cfe
-size 12995
+oid sha256:26dcce8dba20d0f5d7657be53595c4f87fc2605cbc6255a845c51f063ae51405
+size 13002
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png
index f4648ff7b8..ffd6ba0b54 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dae6f8ae15d48ce5e987c4829d2356ccef9a3bfaf047a6d66d2af499922fc021
-size 11167
+oid sha256:f639515409af3bfa8ace4de35faaff91e5e082403d8d48ca949cb4ab8e2552cc
+size 11179
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png
index 20347b9a0d..adc3650ac8 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2c0b4d13f17337b17e6ff5d6a24f3a9a9f18056b294f7d15f90970ddf034135
-size 12871
+oid sha256:63d773c4b9fa2661b357a5821c668c66a133406144fabca7e30af6070bd630ab
+size 12870
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png
index 9248348abe..90dd6a3dac 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d6da75a924634bd285d9e3a31ffbcd56c915a8d03ac74c2a08dd0f0a8692d53
-size 14110
+oid sha256:3b539aeae1bad94ad344a1e4feb340420e1808b2de427e64b5b11be599f27def
+size 14107
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png
index f7d951381f..74f6883955 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79d04e945b82cc81765b65addc4c669946fd297cb5e44dfe4951d683b2a05e84
-size 16536
+oid sha256:c32ed4e78a93e4c9ee9af0aff7af7eec5e10ff6b585651ad4c3accb6f16cfe63
+size 16525
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png
index 8fb70c4d39..bd335617a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f793bdabcd0dc73ddaeda10ed2b4244e01a5de2362751fe78f518a76784a6ddb
-size 14542
+oid sha256:d414edb059bdf5daef8718c87b3303b7f04f0b6479bd8be752039beba5b3bdfa
+size 14537
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png
index d58c0b4d69..f496f280e2 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06401b7a38abbaa1f35bb76f3effce371ed2020fe5244b4650c2b5941282e387
+oid sha256:33d9ddf9655e75a686493ce8b4619e0cbb18e5cc0c88343cd111a7ce01e51a04
 size 14838
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png
index 9e9945164d..a66a802031 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d18776af7125630d084f4c268fafa49a32b598ca9ba91a1672a9f7020eb48b8
-size 16069
+oid sha256:cbb6c21cbe6140b9a6dbf0a30e253080dd4f0c2deb99fb74b7f0bb1c3e5d36bf
+size 16068
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png
index 164790cb18..7ef66e0ece 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cca40d49d1d9abc4a32fd79f0c1ab606f774de8a4562c0089c80e8202b0dfa14
-size 18527
+oid sha256:6bae79fd8d9568ae0b1dd85d5782436f4627311adf87c121d7f7f31dbfe122e1
+size 18506
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png
index 32fbf816e2..cafe6f8e03 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bde1e0a456c6624d34c98b820b83e9a7ecf351794dd322cc2d0a424e64286488
-size 16527
+oid sha256:97e4e0b2f5f12f8b634aeec360e3a47b0a772ba5d4235255e1a2a89ed415243f
+size 16518
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png
index 35a229fa4c..bb2caaf5bb 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d7293e427be92078012e83ff040dd2073fe1d3533b9845b386fdbeecef03bb2
-size 11201
+oid sha256:a100b143e48e40fa110e5ab8cb5e04f33d2502850bef9d01c113b6d5b75e1f70
+size 11205
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png
index 5bf95efb7f..adc938e829 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:186526d0647c805c7eb324dda12a6f594a6ae867d68a8f757643601b1ea21691
-size 12430
+oid sha256:711a991953da8625cf89b926a3becf595cb14f982bde414d261ec759337a8e5d
+size 12435
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png
index 3c8e044481..7aa0c085a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54c28865f9953411d1a70d9c854af8607e909e3839b248aa8b3f03129d81b373
-size 13910
+oid sha256:ce5c296390da6d786bed4956b951ddf86b556a9cf253517a48a59fab54268a6c
+size 13914
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png
index d752309fb3..4a67b204be 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:655571779da4665504903b4dec2c9427929f459320cfcc571e728b146b02c7c9
-size 11949
+oid sha256:bb07590fe78d6aa2e1f36a1eb25553c554d94afdc2910fee1f00d570649a023a
+size 11957
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
new file mode 100644
index 0000000000..9462c2e058
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c125c71ef07cc228ea24bd34a43091e0728d529d2303e44684529f32beaa09f8
+size 13113
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
new file mode 100644
index 0000000000..93c9eb369e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7b78a9d066b454130ad08bfa035a2afafa6ec1711d88921a7fabb84a73b01ee
+size 13616
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png
index b95547f00a..e6443ec3f7 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:929d7eb7ea27b4638a8bb71093f6c0d7c01da4d7bf563ebaf31c91657f3db7fb
-size 20629
+oid sha256:2a8c23e9560ba89e226390862ab0b724465ebb2ab7c20e5a41f2df72b9ee76a1
+size 21024
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png
index 019f2782d5..535aacb021 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:507a1753dfb87c246d1798d9d3b51a8078998a98d07adf4a3e16397fd6d6e28d
-size 15604
+oid sha256:dbf412d003828e0ced05e50c6e6982c7129debf072fbd99701bc7317eaa3cfad
+size 15589
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png
index ccc7ff8410..3b28de6bce 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46f12320840183ac4232ed78e06a6fcbe219f7fe95d7fef5ed721900b0579439
-size 13786
+oid sha256:4cfa82fe00f1cb1b8821677ba61eb64f2ebe600e84b370145da25bc32c3cffcc
+size 13775
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png
index c87eb34637..e2356d490a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de1e862f177e76580c269089cb126700ea2c73f6a88ac09241a356f6be20202a
+oid sha256:c72a31def7d8574ab3ac73469153d148fc000d05f5c16e4fdf5cd545ec317a8d
 size 17178
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png
index 5af9a4e6bb..c35c40b1c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eec85eb8c2425b8ce954fc46239f7921d2d716800da7fe0e6ffc96fd738c2e8
-size 15443
+oid sha256:0524e55818eb73c3b7ec1045fe51172f74cc244e682d4bff043d02285587b245
+size 15447
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png
index 6800420a30..c6f600d5e2 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be7cc088c55fd33d907fc8c070d88a74bd8afe145c6ae3309b7079ec0e4d7e5c
-size 10479
+oid sha256:3442f14ed9ad6a5ca13663204367ef31606c7bc52c353445f91633f5521df005
+size 10483
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png
index 4db15a09f9..ba73c32c54 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab316f339bdfbfc6b6f5d3adf9872ac73e52359b3de98b2be67ee4ab2b5646da
-size 11613
+oid sha256:43c91dbbeb1f4871a385b799853348f58952a1404a07414116b7da796e1b68e2
+size 11614
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png
index 4910050dbe..6d1e8ed2ca 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3aac751775fc22d7cdbb25ab646d7fbb71b1abb76d91f9314c643cd30d89a527
-size 12914
+oid sha256:eb83679aa492ad9925ce869b8e6b1f97134bf1f1bb7377dc7ec0b841f31dd182
+size 12903
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png
index 79b737095f..eee14a5173 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c548afe59fd077b9c895257ce69d50edd70271a3107f2a6145fd0bbb8d37f09b
-size 11173
+oid sha256:994720cc5229557013cf2c21be861a878591a794c8bb67e934379edfb1333e7b
+size 11167
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png
index 5e798648d4..9937199925 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3acc1a3dd6af8f73b91e99d19cb16b9439c27af22e2704afef87e470865f3c35
-size 12910
+oid sha256:6a5799d191f1d2403c2f064654d98af81f8eb533f208e5d8fd782ec3a9a3763d
+size 12911
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png
index 491f0c3364..1fc1a7e27e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ba050cf4c1c0a76f0baef4262c9c93f1abccf74cef8b54b3135129ebadd671c
-size 14087
+oid sha256:7fce6cf1fa63e1f2c17bc01adac0cd85bf164d5f36efe63ecb2d6ba1c845500e
+size 14086
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png
index c59b8f46b8..50c5a6eb95 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e53ebb9f38df05491a8294b8866c7e64a096612877caf43a828bc2b8e570e0d
-size 16164
+oid sha256:5483164587c7e8d360d7d2bbeb15ca475cb72890b021555e06500f7bd013efd4
+size 16162
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png
index 539cccf1e0..5b6dcaa8ed 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da4c0bdd794b10ead48cefbd12798ce1b1d332911a7de01c8a0657d9b5c5e548
-size 14291
+oid sha256:bc6cd2e9486ed676facfa44ee6696f36742368e9d9a958e5aa05c3825cf28452
+size 14289
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png
index b3970c0a90..6adb42395c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b381a41fd73147740ca806fc350cfcabee9def4c5094244332b13c293d622992
-size 14790
+oid sha256:b7c8d9ffa68b0bae11889f600ca252e5d5ea44ce6f0ae9270e74d86ed2a5e435
+size 14789
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png
index bfcc5c890f..426c706101 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3168aadcf3fa5051c637064457ee2a5db4a9ce8a15dbb623ac705bc0c8a72ee8
-size 15951
+oid sha256:70a2c070761542dd6360dd2395ad1f283c025a4fbb364a6337013e62cb2c549d
+size 15950
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png
index 4ed992cc0b..9d1ed84f9a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf984cf49baeed40cd7247548662b3ca95b9838c85285135e6fe42c5296b12cb
-size 18039
+oid sha256:531ad97b4f3cd43caa272dc146322aa19ccbb1c19310e880d985c1f42802ff73
+size 18036
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png
index f68fc64a42..291b2dcae5 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdf0fd1f9b0c2a2924d4b4cc7e76212fcfa92d30fef297466b5881fe7d4d7594
-size 16163
+oid sha256:07880e90a099ec64daca53adbf7abc44076f1059953f466b845496417f70e5aa
+size 16159
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png
index d246223b98..8a8d5ed3b8 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e808ffb1828512646b17b1045ca1f780d4aec6ebdf46ec201edc0b698f5c5b6
-size 11210
+oid sha256:ea264a0c098066f5884da9f4862fed9dd361ee9c81bab9313dd173753060a475
+size 11205
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png
index bcdaafce53..d5627f99b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c981239c48f878f7019352d77272cd7bbb5cb753d1237c1abc10d491f453d82
-size 12358
+oid sha256:a4220538dc3ed7ac9f35ae1081504939f747c128094c884cb0387c8574338342
+size 12342
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png
index b50f760f06..5d58879e30 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf56c11b136e1807c5e5ed8ef3176f7e9ac78bdb663cb058c3caeb3a344c7337
-size 13767
+oid sha256:4a67e650c8e2010733eaf0b123a8ecc1d6fa0edfde5885c9097b74d63f1e83ed
+size 13746
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png
index 7404a82cab..3d0f3a4bed 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44ee7c34d4892aae572d0f5b5c77c132d1171aded33c992b4b3f3aae613d9802
-size 11906
+oid sha256:8469320536eb0ace8305bc7a573e72afb00afaaa4ce4ccd2c7094e11b871c56e
+size 11894
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
new file mode 100644
index 0000000000..132c8a716a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a49cc5e58070d5af3fb905076a41ce5cb0bf77eda4d34550d8e7ac1f4c771472
+size 12981
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
new file mode 100644
index 0000000000..640ad68f5b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3377bf16f847083f340218bd6bf4f4f3290d354c06193a808402f26ee34ea8a7
+size 13432
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png
index 73823e4199..c8c2170780 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:112dcba335114372a39a531be0ad6350f1bcdffe03d4c6033d2a4799715bed6d
-size 20300
+oid sha256:ff0df80592079fadfbf82b192ed79e9684dce58d146bf2e571a04c6784a9e6bc
+size 20696
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png
index bf2e9819ba..325c7372d0 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a754b9973904f020e3915c8013f9cb82632c24350a1ac81f11f849755533f24e
-size 15308
+oid sha256:8d72d3455c54be3e8927219bad87c3029e92be5eb390d056902723efc0a8e56d
+size 15313
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png
index 051bdc0af4..e1d5b79940 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83a360bd2459d925acbbdbf0bc22d69523946f91d0633fbbc3d7861a111e1e6a
-size 13554
+oid sha256:7dc378735e771d22f3cdca0644468711dbf8202dbd2aa85e8c5d874ce5c83429
+size 13558
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en.png
index 1d88045242..53d51bd8f8 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ba415e06d061cf31536ebd439468dd454a830e3fc40b1ae8e2932caa4f8e59f
-size 32619
+oid sha256:1d512d99c854d1a27db692fcbcde83079e4ae944ca56d1fcc3d0780d6d089e5c
+size 32633
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en.png
index 686c12c49c..ab51263b10 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8401b6cc831ef1001e33b681dc6a7fa0cab0c17a88fa9f8fb77e5860105ea413
-size 31533
+oid sha256:cd022f877bfecca96d3bec83d15857dbd70153b140f3ea1ae6929f83ca5357c5
+size 31535
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_0_en.png
index f9af594888..691461753c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23e4d2f712ba17e2c7e015c3b5c31992c16abd0edb02b54bfb63724c4b62792a
-size 14030
+oid sha256:630596148bba4f160f99b691885a7b3387110f875f92071f20f9f02836009252
+size 13393
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_1_en.png
index 76e93d89ad..6b48b2c056 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef686771149fe9c26c50c7b27ded4054c3209e8c5b195903f95ed1909f37f506
-size 12229
+oid sha256:3cfd337f819250d81d93a10d62f857469f4b32de8ea9c92ad317b14dfd623c11
+size 12108
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_0_en.png
index e5c76b1a86..e2044e1952 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8557515b328ac70ba0c0a7336990a8496c7c110fd71d22a2c347d2f59b4fb188
-size 13521
+oid sha256:34eb5ac6367a76db546eeac3ac7b197eb9cb153e8b6186af5c3839a5ffeab6b5
+size 12634
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_1_en.png
index 5797b5d5ab..345ee4c489 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.filters_RoomListFiltersView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:463d90f7b0960008de42da80ca739d13db2b0896f4b13cde4d27f9c001b261b7
-size 11792
+oid sha256:ea1b84b720e246f5f4dff5193f72b32fea3060cc1dfffeaba95ba3cd7c975140
+size 11699
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
index 77ea682158..61eda139cf 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18e44525b9acc696d1e6a1b736def39ae53bb30f2838a43db44ba72c9630ac8c
-size 22633
+oid sha256:02779a816af386de44d4ea286b24cf32998adf471dd42c418c096a872cbb27a8
+size 22620
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
index d8c16a235b..6e2d03c94f 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:652c6cbcb3efacae36068957b6d85a553c3fd86ec331d03e840fcb58216a0d90
-size 22833
+oid sha256:cb454d3b19178dc9c58248e350897037878b7a7b53786856658dcca2c9c726cc
+size 22831
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
index 24a92503e5..52f91c529c 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d7f6684e8b30db13a837d95c67a46a90f41f13c7d2cfc3efe04bb727e52483f
-size 24124
+oid sha256:52580790f4a797f76ef9079a653842f97cb24632957cacfe3369312739e805c4
+size 24094
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
index a6bc862e50..91e8019985 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:228e82e68b30b1360028dfc70a3c8aafd79a7c6a3a30e24c68acc098be6f32ba
-size 21713
+oid sha256:eb39bab7afe53fbc8ded9da0f1f64a61488118dcac73add5e824f8fb65c14e85
+size 21695
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
index 475044aa93..2b8d8a7211 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d63c56382c2785b05a320cd1f5cddf2f69acb1d9b0b611a8d2885bd837b9f549
-size 21965
+oid sha256:e2353f91c964b2d29f658d2847b3cd344c3c0466dbc26324f0f8e1ad0e0eb6bb
+size 21939
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
index 1090d6c7a3..513e6917a6 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:694062f6698cc74b56fbe6ca2fbcc07401139bcaaa67d005a79cfbdba3f4c11c
-size 23459
+oid sha256:36d9a1fa18533acc8643e141ac50ad398e3589776e0afa6764beb06b2b7f3f7d
+size 23432
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_0_en.png
index 933bf8fa4c..34f02e8396 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:970fe059448d148cc7472b57cd079f196ffac2dd94f01ed6600a3901793bb70b
-size 4035
+oid sha256:c62f963015631bf364dcf5140dc2f5171af4f111ae143f83e5a53810b4ca9350
+size 4056
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png
index 604e3390f8..bc04f12385 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3077553914ca940eb2c11a6917d500d6761c95644fd319afb59445a61366d1fe
-size 44010
+oid sha256:de647a2d609bb2ac37875767780dccfa34d47b68da504b59ebb27e2f8d989452
+size 44250
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_0_en.png
index 4c79a350f2..355541860b 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3238047b8ad520c348bfd26daac52242941bb2b5ab362676c890187c2c04cee
-size 4027
+oid sha256:191c7bb9003e24180cea8d0ac4514939f115ca5f2685588857a282de1e00b048
+size 4015
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png
index dcfbd7077c..93624ab755 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60723eabfb2f64a39abb1a1c3fb7afb12d9090101cd5ad5f49347d09f077e510
-size 43495
+oid sha256:1decbfcf1afc6d2f827d570ef0145674ab1f598ce375b95331ca83975793509e
+size 43762
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 4b264c39dd..eebbc79b07 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:a6cee41aea25e78f820acf98f01722062ab8247dcc78652b8ac9a27e60f24249
-size 88723
+oid sha256:388207cd5b424fbb95f070eac393db9330ae1b641795d1bb815874435ef9f623
+size 89027
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 d254ddf882..834f73ab9f 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:52018347e4361a393b130d1ab479ed96685cacc362b72fd71d46666afef0e6cf
-size 40949
+oid sha256:542d8ba6a6031fe2789cf111f333eef22acf95281f57421ace2c7b5b0a599cc2
+size 41140
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 a5fb3cca49..187ee16663 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:5a56da5b32b6ee1ec6c21ec4a24420c219f1318b632fd91bb5e2d8e8d29f2b59
-size 86985
+oid sha256:134e561fc4082339725c241a79fa55e0b5b1e134c046d4454cb7a9e71ea5e1b7
+size 87174
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 9a8e074a97..7dc28605d2 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:a96b3cd320587af70dd8dee4e285eb374d04ffc2ce8371a3cb07866f514f32f2
-size 39863
+oid sha256:c31cd78bc054610be05012cdba7eb0cbc770435b0e12bc065f6eae4a773ca39e
+size 40121
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 dc6b4dabbf..78e57157df 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:a666f932d1a595763b3c88b31ffbe3d195ec0d986ca5f2c0173e8e25a6115317
-size 126085
+oid sha256:29076d1c09d92943b1ba143d0ed3798fe92f7d37f87f45c0ae5f7326afe66f74
+size 136708
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 434e671e21..3e870ea8d7 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:01629494aec1673e7a57a99fbebae5d769a9ac035fe14d956a2fa5106f3f03a0
-size 65669
+oid sha256:580c70e645e954e9e3d29a68aa46b1eae3a82651eb5e419eb92cba48bf7baaf1
+size 61515
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
index b35c1fd5c1..be60b0ceec 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d722145129767f0a4c207c658430d05dff82bbbf26b753fa1c32a9b9da165f9
-size 33618
+oid sha256:dd257b64d9e91bedebcf4552e8b93d357304954ad844b7f7d52bc76fc1543747
+size 29901
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 2f749af0a2..95987c0cb2 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:79b3a78bcb4fa9193817019ea9490d700666079bf3c97f1f147eeb5d051ab8bd
-size 28332
+oid sha256:4e3e455fbe6e3a10ec1578e01dc3f10c3b2b0688f99a1855319143c8fc7044a8
+size 25355
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_12_en.png
index 6c2626f706..7e2570b13d 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:895dd2bc2d3fc9bb71031e141efdce554c905d3937e207d20a4698aca0caff51
-size 5777
+oid sha256:5fd1199e9a19f52eac7995aaeb2a6cf5d39625ee02276ced0fa9506768f2abae
+size 5736
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 b4b205ff7d..343550c109 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:42412e042a5801dc5d3dadab3d13afa126cbbfe36b044d5202b4ae510550b310
-size 89050
+oid sha256:821cb6a2068561375d0988d4ba5404e52411a6d9b73cefbe1a6bd7bc6d467673
+size 88367
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 d36a7fdc44..191d910e04 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:eb215a025a521cd3d5483059fe095619b1df6d5942759cb398e41a553da53bed
-size 83553
+oid sha256:f9f5fef39d80aacb9666deeea43e4df48f7c70231bd8ec41edf2f3eed5f0aa42
+size 81149
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
index 97ffb49bef..2eb8a41683 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1992b62b50aa348c73dd61c7af3f4bbd304053e3e5aeb898f8cea2194ea2fce
-size 51371
+oid sha256:c9e019924f41de0c16f1f403944b8fe390afa65d1ad604db3dd0baadbc30db5b
+size 50953
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 c313592de0..3e870ea8d7 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:38d5ef47e6d9cdf2b4cc34b7b521f177c93ccd86ab3543c33f2371a23617db3c
-size 67668
+oid sha256:580c70e645e954e9e3d29a68aa46b1eae3a82651eb5e419eb92cba48bf7baaf1
+size 61515
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 434e671e21..3e870ea8d7 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:01629494aec1673e7a57a99fbebae5d769a9ac035fe14d956a2fa5106f3f03a0
-size 65669
+oid sha256:580c70e645e954e9e3d29a68aa46b1eae3a82651eb5e419eb92cba48bf7baaf1
+size 61515
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 3607aabc51..b14e265de2 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:7f73c001d770cf772101029706bece528dafb55b4615cf89508dc32aa41ebdc6
-size 62765
+oid sha256:93b7d7b0d7df69921015ece40ae3ab859c81cd3e78828143f660a481a72b73e2
+size 62305
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 573d02a807..5cd1c50997 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:cd1294f7077b7d1cf6a048ecd3b51d1bb95fbb34df9c21e332dc0a7c75160ee8
-size 54965
+oid sha256:27c5418d421ca6cf0069e34ca3e22ca807203d252b9c1424eca447f070fbbbdf
+size 54177
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 434e671e21..3e870ea8d7 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:01629494aec1673e7a57a99fbebae5d769a9ac035fe14d956a2fa5106f3f03a0
-size 65669
+oid sha256:580c70e645e954e9e3d29a68aa46b1eae3a82651eb5e419eb92cba48bf7baaf1
+size 61515
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 08a72488b4..e1b311a970 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:8ee533ba496b10dd24a594d833b8576422ae7c1e9da8dc1b900a66d2f3d0d045
-size 53355
+oid sha256:6bb7a5a23947cd3a311c8d9526508c121beb4e0ee37f337bf8361845be10d172
+size 54415
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 7a6842c57d..1e79e25769 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:557aee243c3bae8bf8171034beb88b5ac93fbd927c2647840c0bacbfdde6d704
-size 53166
+oid sha256:11e9f28e6131eae66e268b72daab6d404d1f1f8b0eba78eb11d4376284eb11e3
+size 54220
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 6d88b76b56..09aa1a9b42 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:b04a71ec89a73fb94cfba1ca5122f3fde7fc7cdc2f744e6c8cd7cce36c2bcf05
-size 51375
+oid sha256:26bfe68b4448aa83e19f196d8633eeb74883064db319aab355a5e755b7cbb56d
+size 52439
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 e3da44fc30..277cd740bb 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:5ecdc5c80e9018a311a3b6bedc1ca75dbcf5199c74a2c2e66d6aeb88c2371994
-size 83408
+oid sha256:a5a68b4d8951b7c516561d538c5d328a84948c66af7eb7c80ac77cd005620cf2
+size 80977
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 0500b123c3..a46c9d21bf 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:f652a27cfc9549246a566114f509049461d570eb110e3b6b13f341986664a28c
-size 61116
+oid sha256:37660e7c0626ae3e5a8404fdc7e57e41d43750abb4004572ffd9c25a501c668e
+size 58325
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
index 6e34521a8c..19f76b695e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e40fe4d4fec92f833e772b969553763523367193b7d1083a8a847ebdb11a544
-size 29237
+oid sha256:496855b1b3186adcad8b35895ee51776dce00a8d3229b8dccac4d6e4482bdaff
+size 26577
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 3a15f9b453..7c3b6e1552 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:9380a13b6ce7bc94d6b94775fc0b6f2ee5a8cae93225dc203fe7e3465968757f
-size 23523
+oid sha256:8b98678dc90bce52ab2293e5102794b4fc3b51fc667a6c061d771ea90212a0f2
+size 22034
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_12_en.png
index d3c84007a1..b7953d0dcb 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90879c2e2bb089a4f90faeb8bd8e7dc463abe1cf50f08c3a30abd416482af6f4
-size 5659
+oid sha256:05c2d030d21627d1d7ed50c3f202bcf3822204d90703242dc29ee176983d69c0
+size 5598
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 841691b1e7..8094781a7f 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:e93783019b2fa77b2038dc0b61f5f8eb564871a0b8408f80591f57284d7ab8bb
-size 83910
+oid sha256:541740cdd54ef7b9a868c1409330a6ca7417bce9f022b22c3d395ac9b215d470
+size 83939
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 3e389216cb..40695d7c0c 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:adf6402b55003f39c6794e05bc0a8aad2f59dc6bdc96f1a9cca1231797cbd129
-size 78652
+oid sha256:a44897f23fc0e6a90779fe96638c560973caf7dbb9a7c92ec4d2f5b56de3ddcc
+size 77280
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
index 056e67daa4..8a3822d03c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2707d2c17a242cceee4e2b3069f335489b170348a404ee4aa69a3117eb8ad09b
-size 46465
+oid sha256:8f0e5430bcd399d5a39c3d92e7551243f0e15bc315f9ec6ded43829d4672308c
+size 47186
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 382db61814..a46c9d21bf 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:4d6621e96a565a252c37f89e348365b888ed0bb5db83952f4f307153bd42ced9
-size 63057
+oid sha256:37660e7c0626ae3e5a8404fdc7e57e41d43750abb4004572ffd9c25a501c668e
+size 58325
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 0500b123c3..a46c9d21bf 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:f652a27cfc9549246a566114f509049461d570eb110e3b6b13f341986664a28c
-size 61116
+oid sha256:37660e7c0626ae3e5a8404fdc7e57e41d43750abb4004572ffd9c25a501c668e
+size 58325
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 5dff4ad364..044c2a9fbc 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:eb62720c97ba96c504543a78488516670916a9986e13e3f4102e741e040f7d8a
-size 58840
+oid sha256:a8db3006e7ea4826022d47a4ae37dab2a7ddd064d4cc2c48b44deca0f158541c
+size 59301
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 a2cce20c03..d6b722a3f3 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:e8a8b0b2e6dfae21cf74cbf48f35e4bd52c1951d0ad24fdbb9a7d958b49d68fa
-size 52156
+oid sha256:fc4c11b4d2c83b179409083ca36fcb95e44b7d8c51abd23e9c07f4d3be8a339c
+size 52626
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 0500b123c3..a46c9d21bf 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:f652a27cfc9549246a566114f509049461d570eb110e3b6b13f341986664a28c
-size 61116
+oid sha256:37660e7c0626ae3e5a8404fdc7e57e41d43750abb4004572ffd9c25a501c668e
+size 58325
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 eefcdf32fb..442eba42bc 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:f985cde6fd504ad8d8fb949f4db340f305449cb92b81c3b961b6c5c07f3b2ef7
-size 50555
+oid sha256:957b8712456f13d83857616e2ffab05c5d60f50e6b39037bb47af0d272c53b02
+size 51863
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 537a106163..34ae9c102a 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:2666484f45ee3535e48fd59839a2cb3d23f9ecb0cadafa1a57e5edd7025d0429
-size 50392
+oid sha256:beac305c3cc0661633873276a99798b1fa693342bd4ab9424bc44759a1f745ec
+size 51695
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 1b93ea622f..54c43af536 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:716b3f83353dca306faf0d111660a6b16512ebe833426b3cbc6f598318dc15f0
-size 48596
+oid sha256:aba9a16cabbe67f28512721740e268bebd93b3084efd93e8de7eed251fd1ffe0
+size 49849
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 b0b25acabd..fc269825f1 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:3fa5bb00b9a154563b2554292830ffca9fd8b9d0feb6f116e811267130e4a7e8
-size 78601
+oid sha256:49ea33ae74532c350b4176355203561cfc5eb79c93c4993d6ffb0cf933f8ad2f
+size 77167
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 97ee108106..1ec8f0df6b 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:8bcbccb41f9624a08138bfb6375367ee52d8c36a5891fc0f047b50ad2e544f71
-size 33175
+oid sha256:bf2428479ece456f7d53e73e20653fc5b24a99a00ca73899a8ccdd85d09870eb
+size 33193
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 558e4ee3c7..ef720c3b5e 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:cdeeb86200f01e4390eae52a1a479becbc7f05204fb8472e69ed6c104186556f
-size 38078
+oid sha256:e5d198eef4752c20fc48e1b4db0480f3173c5844ce76c6eb7d266dd223544393
+size 38091
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 31744f41d9..8ab2ebc5c4 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:72d6f6ad5bdd53d8dab17e1e799c2dd7116052f1ba2e0bf0426ceb123ec4e61d
-size 33374
+oid sha256:9f1adca90a84ede5280143c2a0b0fb78cede7e491428d4d8799fef0c9e233433
+size 33389
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 a7be53547e..a868e27cbc 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:76439a75dd0519c83467706c14150816728c7a938fe3f3d699871f7ae72deb3f
-size 30110
+oid sha256:bd361831d456172aeff63b7343dae98fd818b588c8b4d179561f483189d5595f
+size 30101
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 585eacbcd0..06805478c3 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:556349a370c77677ed83cc13bde92d4b399accecb2d7483ff16d1975278b9b14
-size 34644
+oid sha256:263e2a9c278c9ed6998e7fe0f0b741c6470a111ce020345a06f03149a6d0331b
+size 34636
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 e3da0a4600..546fe892fc 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:9eb16438dd8f358fd0a37e49e53924da32029cc4842a539315aed2915c8a0fde
-size 31789
+oid sha256:482efc683dbaa0ce6226362b5a67defa88ae37e2cfb833bdd5d6e16fc79b53a1
+size 31780
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 acd4e46e1e..0e3a495743 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:b5bcc00a92920f3b9013a31ba378fbbf14ac9661b3d2a8debd095123de08b607
-size 36438
+oid sha256:722b7a5061e4fc95b4f982c9bfe631c8a392065bba4a7eb5ac15653f2fdb1a3d
+size 36427
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 96b2a381fe..0da19a3628 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:c713a274a7ede9e65f6fe42b5c84f3b52779dd6eefa96089b78406d27318d4f8
-size 31927
+oid sha256:b992c4cfec6b69842eba17c7ffcee8a72d8ad47aa32f35f954e0fd0e5dd5b17b
+size 31919
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 5ebfb8d840..7e90a1a77a 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:a8d8e40dd667f72ad01dfd459257bdb307cf7f85939c5d827c7bfaf73f88f328
-size 28230
+oid sha256:37558fe844c968c497b5341b08ce847fd3b8f7473f91f591ff311bfe4e373823
+size 28242
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 3426478870..9335053189 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:ec082834362a27f1bfefe9376b0fab010b52483008f47bc4c2ecc4c5f0b8a987
-size 32083
+oid sha256:b940517d43db9289f1cac9a541d6e03472148fd4ced853799594c8531d6152aa
+size 32078
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 31d8d6d6ee..1e55a5b62a 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:aae19b03efb483fd312e5cf4b02e000af86941ce5c8e3472fe2410bc67178519
-size 9122
+oid sha256:070f37faf63ee4bb7acabfbe19943181b367cb53d23978efe9ca669d6051e04c
+size 9137
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 1e3446160f..db8bb9c93d 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:94341fe8aa52b4551ef8a73cf298aaa1c4352ae0d4c83990c04c4c6e491b64e8
-size 21444
+oid sha256:e1a765e16b340e75d0657de9bbbb429d09ebffae9e94deee982a8bcfc74e21bf
+size 21454
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_2_en.png
index bff2174041..175a697925 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a40987c3fb50529128eee026fa9b21495bacac58bdf20a01a39fb24ea462f4c
-size 6676
+oid sha256:27ba0279436ab9882d4fdcfde7897696e92e9d1a4b77376334abdb88957d5d31
+size 6708
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_3_en.png
index ab2eb0ce3e..61c2bb212f 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c4f3ad870d9d86b96a3cadcf574a48469e72a2270c66eaf5040f7bce2c9fda7
-size 18936
+oid sha256:d115dd52892b91e16547d929e02fbc158d5186ea9be85b374eeb441e47205db2
+size 19004
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_4_en.png
index 09335740e8..bedf5616c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ee1be1b069192b7e155139af4e3dba97fc21373d3e49d31be41f6263b733800
-size 8626
+oid sha256:19480b9a3c48af6b5ff5ea37cd8dae88d84b73c000d6f752935b31ce99cc2e61
+size 8657
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_5_en.png
index 7291dce252..9c8a5cf6c1 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e26d6a17523b87c2cb8b2078e0f4a1cfd8b1aa19fff022f97dff76dda9faab7
-size 38279
+oid sha256:0d5367145bab2e945d17458e24c5ad507197f8bf4600326199cf16f68f2e90f8
+size 37900
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_6_en.png
index 47f0826f5c..31cdcec65b 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61e5b4a31c2ab2620324655c5968799bd758d7256eb89f544b9800d7a81bb91c
-size 32521
+oid sha256:13ab803fe6533ca2b9e937022e0d8f8c32dbe89e99cb97165a16a5a9c399ebd7
+size 33067
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_7_en.png
index 9d3f70ba37..0dd385c93c 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cf9c53daca4b53a2615a4980c2d606292f3fa1aca30bcdd13827d89898aa3b6
-size 25449
+oid sha256:ef3621606ac95901a2d47769ab47758901c3c826b2fa21be22f9f17a0974c5aa
+size 25776
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 1e3446160f..db8bb9c93d 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:94341fe8aa52b4551ef8a73cf298aaa1c4352ae0d4c83990c04c4c6e491b64e8
-size 21444
+oid sha256:e1a765e16b340e75d0657de9bbbb429d09ebffae9e94deee982a8bcfc74e21bf
+size 21454
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 d42ab638fa..8a27251ee9 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:31143646f33a013c30bc4e1cfd6e66beb8af100521dfd9dc599a94be8e6f415c
-size 8535
+oid sha256:1787bd92c75748e69f346f7588170bf6fa9c626dd6544f4270f30f0f9b614037
+size 8631
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 2de946c312..07c21c8e8c 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:00a961c76598dc98a0d9c7a45781865984c51bb440bb1605c381e9496ca1789f
-size 21971
+oid sha256:7c4c5d0035baf55bc67abf83eae90fa0c16e044a0d0ab26634c02fb0ad5d4c26
+size 22062
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_2_en.png
index d4004dd81d..5c64fe9a7e 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d2fae553f7775986fe0c50adcbb581eabe7ebf2f82d39e1fef3d6ecc4e3c288
-size 6511
+oid sha256:20ebf6572b217c13686bd616686d49cf156a969232533e5c6041f9ea9de9ab18
+size 6575
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_3_en.png
index fb722baf78..9b2b6a0149 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbdebc079f54dbac4ce540a87f3ffdd37c4631b4704fb0783313735515e6e820
-size 19853
+oid sha256:6c80b41f4a5bc3320ddb73fb28741c61abaf19791d642a1157fde74b172fe6f3
+size 19930
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_4_en.png
index 0553656788..d77b338c7f 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe4889333bc96358fb3121bdeb54d3d4d75eba234d318462da3985ee75cf8ed2
-size 8420
+oid sha256:a53b0f2a9d9278073e5bcf9a3aaa57b71940461b2dd7b391b12aa0297e50cdb5
+size 8476
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_5_en.png
index 54fe5b9b5a..ea5eb9fb8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6fc23abdd913a0538776d0d0e96ce02ba119302c939ae3517f3eb5bb74b1de5
-size 38995
+oid sha256:9761e44904c0810b0e0b1168bda61f36da47fb1e2d49e8b948a5c50367e630b9
+size 38548
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_6_en.png
index 4db335c11a..68403b844d 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9591e809b411cc5192d35e08d79c6bc0e98bab6b01193207e5af94e778503eed
-size 32679
+oid sha256:7aeee770a09aac3f3cf5cd608d3ef6cbf2e58e34373e04900cf4cbec46193f56
+size 33171
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_7_en.png
index 3c0bd76117..1d66b2ce8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce62e536fd2413c1f15b00aeb9389591035196c74e45d27efab61a5d7add9b66
-size 25047
+oid sha256:a5efa0d8c2c786d5d36f23311221a124499b1cf9368002271ee8ca1931309ae7
+size 25374
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 2de946c312..07c21c8e8c 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:00a961c76598dc98a0d9c7a45781865984c51bb440bb1605c381e9496ca1789f
-size 21971
+oid sha256:7c4c5d0035baf55bc67abf83eae90fa0c16e044a0d0ab26634c02fb0ad5d4c26
+size 22062
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_0_en.png
index fc843bc4f5..3aa1d4d134 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c88f9a3ecbcf7db13846a6074c75fca2ce6bdbe0edd850bfc139e01a4fdc0c8
-size 9956
+oid sha256:4884f1972998a969fa3a8948494bcd0247c1149b9340b1be845ffa432a0a0d9c
+size 9978
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png
index 7475ebf250..067e2a2bb3 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8ed797426703ce250ebb4e0cd0d6753e0581a7751fc35654d12ebe4c0746a9b
-size 39351
+oid sha256:dfe2f91dd046dcd7416cc2767f467d793e14b1587379e328659389515d37ff84
+size 39363
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_11_en.png
index ce1e584d59..f8d9e39de8 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed26457abf2a6d89d61e911944b4e9f62de248c1939f997d0f8764e4c1ae08e9
-size 43088
+oid sha256:b57f48029efc014cd088ac6c36c3f6ecbb1b9c6c8f3ec77590112d09f700dbce
+size 43131
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_12_en.png
index ad220df759..4f948302b3 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46b410cba77b24d8657031f5fde29d4f25a639300862641ce0f8ad0de8ff99cb
-size 44076
+oid sha256:874a0b5d64b35c45a0293ebddbeb887377a8a40134af68828ebea0de34ca8694
+size 44119
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_13_en.png
index af3739d987..0a1de185a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:950e90b7c2c67fc95c9d6698dc7436885ee80dcf9da7d8467b0027c04c03c8f5
-size 29243
+oid sha256:cda32ac453af958cc10e8578ec0f37cecc82740dfbf627b3ef01aebc01136338
+size 29274
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_14_en.png
index 578db9b288..10221f475e 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f892ffadc2999b904be4fc72b0345524a53699386265ff446ee981f815e51ed0
-size 30111
+oid sha256:23c88713ba8991df8b1beff3762ebdd48f3f6e3c31ff3f7713c440bc12435114
+size 30118
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_15_en.png
index 8c7da8b54c..7f9b135b9d 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44f1bc19ce7f2db1d2e9ce5a0018d48848c63af21847ec238d08791999df8401
-size 34559
+oid sha256:9683fc7b78efa029be47bdb20a2049bcddff1277f7170b67f887c0cc8ee0fb10
+size 34591
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_16_en.png
index 1549fc3041..58315fe492 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b05cd6be3be2571745310c89448bce1562fa191a061549cd3ad0936656933d8
-size 42456
+oid sha256:d2bf6ba4782f4c2dc891ea0410ed4797487b7f0f6292867e018b89efd33b46d8
+size 42478
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_1_en.png
index 0c2e9f7f03..847dc439d4 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:680f7a4fd4a992e70aef33628faed82c8238109860fe87b91a417d1b880f0a4d
-size 33258
+oid sha256:22c2ce2d7fe64ad0d18477a23dca604ff92c10d6ebc4a6258ea77750a6a3cdd8
+size 33275
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_2_en.png
index 33023589e6..3a27f6cc85 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62a10762a1eb986d6f870d82fd9f5b10803e5178ce4192c4ae6cc17889f44c14
-size 31021
+oid sha256:a625075676f1bfa3ea2280d18d911b414a0e13e375ada0a5da1f129a76160ec0
+size 31034
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_3_en.png
index 78c6876524..5966b26374 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f592039e3dcf2036bbfc7e644eddd717bb9c2fac2715077b8744a96d5e8ce94
-size 28712
+oid sha256:6847b8f932fde9694cdcc3b911f4c90d6836ade22a2ce4fc2db7518812ef5008
+size 28735
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_4_en.png
index 12dee69df9..8612f6e4a6 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a707c7e9e4a1c91d12733a4002c914feb5365dad1e5fda77b4b3fd862d98916
-size 39587
+oid sha256:41de5451185f9ebd276baa7cb06bdea542cc6d9edd53ee08717f04204a0f4963
+size 39600
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_5_en.png
index 0e57f43ea3..487989afd9 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:018a813fbd3d3bbae4627fa9acbbbde709d83d67b7292ce02c3cd170572184d6
-size 30602
+oid sha256:b24654360b865e485ee280db126029a8f0851127d3c1606810a2ab11aaa0359d
+size 30585
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_6_en.png
index c7d05de034..73c263dd21 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdc24799de625f9826fcf87a624e76b530e7f0e44c294d49f842ed2de7a9c085
-size 32981
+oid sha256:7c4de5a07ef4b6c7a03db84d161a467e929dacda83bf363eef41443dad59f6c1
+size 33002
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_7_en.png
index 3d78e94953..05fa44ca7a 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:247a1cec9f0729ef1b23dc5ad730521bb7bfc117b4e9cc901ec922ee946f942e
-size 39401
+oid sha256:7240e42cb7593cde2c9f4ebb9e3808f8ebe1de2251518074fdafd96aaee3a09d
+size 39424
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_8_en.png
index c6f8b658a3..967e0ba503 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcc00accf1fa84c48831378faa27558d5ba24961dd3ba0c5f0587329cdbaa9bf
-size 29110
+oid sha256:fc05216680219eadfa9df834287831d13c3f37ce6eef45b1b49c26124b562f19
+size 29089
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
index fd13827148..2ca6a388c8 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19484bb21efbedc60478192da648d035334fb0adf7f6efda0977a3a25e3b6696
-size 35394
+oid sha256:22f979dfb2c48d2d03ee439fde88e9fc355a667860c5c55574dc57644e1a9aac
+size 35398
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_0_en.png
index 636b7ba0e6..25fcb47796 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c91724171606aa0c36987908af0abce5c05b3311469a08e532532307d1224c60
-size 9842
+oid sha256:ec6efb77f63ec2e06866aa56c1a8eaa563f651a80144e5da1c4d27ff59275411
+size 9829
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png
index 4e05331ad7..ccc964e8e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27c86e8f5c4a00cb13b024bd0cb1375f04d547d03dd35459c4a0853106f1a3c9
-size 39079
+oid sha256:f1c917c487c0eb32ca844c24ae725921174a8b0446fda2d1263879ce19d90d3f
+size 39060
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_11_en.png
index 5f8961f485..1cca4251d2 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b9cf46f0039e0f91e8372cd5f9a15b7b54b75c80e0a38f9ebc2548315d57c9f
-size 42657
+oid sha256:50c653b8a22a8bdde89f0729568858810991bf43e0628cf65989b487519ce488
+size 42639
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_12_en.png
index c25392b215..4117529a80 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a4f65342c0e84179aceadc5d75fc763ed45c23f4db44bc16441c50990b193ed
-size 43582
+oid sha256:a92f0c0aab2a62bd94f5701b308ae48fab3f342ffb4923071ace642c3b32ae74
+size 43562
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_13_en.png
index 9c134bf310..fbde4b8e3f 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2ef8069be91c6e20263da790c0b8b777515f46bdc4769532b321ae86c9152b8
-size 28701
+oid sha256:2a62ad4b4d17fb24cd4662213876ef8de0a3cf26b5c42089de330760667d91a8
+size 28713
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_14_en.png
index f5fe9ed256..6ecfefa5f8 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6977342388cd3702e94d7b233dcf89ee2b0698ff1f39323c0520a9b88128a3fd
-size 29622
+oid sha256:a457e82ef171deb34b17c70494cd686cab16a5550f17edcbf72d27752f15435d
+size 29606
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_15_en.png
index bcfe430ad5..7c98af9936 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6993298eb428c9f79a7b837c633b20c69a8170f179bf47af1f967ca2eb28f66
-size 33788
+oid sha256:12fa84ff4f3766a34de6eae4d8158e5090d2cf692afbc0cea973c7393ad99729
+size 33774
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_16_en.png
index d0a42e7563..bc8e300d43 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:374318e250e1b813025f56ee7121e05905421c6c5657e228bce58f60da9729f2
-size 42137
+oid sha256:fbe6574b3732b8d3ccde1f8188c6385f92b1109e058e0ff256d5e48451e681b0
+size 42110
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_1_en.png
index 27790717cd..a4351fc583 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:498e344123c195dadb96125bb2fad6ff7c8647dc1205adbb1e2068820e861631
-size 32516
+oid sha256:2f5678297f28480648365b97290c649addcccd871a63bb24022c618fc6648c6b
+size 32479
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_2_en.png
index 129a92851b..4f38f84c57 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d14358f97b6a7267deae81f0ff721fcde2acf63c5baff718beb94c41c9afa022
-size 30696
+oid sha256:04c1214ced713a5576afbd7e8814236db7b2277d7b0685cb9a3d5cfb36b07250
+size 30685
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_3_en.png
index 8a6464958c..6ae6dd0f0f 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77f4e76bc68f099d5f28f811c004dbc48a5da17edb0576dc76761cbe85ee9bb0
-size 28629
+oid sha256:0fdb9e57ee8cd20345f336d38f8be1e3c8d5205ba3854f4ffaaeb3294512df14
+size 28613
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_4_en.png
index 8093435a66..688a3e6342 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7fc4c0f8964f6cde35dc18ad39cc89249e14af35a10ab7a060e213b622f008b
-size 38446
+oid sha256:a9a9aacc227163f349dd0c3525f5f2bdb7959e9352c27f96160c4711de0dc8a9
+size 38443
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_5_en.png
index 0ceacc4260..f76ee55ee4 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1151f42b6fdb810a78dae144be8cdc1a97f4d0153c8690cbf2756b75308aaa13
-size 28869
+oid sha256:69534c11f667a064d5d50a98770cdfc8e82f0988123a7a3ea3e285ef6f94725f
+size 28895
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_6_en.png
index f599f084b6..3e4bbf6c17 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71e56b906decbea31fcf5581dc92dcbb6be79f6a6962595786e9533cc62254ad
-size 32045
+oid sha256:3a7f6665c335429fc21f8868583022b82cb4ac94fc9cd4b2150b8c5e371c0fd1
+size 31959
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_7_en.png
index 4f8d2856a4..61e73d6b07 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18e36242d664e1f2179bb3aef3f77a5bbbf5cd44aece2d2c9a3d7d70d2356b92
-size 38769
+oid sha256:333e605408b2373140bddd69d0ae07d3be531e90ecd36f0d594886465711e50c
+size 38675
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_8_en.png
index b595df5d84..7b04361db8 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37270eed539ed52a113375dbfa516f443838530ef7995bb6372764afbc25e75d
-size 26787
+oid sha256:1262b7be57eda70a38d2e2a205c406688c0c306751c460a5493ec3cf812fed6d
+size 26812
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png
index ecf3010c75..276fda4840 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2e279977cd66e1be4159c788a70b8caca9cf32d7b428b0a2407105aabe9a405
-size 35083
+oid sha256:31d6232428dd0fe61b41c645b86ce10dc6a2f0455785ac114808fa95c66c36ba
+size 35069
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en.png
index 604665f56d..8ddebf6fe6 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2659edc9c1149255c953c86d4076fd8461c3eead74fb4b0f8c113dbad6c9d314
-size 29809
+oid sha256:cc84b5b532d090d91d58216a65d04f9ddfc513bf642ffb9600d44da1a7f8419e
+size 29802
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en.png
index 68f040086d..46907cd270 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ec35abf2bd911902d72527cdfd7338379c7ed70d2434d64b91f1a7164c1e5ca
-size 35379
+oid sha256:227472b9c666dff285d8b060eb8233d8352a218b315cf485748b81b5e39c7cab
+size 35374
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en.png
index 58531912a2..4eb23730cc 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98341c9e5e177bb7211676119d6f2349d2ed1cc04a55998aa2dd0a2a9b89c883
+oid sha256:7b607ca5941018db665fabc738f83dc39439f7a7e15dc20289618a8686f7e251
 size 18252
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en.png
index d2f0fe6108..893b934feb 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79fe50124a0751a300f0ed4e46d26ab004463c96c72cef14376800c0c66a9ebe
-size 19149
+oid sha256:b0fcf98d72b557f0e9a404a6cbaf3ed28a6b790251a5559ddc88346d6e46937f
+size 19166
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en.png
index c8173b1cbc..26291c6e9e 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7036f032cb8aceb9f3fc99557d1ee0f0840a51494bc1f80776effe86f75db75
-size 27710
+oid sha256:0b56cc67f2fceea3450ba4a616312e67cbf24f50ae13924f5294e7ec8bec536b
+size 27707
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
index fc6c43cfc2..b2d5edfbd9 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:100977a64197b95f16a3b45d519b34147a8c7c092e405148c19bb1e38e669684
-size 32236
+oid sha256:33344ab709d4061c55c73e1df34c4a8904243c9ae1255e595f19b4a122d50736
+size 32212
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en.png
index abeb7fa772..5a9bbdd723 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c35b19622942a80ad043af9a1bd9e5bb314984517e6def7eef1b9de71123d059
-size 39860
+oid sha256:defe44448a2fe2bc48f878cfe421a9748e5c52b5c3064b3809e8da233e16e874
+size 39857
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en.png
index 88281c602e..7fb6bc0a54 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2eb8e4e89c85024e2c0b7598ef84b9c56ffec684f0dbdd49cb0308f1d445955
-size 27699
+oid sha256:697f457291dd88f6185d8aa0343a2e884cc3468a837a0beebb4db0ad8e8eab98
+size 27693
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en.png
index a74a6378ca..e178e8a649 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16efdc3b827c35f803c9b4767fb18406bf3b06115435c13db93d49e61cd0cc90
-size 32842
+oid sha256:27ed8fd52bec6c5592f12791e3eb680de2fcce3e1780ec3718fca1cfced319d1
+size 32828
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en.png
index d008fddd15..85abdb45e6 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0e3f24860064ce92d1ca64a98fcbdb112eef2cbed1f693b8f39b20e663a5d66
-size 16245
+oid sha256:4ad5f8a46ac61e62a49d43ddae9582119c803480bd4364b8052c66b13419a073
+size 16232
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en.png
index 05c139be15..612a786d29 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6577b95457cbe765f156bc364d7b5871c99f6a9bc4b1588ee39f06a6df11ff4f
-size 17200
+oid sha256:3e7bd8a5dd2d172ae5a98fc09c55784a5057721fbd7716170130647f021d3ba1
+size 17190
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en.png
index 2cbaea1c10..83841aa6dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d58e9a47a3653dfb6468288f1a7950788f9f41af49bfbf23efaad86a12b43169
-size 25411
+oid sha256:29d18993a742d4fc4f163a407a32c0c391acaa0500c359ada01afadd91a9be7a
+size 25396
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 a66b830bec..27daf15a99 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:b08a45f787377b95d323d55952d897ac535c8dbefd2035ac243afcced81703eb
-size 28580
+oid sha256:72adc03453974837d48db36d5eed1ba68114da2964d163a43ff92468679abc13
+size 28568
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en.png
index a9ca009808..c3ce00dfa1 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25f2e7144d142a4012601295e7198d1d450d711049a4067ec1221301a7489702
-size 37353
+oid sha256:bb4a624106605010f943409f6e9fbbfd31bddecd5acdf7bff49093685647a4b0
+size 37345
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_0_en.png
index a7023c66ba..7fc2e2d268 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0108175ae5fea46394b5215352e19d95545bd0d2519e2bfcf1e368e621aa21f
-size 14318
+oid sha256:2a9a41f3799cd7d663213b7b8a85faa8f06dc1e761dd872bd3c0230530cb7b1d
+size 14330
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_10_en.png
index 10d4ce49b2..dde07c6a42 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7d2098e616849e14e6308253f96adaffe286b10e2004ddaff7aa406a3f083f5
-size 31003
+oid sha256:d0b4dd14a7411a75da7664315b6ae4efc1d3aba56945ac4726be916f997d2c69
+size 31016
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_1_en.png
index f6ec06a525..e33a736254 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:247b7b95443c6e2bf7cbadbd1c85935e8310bcc54980e057ccb6c61c72b797a2
-size 26521
+oid sha256:b357f432d5dff4d692b03b6a0fce8d59a044b4f6f139e3c644b1ddd9ef4f15d3
+size 26502
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_2_en.png
index 1982cc072b..4a0595e7c2 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32369315f99990e5b9a62d1b385a3caa2eaaad93695769c8ff8d7b6b07ebf31f
-size 33717
+oid sha256:27fbbc4d7fedd2143714333743ecf60c2d446193677a6f71196494d1a220a9e9
+size 33729
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
index 356fd34504..d02c0237ef 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a170b2e8dc5105a41f6eb289dbd88a7ba7388ad31b9fdd2e7232358ee53fb9c
-size 42246
+oid sha256:55d145c33e1c6d820cd8f3326da308bfff1f52d54619a2f8ef207ba648154654
+size 42257
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 df770a865b..ee8c77d4f3 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:e8af887789d660038aeaaf4cd234ff926879ad5d5eaf3b38d9b0d6de3cda530e
-size 53485
+oid sha256:198e0d289bf4abb7a10b17f9de3ac5ff2fa3f89915ddcfb14b55926e33bee005
+size 53501
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_5_en.png
index 22f56c4da8..66b6406d9e 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6e13b1e5c43efab5cc40daa0118566aea330552075e5409564c496b86db4564
-size 45402
+oid sha256:a589f95e6f8dd02a1507fff0417844252731447ed25023f800e8ce59b88464be
+size 45373
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_6_en.png
index 24f74a6607..a1cf6f613c 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbe3e94a10d42de71c2dff8085f1d0890a6da9015c6d4ee8ed559305996efd46
-size 34518
+oid sha256:43151d23f08e8b0fca98f62b38c7a7fffaa2f03e5950600a522ed1a7a4dbb8c9
+size 34496
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_7_en.png
index 204676341b..c202ce5c89 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:217d15b6aa61b9961b79d76a2f88cfb2e757125680c6f8732b48f3de9e506699
-size 39904
+oid sha256:a0ec9eaab640d25afb83fe5b1adcb5a612d82e2963a8639134a72facdb3e5b6a
+size 39881
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_8_en.png
index 1c352f5e4d..855226b3cf 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab348a84c5f880b2fc49d60faa94ae3b823924115003d4c734cdd846607ff5d9
-size 30739
+oid sha256:ffb451cb51b23ad8e1485c2d532c5d3fd302dcf38ff7cd75f9dfe8517c1bb22e
+size 30749
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_9_en.png
index 9e17904f06..5f021d4794 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f4cb6f7cda4740749eae68d2001d713d743663fcb572e445f8a57efe1fd6725
-size 27582
+oid sha256:4c0cd058c36f277293c326a5215476acae260d4c868652150a8ecb7e477319eb
+size 27586
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_0_en.png
index 2b642f1710..b425b6cee1 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d19a663e364e5d6e4eb13bfe5f2538b077e682ef75a82234e428c1f6e5f327b
-size 13942
+oid sha256:28c87be27141a8c8f80aa7b9c0fd2171d745e37040941748426adb49f7d24ff7
+size 13932
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_10_en.png
index 49652d25e0..6e246ac96e 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56dab3a7d0d42a4a2584cf5905fa173f47043c5358480e376e91bdeccfa0d9cc
-size 30141
+oid sha256:e413595d9e61bbaed43c84297d2d62bd05702fa2c59a34c7e0fe794aa23e5b15
+size 30131
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_1_en.png
index 5095c84423..bbbdf1aee4 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a316d205b345754d58798a3f8f75c4d6893c578ac01892db26b91d106caaf72
-size 26029
+oid sha256:6358f7ffbc43efb97fdfec53886340fbbce4143fb420008b7ce02d563b2b6aab
+size 25978
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_2_en.png
index 5f4903117c..6844c9d608 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26a1769ee81d4efbee072e9e40a725ae8c725d90f4ff3e52a8f1cb4a8882c587
-size 32746
+oid sha256:be9b7f4f3589fef8d4a2dcd32b0777819c3c66f92313828d5339870ddd92fc64
+size 32737
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 7882cbe0d4..4d55899355 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:60daaa902bf1bc170b517d39f32af08744111ad9ad2eb87ffc2122ec826622b8
-size 41106
+oid sha256:15dc9876d33677a9a36bb43a3345b47865e24af6b5f5a9bff2f88b8a93b48e5e
+size 41098
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 9624a721ac..a02e2ad6ce 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:f012049a5b9eacf9c37c46e786de1edad92449ae941e8a11908369a794a1ddc7
-size 52045
+oid sha256:aace908192a5cf5a1bdfbb25d9959e80c1a95465a35a3b66474642b0a4c88cb1
+size 52036
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_5_en.png
index 4312dcda4b..12cf6b1daf 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4ae8ce188cf5d380117fef6f98c73285486970267db88b0823409e75fdf1c1b
-size 43250
+oid sha256:54555b86f9c98d0d06feb25c918849fd545d7c56a5f4c48330e528a6f9ce5c87
+size 43270
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_6_en.png
index 04b76a416e..20fe6a16f4 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5132609cd9921570f91274c0b4de06a4e9d5059b8d4ca381c87161900a042b1d
-size 33505
+oid sha256:b368ec67042eeab3657efcc49da3f9b4caec3285a4a54fcb3ea453697b563c6c
+size 33525
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_7_en.png
index 1881fbc86d..f4f8d25368 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0de7bb034b2414146bfb0e3db535c4da6b431d1dda8856fbe69e2aae5f312a37
-size 37462
+oid sha256:4f6ade3b8793e47f9c1372019894cbe99e2bfde1ec0d5872e035a2f6a015bf1c
+size 37484
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_8_en.png
index 4b91fd41b1..cf963f529b 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb61a4338b5ca6938d92be97565dab866682d55baf09a1efc8bfea2df635fb8e
-size 30221
+oid sha256:37cb25021aafe5ac47fdae828ce6f117bc670ce5068ae0ad99c4fe3b7dc4409b
+size 30212
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_9_en.png
index 7ecf033794..1debceec74 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5344b698393a443c40339d4a95ee16c3acf3313802006115332e6977df9f2aa
-size 27401
+oid sha256:f5d168735d27d5d873c8866608f9da7bf38267e027887e784a6166a5c53fd907
+size 27392
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 c9252541e2..c222e295ff 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:2468979bee62f4c3c654045b564bfece46af7471557e0117f1f15e723bf16f7d
-size 18719
+oid sha256:22e8b0c20dc080acf5720cbfaacb6b17f3f23e017ee4714e21b00bff3e1dd307
+size 18741
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 ca2a5480b4..ba8c352d48 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:7fea521646c14b4e067cd2cea83e497e7e2bf20ca5acb16b162c2058947f3ac6
-size 18549
+oid sha256:c085ce6bb1aec0d57daa4904be477a2b5db5313828020e86bfe10f0cd920b57c
+size 18540
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_0_en.png
index 36abfbb388..33917528ea 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0eb1a82b41f242b783f78e182835ff36fa39279b988056497abf1efca6b868c6
-size 10876
+oid sha256:ec1155a013bc06aa4a46a47231c9fa0105d1f409ac9ebb667044a3289b882fbf
+size 10878
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_1_en.png
index 01bf030f5f..6dec1229b0 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ec76da2e77f7b9e4a42e758a218a7d794a6c63112e6870fe099ad6df09d85b6
-size 10098
+oid sha256:23a393211214fc5cfc1c63c5b37d3cb2c9c45e7d55c6642029b280a8f6709ebf
+size 10104
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_2_en.png
index 6d49c2d8a9..228fa0b17d 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30c66097f944497349272d010eb47d18f82c5cf883d22ab72604bb3463381464
-size 29354
+oid sha256:ae8ae38533d194ac5c1c33e77697e3d43b2f51e7285581a91c05f537b4857434
+size 29352
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_3_en.png
index 2301bc67c8..7b7bfb345f 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5060a3a0576d988be7ae07d6953941a997a9e4c32a22960ce0cf9a2012a7764c
-size 30614
+oid sha256:49940300eef5e463d4bd4c437b483c1d2431c226b449dc27175e1655617b0617
+size 30609
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_0_en.png
index f262a5316a..7a364b7b2c 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22a7e1fc2b7c0ee38e5749fe40876a826c0cea6065bfc47021f60ba17d23fa31
-size 10658
+oid sha256:024d500339d3ca8c3f83d7341c545a74f0520b3f8c613f52dc2f75a28bde31e0
+size 10650
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_1_en.png
index e2e3c79d52..faeb11d4d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52f9c3b1213e88694bf196f9ed90326c104c636267ccc7806d0de3416f74aed7
-size 9905
+oid sha256:1c3cf0b4c86b08bd75888a955c613339793ea71747d824054bd8a53509755edc
+size 9898
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_2_en.png
index 2c1a623f6e..2e8a89c8a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4b0c2f3a87779866f20c855e9f9c866118ea23613993724b7370a6eeda5cd1c
-size 28765
+oid sha256:ea577168ed996b5366609d3b0e76c5a837e89037427816940f1848445bc81993
+size 28718
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_3_en.png
index 434041f432..c71837dff6 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.list_DependencyLicensesListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55d0fe08862d1a7dd30ade4e5e7a5535a79b3a4277f6cb6ad34502e913489032
-size 29982
+oid sha256:7b5ba86629299e27a5cc0fa3aab18d5b05f58d79bdb3cb50fd518e79f2e30aeb
+size 29943
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
new file mode 100644
index 0000000000..a28be5b7c6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3b60fe3c4ca517486d0eec1435498311525b8f3b1698d04d9a41a948559332b
+size 43861
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
new file mode 100644
index 0000000000..282cada077
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcab3501c7ec8e1bd100016736946a3462405ce90e75610967e71a01445322ed
+size 43207
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
new file mode 100644
index 0000000000..b8de2286e7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f452019200e44097f9c4f7911fa144d4cc88fb63a58a8351a820d8e34b7d7a53
+size 42829
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
new file mode 100644
index 0000000000..2daeb9dca0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6dfcfce70c52b8bdbc06154d0a206f25655f01ae7548f8d624a4bd4ad87330a6
+size 40871
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_0_en.png
new file mode 100644
index 0000000000..b2f95a9597
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24fd98aa0c43fdf26b67ec4dffc72d7f2d48f5d19f0a68a79c2c2c53e6c5fd12
+size 20769
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_1_en.png
new file mode 100644
index 0000000000..b8fe60681d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58ddf6004bf14c10a0b65f271f6e95641891777e28ab12967e234363a10c33a5
+size 18411
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_2_en.png
new file mode 100644
index 0000000000..5b85ab50d6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7f5c9646571391933edc18c8a6b672b5208a6a4636b5bc15f77b8a06c6ec4a6
+size 21751
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
new file mode 100644
index 0000000000..ecd17390a7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:157115c94aff169efbcb87343c4167334d074a4eb78ff4ddb075fa0cfff2c400
+size 33058
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
new file mode 100644
index 0000000000..74694ddb0a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7077c7ed0c0656c538887db2e08e7c288e522261c160a13753e1573ed18606ca
+size 32697
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_5_en.png
new file mode 100644
index 0000000000..dc89ee8fc3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e0ae0d30fde1317c5b8f20569597cc6039eac3e8f70c80c075ef4259e3e74c4
+size 67039
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
new file mode 100644
index 0000000000..94ef0539ac
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9077a09b21bbdc7e2a22cf4fca9a6533ec11b1b6e898aa71d2b5393ef01f426c
+size 21058
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
new file mode 100644
index 0000000000..60b3be0d0f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:330d0d44bb7638a4668fa33974e3b2cd31b3ce285776c993cced2b928b01bbb0
+size 20909
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_0_en.png
new file mode 100644
index 0000000000..733d9413a4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe2527eae9bc919a3994cd59e8f6d0c181aa3ab9209b1c34b2bf6e63c7a434af
+size 20505
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_1_en.png
new file mode 100644
index 0000000000..0199609ebf
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d015f4c5905ab38b4bd987aaf4bf0ac8f55795700de8ae19b5872d4acd5bfd8c
+size 18323
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_2_en.png
new file mode 100644
index 0000000000..c19826eb03
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:443ca45f4951fc0ef2d390cca6bb2c5717c0160a9df04fd3fe5bb7ede82a1f91
+size 21530
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
new file mode 100644
index 0000000000..17753af5d1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f72a52b922d9a4b058cc5bf1475711b0d1adb6e4ebb1b3e75278a4b9117a9869
+size 32359
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
new file mode 100644
index 0000000000..e92d032dea
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3430a0cdbd3eb28989a5f9fb397fc082b012ea2a3c284787d27da24870ecd12c
+size 32244
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_5_en.png
new file mode 100644
index 0000000000..f550be4d00
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a90a5fb148455d4e4d9c4d8332222927d6cf3c606e27c695e4c44af13cedad9a
+size 65592
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
new file mode 100644
index 0000000000..a9c4133bfa
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6481d57a4d3331e812b310a4a90963e30255ef894a9644df66de73eccccea7d
+size 20735
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
new file mode 100644
index 0000000000..a1fdb67640
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:516a6c8873c80c96febb9edf8956bccb00b849301df4682b969d3979158316a0
+size 20632
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number.component_NumberTextField_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number.component_NumberTextField_Day_0_en.png
new file mode 100644
index 0000000000..b88e154565
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number.component_NumberTextField_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce3903e4d279b4550ed6097eb030edb512ef7aee47392fcad6e48628afeed256
+size 6183
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number.component_NumberTextField_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number.component_NumberTextField_Night_0_en.png
new file mode 100644
index 0000000000..91d4e1760b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number.component_NumberTextField_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a075fe842940349e4528aeefd1cfe833b682641b51f6eac51009a8f471be35e4
+size 6197
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
new file mode 100644
index 0000000000..d379df9f93
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c7f784a38660b1d75c7608310d84d99747beac15085d315f0f769a6ff6efa6d
+size 30212
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
new file mode 100644
index 0000000000..09100c4e49
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:020f577d6a2504664933b4a6b642ba1f7ac41b8babbd5d118e714d2e9e0a08b3
+size 30197
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
new file mode 100644
index 0000000000..0857590460
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39333077444bf27e5c21750a7ecad964f761b8d784324cb12ae31035c94a0a37
+size 30806
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
new file mode 100644
index 0000000000..d3e5554074
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae4edadc0fda7c5c5f75866de9779da968036705965230dfcfc3a03e5f8e2757
+size 30936
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
new file mode 100644
index 0000000000..bbd3e09e23
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c968f0c1c8bd1d21fda861861f1a7472479a97f7413a7ccdcefbb864d619a5e
+size 34248
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
new file mode 100644
index 0000000000..f17da429a2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7812c0a76fb369670d3bf90828aa94df52902dc092da0d22c4dc76f437f22c9e
+size 33961
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
new file mode 100644
index 0000000000..701d1405f1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:637e1029b3a8193c2dfa4d5511933ff75c54bb2a0e37afade1b550cbd0050279
+size 29203
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
new file mode 100644
index 0000000000..4bf546ba11
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f02d37ae2b82d50440539bb1299053c1e431f14a4d302fc2fd9fdacd5abe34ee
+size 29170
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
new file mode 100644
index 0000000000..8b454226be
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a55f9b20767eb0586d12639a589ab6119496939cb17d0fed6e58f3c2b22aa511
+size 29893
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
new file mode 100644
index 0000000000..12c06cbf70
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca8b496d6d6eb08d78b3039b479e4742bfac568cf5c2d6f3217b0af63abca9d9
+size 29918
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
new file mode 100644
index 0000000000..7adeb74986
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:924e2289ca0d36b7504820ccc48d9eb943ebc19262d8fd3b8357138a0ffb50ce
+size 33170
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
new file mode 100644
index 0000000000..f342186acd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8025c4c03d58a10dd9cc7b174e6c825b2359777f442458071baacc533bba6b35
+size 32868
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
new file mode 100644
index 0000000000..083cc9d823
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd8e91925396d1702df49a2e342730cda9a0318adb8a3d17dd906d8185d5c846
+size 32140
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
new file mode 100644
index 0000000000..474b47228a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ab17222e6d51768a8863ee4d282ef36340ca6fa47e8ddb597c1dbd409e213d3
+size 32680
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
new file mode 100644
index 0000000000..303f628e09
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ace7883ab223f7031d0eccdbbfe96b89f21481bdfa8c34a4470b5488b7db42ed
+size 18256
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
new file mode 100644
index 0000000000..361a2b5af9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c59349060460c76f4b3db020ea5642e70bd21acc963ec32567eb6b5dae142c86
+size 24432
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_en.png
new file mode 100644
index 0000000000..2d02847167
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37b0b44b213ca6daf129f096ca3d909031a4d79bdee79fe54595e4bf08f93977
+size 25775
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
new file mode 100644
index 0000000000..13180a6b8d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e764db89c970799b230e16a1f345d4f78b58ff00ea7ef03e94b863763485768
+size 21795
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
new file mode 100644
index 0000000000..e923896419
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:670582ea30ebb350af301f4ca8c15f6bcb4c199b67366e19bbdf30456789f470
+size 23962
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
new file mode 100644
index 0000000000..9816c6d1c5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:096f01d87cf3414f18c67d24269d5ea5284a0652b5e6137ebb117645d8e02cb0
+size 34075
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
new file mode 100644
index 0000000000..19573907e6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:623ceb15f4fa87d4674249693a94b89cd742ed93df9c36b2603a54bf18cb879c
+size 17626
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
new file mode 100644
index 0000000000..269aab3c89
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddabca52e06c1bc184dc0deb71651b5d282adb55a8264fd588345937f4410f2f
+size 23511
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_2_en.png
new file mode 100644
index 0000000000..ed74d392ac
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64b240c3bb9e40677dddfdaf5e8cfa09c1f2c1a19d9544bd74634a9a04262943
+size 25387
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
new file mode 100644
index 0000000000..bb7a6f3a24
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f13958a45f7afe8f57478a6c2539ae26e8c470bf4a412f06cfa540448506b29
+size 21070
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
new file mode 100644
index 0000000000..3b7e50be12
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96d9c8f4dde2d1330572e30014d6262f88575d5f012d7986c2a6a938b4a66db6
+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
new file mode 100644
index 0000000000..100368ef3f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b41a1f00e6bc7cca9af41e0d4b62a9e05370f191464e3d76cee878fad9dc230e
+size 31941
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_en.png
new file mode 100644
index 0000000000..f6a46dab95
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76af36f8440efa9c2b2c3a98d34e8ed356390158a9f1b2cbe9e86c820553213b
+size 15956
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_en.png
new file mode 100644
index 0000000000..4e809b9b7e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c0239a08b541d07fb2d916624fe97dc997cbe0a05903b8aa93c05cc172b0640
+size 16602
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_en.png
new file mode 100644
index 0000000000..21294e5561
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbd8bb22a902f03847c22b27afed456eb08e60656e6777803531cc9448b7a42b
+size 16760
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_en.png
new file mode 100644
index 0000000000..43adf5019f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7284871dd335aa43efdcde312febfefbf0e44ce38e41943609faa3c3e2c3c1c8
+size 27442
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_0_en.png
new file mode 100644
index 0000000000..db5157c4d3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8f45fcfe13302231733a1d5d845f9eee9f5428381a312e021d1f34cad47e66f
+size 15312
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_1_en.png
new file mode 100644
index 0000000000..bf6cc48d4b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:def2668a2168bb3f1c37994914fd2f32df3c900bf0d43fc5b6bca9f1d8183240
+size 15927
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_2_en.png
new file mode 100644
index 0000000000..d5b00ae510
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7a4a1642295e2e8b6f7aba548b54ebc122f525a28394414aa7513d9c60bbc23
+size 16093
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_3_en.png
new file mode 100644
index 0000000000..2967e646da
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:807e0cd53e97683966343e75079a287e17484cc3026ac328792da17cda023ee3
+size 26379
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 4fcccbbf4b..f6e547e814 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:389171c430db4f6e6475b7e0119d384314443e82ce49aa3501a8f022b3ee7f8c
-size 438942
+oid sha256:914c19ee49ed836cc8f27dce9550b325a3aead05dfc04eec114365f6aa7e2d9b
+size 438941
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 d70ffe3658..02d92197fb 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:194048bcc1f4507af21253baabe271a227aea706b451ef43588227e5ba5102f0
-size 173416
+oid sha256:7f7cba4b87d9e4d2886adcbc8181b417684fb08329950d83da7e7b9d8199d7ca
+size 173418
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_0_en.png
index 6945ed0c4f..b320e1bfbb 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:780bec44e40578fd3d25ba06ef9a5dc3b0670f912e9957ef7a1305715fe764fd
-size 18881
+oid sha256:f0a69815f56a84fee69cbb6edd14b2f9613f79cfdfcf47a9636fe38ff79f4fb1
+size 18920
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_1_en.png
index 36c75829d2..c67fe7d7ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cba7e6e0f579f8da9c0d36ea2e56174e6d2ae48020d09252b393dce0b5fdb73b
-size 35032
+oid sha256:10afa8471e0c9699a1662ac758f505bc4db9e71c24cf9cb2adf9674c06adadd7
+size 35037
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_2_en.png
index 7812df3f5f..7a5c5ce7ca 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64257748b4047b9dbc48a5853f22a8e442875a85587cce2de70660bec024e1a6
-size 33353
+oid sha256:0be60af8c60993127fcfe4710071a588e44dc26545c526cb5ad532e4822d91f2
+size 33356
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_3_en.png
index 6945ed0c4f..b320e1bfbb 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:780bec44e40578fd3d25ba06ef9a5dc3b0670f912e9957ef7a1305715fe764fd
-size 18881
+oid sha256:f0a69815f56a84fee69cbb6edd14b2f9613f79cfdfcf47a9636fe38ff79f4fb1
+size 18920
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_4_en.png
index b8e309987d..c353770363 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0d952bd32bcc332a7efc4db4066f34d165cff2c4d810738bc2830d033b28723
-size 19019
+oid sha256:0b0b03bf0b3084e1e376ac76772d55aabcc8dfb36114b5aedf10e914c7e9a63a
+size 19030
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_0_en.png
index d76fb95f4b..292a6a2f04 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2888144c07cd2d97f2f1554ba7aa7a5a4aeb2057d514d070311af7aaa921aec1
-size 18546
+oid sha256:531195e6951dcbef418a40812eb1ce3d1992524607ca6e6116a62ad0c8a6be39
+size 18547
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_1_en.png
index b68333e367..8e3340ce3f 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5430fd67358ca399a09df6339ec7fa76cc7fa35eb2867730b04aa49a7c4d7e06
-size 33149
+oid sha256:bd569dd607e485ef7f237200a643d955cbae046d402c14c26c30dd02708d936c
+size 33167
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_2_en.png
index 941784dc64..8115443f5a 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b9a609a69735b9542586fea5875626207f74c87b91fe1de848b81ff381a2068
-size 31693
+oid sha256:3d89f7606776540c955ebc925fb9c81cf1a1dbdbc8e7e188ffbb403fa3973e5a
+size 31712
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_3_en.png
index d76fb95f4b..292a6a2f04 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2888144c07cd2d97f2f1554ba7aa7a5a4aeb2057d514d070311af7aaa921aec1
-size 18546
+oid sha256:531195e6951dcbef418a40812eb1ce3d1992524607ca6e6116a62ad0c8a6be39
+size 18547
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_4_en.png
index c293a4b4ba..f2e4edb38a 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.send_SendLocationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:527850ba915e6ecc80ee5e1d75c4bba490999d1a22e6a8643d6c916f697284eb
-size 18687
+oid sha256:27fda7373270da1be20f70e4ca795650dc3010a3befa27e5e1e32142c2fba4bf
+size 18706
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_0_en.png
index e252711709..ce0256bd6f 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64d3a64a4ac6c0ebf03e0e9df70b47bf4f2390ae544c03495c42f31eb44ad02a
-size 10922
+oid sha256:72b19100f3e530cea722f66169e1df1b967f61c5b2e41cd15cfe0779795ec0d6
+size 10920
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 dde4451b72..cbf3ed512a 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:ab03b157f9810e5a16a1b732fc887dc5143703e659ff6363730ac220b283f03b
-size 29780
+oid sha256:abe540056a43e6dd0774b22be04479e846221fcd95ab6512b61c52984fab5071
+size 29764
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 a41a95d710..b5ad9e3cfb 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:d96a4a7eaebe458f8f7a43c20f9c711c739a74ce6f97ef8e209417731a468cc9
-size 28200
+oid sha256:27e31149fcdc9d96ab0fdb111b8eb7e114769cf39a861600ac4651265c92b1f0
+size 28178
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 e252711709..ce0256bd6f 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:64d3a64a4ac6c0ebf03e0e9df70b47bf4f2390ae544c03495c42f31eb44ad02a
-size 10922
+oid sha256:72b19100f3e530cea722f66169e1df1b967f61c5b2e41cd15cfe0779795ec0d6
+size 10920
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 f342a66deb..572a275f0f 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:1f9536e26d0056c139ebec3a49b780cc0e18f1efc6033120c9648074c19a1e6b
-size 11052
+oid sha256:6d2cee2219e96d74825b4d94ef71b1d43a4bcbb39846471f21769f10dd19329e
+size 11055
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 c956d1bb76..7a5fc36e35 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:107d54b935bf5466b811735ee2b51e1e3ee3d3045f9f7686a1adc14e8ee4b9ee
-size 14650
+oid sha256:4fc37c32da99ec30811253f3d72000033fe150d1f0777aa1af960892074dd2d3
+size 14648
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
index 719c88f202..5e654f5849 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbb3ab1766f4566ed5cc742a6b33dfd65ed517ebc6819ff38883fc233437bcf3
-size 23279
+oid sha256:ab6c334b5ab114225dc2ef897fa061b78e6c0ae6e3c60488cb38f07aa35f28e2
+size 23278
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
index df40f78bac..5c45000935 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cfff8805665fcae6d0637285a9742865e194c1d1e5a4e00c435f8f6c574d4fc
-size 26040
+oid sha256:5d07cc3065af85dd5b723bf5ffd2dffcdd66f34fd88d951c4e20a53bbe602422
+size 26047
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_0_en.png
index 0f9c47d4c8..30276d3ff9 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:deab2caf175531eaeafc1c39818ce8159b19cd95245369ce81fc14c263178e65
-size 10600
+oid sha256:e8f5fcd8ebebc78e1c24ae34da1efff5d6677cb2c3c9c4719252e1a06abefafb
+size 10602
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 a82aa7fdcd..1248e3a7c6 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:6821dd9227e5c439a05b738dbe0bd6d96d25bb123ae98e213df1740630fea140
-size 28161
+oid sha256:543eacfcfcb1ee7e2a502f408a5fff239b899d6a4021e1d67a88570a4bf41179
+size 28187
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 7f55ac54e1..cd4fd1b690 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:0a51febb963559a95e95a0b1f8d93f0397b46e9862afe05610c793a948001289
-size 26709
+oid sha256:0c6aa641c9b683a0ed71bdcfd0648c667121f88d35e52429c43abaf951c20618
+size 26731
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 0f9c47d4c8..30276d3ff9 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:deab2caf175531eaeafc1c39818ce8159b19cd95245369ce81fc14c263178e65
-size 10600
+oid sha256:e8f5fcd8ebebc78e1c24ae34da1efff5d6677cb2c3c9c4719252e1a06abefafb
+size 10602
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 465b9d8a23..8d6b1c7a1b 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:a0c6ecb69d84b8cb817ff6934f395ffb70675ca8ea6b6fefcedd8f90d77248d7
-size 10715
+oid sha256:3a059a1c0075861a6761f60db28f7e91abc8d6ec0f5c93784032bf7b204d2640
+size 10712
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 c98fa3cf1b..4cecf6c746 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:fb0f0a66aee90e225d1ff8f749192fa5ad58a52419c9481df9426f7a519ef057
-size 14122
+oid sha256:a154b1278997024d8d9794ccfba0b7f2082179f7666f6b477c58b0b463a90496
+size 14125
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
index 955ea2cdb6..96d831f2a4 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fef81167f3f01aad5cd75ad4e6a5679bef193663dfe77c4c4da92ed510634f54
-size 22543
+oid sha256:fdac9fcab59381a510d69f9b4fed399d0b1c8026b06517704007f95433448327
+size 22546
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
index 5d8a5ef5b1..a9e4dbf229 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1c826aa22732231112e2368c35f9216d9b1a06908c85d883744a450cca5743
-size 25205
+oid sha256:40ff18c8e4039abd9d24b8f4a91aeb3a207c11e24f3d2c425aab89a094fd82d0
+size 25214
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 cbc9f1ad35..bbc7f08cd0 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:36660f5c7db79ebadd94a2cc336de38d3aaa892e4063620fa3158ef46943ca97
-size 16773
+oid sha256:62edb0d74da0cc9594b24bf78cbf3e6fc331d14c0b38c98e0fdd537f0bac43fd
+size 16791
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 c462fd6a37..a84fc25954 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:696440bc3b44778f7894b686a85a60b49db16cfb05bc09549f0626817b37d8f9
-size 19158
+oid sha256:8356653061edd876f83a32326e0226be2af7956d7d03c121ea5b6429e8f7453f
+size 19172
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 defcb90471..803e0fb3c6 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:aa15f390927a533cdff4d42751e19942b0386473301cdb8cd800b37428ca2179
-size 28851
+oid sha256:398938718e1bd357f91e84459314d648bfb86f62382ed4e395b3b25233febe3d
+size 28827
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 0262823ec2..5930fffc5b 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:0b03df9e5aedcc3cfa9fa6c1ca021931088bf3fb00c34618b218e3c169e58e47
-size 16145
+oid sha256:f3869ad677c0b01e2c88bd402eb7f30cb39af995f5d580a1203901c960af60d9
+size 16125
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 d39e809ffc..e2255adfbd 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:3f7201708ab937a6b905d1a9395f788e77ca49cfd9230e8d0e21d20a53d530f7
-size 18526
+oid sha256:14e98c47b4fde1400980a14cf01a40825d10eb455614c58158fe4e1bb67a09ea
+size 18507
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 c2dbf39b83..27f1f74d21 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:91251a1871095a734f70d335b3f514d266a5486b1fc57cbd130214f268525f1f
-size 26957
+oid sha256:34942f62984ba9d0cc1dc131c9722eac27575cfab79399449476d72bb18666ce
+size 26976
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en.png
index 9834ab9e99..3b2f42cf47 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b4bd33dead4e999e81e133c768d4b84305ee5204be0e5114809f7490023d544
-size 29742
+oid sha256:333fbe4f530f4614aa9a79d718f23e58a4453f5ad79ac3292dbcf7d54857a05c
+size 29763
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en.png
index 0be8cf4f83..116c64dcff 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31b0c682fd6189a7f68024cf09d011a77d573818cb79ac70571a0c501cd13b35
-size 29351
+oid sha256:4b67ff23e20d6dae038a7c66cdf5a37f497dab0a8a4921455d12336fa36c8213
+size 29374
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en.png
index 240776917d..81af5e81be 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:015cf2cc614aac901b825ced662af3b442a6133a4e696386d75aa1839754a8e5
-size 29215
+oid sha256:ca92bacba980314fc73b0fe3a0798f7ffa531d00f59a5424af780d6272ffd948
+size 29230
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en.png
index 085c34f992..0e0fcc19e6 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbf3b090b0e3b4a00f5ddd86b7b2a62baa62e9cb6d1c24c36191620124dd6d12
-size 25210
+oid sha256:00a522594d9a00798827672c5019aebd6237dec4db89346b7f5ff2deed288850
+size 25189
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en.png
index a50a3c140a..3484b7182d 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53187c4901a528f5ea59fff3def64197eb0664ebffe85f48635c5cf1720c977a
-size 29700
+oid sha256:e8e6a1da776c6f25bb529c12a8b4ba431e1aa3dd911d4067b1cb6f3b976fb254
+size 29679
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en.png
index 191c16855e..85c94eee17 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14a97916b95f4a265960e64f069acc76830033f9474a9466a89e857a63eef53d
-size 29197
+oid sha256:6494921960e25ad28818665ce18d700aaec7d386b0e94f833d02e10eb808811b
+size 29188
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en.png
index 4f0c887da6..dc7185d583 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbd42154b2f722c149613eb1d10c2972001eb3391a5ff8787d913334e9f5fc1c
-size 28853
+oid sha256:1aa9b53bf436f2801781fa1b2e58b424e57ed60840f7dd517387c3fb807c91d1
+size 28842
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en.png
index 56e16eb9d9..d2f6aa1683 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b133195d083c3bc6a1f7a8864c1a65945b35b7bd7829d8e08253720e06b59e14
-size 28698
+oid sha256:2ef692ef5cf9a30ef224a4e6be31519abc62fb92d2f6c18e85fcbcfae57e569a
+size 28689
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en.png
index 78f23cecd5..f7fe822bfc 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a430db03a543cf4517f9086e3bdf43cae72ac544f5fa1b5994bf62aa3151463
-size 23228
+oid sha256:9649f5aa33a6a030fa90056a433cfa1f1a33b81228773d8399f1b54b33c0c4dd
+size 23253
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en.png
index ca9ce8c967..fcfdfbe2e5 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0870a37c29bd5b62b559e47c0eb2dfd7ae94ed38efd62d3fa91eb0d646923373
-size 27565
+oid sha256:8f55f8443433b4c6f6f40f2f59581a191db684d2ccaca9072fa2d7895c723783
+size 27588
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en.png
index 21f8cfe6db..01603dc202 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24ebbb52fb801813c07dc602f95917d8d7a386e019526c4e32c22ded17ae5f1c
-size 27992
+oid sha256:3e041bd0f0506fbf4abfeb18fcbd9f84bdd0004d56ebb679e4c7606a6af5a253
+size 28009
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en.png
index db5097080b..c4c2b61d59 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cac52c4f2ff9e5c35cc527a6e1dfaaa38ba724747f3eeb25b401ea857dc2e17
-size 26854
+oid sha256:cc2f12e5f13d92c2188c687c67be0dea1fb04420ade868674e2a75e93a664dd0
+size 26877
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en.png
index 757be85f3d..75512c8ea0 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d60096fa3c40d902db6ee85440a3f43e1e6c27e15af61b5622131d08b2cf0018
-size 20385
+oid sha256:ff7bf2400e9aafa54dedf5302bb606f5b2931579049f800477d4d0231737bfb2
+size 20379
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en.png
index 1d2deaa7be..091f5f41e6 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3fc4e8b0dd167e5229514a940d478ccf79efed9013b9e484ebd255f4cc3cd70
-size 19974
+oid sha256:6b18036e7eb66bf73494cd21658cbc707e518ac0fea276f656cb881136668b15
+size 19958
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en.png
index e2c57e9db5..1e5ee7e2a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5819730f4ada3a025dea9b01766adc9caa0ddabce05d1cc91a1962654b438c00
-size 21734
+oid sha256:313440c36f1ac39d2d567cfc28193da312e46bf33fb28e90e96b3b14d47c61e4
+size 21727
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en.png
index a8c91fb894..ce06a09131 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdcf4034d40b183d7ae6feb6b9a2f7bdfbf191fcc6d62bebaa9dd34067106dba
-size 33772
+oid sha256:5e78dfc5d7e18de754f30f097ee0c57049396d3af2077c57dd70e19660335ef0
+size 33774
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en.png
index cf3f345af9..ed1777afcb 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9a34baf728a4dabea20798983c4f7218d703607b2caad8f1d1a125d9e859164
-size 17970
+oid sha256:6856854a1b4612243eb221c2d2f98f3246259ef9c7bdc25dbb6b4ff1686a8ce9
+size 17962
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en.png
index 8b17bbfca9..d7a32b70dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d36bd06ecd781058c66fae05e0a74b04a6579db4eaaafb8c668238cdf6d066d
-size 31025
+oid sha256:dcce5ae74a03d224f211559255316eac4230ffd1379af825d6270609e405fcd1
+size 31022
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en.png
index 5138536590..62574bfea1 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e4b059661e05040f194313bd8442d18761da730ac8d2ebfac8f464491d43d52
-size 22047
+oid sha256:6fb9a98b01bd453ba1a6aab386159cebc2a8728c3694586cd1aedd3f0e0bfa1a
+size 22045
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en.png
index 215e03e297..898daaa125 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45d6be27f49a786a797e90eb4cebd34e7227d4e3576e06fdf3840bf0a072f644
+oid sha256:d4f1ce61e6df5c758d7bda3b88dca91a706539e60bcb171764f654805c700176
 size 23137
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en.png
index 800045d229..9d8925cb85 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4f26d3ad812cede71d2b1928d257636c7252b711bb3985325204049081fe476
-size 19903
+oid sha256:3e4e387f7454ae8e9f513600578d85e69a398dba447381e4ad77e96084d4d065
+size 19898
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en.png
index b3c39418be..492c571e4d 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5be795840cbd990edc68b3b3a45f27054c49298d751f26d7560cbcd49e92f4de
-size 19581
+oid sha256:cfc91d549f5b529106fb072e6eace90215348e8a9ddda7fa9327b6b22d547058
+size 19578
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en.png
index 02f30f7e3f..e8df15942e 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a987e3e4fc3c390bd1ed4dc19f0e90187a36e270d4fadb06924a778d0a7447a7
-size 21146
+oid sha256:9ced19fe30b254f43401354dff70a7c85c68c9a4142bbc774f29d37bef9c5daa
+size 21138
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en.png
index b34e5fa61e..06371269e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a53bc579f1fea83bb5ec49aae3f6a44373292369d88dc9841084967449d5b0d
-size 31370
+oid sha256:0591d69a46b66eb844e6c4c1eeb5aa1a3aea1c00c14474767211a081232e3e09
+size 31372
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en.png
index d24a46a11b..9369a88cae 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54f3b41df529b01806eeb8825ff837dc2911538a0325b4e8341831982a879040
-size 17633
+oid sha256:c999367fafbf5ebd10f3da6af2db7577589a2bfa87256e9f0da8765a4e8ee9a8
+size 17630
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en.png
index 97e5f69dd3..9533ee7b42 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c135ed28162513c43723434a3ddc6b5b0743c4246ce096f0d3ba261e49f31a68
-size 29001
+oid sha256:ca3eb2e98213dda39282464a12e98e25fa60d56083f01705f19ece1708ac64c1
+size 29006
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en.png
index 0573dfea12..407c49827c 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5889b08ee5c1b7719f8f19c915b568c90ab709ad519e4ff18835097143a753d3
-size 20624
+oid sha256:93a4a28be0e3baa8889096f2dc91fe794a7469a57364cc304b4b3294c758336f
+size 20626
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en.png
index 30666f1901..886249828f 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:add26f4f31638ec3e409c3af159b68a891b41998ad24e464a59135da4e6bb09c
+oid sha256:9b814e6d456ab88abdbcc0a73d17ff6ece1125e7cfba6a45f1fb8497e0fed2f5
 size 21037
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 dce06c0e2c..592621be6f 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:40c6c470acaf071d1abce378f1eb88330d323f92561ec355a2cb742b3360e12c
-size 36067
+oid sha256:8f57aec639b101e318a50fbed53787ddeecaa36f132d45fccd815d8e44db2a17
+size 36120
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 3d296259bf..d35f9868d6 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:97ed2313ecd729f889bf11f23655d19f17ad579f10de031499ef81b1a89cbb10
-size 36477
+oid sha256:3aa45a9733f3b076b28b84675dbc70439c3271b4881eb73ff7ca73e338b2e1cd
+size 36529
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 d5af184861..9ece7bf627 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:fa58abb85be88f13d88db6ce1de9ec468373b7c4a765408656c4c51cee9ec126
-size 37392
+oid sha256:8d84f2ab82c4fc7e32a039cbdee38de33188afe0381ed02eb9facd8a5c6e3fe5
+size 37448
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 3b5431a1fc..93fc3a9d4e 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:3ef73ad02be6fa34496de42393c88058ff3336359c58553f5c92217debbab06c
-size 40723
+oid sha256:9d68eaab539ae2c98599808a22c6448f388bebb95e7f2b8130d77247e07ac6fc
+size 40774
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 02815fff59..6a79292cbb 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:3f98b32b21a5d828d91aaadb92a82675a867e8f343a158c4be84a728be127b57
-size 33766
+oid sha256:d44c3ebbdebf8303f324f687ac667037033bd305294afe56d86094acf8d04467
+size 33817
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 bd4b84ae5b..1a0f15f598 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:d639fd64425c20093218887f6d2080d75121dbf9df38954b411d9d05aa3dcede
-size 38012
+oid sha256:971856e46c73fba7f667a3a5e3a11296d8468cd0fab1b011f14d9e63d7416689
+size 38058
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 35d2105136..9e6a4d8ddc 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:6631906e10e92eac8be37aee94926cd05a90e7f4402bafda52ec3081c4518af0
-size 30197
+oid sha256:6eaab5049e84445db1e187558263279f55a51cd132b17a28adfaa81e9d6b1049
+size 30243
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 f7e31ee025..9bda9734ee 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:3898c9a578430b49a8f1bde6bb611b70251e267b6679ca8298a7810d80a72702
-size 30356
+oid sha256:0eafbb6bb63c629fb74cc26219d51dc7221935d0a0abc7a106bc63d248456427
+size 30401
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 f9f9fa56b9..17d6639d45 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:ffb504acbc5cd601a5c23f83e3f1d0f98e73bdd8dc489ec9d54b9dfe3f6ff818
-size 34841
+oid sha256:d511220a0034d6ac1eacd16500170e380f4158dca76224814f042fed60cc5b4a
+size 34878
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 d945d408d6..5b90bf360b 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:a9dfd360f1bb45622d9b032d85ed729cc7f5690250769aa97b022220faf6695d
-size 35231
+oid sha256:ad01f3bc714511d54bc0110cac4bb069a6c5d2c4328976981bbe473f3dd30146
+size 35268
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 813aeb9294..f3d0be5deb 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:35aa62e603d8b68f4726d5ce0dd1f142e01b4718e63d977994587fd72b3325c8
-size 36021
+oid sha256:dba083c2aecd51cd697e71feb812411ca5f818931a7977a49ff6e2e348ad6b31
+size 36050
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 2e2ced4d5e..ed70a90127 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:c3c28c88852bcd684e47e5cb01c79f10c956a16de3f608b7054b39c49cc0ed6f
-size 37633
+oid sha256:3ad40bf331b6039ee7a9214bf95628898c590ecb655d7e4695f84d49ec3756ea
+size 37675
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 444ca3b062..1d6978def6 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:44449bdd8bc4376004ab8343225c4245f15c931bd42b9956eba4dc53acc65178
-size 32651
+oid sha256:d0cb1f24daf8204ee0e4168b7adbafdfd5ea005ce9e1381e3951c86c2d6803f9
+size 32689
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 47f11c5d33..aa0038e291 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:8b2a9058c3758dba8b4ce43293cbd2fd04aa947f23f8d4bb1100ab8f1b610af8
-size 35181
+oid sha256:1c8f6a181d08773e96a500b979cfe6510b6522c1f1258d03d8e259ea638a1305
+size 35222
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 cb11d83e3d..6694b535c5 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:9cac1e820d1dae190324860f01a986f46997c87aa604678ef2b9d48309876d09
-size 27616
+oid sha256:1f28a59217041e6078c910ed3da4f21987dedd04c958acc666cba37682a4b5bc
+size 27662
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 b246835d89..a62fcc0aaa 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:7a6b35c5825831ad11a8287d3f2076597304fb0f90090e3e073de7faa70bf720
-size 27497
+oid sha256:267b09143f52c5fca826d87b969a1f10756e757d134bced4aeef25725bfadbcb
+size 27552
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 5e2b6ca1c5..47f67ecc35 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:1bdd621f769997547dbd5cea14158b32e0dead55145ba7894b331e19ebcfe6ab
-size 5996
+oid sha256:88e8024723d128f5095e15f92c48afa6f5f75058d11077f6fdde4b8722d8231c
+size 5998
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 37dce9bd1a..dd9eead0e3 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:c10d7e56a9c713282988097a754100c2dc79fe34cb8e1916fc742c05855f1996
-size 5939
+oid sha256:c6b8fa0e76653455693cfa82d41c5baf6458dda56867bf9771c02d8d3cf38f3b
+size 5950
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 f9e95c7a4a..7be52d44c4 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:28a62e528356d2276053c3a168d0079896046ce0094bbfbc2d07f063d710b726
-size 17978
+oid sha256:ab386d9efb188f10062ce65cef22b6bd019e512cd1ae56d49fe3c738611207d7
+size 17987
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 dff1394b7a..896d28d758 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:52c09057b8570a1b37e24f624edc824e19a373dd9cd623a84e1a83eb329ce932
-size 7733
+oid sha256:910f76758cc8810f9113e2b1a4d98da3afe6e801be7cf1ee14482cd66060f9e5
+size 7742
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 778e06bcad..8bab08a5db 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:fb2075e4489927b0df1ff34c584f26438197452b7ea97762d6cd1878b1151cee
-size 6847
+oid sha256:4b6f0ddd0a60d1ddca52013960e1ff09d297cd8a8848d78ffe241deae715ff25
+size 6852
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 bc9265980f..941301bdcb 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:182f6175d4bf8555462855170ca59d15daeb283bffa7b595382bd7617a56030c
-size 5727
+oid sha256:3c9017dc880f96257a1047cab046a0d5d218ed1ae155e7e1f2d0b918e9a1ac8e
+size 5728
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 da06089f8c..5fa3850c0c 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:e8a5bc1a4778babee1445bf8577d14402d500818f961b334538da40b742af13a
-size 17244
+oid sha256:c48f3d889bed5a08500009b4c9b28913ec55dc5255eb17210a3b7092b4227131
+size 17252
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 31bbc7e536..0e9fafc8e2 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:0444250db1eb42738c546d3ac75d4f43077df6e831a8bb38110e158486d92a92
-size 7416
+oid sha256:5c523ab43ed9d2e639a59d8bb275525210fbfa778004ab03b7c18c7784ffe506
+size 7425
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 a8a48c1c59..4c6378eee8 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:d8ad2af90f6fabb9dbce8c7f89327f8f13fc51be48be8da188830437dc986044
-size 6601
+oid sha256:d733e44ccd5daa529c79313a52ab462d877d4f6f7ca8e416e9433fe69bff530b
+size 6611
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 6dee2b3d38..bbf83b9e7e 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:a3f8ec394689043929d83d1b182e8a88dfa7fe6875cc5db71d5211a61644a242
-size 5597
+oid sha256:86c9fabb1e0e253df54539394c55fbd5cb031b114e0cb4fcb502f50b86c5f3b3
+size 5599
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
new file mode 100644
index 0000000000..1125024a5a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae6d230961018f1128ea655529a4287dbe3bbbc2762079d0c4f335313d2f2ab0
+size 25166
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
new file mode 100644
index 0000000000..777f0bb627
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1502711e6305f9adf4719b28c1fe3755089ae6c42c6c66e8e5bf73ab2bbb65c1
+size 23874
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 2e7635cfdb..1125024a5a 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:4eaf3d650155e9a779cf796cef116eaba0f1d6722b229332b224475393a88178
-size 16828
+oid sha256:ae6d230961018f1128ea655529a4287dbe3bbbc2762079d0c4f335313d2f2ab0
+size 25166
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_6_en.png
new file mode 100644
index 0000000000..2e7635cfdb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4eaf3d650155e9a779cf796cef116eaba0f1d6722b229332b224475393a88178
+size 16828
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 10ca16827e..777f0bb627 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:59f062f54833df71be9d7c4e785bb01013a10642e0d863bf7ef2abd8862b93c8
-size 15476
+oid sha256:1502711e6305f9adf4719b28c1fe3755089ae6c42c6c66e8e5bf73ab2bbb65c1
+size 23874
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_6_en.png
new file mode 100644
index 0000000000..10ca16827e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59f062f54833df71be9d7c4e785bb01013a10642e0d863bf7ef2abd8862b93c8
+size 15476
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 2c3d0109d8..d4f8847135 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:88023e66ddbdaf1547808af570bea7e805ed00a98eb99384f9e04b861fd32f03
-size 47402
+oid sha256:cf6c69893bea05615fb19e0d1e3550f2b49542fc1b5a77b75d6d990c98fd901d
+size 47422
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 bf76269d8b..a6f2545fbf 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:c09fbb36ec755ba6fe2b6690deb0a98021792eacf627e138cc5798fce240ecce
-size 45197
+oid sha256:4956c1cd07901d7c393a3e84c29f281b78dc974f9352b808004b288fc1a1fa70
+size 45210
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 28bd43a244..1600389f1c 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:8a33aacdc7ccc5750ec85803509d81b3c6b6adce8786b396771edcf7c9320bb0
-size 46493
+oid sha256:a67e4fd98c9f0a39aa74a8fb2e37b8163c3a22476cb6e4dfa0a07ce8d4d06d0c
+size 46472
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 2086c32315..cb4b1a0a87 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:5903c67fb7ba6e494b75654b5c88f812939f4fff9a31927e159568b5598a0d18
-size 44251
+oid sha256:7ca7f99493b89c021f880d0ed3eee57fbe5f6e463e6ce623ad4bce94979916f2
+size 44235
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 28cf9382f7..59bdbc5b9a 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:12cca8121312e499cc2b5d7f48301cf7f6aa00495189719b0c89fb8622e09e75
-size 22629
+oid sha256:7686d3968c0fda3d8e614577f198ac9ddf25c974b6a960b44fa6e90721a159ee
+size 22637
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 a7d042279d..930a635c7b 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:3d8b02a89dc06a26e334ad4d3cf975dcfd7a9e3aca1e843072135430f3c5798c
-size 23591
+oid sha256:72f18d76f588da96115181ebe14d89703451af2fe9be711d7248acc9ea373238
+size 23599
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 b8dccf7a41..8a2e33eb62 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:48804863c5b08d5b2c0b2a0e3451dc8d6e493001c758fcd65d9752c16c54d0de
-size 24123
+oid sha256:9bb9d84ecc37123f6d6e66f315626320d697ec2b5a82460f827b13921ed4b932
+size 24128
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 e885631b95..5419c8177c 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:f808d6ea2a1eb3891de9e746963cae5f398c6f6b0d1ac8d0c06914194ef4c56d
-size 22172
+oid sha256:031c74c93390702a5fafaf6479b7ef22d33ff06fb39351ae42bd613092b0d0a3
+size 22160
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 aafee6ef8c..50a045f970 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:45e3ff62c2ad05b7d7f10ff7d47172158415aee833ce6f85c9f2426e10ed5396
-size 23061
+oid sha256:0be5327fe38b6d29ce6622213fb068566b20d2a206bfc440f227696d0a5ce0c9
+size 23056
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 59c69ee398..04f5edeca4 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:d05a8765d84c650ec5d2fcc84704fac76e8a7ca2b6bb21320eb808e4a7977e34
-size 23607
+oid sha256:736f0207db49d32abfed0e73416b7aa81a2e56e2565d01a9ceab0c40c44665e4
+size 23602
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en.png
index 3917d151a2..dc79ae0b25 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8678e865aa65d5a4882ee278ecd8f2b4a876f8a989c175e6f09c8a4e6075ac1
-size 35521
+oid sha256:a19833d0e5143255da7a37c2b32ebd95dd56d25aad537bdf7160f1a0df9dfa5f
+size 35508
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en.png
index a707eec995..3f6d94d008 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:faf544d1012dd64dce052f49516dd9808d4635b03da2a1ca0a353d8d32af7f17
-size 37775
+oid sha256:0fb20d41f430f8a3c231fbef142f8c57d8d6bf461b79693f009719375eb2c5d0
+size 37766
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en.png
index 356ec8c03e..e5b36d9c1b 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ab69843f78b7fd9d7c362103190ae97054a1851d6d6d57f1b1c70fa205e27e4
-size 39293
+oid sha256:ed45d2cb4c4cd740da090b1b0d64f5baec224818412a4a0643800fde250ea949
+size 39291
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en.png
index b12690a3e1..7c3b569d2d 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e4de4b4b1f8e6aa91842eaa002e2dbe62a29813fef781ed7fc80b28a5001e3c
-size 34754
+oid sha256:e53c1aa9c1b53f4da9976ba8604bd3e9c5805fe802bbdf4973e0fb7d7d2bd378
+size 34747
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en.png
index 0eefb2ee37..51735e68e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55c4168327e00ce0dfc2dd6e6a93c126998d4e4d9335307aac8e06a0d40f49dc
-size 36623
+oid sha256:b6d1cc74556654b9c00148768ada22db491cdeacc9544a06f1f4aaee793327a9
+size 36615
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en.png
index 72e9832dd5..30b8efc352 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c686188413603f6ea05966705cb45187d119e20b7606bf0b43e30c4b7652e460
-size 36754
+oid sha256:747e3b66d71a13e6f54a9011f70057ec7ac75dc458fbe8616d0351dbb3b1a1cc
+size 36755
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_0_en.png
index fb4750faa9..a41f0840a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c73e84f10a891ee697f8502d1a4c703081f3ec37e57627095a12ad9ef052383
-size 13663
+oid sha256:b3adb907b1c0096ececf1c33547947a88eecd4d1e8fb7349400aaa501b06baa0
+size 13673
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_1_en.png
index c0ec143549..3eab530cd3 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d42d22ac83029b1d910b28ef418d8c96b4743f416dc5160ebdd0e3e99bce39ba
-size 13778
+oid sha256:985cf31a5f8e521a308839f7c6e7782a19adad894cf390f175b75e023e3f8318
+size 13787
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_2_en.png
index 3a35e87929..c1f388231c 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb50f96f14f0facb16a6b554b5a0b81f9df2d6811af6510d28dff545391b52c1
-size 13593
+oid sha256:2156fdc4cc6a142e7678e15191e22baf991f6c1431aa2c89496cc06f8eb307c9
+size 13575
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_3_en.png
index 782a8b5e4f..fd355f0ae7 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2a11ca18878361ca87f7b9c49532fda925661f6639409143c651a3b1da055e8
-size 15479
+oid sha256:278cce531815bd30b231d55747c2b76b09f98cb1f37c68184071fbb906d7bed0
+size 15462
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_0_en.png
index 0b5e688ad0..86871c4014 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4501ad200cb22f29e89684061ed0804c0ce61deb7f09530abb017685b217002
-size 13302
+oid sha256:31abaa311b8e7aa174c960143ed793c1fc8489892dd62b1674a046d53645d25d
+size 13287
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_1_en.png
index 9caf313c73..519e58f577 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a74c0283b6978b51a61d4e86f09ff75d67e95c9a441ab3c66769a702f278071f
-size 13406
+oid sha256:62df4af7c19201cff8da4b15c7287775e36c1096d882d86264e094db049515bf
+size 13391
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_2_en.png
index ea60325ea0..81477f81ee 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f59e8f17fac707f9b700d9c36e70f0199a294e89c6d8c4dd10cf52e04fb9b6ab
-size 12448
+oid sha256:97032955377761c96196ce4038e8afd31a29f3d75f4bf1cc4c91484b5c609b33
+size 12462
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_3_en.png
index 9ee8cbd01b..f2e7fa7369 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.createaccount_CreateAccountView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29a7515bf07189c657e870d9409301aa3e9c1e0b40752d98cf6be42b5555c941
-size 13831
+oid sha256:456a43b2d9aad1dfeed7ba658a4066ed172cf8bc1763a07e256286d8440b3286
+size 13845
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en.png
index fc9d6b50ac..6c5179625e 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b07f82e21321935cea24954353113216fe99122494b2d52ab366a8c09c321d0
-size 35661
+oid sha256:58b726014d03b614717f6bc6515d53f1cdd63beda6294d191863c32175ea2680
+size 35698
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en.png
index 6c78a29042..13a01fef28 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c573e0578549b128dea66c56cb099a40a36bdfc0293975c977e07bd2f5bc8779
-size 37066
+oid sha256:27a4dafd2a2a1c4a70d4b5adfb749e4db11f178cd87efb7929e8acf68b849e69
+size 37087
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en.png
index dd5987b288..6b1db9e2bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa8738284f5fac6505f2238c982f07a0c239fd32c71a868119437035effd522e
-size 27758
+oid sha256:9b3227338f6ff382c47816260dee08e784aac98efefb4d6a9f5ba548bfb4c9f1
+size 27724
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en.png
index 3013d81bed..709df42a87 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bce7cdf7af45f2192cefef78b5dd5c864469428110335c04988f8f8e99967eb9
-size 34562
+oid sha256:e3a63c11864f1689f3aca8148727fd3b859606c4fe046b1a4d39c66184246a2d
+size 34550
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en.png
index 07f5c8b0c6..fc59d54363 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d761ffe23fff7689c4a6e0e24b9c3d55de754325db7c2f6d54ae8d0fa87aac6
-size 35654
+oid sha256:7b90dbdddea9d7eafdb66a65aaac3976af27bb3b63090046ff414138c6ecfbb3
+size 35662
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en.png
index 62384fbdce..e1bfbd926b 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:131c375ea2c0c22ede1c3d4d469b2233dde4f8acdf57fc0f851c45e1cc759896
-size 25711
+oid sha256:eb4245b8d137848d2b60d1d5d7d6840eff80f36e312ce46631a789f92eb298f1
+size 25766
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_7_en.png
index cdd0ab890c..0895f51e3f 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0c1cb36f30969765191d54131c862a06ec749668f79e5cf025f487ddda1ca0c
-size 21891
+oid sha256:8df3003af45b005ab467ad87f7e7757b2797729c856332b34459334911eb2c6a
+size 21897
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_7_en.png
index f45558ed75..ce0e27cb02 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f25dd05a8be436b2a6d9721080dc460f50bc7a0549885144a285a428a80a2e3f
-size 20982
+oid sha256:2f38fd9da5fa43feecfa99455d7c4770d5cdbf342728c2912a2d04fd33e13ce7
+size 20964
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 aae316a90a..7f1ca1120d 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:8481030721604e65fa93029630a3cf5e9d314dea3a33c4383819958507333450
-size 32021
+oid sha256:eb9fa26c85ceff7d65c474c491aa921edf0c9328c05e4d13ee2862a4c223b805
+size 32016
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 5bc8f68fd8..98b8084228 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:9826932d12f100cd7eaa16eaadd3a1a9d0809c713a946b3286c6e4ac614421c9
-size 31500
+oid sha256:edb75e23804c001cca044e9e9dacc17b542367bb7fa2137697b6050fac32e0ee
+size 31495
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 001a5e65c5..0dac0cbc38 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:48d5bda07ebc3e33f43c3e71f832a43008b9f0ffcb82d009bf3acba749433578
-size 33703
+oid sha256:8c03c5e0f6fbdbc7442ce89c24169b33b3fb9364e0f2a68d71263acc1eba6cf7
+size 33698
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 1a04c3052b..bc910c0da0 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:e5b4b059ff853d458871b1ef769fa32b1394a78c85a6ccc3ff6ab363f4e65c95
-size 31230
+oid sha256:c5ad68ad6f3afd5f36726cade7f11193549156b683ff0c599636af2944163a75
+size 31237
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 9ce500caec..529861848a 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:549318641c94f6ebeedc9f5f52ae71ec4ae1809ceac18f24f70dfd09ce993a5e
-size 30656
+oid sha256:c8d331f307fca629532858d175b8c3ef51b876281a2d9fe8fb557fc5b2f08bff
+size 30643
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 d6849e6a0e..5f90928ae3 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:cc9f1b97209467ef809079b5635ba8001bfcb415dbb258354d1b81e295b8801f
-size 32942
+oid sha256:2079d7e9022ea5fb117381db520e9c1b20caf614d8e35d2e73f03784ae51ef2b
+size 32931
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en.png
index 6a4686405c..b2f95a9597 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ff3542d030785564597ad45d2b6b80a4447d9de6d0d7f682ffd7c85a40106f9
-size 20779
+oid sha256:24fd98aa0c43fdf26b67ec4dffc72d7f2d48f5d19f0a68a79c2c2c53e6c5fd12
+size 20769
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en.png
index 4843324a67..b8fe60681d 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48c53cc175948d08fac32100a285bd82cb6997cc5e50cad2537a7f164bdc5bf9
-size 18417
+oid sha256:58ddf6004bf14c10a0b65f271f6e95641891777e28ab12967e234363a10c33a5
+size 18411
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en.png
index a69ba7b423..5b85ab50d6 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97745b6207461b287581176263991ff8ef42c46dd7564c75cea57dab6b1b0445
-size 21763
+oid sha256:c7f5c9646571391933edc18c8a6b672b5208a6a4636b5bc15f77b8a06c6ec4a6
+size 21751
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 9af6ff8b89..09900745bd 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:12e8e16ad25f1946c15c0c4a9918c0cafd6ae0fcbe11ffcb510cae855251643f
-size 33065
+oid sha256:8f32bf15145564a938bacc40ae61e8f7d02d74e7a76452d62e56c88b5c193931
+size 33053
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en.png
index 91388e92a9..dc89ee8fc3 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1806e375c572b2cbd0fe128fb1965ae2a1fd78bc9666235dd7e9f0162c372882
-size 67044
+oid sha256:6e0ae0d30fde1317c5b8f20569597cc6039eac3e8f70c80c075ef4259e3e74c4
+size 67039
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 6c3c842f3f..388427f218 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:4342ad5723edfa7cf0bd7224e014a834edbf73f6464b953ce7dabb1b21b2f09a
-size 21155
+oid sha256:55c8f3cde0d4f5466e24a6636ee04c4baccb7e10edd4ba24e034ac16f74af1d4
+size 21150
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 54e64b98b5..60b3be0d0f 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:a27fce1b620293b7e0f6b72feb60982b8c7e23865c5b734d8227b607b622f105
-size 20917
+oid sha256:330d0d44bb7638a4668fa33974e3b2cd31b3ce285776c993cced2b928b01bbb0
+size 20909
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en.png
index b772e4717b..733d9413a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1c388b6e43e1fc804f2be5ab59b40d866642d415e332c97b0ba16e15cb40af3
-size 20503
+oid sha256:fe2527eae9bc919a3994cd59e8f6d0c181aa3ab9209b1c34b2bf6e63c7a434af
+size 20505
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en.png
index e5871c766f..0199609ebf 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f187b86f0b3338ebd31ae2f7ef639dacb1f217cde283d3ad8bb1d64176d4402
-size 18316
+oid sha256:d015f4c5905ab38b4bd987aaf4bf0ac8f55795700de8ae19b5872d4acd5bfd8c
+size 18323
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en.png
index 208a1be0f8..c19826eb03 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:527bed48f32f454a17933a029c607a4ff290072a77fa06dc078e4c9487e8e2c5
-size 21523
+oid sha256:443ca45f4951fc0ef2d390cca6bb2c5717c0160a9df04fd3fe5bb7ede82a1f91
+size 21530
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 3b6e51994c..111df0a72d 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:9090b07463eb2384cc542bb0fb5da7c43e338650a8488343eb70625f7e64d604
+oid sha256:76f4bf4c4d8783e9f79d2cd174484433dce3d4ac67eb3b60a178dfafc3df780f
 size 32416
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en.png
index 2cc361a85d..f550be4d00 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1b06dafdd25ec468016838735177c807a9e950bf99521de4b9e67ad804816ae
-size 65594
+oid sha256:a90a5fb148455d4e4d9c4d8332222927d6cf3c606e27c695e4c44af13cedad9a
+size 65592
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 66a2d68689..bfb26876c2 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:a88bccb59cc963430c8d0cb3c8d3c1b13ec2f842e4a8bbcf4f8bfc75af1cef9e
-size 20944
+oid sha256:3d2efd7eeeb3ef4dd0746f854028dd012705e4565510596fbc25c86b27e41903
+size 20955
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 294dea5e58..a1fdb67640 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:1458d506556b3cce3507e08aa7a435583e0d369989e5858e7700c88b9e456a91
-size 20629
+oid sha256:516a6c8873c80c96febb9edf8956bccb00b849301df4682b969d3979158316a0
+size 20632
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 1788cfe31c..8b832b680a 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:b496323ae79dd599379d0599796f42a1ceec66063150c47e67bba554a557e28c
-size 50017
+oid sha256:d56fa06676b57960d2fb80755eafa2d227c3d18e1192136602e34c1b2520fede
+size 50037
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 c3ab42fb5c..fb2b7e9193 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:e876ad66d9571da8579204cdd5eccbdb6255f11e176ce26617e3273c829352a3
-size 49153
+oid sha256:33bc8df0c875903c216ffd7f62be804d9afe3922c2feec914d27ff552008ee44
+size 49127
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 58f9b452fc..c30565fe33 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:0f5cfce9ce5cc6c1ab4c3a0407eb47ed6816d88ea29d4a3879b258cbe32a0206
-size 48944
+oid sha256:fd0fda31fa91d40c8d24ba07ae3c3720308208b9f6fbb8225541d42467330f0a
+size 48936
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 0c6f82c6e2..c436d587a6 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:08b0fbd0a78a1a3e58c4c4f21e636cf5f84d0c371627892cc83eb9c7359e34d9
-size 46550
+oid sha256:5c26e52a8c1dacb2a5c7b567e69f2cec9022d4ffffeeb461fac5056659ef50f5
+size 46572
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en.png
index b881f5507c..4e809b9b7e 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a691b9eccd82b6f71fb4c7f3d0931d4b168fe99fea3e8b35103de2617d0d164f
-size 14609
+oid sha256:7c0239a08b541d07fb2d916624fe97dc997cbe0a05903b8aa93c05cc172b0640
+size 16602
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en.png
index acd15bed62..5a2f32de64 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ad8ebe5cd44806067cf9d22753c3b71f52e405f47b71cac0f3b0edfcdd30b6c
-size 19753
+oid sha256:5ebfd4977ff437718e99e23e982dd1b1aa74e8bea6b1f4ffed07d515807d840e
+size 21097
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en.png
index a4781f729a..43adf5019f 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e3ad90bf5f4bc7e18c3b7040e2c055a55e518f24dee719447534ecce27dccb9
-size 26106
+oid sha256:7284871dd335aa43efdcde312febfefbf0e44ce38e41943609faa3c3e2c3c1c8
+size 27442
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en.png
index 5c0fd6cc44..845385f33c 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ea9fc610c5cb79b546dcd0438e658529aaa6f9f1135d63d8b1bbcf5e798c57e
-size 32258
+oid sha256:1d2fc6e9cdaff3313b30f506966c3b6c0cba5df0ffd6572b39b017c717837cd5
+size 33520
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en.png
index e4c29da6e3..618f027a77 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2b974ef6efffed566221686dc68643c4cb84fa473196d140c874f7f2e89d346
-size 31287
+oid sha256:c218a232169097b71be6a44a52fee46569fd2db49c374627fc24f4ebb492ee1d
+size 32458
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en.png
index 28350efe96..84310320d0 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8985b0c0826e77917db5038c9cf603b300ee9db4476747661e31b81a2ed21e37
-size 30423
+oid sha256:308023d6e55d65f9091dd01dc7b27e12a1b62f8560288a1a6d2b28d23c2ea317
+size 31727
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en.png
index 821feaea19..bf6cc48d4b 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0d283a0fbcae1ec2864a39bed60ed7799173724ecf1acb7b55c259477553cc5
-size 13963
+oid sha256:def2668a2168bb3f1c37994914fd2f32df3c900bf0d43fc5b6bca9f1d8183240
+size 15927
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en.png
index 8c2398f979..816496a9ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85e270ec5307a15f57ac92862efed174e435d1bd869f2c8ef99e38a97ff81252
-size 19024
+oid sha256:ad74d69f874563e3211c703a1b428972efcab4eed3672766ba441cf6ae8e8fa6
+size 20375
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en.png
index 0b823ed8cd..2967e646da 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73a233802af6e13796f5e7be2e85e67b17c0e3175fbf4a98733a1f3c86909939
-size 25038
+oid sha256:807e0cd53e97683966343e75079a287e17484cc3026ac328792da17cda023ee3
+size 26379
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en.png
index e779ba29fc..53ffb846dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:056e162c06b71bfad54d1938d485845b6221e4ec8da4d624cc8ffbb4779b6ece
-size 31054
+oid sha256:cd71385b1d51e6e6175847766149ffafafec5337109ac18c615dad0251eedee3
+size 32438
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en.png
index 0650ea1162..2920e464c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2ae9d386bc79df3897861413f8856510c12107063280443431ca7c82931eb2c
-size 30091
+oid sha256:b0e2213b46c83b3256293a7b0638c7b9dd51d2ee9ccd3aa77d3dbce7da84d66f
+size 31363
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en.png
index 7eb468d971..4d8c26a700 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2462994c75c4b75ffdf772a8f058f9ac7769e51c32b3373efb734d6071b12fb3
-size 29127
+oid sha256:d2a1545d8111c03a01923f8cdfc227adc5a87bb89074f45aa542bfcb9e18ccf4
+size 30489
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en.png
index 53d093d697..124496f09a 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74a0cc83697dfc3e21155c061c356c42732ce57aaa3202437a7e6aaf0f0a4652
-size 23633
+oid sha256:96ecd537c90cc286029ea53b345c05279dbc0bfd6c7e907e328b5f54b6f71822
+size 23667
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 4b7482c16b..ec657b622f 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:2d9d0859280bf789a095ee379dbce92c5c3fb9cbc994b370e108ab711dcff223
-size 50755
+oid sha256:060cdf1ae2d280bcd101fe11979f318aac7f9f34f2f943d702628cb5acb2b726
+size 50797
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en.png
index 276bb073fc..d6cc40fea8 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c49c2a3be28f39bd31f720a8ede2b6b1a5aad456a86942ea34e1c2dee363d626
-size 23148
+oid sha256:58089aa957efb70172a21c186adb493ff811e0bbc639c1293cdb38659cbf4f34
+size 23156
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 75a7f15a1d..7357be6a41 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:079d3c04aec0ef842ac3bb3cd1ce9920c7ab6dac6967805254d304e34eb76c3a
-size 49860
+oid sha256:717d2f9f06238064f4a4a77853594b1f9aca44d4e5e90d96ddd54c8a1dd7b44f
+size 49877
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 d8112aaf75..8b3c209fea 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:b50e20e3379d61b4bca099960ef4d5ee5704c034d3f7d8622c5c9144838adf18
-size 77808
+oid sha256:0f92ab829b4ea1131e6dc3082becd30b286c25f0361dcb5c387832d659936c77
+size 77788
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 a2fede0b8b..9e1fb0f9c5 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:454311f3da693362bb0828f46e121db986a3155812271d44e3a54390fa882fdc
-size 76225
+oid sha256:dc11c389f93db0b73d495f76762c3725bb6f9857231406b3614ef4566dc3e66e
+size 76218
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 0314ca1c8f..b10e5ff7de 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:d81131943b6ff08a8c52827e956a9cf8d830b8523c192e645b116733aff2f8e5
-size 61663
+oid sha256:ff56fbfba0d25239366b734469f76b0856a65ccb16cf865120455ef72fd05ece
+size 61647
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 9646868b80..070fb9463e 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:20bd0e1458afb6c992e9240ad9907c60a6dfd90c34b8cbbd274367f607e7160e
-size 55857
+oid sha256:d49792bec9eaa05e0ac304eaa3aab568bf07118acd81d2ac133f8479782f79d3
+size 55835
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 4b4539e0bb..12fe289755 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:3eb3667dd904f0e831cde35cef4999066efd173f374084655b7a3c0ec43babf5
-size 53080
+oid sha256:a9b62038185e1a54d4ff38a93a12394b18692339d2e4dc91ecf88d27919bbab6
+size 53060
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 93dde4e943..7d4931df34 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:ea1e0a8550ab8891d0df0312476c943cee9f921814b8640c53fbeed3679928ba
-size 75969
+oid sha256:2b28725659526b938f54d89f8365c8f25558ca913116822fcf8246bdc6fb84bd
+size 75947
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 cd6d404a0b..721cbb9232 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:5c0dcbcaea409193889685c6d60a21b1b64241796f1189c0315422e6f37721c8
-size 74302
+oid sha256:a40491ad50238d2dce8fa143e24fa40d5d32b3c950d54105a0196f20618055af
+size 74306
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 7b590a03ac..967a41c778 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:5204b189cf02f8f0145427df1c412e597cea106bcb87ac259b28e41ba55f2f0c
-size 58053
+oid sha256:20e3405ea9c51c4046aeb5cdd7b3b476ca4f24e759dbae00db14e27c8b9fb1f5
+size 58072
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 3e9223d717..0f993bde4e 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:425f454b182dc1cc54a13db28cc43c35964b4fd51c959ecdd32270aa1edd6c63
-size 52855
+oid sha256:77d46d7149e796c7885e1d2406c44667c44cc405a1dd8be142c7b0349e2349d1
+size 52828
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 1235b78c00..d505d0c496 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:d6b8b614b6c240d612fbbaa97fb3df77269a6fda04cb8c245af91cb2b75fce57
-size 49654
+oid sha256:52b1546c184a5ba9057e37a44c5d025a65f1d6bb9891e79d9bc84444bd24d44b
+size 49659
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_0_en.png
index 3312091d9f..a1845184db 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26c9c3c7dbf02862565bbafe7b763bd140eb898cb737d9b3a1eaef20632c91b6
-size 10915
+oid sha256:d86c9bf9e2ffdb999200851c33ff40e90a8cfe75e63ca0298f5a957f65c5fc26
+size 10940
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 eb95a3a49e..710c720b97 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:d8091f08791f11b595d91e122cd289286559d73051056f56876574e5cd0f5e4e
-size 25825
+oid sha256:ed962e2ad170015fa521906dff399e51f2127a985f49fac0dabba38a18b22299
+size 25855
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 94bfba80e9..e0df4506aa 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:9711b003b1183198368df7b045f6a213c7fdcbe7c56246b270ff7abb8397cfbd
-size 30603
+oid sha256:0ae3da8f5e9c68186bc10638dcf50e4004c49b4fc8767da3b7ab16e3b429c5e8
+size 30634
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 d850d9b28d..a06bd225cc 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:45f87240bbfa831fed4a80ad68a8253f80d161626189f7b884832bc7542f2078
-size 37092
+oid sha256:d1f34307d2dfbb82ab37b39998c8e7dcfcff2eda0f707501c9fa144e9a167c23
+size 37130
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 f8bcdcc53a..7d4e2ffc48 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:f78446809786d799b9fb3930dfdee13ceac7184a4a4767feed690c29943943a1
-size 27517
+oid sha256:c1f5075f4d1060f8ce9fa297d184f0461687edca4fe401de08858b037c3bf99a
+size 27546
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 d850d9b28d..a06bd225cc 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:45f87240bbfa831fed4a80ad68a8253f80d161626189f7b884832bc7542f2078
-size 37092
+oid sha256:d1f34307d2dfbb82ab37b39998c8e7dcfcff2eda0f707501c9fa144e9a167c23
+size 37130
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_4_en.png
index 2e9718ef25..efde266a15 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:528d6fbc1077900bc3f60c322e6a9705c6eda325308a4b4c0ec64f361a8bfa61
-size 24155
+oid sha256:da5c79f4ea2f59f8acd78aa6497131d30354c895ebd9490c3a1f74c00fd05f27
+size 24134
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_5_en.png
index c8798e8cce..1863833cf4 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ceca5b199df655056c7ace20a323fef66b0821f1a375763b9efdd58114ef66e
-size 17221
+oid sha256:693b82b8a1587fe26788910db9a0c668029d1fa1745d342b74dd5bd7f01dcfac
+size 17202
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_6_en.png
index 9d1a2e3389..cfe2ad30e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d3485c356369d0f809fba0ea28f1ecbf2544f8dc277194140824a07704ddd59
-size 23083
+oid sha256:837f9d87cae529d3e42a2d6be9d330d2553b1b0f13ec1b4ad1ae1527770ad3eb
+size 23061
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 20981bd7a4..2b20728bdb 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:1447bd81bc01ceefa94a4265ed787a6b70f3c912af51cdc7ffe554985575a5f3
-size 35271
+oid sha256:f86a22d4e6d2f73cf26db9f2448df6c4a74d38afc2a00af93fd9e4449bb020ea
+size 35303
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 db4ac9865e..9535c84de7 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:57c24c7a46fed938521874661dc19ec71fd4803e33dc68c439ae10f8d1646ded
-size 33417
+oid sha256:41ba56d647b8e5ff6956516e24dbf2e25e041cc8762a30528e15d0dfc327faea
+size 33444
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 b6200e998e..5274e8f04c 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:9f063221a85384ceeb2937628d2e95320c06699e3b42153518f3a8578981e90e
-size 34339
+oid sha256:0af27227bd4eb5cc8a48b883d1d829b059a9aa347f38995ba329ceba384c84e0
+size 34365
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_0_en.png
index f6be0efd9b..193f658a30 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92148829848b2aed2bf5798227e33ebf182df4ff060f3af335ca5d1d20301f3a
-size 10522
+oid sha256:b1cff939257db9f0031ca24a44566889f7adcc7510b51222ab0a83a21840aed7
+size 10515
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 48b17e29d8..dace95b236 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:1c8226bb4abcd49cb081c8afe1f82788d0ef706e9e294b4ef96be6ee5e1224f8
-size 24905
+oid sha256:1840d57044559abcfc6adcdf66c1e2f6e6b8e88246972f7fb9d8f6587e2517df
+size 24895
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 ec9ad9ae2f..90f0009af4 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:dab562694765608729a5084fe0ea0355878507103592ac555e4fcebb8d292d56
-size 29612
+oid sha256:18160a8994ac13621938ea64136aec18f2409046ba9df054d76d0fd3d4db7cb4
+size 29605
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 b07ba32d93..47df40b0d7 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:de33894dad24f9e8a8ccecf73b80d76ccef208510de3b16e7688782e82f769d9
-size 35736
+oid sha256:bf6fbd19bc18ee9c9430593413852730518d0ddb897560fcbc6a8012ca0eca6c
+size 35732
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 290a4b02a3..b5a6480066 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:401c69cfdb83b0a8017b4e972abc13eb46f740bb49d1894c66157045a6a6289a
-size 26482
+oid sha256:9ee4271bf13d49812d2bee18a2d012f0704e4c678393bec3a1dbffb784fe9796
+size 26481
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 b07ba32d93..47df40b0d7 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:de33894dad24f9e8a8ccecf73b80d76ccef208510de3b16e7688782e82f769d9
-size 35736
+oid sha256:bf6fbd19bc18ee9c9430593413852730518d0ddb897560fcbc6a8012ca0eca6c
+size 35732
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_4_en.png
index 1e5e32cf3f..9dc174d422 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d985c2b02ad798a2804e3db14b93624bf517fc637e9d2ae2dddff571ecc96d1
-size 21989
+oid sha256:d6ca8f4714628a79fc36704fc7562e27d1692a81545ea310196c0c4f754a2f95
+size 22002
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_5_en.png
index 8b36658e1d..f55af83578 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a7f0ab5f5025ec834429c4112438c1c67640fcc0178ec0779279e06efb45971
-size 15740
+oid sha256:a58bb65a33c438a14f10f4a2ac1ae341e3d8d65bedbe6444a63f278f61fd7dcf
+size 15749
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_6_en.png
index 4f8b313065..678735985a 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57784a0cfc2f033e722c1d30c57fae997a63f01c0a38a653a9d6c51a747e7590
-size 20961
+oid sha256:7da4472cbc085b2cd0a5853c3fa57d2867dfb2e6de57004292e26fc995a40700
+size 20976
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 b484c46188..5582d1fba7 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:0b46c117b3450960673450872fe15146456c27af2bea2b372276643a15baeaa8
-size 34097
+oid sha256:98f699ad4c8195212e4913be285977101f8cc02b80af707870a108520361dc9b
+size 34093
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 15bc56a51a..2f1e9cb2ae 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:24cafa0c4c57a00dd1c4951c2c45aec794c8c4b54f0365b3b8022ebfc2c4a75f
-size 32363
+oid sha256:76989befe99e32a24d6a469b664745fab89ba96d7e3597f4f2db4fea78abb1f0
+size 32356
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 fac0d85507..b7ea9de673 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:b3813fe8f68e4882abda419745563b71b9252848d56fdf81e5f1c309d512ef5c
-size 33292
+oid sha256:3a4cf571811cd039c67a55ac3e3a910c32753121a1ae1abe0c29dfd0fad43ca2
+size 33284
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 b1d5fd3d3b..f6aa89fb99 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:b15a3f5119d31c2da2976f6526fbf8aca73cc1eb1eb6436a4bf619137b9880a4
-size 29616
+oid sha256:41455ed68974b754aadc75fdb3f4402585392f865cdd04301a3453c29ff99bea
+size 29613
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 d7254dca40..fe25500e7d 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:cefbe57afc5b78b598d004fa9f6cc9d42e00127ffb7900a2f5346eeee0b1531c
-size 49183
+oid sha256:a374aa173eeff89b16c1aca45c7df58348f795fc4f6e06c2728114885905967b
+size 49167
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 789df60a7c..b565dc2a90 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:03fbd054c197e783d2079cf4b3953f1a4f15dc7c38889dc826cb5de3b7c1f4d0
-size 50597
+oid sha256:452266b8c0b1672b84e90574490a6ba4f9effec54e52c830adb609946ae91cd2
+size 50652
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 4568d23092..4cc104bb95 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:34c5fd10902041682c6ab2c3022ea44977035f7de6ea9844d94876b921327ced
-size 43960
+oid sha256:e6c189fc3d50e0ac43990ab1ad7a78f7042ff24d48262a73c1a82425ab1ef6c6
+size 43920
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 dca9066157..528cc91b71 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:531e376ef91fdb4f535a951222f5e25ecacc7ded6d6693e30551ec68a16dcd33
-size 46911
+oid sha256:810eaf70634b3a08cccd928bf10c6472c56b9e315c28e4f62079341e7446c1d3
+size 46858
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 c051c9bd74..ed07f0ee94 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:c18f38af96a7f2d0e6dd30827d9ef5cae25d7c864df81ba763044f782f3bb7c7
-size 45233
+oid sha256:d11c49c0a5303bbfa2dc5cd94a2a71ea421b91f45d5dc8f6ce559716107cd36c
+size 45189
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 13a4439f26..2cdd106985 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:96472d116b4c961b4dc44e7a5e8fcf9a7751ed7662e8c4a169722ff53a53ceed
-size 42380
+oid sha256:e3e2510f39a924c7e86b2725bad2b70547fa9329764f8e165f21ed169774b6f7
+size 42394
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 10ee8e348d..4c25d1d690 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:055df03c64585976d1453c0c3b5b0460cefaf1aaa93a47d17b98cc80fba11f29
-size 45525
+oid sha256:a00f78ed08a6b29f02eb0225a5b627e29ee218cac8067d42c38dc35eba362969
+size 45470
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 05e6b2c7b7..50c97e2207 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:21a5e088364ec86448df788e0d54c27dcba3c6f696a86e7f97289da0792ede75
-size 43598
+oid sha256:b9e3eb76e43e240e2e25dd82f19fe8cbf3da5a712dad00c1a2c1924fe3ef5e8e
+size 43620
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 36ecb96acc..0e61377758 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:e356e49f62609b0c96b294a51af0c3dba861906d0cf18492460b2d199dcd1003
-size 45368
+oid sha256:bebbadba5009f56d0b98f7e29383c1b04e793aff9ce8be83fa35b8e5aaa37de7
+size 45321
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 a0ea657805..fd54f40161 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:ed74db84d89dd5c59bc9470b1cb6e7dba625a830f7f215b5af60322deed39b04
-size 34643
+oid sha256:13a5f12c6bd1b87581bba68e4ad8f1f971caeda4680832ed3182d62fab5973e8
+size 34599
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 2feaa1bd5f..0972142472 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:25969c104deb93b7816d7db30cbc1d6f1b747841f97d017211f6769f10946b52
+oid sha256:8221339de385c37cb4a53c1b9cd5d3b8e8a35b594235c02eb0b4d8c5b79d4864
 size 28701
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 e762a68e92..364dfa79b9 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:a883e703a5f8c9a794ca274e52b493c490815f39c84c7c7b9c9cef348ecfb766
-size 48368
+oid sha256:4b8db882c5c5f54aed41c2803e6845a95305206f3237b4aa788d3ba5d883ee3d
+size 48338
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 67b93b5e8b..2bfecaecea 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:c44806a243336438401a21e265c8d513fff7e4f2cbf68a0c745f5918c89d639a
-size 49828
+oid sha256:3fb27bdd0394a7b1aa82d2fb20e0a627e6fd47ebc3dd60a2d3b5ee8e24717b53
+size 49889
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 ff27990665..ab2a512998 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:9725a74d334baddaf3946675b871abcc24f20e3518fe572f6eaffdcd5e0bf98e
-size 43028
+oid sha256:3fd7ac1724cf64adce731ffd80a83046944bd8af6c5b556e2b00e1ac3e3f398e
+size 43044
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 ddf220b94f..9ede501c99 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:78379d56dda45b77f6bcfbf32e12e78f72e88c760d7a0911bb9e8c9f244c39b8
-size 46151
+oid sha256:a4bc8613ca9c419b2d238990fb090db20434cb4fc026c4f904d2f1712f8329fb
+size 46167
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 39a4ed6170..4699f6a24a 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:b8213b5f1c9620cc8edaaa9971906f09c8b466d42ce253a9f52d30419af2e732
-size 44722
+oid sha256:a40530757b5cca798f26794e098fc7e0c07044e227458da2603774989e15bf87
+size 44744
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 05aa90f6c5..51c0820e25 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:5c94f65df581c57f83346e9c8d697a50eb95cffa5ac3fc4198017a41b9d72537
-size 41215
+oid sha256:eca8d3d3d838db44578c45bca4b3bed73d40f04000b2d947cb2742a22ff6b8bb
+size 41237
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 6863297844..d016dae2e3 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:9fc2b4034704979785701cb42fe2b967256a6151ac90934cecd5b8b1922f780b
-size 44987
+oid sha256:64d17ce693cdf66ed72f2b881c54ac455e830d27522e0163c7a51fe5e29f0787
+size 45004
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 cedfe0a891..b6ee950d3e 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:d14b2d18fb60fcabb3e657001c97d95f55b82e87cf8efa34c8a5fb2ab237a359
-size 42385
+oid sha256:709da1c52a89625280393ea02b7a6281f6e7101c80d485ba82a7b4f71279ff46
+size 42401
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 ed3e934f07..fff9e25dc5 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:5d081025bedebd0993968f3522a6e4266ecd20526284c37794a7180305d07c7c
-size 44806
+oid sha256:68b92e58a4670ac3e0d621843c1a234507fb164602c7d1096ab33b248a58cb61
+size 44819
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 1b9fb82bff..1bbe6d7ffe 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:5a6fb2cfae961192dbf019291f157e0c167d44ef16c441d1bb273b4b6fbe9a1a
-size 33331
+oid sha256:020b7638e8de0c7e96051e08c47f03c54df5e6cadadae80b5b7599fec943c9ac
+size 33357
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
new file mode 100644
index 0000000000..a0d6d70b6f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17caffb2cfe6e5532ef33b333e1757d22db57867d61491d7f3717f12f9af6e68
+size 400171
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
new file mode 100644
index 0000000000..82330fb9ac
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7066d8825b71f3fb42fa76836d73093296d33ea07415bb78d3755e5de56fb55c
+size 399883
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
new file mode 100644
index 0000000000..2b0306f7e1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e33323ca7754089a9d381d7fadf802e9c7b655c291d4adb8c5c154a7a9ee01a
+size 59425
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
new file mode 100644
index 0000000000..a0d6d70b6f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17caffb2cfe6e5532ef33b333e1757d22db57867d61491d7f3717f12f9af6e68
+size 400171
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
new file mode 100644
index 0000000000..b5a44410a8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c31caee91a73dd86351e98f2958bbb22ad6b286d18979862f36d99639983b689
+size 59331
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
new file mode 100644
index 0000000000..0b2acc1b7b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6158acd4fe1e55ce12c7863d179284e7af5f2dc3eaa6d35d5258853511693c55
+size 86433
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
new file mode 100644
index 0000000000..14f96e6874
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:267c22669a6b79d3f2cf39307bab2bc9192c7d5426cd8967400ccb6422d3afee
+size 73059
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
new file mode 100644
index 0000000000..0964b15178
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc10238dcf203073bb7347372164135ad27a219f8b29b293ebbef4e38c16b6fa
+size 406059
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
new file mode 100644
index 0000000000..b09cb621a6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88539a3267facb99fdff7e49f6d554aca83d7fafa4896c27b1d5f5ab0dedfb32
+size 83677
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_0_en.png
deleted file mode 100644
index fee039658b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab08d702a9426d5d577939130c8dc21c23574998754ff1afaa2fec8622fd35b5
-size 400216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_1_en.png
deleted file mode 100644
index c86b8ea729..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:042e8567096a4ed1809286c48a6dcfeabf403098355ee5d56b8a2b5d9f71b4af
-size 399918
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_2_en.png
deleted file mode 100644
index b9fc892a6c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e9ee69210098536033f3b3ac80a5f2ff6e9b9f83e5b030eaec572bfc924431e
-size 59465
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_3_en.png
deleted file mode 100644
index fee039658b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab08d702a9426d5d577939130c8dc21c23574998754ff1afaa2fec8622fd35b5
-size 400216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_4_en.png
deleted file mode 100644
index 3dbe80b1b5..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8088d0a6abe61b16595574f4cf6b18af122a1e7caba61c560b7bd22af0c1fcad
-size 59371
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_5_en.png
deleted file mode 100644
index 07c778a8a2..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:718838b71f5e69e54b9d2977c7dd9f4a1cfba2e5c03f98bbac4476bd4f91e352
-size 86475
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png
deleted file mode 100644
index 41a7341afa..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4214287ce64b1083c0be5227fd6e16066f3932c48ce7a8953d47999a5924fbf
-size 72848
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png
deleted file mode 100644
index fefd103edb..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e0cf2a3fc5f92c5b7e8caff9e60ad9495ba1703dbb160aa64f9fd0a1bd4822f
-size 406105
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png
deleted file mode 100644
index 23c8cbc45b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsView_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbeb0287f75afc662c28cca13fe39f9d24e67ee5b507cf976324d5d9dd4c381b
-size 83505
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 7be6eb15ee..a15633ae9f 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:521262df440dc94729863544f131f3b025057aa854f7b5d40490bbb24aafe45b
-size 56605
+oid sha256:17b4bfbf75f7999c39e32245ecfeb209524865a47d0d79b9249a2833d0988ffe
+size 56663
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 f2dc0e0579..3395ea1c12 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:72132b0490257da50ca1a55599eff7f5c4bfdc0266d9d01c0822d51c728423f5
-size 54345
+oid sha256:724455c16cb39e9b532a57286c2a1a22d74930b5b06ff3e5b13771327545fa8f
+size 54404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_en.png
new file mode 100644
index 0000000000..82395ab3e4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0489a15e6f8b358780484ea33807aaa2079512f7077b81b1e7e455092968cd61
+size 25463
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Night_0_en.png
new file mode 100644
index 0000000000..75c8eb8e45
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_HistoryVisibleStateView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da4fa289d3a4f32da964a47392458a09bdf80d4410e9ab9519225d077bb4a168
+size 28316
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_en.png
new file mode 100644
index 0000000000..6ebf12ac3d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf7b2508bdf41e2ee9b8b26207c604232f54314797237aceec5675524a7c8ab5
+size 66644
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Night_0_en.png
new file mode 100644
index 0000000000..02b6564855
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.historyvisible_MessagesViewWithHistoryVisible_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e58f097893ebc5f8664283d3e22b055b7294ce6d6bf571b34507e2242f70e677
+size 68988
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 f0876872e3..33761f5e0b 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:dd04311a5a5149ff49533ea8dc92c20533fcededdd555009c494b4faf1228d70
-size 56136
+oid sha256:2ceaf287838c0a6fcd1e132e2e524dd26de2895110387d177f07524979610049
+size 56178
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 4e67dc4988..f082fdfd50 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:a9f218607af91fc6c214e83bd35091320dc63f0e8a65de169f6635b8c312cc74
-size 64464
+oid sha256:8e61c655429be007d2492016db77d6f276ca7cc3cecb19b7e7bf723ff3f599ca
+size 64475
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
index 1877ff8348..85a03690d1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f344bc8222bc7ce57eaa9c7025b318aaff8b921950cda1674ffd61c8b1e734f5
-size 64753
+oid sha256:f1d607448052e38efa6f36f4d3aae2712181594bdaaf19094fa035c941c46897
+size 64738
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
index 547fd389af..0fe9ba140a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad0d72ac9350beac968fe5c658dfdfede14ecae3d4825db3cc0d873362241c83
-size 54736
+oid sha256:016506802e24fad8c456394833b15d761b391231af888b8d561f7c984389c3dd
+size 54747
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 b4d5de3673..79e65c00f1 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:c9c7c8f8276d60dc85481a4a6aba7562f9a7ef6ebfeef639984ce23878974277
-size 66875
+oid sha256:9b51235edba1e4c4091dab2d8da2d0a44347d815ec6dbf35e5916e8a1ce24d0e
+size 66895
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 e9b277c8ad..5e3703cf6a 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:3ec65cd67b1014c45c7d6f8310263bbeb225c59cd1d5da1aa22dc1ee29e54975
-size 66217
+oid sha256:7b2ccc52904228530bc7efdadd73998e882baa04c66de02b8ae7e88f7be3787d
+size 66248
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
index 7cce647f45..e6c9140cc5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5eb071620522e1cc85e02554ba88ea1d0fd1240177e6e14f341137ea36433a6
-size 56761
+oid sha256:ebaea3664362e8e9c91e0727a1c7e4d9ed42d3661c2c5c6d8b7b51dfe4a1a696
+size 56767
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 2c69c45672..f9a54c7fd5 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:6e4b8a9839598a5d035f6834865b8b66762ef49024ede88a498ed568261d0e98
-size 54446
+oid sha256:6632f47fb3dcebad21f74716b39b7dc67819d2d54f1165bc055e90c2e1aef1df
+size 54442
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
index 95976d8ced..b5c996bed7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f56ab3bf4f8cdc2ce98be69a0064592e5679eac186c1ec5431e6470b2416d987
-size 55313
+oid sha256:c286179169bd57dfd1c6111aac86c168537641e1591ec887f497712b3bcd05a3
+size 55324
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
index 22ac848113..da52f4ff0c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cb0632e3d9222b6e5ab087539e5c8bc3a5c7ad7177631801ec1e43bf2d14bc2
-size 52426
+oid sha256:312d00ac7fb97d683372f1122ed0dc6ea81946b1f8b6a1d3a84fc1a3ab212bb4
+size 52416
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_3_en.png
deleted file mode 100644
index c913d383ca..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c6ab936964323971e9b4927684e3ae2da96884b340569aebe6e6a711bd6c241
-size 8446
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_3_en.png
deleted file mode 100644
index 33799bf61d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.forward_ForwardMessagesView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd3611749f6ad60bc647236c5a10694b8ac9d1aa84e546740c1bf85df277c6f9
-size 7668
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
index dd7484b444..42bbe37ae4 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:050bc2041dbd68877ec793cee650ec0a859de5aaf6dbefbde7ae541827cd6ec4
-size 24179
+oid sha256:44f6ccfb561e6449565a130c6026f366ab34b2e65e2e33ae14c7a46ce091ddbd
+size 24142
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
index 351ce3983c..5dbed8456a 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecd3846189fd336e3608d636309670bd3f916aa484afd0f63851b8a4322d7e83
-size 23418
+oid sha256:a5cb908bafa11a205f43c48e11d757181dce0051ffba17cbf3dfdc30601414f6
+size 23369
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Day_0_en.png
index 7e8b641387..3fd7a0e0bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdb8df2bc5ffafad24a948d5b388ebace2dc412ac8f0e6f639abd03a4dedbfde
-size 6742
+oid sha256:7350c5f81af5791e96f0202d6b98752d68cfa95d6c9226669fef07486fb8fc2d
+size 6738
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Night_0_en.png
index 5ca82a215e..38d49eea12 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_DisabledComposerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd25f8e9a84252ae86d72ffe41da93c8630e7dc469fa2b065301a19a8009b469
-size 6411
+oid sha256:e84e57e40005b39e2b2a9458156cef7063dc914e7bc8b5ef95689cdd04e893b7
+size 6380
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en.png
index aca96909a9..ae0d626b47 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:095c359ccc6c82bc76f2218a79f5ad581b6c53aaea7c2f003d64ade5ec2f46fa
-size 8603
+oid sha256:fd658d5f8e99366b31a0aa1f65b09452823cab10c19a7216bf80569dc7463eaf
+size 8596
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en.png
index ddebcf77f9..c33fccf93b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd03c5a7f395ca18ca5aab54047719bf5fe27869912e26e4b7b1c079a7fa15c1
-size 8229
+oid sha256:e94077469c60275eb6601ce34c1f6d804fc11803e7ef1037bc9b49c5eb1d93f7
+size 8222
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 8a53ab1115..217766f386 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:654a86eab37998ec6aae6786043cb1514203a88e315c090c7b88f6e37a6d778d
-size 19128
+oid sha256:9d9efaa65d699dbd74bd4bbc7933c31b6360758f540cf996406d562b3ba86060
+size 19130
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 1d7980006a..5925a93929 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:d69e545f9971e6b34d0e48ead3dd6e7ffdb4cf1d388b15c7a8078211e72e4747
-size 17978
+oid sha256:7523f6a9a514393c668a012bfdd60c2d28dac14e6a30acb9c18c57311e128f15
+size 17951
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en.png
index 345ce9fe34..cafaa81200 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d194ea0d68d15d8950277eb747047b7ac3c809eecfc12877296b7eb67d67b02
-size 20707
+oid sha256:ad1808fd1f7eeec6a723d6037dd6ef163ce18163d4d0e6aa8301ba5dad4ae510
+size 20696
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en.png
index 3f862fc218..9e6b22ade6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a677ede82dfc471dad04ef5b1e5797def8847dad800c2ddb25de4d57967cd54
-size 9951
+oid sha256:e61cbe97457377827d04b60b5a78eaf27ef99e2af2c07f58e1bbfcc488127622
+size 9949
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en.png
index 706a51a6b1..17d9ff14bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49bd11464ee00bad139378a1c838e28137df0ee1d0b79a409a849dd072b5f34c
-size 31674
+oid sha256:cc1b0d4d04b6fe66d9bfff4ad3a376bc9a13933b903058072b189cf76631cc97
+size 31680
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 261a484f6a..f27a94d3a5 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:65b491ffa423ac5dce4e9bbf50b623edda962a595834e6ef3ee0b11766f0e174
-size 43773
+oid sha256:acbac9e1edbdda905ee58cafb8ef22d7fd4e1508375cae17eae8db606ee45f15
+size 43792
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en.png
index 25a06027ed..ca875559c0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dc9805c2f2d910491da944f1cf91430bcc5a8a91137eaaf301f65955d0d350e
-size 18798
+oid sha256:cb2d0b37abf2b2e2697e52aeeadea59ea92c824db4e46c3dae173599720f2853
+size 18828
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en.png
index c76cd4b662..5774300c14 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da92e41ef68fcbd813502ef6b9fcd6c535a84b45532fe868a8ddb72c151423ad
-size 9765
+oid sha256:94dcf16e44de6fc1410ea19dd066c861ff1171d43802a8885abcaec069f77302
+size 9743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en.png
index a53ebc5379..f363107d11 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ba2c4c469b7e4150156cf3a22a63bb3ab5c17493bc2714534ee8c3138305819
-size 30760
+oid sha256:2dd313ba433a5b568989846f5037d0d029cd205e2751c0dc87af29255b62a56d
+size 30741
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 de08db01de..605b3573a5 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:c6f6171368be0a7dc5395b198ec421f72b397a2559f27473d4f5935944c60b2f
-size 42510
+oid sha256:20005156ec4fd44450da5dfdfd422a747614fc572fabf0a1f79d5c8e689e3b77
+size 42514
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_0_en.png
index fa6ec5174c..26758d7384 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c90eb5d5ee91ec306263f32a252888a2e8e574ed6c8206cad08c094a9a9cb2ed
-size 43574
+oid sha256:2faf649225ecdebc6bfc68f8a668fbf9082589c90014adac8c9dfcd3eada2d60
+size 43596
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_1_en.png
index 99f01b3bed..ad85d5437b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4799f6d61825bb1873d7d90a7fa4e6e4cbf4886bc37ee82696851e7c8232b68
-size 44662
+oid sha256:ca1fbed236431eebbacd58199d244d5167d1870d4ac1098850daf20e94a7c387
+size 44681
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_2_en.png
index 4bf8a52b5b..337dc3b4ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f21c1edd672ab72920c1a75e0e191a5e15c1416b8855eb80a18fd9325e2d6835
-size 44201
+oid sha256:63b0deae7849299e6f3a64c4361d24641ec267b782e831bdcc820f8c18656418
+size 44223
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_3_en.png
index 1043879096..b3f96beb1f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:278669a85a31608f7865f06b416afc1270a9873b550f0c10fde4625c5f3e7f12
-size 43927
+oid sha256:28a6e5bec7201237252a65e97302c7ce6eb59b1c6dbdfe24e027f6649a359b19
+size 43948
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_4_en.png
index cbf61120ea..633fe3ef1d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58f9159a23fbb0880d42021d02c8a58a304752db6806631694c8a6eb39566c79
-size 34833
+oid sha256:457de59d5bbd601bb548ea95f53705d247dee1e49a72ea9de9146c7742981e4b
+size 34827
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_5_en.png
index 4bf8a52b5b..337dc3b4ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f21c1edd672ab72920c1a75e0e191a5e15c1416b8855eb80a18fd9325e2d6835
-size 44201
+oid sha256:63b0deae7849299e6f3a64c4361d24641ec267b782e831bdcc820f8c18656418
+size 44223
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_0_en.png
index 6216365657..b8fdea1b5a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e958c8160a12c016826cc4e8af43b48c600d0ab7d3d811f23cfb10b2632450d6
+oid sha256:18611a0d29277f7429b1d8c396e44dd1dce34b32e060cacde1bc6df8731ecbdf
 size 42179
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_1_en.png
index 06016b1be4..afe043da83 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d065bdc2440a2197e6eef113484ea1ed646aa4f4673a4438e4c96bc348f4c910
-size 43511
+oid sha256:9c95d7894c2e89fa6037ba15412a0de744e8bb6ff0fc764721965661e4fd8869
+size 43512
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_2_en.png
index 4bff1718a8..87b7d74896 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:284cd97cf142afacf4df16fb775bde7a06b074c66fb3f63914b10790ed96570e
-size 43192
+oid sha256:b036a6a129ab46a55594bae490d3be337a911d5b4ea2a7c0703f7ca14cdcac16
+size 43190
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_3_en.png
index 1a264655b5..82fed492dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:401cc1b3dfac1187eed0ce7672acc8f9f18dc43a1428ea1eaf75f3e513a1d31c
+oid sha256:69068edd97303c21ecb9ab563d005c8c155ea776151ddfd131712f341826d5ce
 size 42372
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_4_en.png
index 00ab993e22..c5236c9803 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:126bd6349944c619190a442a12824f7c48335648f2e41bf182c03da71b44c8b4
-size 32404
+oid sha256:6cd31dc75a87da033d7c1c6b1933de79a49ad463e6ab1cd7ded2ebbf80217668
+size 32420
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_5_en.png
index 4bff1718a8..87b7d74896 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.report_ReportMessageView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:284cd97cf142afacf4df16fb775bde7a06b074c66fb3f63914b10790ed96570e
-size 43192
+oid sha256:b036a6a129ab46a55594bae490d3be337a911d5b4ea2a7c0703f7ca14cdcac16
+size 43190
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
index 04c099106f..0d10f912be 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65a59efc8cfd19f4dddf0ed9d39c4cab634ebc720c2da7737f382dd2e325ad37
-size 22517
+oid sha256:ade3578eb4da40cd986459e34b6b851bfa5040d802e3d2f0321353161262db3a
+size 22535
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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en.png
index 045c8dba15..0094af760e 100644
--- 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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b7fdc137bb92ef23da15f9caad89a095355c719a4151b10d3f6156d04ab7055
-size 6807
+oid sha256:975b14dea5a3b4363c6977137846227a32f35fc530e554d76617aec53b341d68
+size 6943
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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en.png
index 3e93b95261..cc836dd47a 100644
--- 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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9ea09c61e22ba6bf59a93f06f89ae738d4cde1199fe79d2b0aed86805ddabab
-size 5636
+oid sha256:6968b48982e16c91975d3debf329ec5cd8eae3e16d63cdd936baad4ef4cc5e1c
+size 5658
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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en.png
index cc8c7de1ba..a8bbd66493 100644
--- 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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da07b6a6c81f2d819247b77cb6452bf808a6ba9097143e8ca6acf85025ab5b3d
-size 14438
+oid sha256:f1b54e9c23078f0268c37c673183035108c4301e8a9663bfa16376b270d87d85
+size 14472
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
index 42c3854905..cd3004cb0b 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18b5a57b061028e9b0d265f725e5c2b08439589c778c49f054822ab3baab68bb
-size 21551
+oid sha256:8e0996466c314ebc8bf144bb0370d8865ac78476f29d434522fae83913867ffe
+size 21628
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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en.png
index 493c2947a1..833303d006 100644
--- 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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12be2dd55a8f06cb5fe3ffcd0364a0cfee77a4ea502a31044c2c201ace026e49
-size 6702
+oid sha256:3877b6b6459012ca5766ed03de7666a8e073399b05d679a26487e5593812059f
+size 6884
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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en.png
index 136b09b57a..78cce88787 100644
--- 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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ffe383d6b566d8ea19d335012e8aeff51de67fb75b208532a3c07bc02d76464
-size 5523
+oid sha256:d98044d3c2d2ffb77e8357d8642c03b92b0054859ac2db3647b0dbb2ade2d6b8
+size 5558
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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en.png
index cc96f69e93..072cb32978 100644
--- 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/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8b0196422fbee4892e4909c027de98ca9f98c1d4d9c5d09fe8606b120f0e4de
-size 14264
+oid sha256:1e582e2c6b01cfbc6924d2b895ac64a9689c56979712c8e0280e5126158a22d3
+size 14300
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
index 2f8870c83c..2d5bf964df 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eca4089cc6ea4a4d002f3f7d465a8b669c8fc6e9955b235e67d14ff0d6cbc0c
-size 613159
+oid sha256:2831a3aa710ec9176ae5a8e3816342fdd65b549538d8636eba11a95b65d24654
+size 613161
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
index ebf5333c5a..76f96195ac 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6999ced40cfa54bfc972449887c38c015e903e12b981c3f7eea539ad3dee59c2
-size 611659
+oid sha256:1e216b136d7ff810d8d6a89a4942f29c1c1d44b8e810857a1657985d065faac8
+size 611655
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en.png
index 93f6d92dc7..f79cc954b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67e6b9dd63aba10d9846722c167ecf5c9f219a149a2a7a89a6784ed0e9722a05
-size 9014
+oid sha256:f94442178a32e767e325d31c3130978f762861147cf25c684c8a1dbaebd31524
+size 9013
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en.png
index e851758f7f..9159e1088a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a4a429f3349de4f6b22be2b56b5313c701d9b2f0caa988821d850922ad7b210
-size 10823
+oid sha256:c94badc42259eea54f9c1c206ca2e5db131c3d96b50e38cade8818c83090c525
+size 10793
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en.png
index 169a8ba58e..3813a9da01 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6c5cba84a59f3b5c4e160321ace07213af08615e5d046be1b0e2a1a7240d78f
-size 10264
+oid sha256:74b5ff422b229b78f0df6b6925077ba1bcec22952cc1e121fcc97dee981a4597
+size 10253
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en.png
index bd910671c0..a5a855a116 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef2f375239cdfd6348554769f919332b29d69da4207b6c208b088cb559d368b9
-size 9256
+oid sha256:5abf1a4d2996401d56f234304e6db9f4a93f6bf22170f8d3db75ae8a620605d0
+size 9282
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en.png
index cbcd6115b4..4b527e228f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa08907ce95360ce237dd3843936331a9460a9f6e035e23a36c5fc53dce8f941
-size 12569
+oid sha256:b0f368e4ab71cd07ab8400b73bac0c089ee2a0fd9a5c7effecfc55cd676fdad7
+size 12588
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en.png
index 75ab0867e8..8dbc9d11f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51d3dfc99a193923acb7652bf0d0d286b2beed237452e74bddddc5a7fcf9a7bc
-size 14806
+oid sha256:9fd4bd4529177dc8bdfaeeaaccbb7dd7f72b1a89ebcb9c429629841411b808b5
+size 14804
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en.png
index daea84ea9b..5dadea0d47 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0194400efc740d003ebb8b27a57fd505b9941cc9b66bcafef5b64b99156aa54c
-size 24221
+oid sha256:4b64fcc58374f1f1eb928e6a05ba25f371cc9fa634b851471a5b16a2c1644d23
+size 24215
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en.png
index a1fc125bdb..50064d53a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cab575f38bf2134f0271f9fb1a0eba018d51cd8eb9ca582951d4be52aaf74e4
-size 9300
+oid sha256:4237f1ed8fae3c6435d973773a991e2937d263f8ba508bbf713e399f365d5015
+size 9289
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en.png
index 93f6d92dc7..f79cc954b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67e6b9dd63aba10d9846722c167ecf5c9f219a149a2a7a89a6784ed0e9722a05
-size 9014
+oid sha256:f94442178a32e767e325d31c3130978f762861147cf25c684c8a1dbaebd31524
+size 9013
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en.png
index f56493c157..6ec713e352 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec8a4d89051dd217f8652de2d8493234d714670bff218d1d5bc3b7d06beb7c61
-size 8822
+oid sha256:013021db6d2f767623c863b45d105ab87cf87500b21151573864eda10714ed9d
+size 8820
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en.png
index e08a42eeb2..f66b4265c8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4afbba228eca3d932cd273d8ab440bd4852798ab7b706af9c285caefab99e56
-size 10549
+oid sha256:298ba1a9ccbb0a67aa7a68000d6de06bbc1b58a01343db397db24dcea47b76e8
+size 10555
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en.png
index d11dfe7c5f..a7d61e8711 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0b0b3dc7878192e645c14b9d1a9adf7f0fb76c69afc0748f91614226c80c59c
-size 10181
+oid sha256:7c9705480c6e785519e89896729bc732e1a0e26b245a056d71264e7dc7e6cca8
+size 10176
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en.png
index 34b00ece43..d195389718 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ac3cf77e574c2e9c9f7f30d3ca15df3f4e3936b7f5d252a925ada598913b229
-size 9105
+oid sha256:98c30b16426bb67e7a01aed77afccd3dd28fcb49dd59c439bad3beb5339126fd
+size 9123
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en.png
index bb3787d765..dae1422143 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c80385d94f8134d52f0fb809ac51ffd2996da4a3f1b68b70f12cfce98f9b0e96
-size 12368
+oid sha256:0b1b8e4be4d8d8c493a7ff259a55d11cb3f4159966d251ecf58050ae2446779e
+size 12374
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en.png
index 2e9f93bcae..0b75b2f577 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f4a51543a70f1deb60ce53ffc266cf2acbe00264508b0c0fb11440a4aa7200e
-size 14453
+oid sha256:0d5215c2596f4a3fdd6ebbd9a87b799178795e6d1942a171226eec956a9eb730
+size 14446
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en.png
index 8c13aaed0f..84a530c9b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb10d7c1bf6fd6bb7d9c1d93af57293b92f66916ea64a02dba5142f583718800
-size 23555
+oid sha256:556dda2b597c031a52728a65b8d767066e45e64bfd3cada83108a9286954b432
+size 23566
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en.png
index 5185abf2cc..40e8ea6546 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bda3f281f21da980f21e84b9fd95663f549325fae27472525ea18ae3846ff029
-size 9140
+oid sha256:f7aac7dd7ba679f1fdff9ae0605873b86c68929adb13abaadf5c9252093cf1f7
+size 9125
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en.png
index f56493c157..6ec713e352 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec8a4d89051dd217f8652de2d8493234d714670bff218d1d5bc3b7d06beb7c61
-size 8822
+oid sha256:013021db6d2f767623c863b45d105ab87cf87500b21151573864eda10714ed9d
+size 8820
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 739dcfed73..57acf13050 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:8bcb1e5c125a2970c30b0467b328fceebb9122085a915360bf8d5a79b1a542f0
-size 8176
+oid sha256:6929bbc0adb2503498b7424356b1a27980be484f362e1c478f03bb0ab42a3337
+size 8178
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 db83722607..97a12bc843 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:7d576efe1e38008ccc0e3c7cf64ae9fca88b615df7875769812758f81b74d238
-size 10597
+oid sha256:2009164e45d18dee96634768edf2bea6315b50075af1766d41fd28d9181139bc
+size 10596
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 91286e29e7..aa2157ce1c 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:696107edd2b836af7af54ca794ba6e12015e6d8cd40c7319604aa9cc61bf0a8b
-size 21831
+oid sha256:5ac5a0bbc502a114481a5e9c4d2e3c536c73c0b4a422a9ef1594110a761a7f9a
+size 21821
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
index 6cecb02e0f..5a6fb008b5 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7084dd120e36c226b0d7d7ec031eeb0785de067a5bedffcbe4371be7c6728842
-size 10360
+oid sha256:92754615711d2f1e2cdf4b038725e0ccf8a9ac089bba709a6b2f52a1ebda2e42
+size 10359
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
index 216a518cd1..f6a8f042a0 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff0d40ce33f8511cb8257bf9ce2846109ba0244dd320674a0619a38316c1adc5
-size 21116
+oid sha256:b0c79bd4feca12c792e891e9d2c20c6d26df26fad3dbee15401fc65c8871e10f
+size 21119
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 4c3cda9a93..9caed5aec2 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:3a91c56e40e2f823b6b3e821657c048c9deba57f46bb141f556cd53343a1203d
-size 8118
+oid sha256:21785ef7f34e3a628182723985b14a694f0c9afbaebaac71562fa46188f09460
+size 8121
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 2b07e34aa3..50fe665850 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:ed27e7c1f2bf1e2ae239fa5a49c6eb4d18ccfbab1a781d0075516cf8a957e63e
-size 10419
+oid sha256:9c7c57247861ab70e90a12a270f38790d8ec705453a1abe074e696a824b9c272
+size 10411
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 f6ea664966..797fe438b5 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:44defcacaa00c21b9f53f9634e25bf581e9510a3de6bed8bd51fa49c6cf8e41f
-size 21065
+oid sha256:510e41e944782f6c6fdc6ad71b356363da178f58ea1a5e80a679949196b9c0cf
+size 21064
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
index d52e7c9be8..49d7bc5192 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b50c9cbffe0519db9b503b9e119f2284260239148b99ba023c2b84a61cfd2b3
-size 10208
+oid sha256:6b8425afd6ae2a852297400f57c838b97c7bc85bb80c85ad321a3e246b773a97
+size 10207
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
index 080c4ee44b..d6bd786f17 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9df001e8eb669beebdc823a260f8c215cb3e194349e3d7a58ac8d64c534f9c85
-size 20227
+oid sha256:6b3842f55ac92b365c0e97eb869ce7b86c948eb9c764e2c2801e01f04db850fc
+size 20226
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en.png
index 9902236b72..3b1bd71576 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35f419b462fd6f734856f3ae20e11f924bcda9224f7cd1d975102f48c747d68a
-size 4919
+oid sha256:9666aa672226eba345da458c463b4494c06b72353ef989f47e7094b93cd671c8
+size 4916
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en.png
index d3c5f6b219..2a34d63188 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dfdb1cfb62f21a6f2291cbecfc1eb9ab300dadace21b7b9a8c054edb0f5980b
-size 4895
+oid sha256:993cb6cdc3e3ff1380306511391e5617d957687617c5b42b2294a0c93cfcb20c
+size 4898
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en.png
index 86816ca5b4..a3c2b85d48 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fbbc521450e8a7f4c1503357e521c58ae252f36f481d28ec105c0b134999f72
-size 12979
+oid sha256:9cf9cd6822d784894fc38c246f0d0f7ed3a10026542bc0bf6f31d9dff52a5d14
+size 13003
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en.png
index f833c5db7a..109ea46ad9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11593e9aa7caecea405f007b8b179e43357f52da134d6fe9be7c7c2fad0d41fc
-size 12568
+oid sha256:f86e96f17184672774acae8d5ab0f8f719acfad2404daf2f68a46249facfbba6
+size 12567
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 b8a5c94bc1..ddc0c5c9dd 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:895e0799a4d7c15218367042c5b6f3faf03b817d6f7c74c3236fa06e56f3d282
-size 47360
+oid sha256:55638e0bcad96a1aa5225d0cc01b32bca63c8dab1a7c284f8912fa63fea33973
+size 47363
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 5d243240f8..9440926951 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:8e01095fd862e354e9bc04a675224405d9e52f6fa8886ce592d7372d9e1562d2
-size 49402
+oid sha256:b20bc21e6c41505e58a53c135cd2a89d214e59abc5e3cecec915cfaa6f2b225c
+size 49407
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 989fb9e247..fdb049d4cc 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:5d771112966c611b3417bfd14c83e3535c83a13182ca7f756e512a91c488bc33
-size 49308
+oid sha256:a0366b37b3371ff7d46dae9a569159618476d046b85ceaba523946539355ba46
+size 49304
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 3a771fd746..47330a5876 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:5e8a88d5ef96e76fb74a9628af81b4f44c11f8c4f3f4f737f1f07728e3f0ff5e
-size 49348
+oid sha256:b1284ae7a3797f855fa17ee1baa3c966965d4528bdc7425ae601b57015e17b6c
+size 49343
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 dcd18ffc85..2eece14b39 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:55ae6865681d1a7b10e0093b2a901c1c1c994d547b33b82e574687ea513c8e41
-size 45774
+oid sha256:947baaeadbffcee1367d7e28e93135937c3a3243ca4b1afe3ffde35bc4281dda
+size 45784
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 6c1407f3d7..1e197c7101 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:2b770232557af1d4431e44c839220c7b375c8ac9dd3f2e260a829037e2bc05c8
-size 47944
+oid sha256:1baa771305baefe715cfa268fc3338d101b08c8df00e49e9f566303bbf4d8dc9
+size 47951
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 409f56d162..9ffae621b7 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:0f09d6ab2eafaf87aff4d4af974632c803700ebbca5dc231adaa572227e8c4bd
-size 47964
+oid sha256:9149b8dfd77717ef1716727860b3cac431a4d34aa9377160010dbeda13f566d9
+size 47971
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 833665b100..f3239c6966 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:30affe826673bac3f7814f1c85dc66e621abb8001eab14e8009ba4a7fdad8b76
-size 48032
+oid sha256:feb700533177998be86802fc32efcfe0ec070a85892e738d4d7734245997b360
+size 48036
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en.png
index c53bcf4ee9..c44a9fa4c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e82ed1e80a2ebf75a770cc9a3ce5cef8c245941a49511db51c6e2f7c70026b4
-size 7586
+oid sha256:23f66f318c5da83d6ea516603b23a79d9a98376cd7ad258372cff136b5467e51
+size 7589
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en.png
index 5411c6f1a6..e3c458fc37 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7bb1206ac87607d1b221aecc7aa1e2148afdb3e051cec7adb7cf11d396e4f17
-size 7474
+oid sha256:5e1711526f9fd574964b654ddcd640abe515e94070d612d24b56e402e07da7aa
+size 7483
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrlAndNestedParenthesis_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrlAndNestedParenthesis_en.png
index 6bd15db678..12e583aac4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrlAndNestedParenthesis_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrlAndNestedParenthesis_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa94348d573952caea928cef169e6dab0b2e46c8d7328ffd31b385fbf575fd39
-size 20313
+oid sha256:82210d42de0cf0fd4fef8d23a3c3971b8778a916a2af27b3e8e3320de96d5c3f
+size 20475
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrl_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrl_en.png
index 551c04dedd..0b13dd05c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrl_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemTextViewWithLinkifiedUrl_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6678b4bfada4177341a7af5a892726522b1771e7a13f421a74b33a474f7b0a8b
-size 19552
+oid sha256:50f6dbb2770fc8184c9a410b6a3a1182f26e063075e66a657e81eba8496a3489
+size 19729
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en.png
index 5c73b374d5..764e1f2f62 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4a9fe0e21900921bf8defa3daa83b27c418d7cb1dd8c9b6dcbe57385db5cac5
-size 7765
+oid sha256:ae153c28e3144dca742eabbf07e1737bf5a59e8038ebf1c9831c9cfec4f0e06c
+size 7771
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en.png
index 6c65d43dd8..17e469f001 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8902fca64178c2220febc9fe1dd8f889e23a272f8310c8f731878c0e0507e2c
-size 7626
+oid sha256:cdbfc07ccc078656f6e3608ea838b7f87a86b873e81bd5941ba1f46c84a1017d
+size 7627
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en.png
index 48c96d960f..71e3f41e86 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5ae7adb0e35ce929b4d98ae2e2eb10e47a96c57c43ef3d157848433c72c5cbe
-size 274710
+oid sha256:e1d7b969ec71a3103f86176e7cff801e8c00433edb5da9496acb574feede43db
+size 274709
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en.png
index fded23e8c9..beeb0cafca 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:034352befeb44709dcd1473771365347d12cade26f01011265fe26cb6a1a0a56
+oid sha256:0356eb4418698d3401ddc985a849fc06de22daea822e0bc286c4b99178c00477
 size 506363
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en.png
index 72d1fe15b0..762c38a500 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6bff5342799b70df92a642e0a78eebd4eb7f2dcc787cdf6a68d356baf9cb4b3
-size 383740
+oid sha256:c892b2f2ae4658e9a0a904539018bb2da9e990677feb87be91f531e0ba40adc8
+size 383744
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_3_en.png
index 48c96d960f..71e3f41e86 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5ae7adb0e35ce929b4d98ae2e2eb10e47a96c57c43ef3d157848433c72c5cbe
-size 274710
+oid sha256:e1d7b969ec71a3103f86176e7cff801e8c00433edb5da9496acb574feede43db
+size 274709
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en.png
index 48c96d960f..71e3f41e86 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5ae7adb0e35ce929b4d98ae2e2eb10e47a96c57c43ef3d157848433c72c5cbe
-size 274710
+oid sha256:e1d7b969ec71a3103f86176e7cff801e8c00433edb5da9496acb574feede43db
+size 274709
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en.png
index fded23e8c9..beeb0cafca 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:034352befeb44709dcd1473771365347d12cade26f01011265fe26cb6a1a0a56
+oid sha256:0356eb4418698d3401ddc985a849fc06de22daea822e0bc286c4b99178c00477
 size 506363
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en.png
index 72d1fe15b0..762c38a500 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6bff5342799b70df92a642e0a78eebd4eb7f2dcc787cdf6a68d356baf9cb4b3
-size 383740
+oid sha256:c892b2f2ae4658e9a0a904539018bb2da9e990677feb87be91f531e0ba40adc8
+size 383744
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_3_en.png
index 48c96d960f..71e3f41e86 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5ae7adb0e35ce929b4d98ae2e2eb10e47a96c57c43ef3d157848433c72c5cbe
-size 274710
+oid sha256:e1d7b969ec71a3103f86176e7cff801e8c00433edb5da9496acb574feede43db
+size 274709
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Day_0_en.png
index 05d11afca3..71aafa8951 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1d9911da8b84dd682ac6829d2a1f6b38c02d52c5b0429cc91b9c47a20c67611
-size 39891
+oid sha256:45f61d7b50a14b483d9459846f002b9ac94c6ccb632c636f891616629ad47248
+size 39899
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Night_0_en.png
index 2a5a9ed69e..5067f5b5d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:878190c02f046d6eada9ea9b150c1e22739695681bbcf8577f5a1a20098d5236
-size 39966
+oid sha256:80ce1738cf56d99afbe781c82e32cdef03564a31fec0450aa66a84c56085ce81
+size 39956
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_11_en.png
index e6a1534e69..a2f4e5c84a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3983e68125e92ee174d40bf9189dc0ca08e421e2e3bcfb643caf3a83f1601ba1
-size 8615
+oid sha256:68c8f0a94de98773a3dae69fd44fa87fd3eeee5c6bc44afa710a2ba32eacde7e
+size 8620
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_12_en.png
index c514750243..320efac4d0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91910b1e33b16201a0fc06aa2aeeec940062da82e1ad094cf88aec49edee1425
-size 8257
+oid sha256:b98fde923272c2959c407fb3f62cb150f1b0fac3f54d29d94f30646096d889d2
+size 8261
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_14_en.png
index 74a1a8d5f8..c1d138f7ad 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5327a1baa2b0486d29c656f83879d001f4f0d1ee0795496718e8d4f644a7a03e
-size 8480
+oid sha256:f6e969ae817abeaa153edbc06cbe873439cd3e65be31184f22db1d8becc7953a
+size 8487
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_1_en.png
index 4803c4b3fd..4b84f30648 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b377e9613e8d1bb29274f96a306c61218072157f5367dd03410538028854ada
-size 5167
+oid sha256:fd514ccd8d00f7f1ea2dc0bce9b786be8fe99c98b44a1b99add18e132d0dc1c1
+size 5171
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_2_en.png
index a94560cd79..07cf2c5161 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cca95d31978a550279cd2b36736127542a6010adc847c065c666a67d4bcb84d
-size 4906
+oid sha256:9e69b5e773119af8ab4749064e68f6584aac0aa41c11a054db9e9c14e7e9aab0
+size 4908
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_4_en.png
index 8fb61e6f13..b49506008e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:194a9f854b996a3228ff9e47858b50824c2b41fc7798deaddf8d317b4bd14145
-size 5220
+oid sha256:df2ac9c5cbee9a350f54ca6892f42c6685d91d9d4fbe46943143b99c915e8ae1
+size 5223
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_6_en.png
index b4912b2caf..771495367c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad75b56bd561c849e596500331c99740f1c0c91ce0edb032f35dacc2dfc60604
-size 5729
+oid sha256:93a441c65d9ae6cfba78c4a89a72c037bfe1759325a7bbc0bee05dfbc40e96c7
+size 5732
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_7_en.png
index 56d7952499..b379bf3ca9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57049b44b184b7e6004e8a7c9a3ee1c3e4b34d6e1f51d086bcb9f9f5b7188bca
-size 5433
+oid sha256:a82b644e43af13b60c98ccd565873cfbe1c46e3391426bafcd5d71881fabe34c
+size 5434
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en.png
index 701e2efe09..fc9b835afa 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb60e31ed37ad9329f5d3a394ffa5220f5c32111c93ceb1ddf8de1d629f103c6
-size 5777
+oid sha256:11adeb3f01fa93c159d692cc2323761873bfba37ad6a3a014e2fdbe80cd108b1
+size 5779
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_11_en.png
index b8b0c95ea2..bb12277d62 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31103ad947b4e9f270908403974478b6324139e8d148e3c3d5252f5daad35a73
-size 8326
+oid sha256:b13a02e83748f671aa4aec7eb8052bd3637eeb8c898ded100e29aa219ffc1fbb
+size 8337
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_12_en.png
index fc5428a7f5..b2ed5f6991 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47e57feb0ac270d1be7781326e5449eeeccedc4deefd4aeef2fdeb0b441d0c9b
-size 8157
+oid sha256:4ef577bfe5233d1194c7bfbaedb38b3690964fe8d3325a9f1c71c3e83fc81d8f
+size 8149
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_14_en.png
index 671dec99bf..92476e7b4b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1878b6aaad15a42e7e17eca871c1b72b152af6df8eed4165c9ba4c360006a2da
-size 8114
+oid sha256:0464770461d9a59015fa3bd2149bdd17c00600ae256fe4d6b2eaec12a029d04d
+size 8121
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_1_en.png
index e0add7031f..c9da9a4b6f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:457aa1c9c8c02fb6d40d33e442fc4eed7d5adfdfaca6eeceb0170d081af7d04d
-size 5105
+oid sha256:b79152dddd997e11c52b910c19c02d21cf504d2a8ae228e11c9546f2496596da
+size 5109
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_2_en.png
index 272151df31..89e7d512c1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a3befd7e367a73614c6dd40809fe2ca89bd2e759b24102950615aa84555977e
-size 4923
+oid sha256:ebee4fdf176801a756018e9c4ea80a7e506e9a58dc789f1fb0b9df8306abacf0
+size 4918
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_4_en.png
index ede430bbb0..ba74381c3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e52b92c4132f6b12871d2967822ded602cbf2d13c98c6208907a560949d8a2fe
+oid sha256:8e1098a584fec0ec74838c2cebf0db3f1c6d75eea8575e2d0e946657cd065395
 size 5184
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_6_en.png
index 28bf140dea..7c2d0128ff 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26a433ed71e35d9585d7a6632bcdaefe19d8a942f986b0b99cff0bab9342f519
-size 5702
+oid sha256:8d530adf3152141fafb258bad3cc45349fc2726bd1c5a51440d1608a654dd031
+size 5707
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_7_en.png
index 53c5f672d2..11bd395271 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9361e1aaae18cb3394313d7ae0c6391f74b04385b267632ced24bb7d1fbf4113
-size 5459
+oid sha256:d397a13c3fba112e8bd2f3045c4e9fc9de10869204451b33cc7a88b2938b9797
+size 5451
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en.png
index 307c3dbc20..7aa2ec7227 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c6762c06d78dc3055bbb75b4367fc1a581b87f45c245d4e5403509c3453c8cf
-size 5775
+oid sha256:614d88406ef318b65475837e79b10759f3c9ee038dcfea963677d371874a7a1b
+size 5774
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
index 766ad71da0..18e0e58bd9 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03c1d2eb83fe35e3183d2570ca2d772b62527938269ca4949700e89e2b565da2
-size 608644
+oid sha256:4e60262061ca652520fc3ffce83916e34eb75e4a7eea4ef474ec940a55edee23
+size 608642
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
index dc3fd3fc29..6b4abaaa88 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3eb688eeae227a611f73eedb29c1cadeb5a06a753cf334fb57e2f9623f624a8e
-size 607050
+oid sha256:112c9a01861d07fd5386a78158d744e26d068672e2d2097ed5f5194842454341
+size 607053
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en.png
index 0c39b447cf..9076752deb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f6041b2a91114581185017d761cf5b441263dc343db201ab19cf32a0a5679c6
-size 24654
+oid sha256:bd2b5a0473511d575b25de19e33c2a71c4e6e7210efab896dedff7b0a4552e29
+size 24655
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en.png
index d3b2dbc501..c19df9e807 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3a446323fa2329104709248fed572396cd9d485ddd24fe75c968415a9e161b5
-size 23813
+oid sha256:14c6b9e8f7dacf216483993a09c378fd4c444f76cf97ebc5b405977117aa82f1
+size 23799
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 d99f4f4bf2..24cd69292a 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:8e10ab8535d37d714ce4ec7392fed1e3ecaab3f459c1bcc872601bed6d57fc69
-size 11417
+oid sha256:64b472e04eca6203aa2563e65b0f54af3b4baa9da1706a4ecf4a0609697d48d9
+size 11403
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 ea1c9353b8..517f2db0e7 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:8e97d19ae75ab72b57ec48bf6c39bf1f742e25ef5acbb20a7583ba697ae4d745
-size 16881
+oid sha256:fdc697787133723238c5b228b53c76b94e8a159b63df9068189398439d179353
+size 16904
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 4243e92aaf..35ea429edc 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:f58353935619cb6551f737a95381bdb4a1736fd77054886cd908044110c6dd03
-size 21967
+oid sha256:f4a48c30efc2dc278c5c9aa6274899f0c669fc7d5433fafd737681bc3486bdd2
+size 22025
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 1b2abb045c..eb3bb61a96 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:d6ae65c60453959b99624c3b51c6b84b721ef9999bd0313e6c785c9d5bb82c00
-size 26218
+oid sha256:ddd99012579e28dc0d52dedcfa097825d3ada4548c4a3d3595a6fa9347168bf4
+size 26295
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 0401898572..f9e54b9351 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:1a00ac9b95359013527bafc8f244b55ed02a75cde8a81a16815e121575a4b6ae
-size 31544
+oid sha256:1a086cf3f75b8e525e41684e5366a5d416ae04cd43a093c8f2f09f6d1509b3f2
+size 31717
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 ef64f0eff5..fca1afde50 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:1efb80a24b556fdeea528de1b5afb004100616bf3163c7b5c5b184a2ff82a84e
-size 11080
+oid sha256:f4891d5825449f0362bad22f16cb8ffd9c9332312f9528d0acf23a8db146f37b
+size 11055
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 d468d2491a..56d6e2edb9 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:70b76a4cab9419ac6e49352982c203a87db6f7cb44091f29a8abf24584db2292
-size 16208
+oid sha256:d2d1dcdd63d79289f6d56ecf3b108e147791e218cef96c598bdfcf0e51f15ddd
+size 16273
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 009bda75c5..082b848111 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:00fce403745ec69a35aa00ca423cd42633e2870504806857d13ffc7d920846fc
-size 21474
+oid sha256:17ca7249652b4fd0263cedd75782e8f57277feecb0d77976b8d428d1621506b0
+size 21525
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 e1f610cad0..6d88f73cc6 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:cba66ab8e687a3f7fd904fda4001bb5bee26d8825d5d19cf700aefad98637d6e
-size 26307
+oid sha256:87501fc77eb9026ff8b4a703eb85c93b31fcf7c0d0cbfde7afe9b6dd0110d068
+size 26460
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 b9a11d8f1c..037728612a 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:417f719ea18b93aa1ced2c2fe0cd73c2558170a16df8370edf2c66491337b607
-size 31734
+oid sha256:9cf2adb5e8ac9f8bca87e6b5e1a8b5f59dacd6ee470d8a3b5bb5c2e6233e1709
+size 31937
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en.png
index 35c3834c65..9931828a47 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e490617e1be4d4a442308a1cf0cdb50ed28b7b3bd89db08a4f30783e18d9044b
-size 4738
+oid sha256:654b3e02cdb633f496bf469b1d2aa7d9d378ab1f7d268baa56fbb51f582e8d49
+size 4726
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en.png
index f1ac54a848..c7b23e6596 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:adb2a08a5cef64a1d3d57adcece013b128947cf2fdc311c08174514c6125cbdc
-size 4572
+oid sha256:49d4c593002d2ed5f6ace886d9220f3d236356cf1cefd8f7c0da68177032d0bc
+size 4561
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en.png
index 35c3834c65..9931828a47 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e490617e1be4d4a442308a1cf0cdb50ed28b7b3bd89db08a4f30783e18d9044b
-size 4738
+oid sha256:654b3e02cdb633f496bf469b1d2aa7d9d378ab1f7d268baa56fbb51f582e8d49
+size 4726
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en.png
index 417ef6ba0e..3c5b6da0fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6519f106b3a543ec2bde9164d35d2763f0fa78fae72a870e8faec20c37bdedc4
-size 4605
+oid sha256:d072a1765ed49460b0cd8494c7ac6b047990fbc68dc7183a5cd5199ee6ec9a87
+size 4604
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en.png
index 2812b92341..ac2beb8344 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9097f9ffd2c54ac6c70160dd411566545c499c562cc2867a9a6cacd5922fb412
-size 4447
+oid sha256:4bc4fe868c3386c0ff38ee807ccfd098943bdb08595372378cffc0df44956b2c
+size 4448
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en.png
index 417ef6ba0e..3c5b6da0fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6519f106b3a543ec2bde9164d35d2763f0fa78fae72a870e8faec20c37bdedc4
-size 4605
+oid sha256:d072a1765ed49460b0cd8494c7ac6b047990fbc68dc7183a5cd5199ee6ec9a87
+size 4604
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_0_en.png
index 1d1e608c0d..a2589cdbb3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28c97af140962b913fa77f02491cd6bf577fd010a600afe700880867548b7d87
-size 4118
+oid sha256:b963fea01a8e9a1e4d5dee78827dea2bb25ee286c015a05e0e04adb9c10cdfa5
+size 4115
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_1_en.png
index 5b518a263c..3d9be7d51e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d402a9c7a784723d362ef0343e14997bc02ee6ed860b55cf5a0f9336975c1fb
-size 4065
+oid sha256:17396bf0185da40a808f25dda85b8fd8c49d3fd2c14f1d25d620348994494570
+size 4062
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_2_en.png
index 974da4f4f5..31401b1481 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c426d69c20033d67b5db344ef8a01782f232e8b321dd4cea24bb05e159ba450
-size 5797
+oid sha256:c742d69992fc4fb291d40d2be787326fdcc1f45870dcad2086a8ee479d7a0d60
+size 5793
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_3_en.png
index 4eda301073..2ee3df7b95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65fcdc6619c1d3b0e0e74961f6199d8d7e0eafb10673b947e7289d998e6c5bc5
-size 5511
+oid sha256:1dba02eaaa4c766068ed8feaac6a0854651e83cf177de6dfe3e71d5f65ea4b02
+size 5445
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_0_en.png
index df2395e9cf..97ea119325 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ceb5067d47441b34c37e4daaa7a3fec47e0fc7e53344b124061634072f23d886
-size 4116
+oid sha256:9ec34113d6350f3970dadba1b845de2b0907ae6bf03db487d7922a1a254f986e
+size 4110
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_1_en.png
index 7ada653915..d3baae837e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:259a99d8272af58f2becf075e2d0e9f7ab06a0517d93d08bb45e35f36babceaa
-size 4053
+oid sha256:500e29c0f87bed4e23edcbeaacf651219d4ee80113d89e844f55b81a5cd98e0e
+size 4046
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_2_en.png
index ca68f8dc18..049d7a24ad 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69790f5fc88f6867a66904c784da828a4d17b7c614403db6b388e7edef22ccf3
-size 5519
+oid sha256:0332421cf70c150fb269a90ca1c1380522df9961130f14f7a077e32c38a0b8af
+size 5521
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_3_en.png
index ea6d8869e4..7f84250229 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_CallMenuItem_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86134025e201b0309131428a131efb042c84d044b71be96a088dff67d9571e7d
-size 5445
+oid sha256:46d3a70cba326d72d7b099bbcac3d08d8f18902bcf08108f80718ad759fbe697
+size 5429
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png
deleted file mode 100644
index 581c5d919f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6349c9b5e5697b05e8c12896cf5e230edfe09330323c4b1658dfd84d3ebdaa38
-size 9664
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png
deleted file mode 100644
index f4cf788891..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34bfc1aa893118f9e5f3da63896fcf85f946f0072c460d7f8a4f1d5722b6ec17
-size 9075
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Day_0_en.png
index d57cad5b4e..b2de7d213c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d082c4126d5738d967d4f5581881465a93edb5ce998171818dfe758e4f0d3635
-size 45320
+oid sha256:c46805397e92a263c4c19aa67c6a7b6ada90323604f1171c9dae21b29aa0d425
+size 45307
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Night_0_en.png
index 998d0314dc..f3d7df2758 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessageShieldView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:690d96482ea6f20bea59689c9466f47b5a83ad9057a2739b4c242b06e650fbf5
-size 43900
+oid sha256:ad9ebc7d4700f7f8b50c478bbf996e3d3b7d9b7f267c27fff9108274fb6d3f28
+size 43948
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en.png
index 57426ed101..763670185d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12625896f18d87016ebde0bd69438c44baee56dc41fb875957d122fa84938024
-size 5161
+oid sha256:caa884501fb8a88ba6560c7487b4c85d02d7f907b7983c0049f667f4062a0ced
+size 5163
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en.png
index 171e8275fd..5d802ae729 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b87fee6b173962f2a3dcff13f5faca7948a6842734cb78b3be49465211460a2d
-size 5298
+oid sha256:55b9ed4fc283809e9a94efc7731133df0981d23595beb7bd47caf9f830d9e294
+size 5287
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en.png
index dab3e0f247..fb98ed9de4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:825df1b768860fe51643b479ae80b722a246e2c1a37b676ad35a4b0eb3879563
-size 10434
+oid sha256:036d08a8e11029537d4be614ca0c1814bd780b8784f40b186568f33080b86318
+size 10383
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en.png
index e062140dce..c570272f2f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6a2b4ca0e09de68902d05fb057cd9aae69cbdf4d4d899d1cfa8c4376f01311b
-size 9701
+oid sha256:9ebaa1c9f091a5f2ce53c38b6160e1d2213b535941ba54cc53a5ada4c65c4e81
+size 9743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en.png
index 32733b09b6..8a2324db79 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cb3989055cf63e3ee14d8e2d8b2cdcd67b3af1addae78b38ab13ddcf93a232d
-size 9740
+oid sha256:2ae7f9c33c329fad507868f5e36a122045fb79e401a2215b487bf3f41f8cc977
+size 9739
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en.png
index 9b9901528b..120ca41bbc 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e206a2485736baa2ac8c6dae6847ef381bfa1f36a5b7bda14a7f93a55069f41
+oid sha256:7a0e23b9af1963b9c500c39e6d5ac1fa72623db436c9e21596b69b4cae5dc6bb
 size 9666
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en.png
index 1af01d026c..d1045de45b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dd9fc35c14dda8c5a05a94dac78ef57b12724b2fa3b225eea19d18309374c36
-size 5031
+oid sha256:dbaf5334b7c379a176a7ef83d8a981dd9e19450ed42e0564fce5182774cf6b7b
+size 5030
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en.png
index 4922d4037f..5981d9c5d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9de0ecd2f210a895772edd1c6b76e8f93597ba0c0cd974648fe808211b6b39c1
-size 6251
+oid sha256:2de058c2e7a6a4509add58c45dccf73fc8cbc9104a18968a38284c90ff36722a
+size 6261
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en.png
index 549f69b5d6..f950c76284 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6879b2e22109097b13a2fec79c861a6c0923769ee0a3556717893115f8e44706
-size 5152
+oid sha256:3b003672f33830450c8dde5eb1139c45f6dfcae559eef5c5a6d7e15e2e87d036
+size 5153
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en.png
index b410516f0f..86146c7f63 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f57d8786d0c29d433d9782a501a3f8791dd8edaa06d6f7a93bf887aed62373c
-size 5091
+oid sha256:f39328e95d31f7dfed861351447cbd5e8889fd808d4aa266c4610688ae6809d7
+size 5101
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en.png
index 681f9cca80..726ff02d2e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b35af96336c40dd23545b1485beb8495040834f8a125ad64324b0f7ad7cf65a
-size 4927
+oid sha256:b380a364d4b107066b3d8df1451ed1b5cdb98fe21f5f09d18bfc7011d1ec8b05
+size 4941
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en.png
index 308a94e5f6..9d7bcadc5d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:311dbf956d2503473960fcb74050594155fcc1f9b84af7aab42c87b51a88e0d1
-size 6150
+oid sha256:c27118cb6cc0e21220afcd6c53ad6fadc506c7e78f9df86d0b47a7fa5dd07045
+size 6161
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en.png
index 5e363f4a9e..61ee15396c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:126b3cd3424cef7d4fe72626930d535700c34403542f75f49c0c94dd5998e521
-size 5069
+oid sha256:671526beaabddd50f4a7cbf17172ab25f787537794764037f6e5ef0cf0c1746d
+size 5065
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en.png
index dd0a71477f..01f2ea53a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a57aa648095a9ffe23df184be7fbf627105049660c73b36765c1cc88d055d573
-size 5038
+oid sha256:066da313f50d67e697adabdbedc975e5935e517e5c145cefda65ff68426a5ee9
+size 5041
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 08c6376813..014fb187cc 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:8579548611cd0fc2c30f518c5fc5c84686d78797bcdffff51f1341c7d0368b44
-size 38239
+oid sha256:c9fd514c76baa0fd45166b9b3928a2a09e25c19451f3e80bd458cc9b0174f6d7
+size 38160
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 fb712aea1c..fe1d630a82 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:aec78d5011f5aaa1ccb3ffef430869a86d328e2dead1653ad70c9225d41cf9f8
-size 38043
+oid sha256:d0c7b57c946831f8454a0a4eb283b9f1783ec5a8c8066627460923a5256c977c
+size 38068
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 4850eca991..fe900dffc8 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:2e469e1d16e26b6615191bd26e1ada64c98292572b7d8ab98a423ec3ae355c16
-size 379478
+oid sha256:e516218540c579c2dd9b322b498afc502fd9473b087b416efa43dd8260d056bb
+size 379469
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 05caec2562..f2ae031f5f 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:2ac5f753b3d3973878b9244d3f59ee3171864506f8a8765a4caad5424512f5e1
-size 377817
+oid sha256:8cf6dd8fbd5f7c7cc66ed09fe29fb6760ba0c2a2d664b129dac9acb80e3c95d9
+size 377818
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 9eab999397..a970f199b4 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:400a051934074cb4744f717c8d1cfff85b2cf46190825fd5a9902e31080068ea
-size 294695
+oid sha256:17922020f88e0a53150f6207b3ba8245cc244eeb46fb62c29d534949f9184458
+size 294699
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 1149dd576d..6ea638fc8e 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:4f6d44bfe0eb3349a6c21b7cc5c3435bf3dcf0a0ed6e8b2b011111f458124b6c
-size 293403
+oid sha256:4ba3a24a557f637607b9ddad97837964668289d8da7ecae3f7b0e2108f1ce277
+size 293377
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en.png
index 54d147a2ec..7dcddc44bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9af144716e5296735065c7c7541d7a526db3d6b0e2af05731695a317d7871dd6
-size 16215
+oid sha256:cc9d7541e981aaca0bc0cfd416391bd974cd4efd95536c73ed87d8d989fdbb6d
+size 16220
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 a8dd191009..75f43f5634 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:90ebfbb6b1dd2b97bf6622dd072fc64edae450b616318021f5e17234c4f83956
-size 377916
+oid sha256:c69d83be858492a74c63c1503a964ccfd2467648293d9f71d54a87c045a079ac
+size 377918
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 991809f68d..86c4b2d2f0 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:81bb625d2d230493531fd781254c5af49a4a73306def0d7392ccef5e9f91668d
-size 375656
+oid sha256:3151d2189c772b19f1bd917bcfbf156853c6af4965af0b08a47a4d3775ad614f
+size 375662
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en.png
index 93e7d71774..593d35940e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6700000e63a4b56d591179a28dae85f32d3062f6e99305e2e03c73d91d74a33b
-size 31208
+oid sha256:be859b78a35b5b97ad69c04f87a190ee7efc7833f55f674ba6bc945c81bec3f7
+size 31201
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en.png
index 3f213a35eb..4ef05b15fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58328bb4b0f8f14ca7dd21c3f68f9fc3dd04228239e3a5a427df659285479613
-size 30212
+oid sha256:4ef570b6f6b312163ec145d93330de3f092e60e2498c2a1df463dd5a7c09aac7
+size 30228
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en.png
index 146e1b032c..71a5e4df76 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:082947ae7c370d96cb722c34d6c81c71afb3f15b0e166d53c60ddec0528faea0
-size 33842
+oid sha256:3d0fd97ccac99ded4769450e76fc82f52938621d16f3b82dfbdb3e1ac145838d
+size 33867
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en.png
index 32728e0994..fb98d320b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:208835ca0ec478762fb103b1c41273c3a02f80be516ffb116a76bcaf4479e562
-size 30680
+oid sha256:c92021d8818f41f33aa3815005df32538f661543116a8f1c0e6bda430a99fb48
+size 30677
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en.png
index 0090a15484..900855440b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23745b22ca04866aca6eef805f89765b9e7a8da9c79e313085f1d39b45e2088b
-size 30551
+oid sha256:7b36370e4d6d5c0cbb2288b69ecdcc67084f6e37b78a1623c131015255193db6
+size 30554
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en.png
index af497d7a37..7c07bb74fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:584c8d63428129a47dbde137d9c6a163f5ccca8806de8738b18c23676ecbd0d4
-size 11411
+oid sha256:f8537fbadfb33780b28ca974442f32ff242f6fbb299029dd4bf500a0fa89fe04
+size 11408
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en.png
index acafe4e291..e19e3003a7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abdf0e03ada3b74dcfd37215a35846a6447dd7d4c1685c5dc0697b98e6d1b8d7
-size 31797
+oid sha256:ed72056f9383bddc3cdc1782fe96fb20ccf1a43021b8f3d139b0ae54e5bc1439
+size 31785
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en.png
index 63f9da8e03..de5c198355 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bef19cca7cf2e50af904e9221b1b79debb3754bdb6cf91c334cf7d46b52e725
-size 30542
+oid sha256:f3200c60893618ade644792fba016f68f73ed5c1e5f35eccd3bbfde965d7eeff
+size 30545
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en.png
index c597e038f5..dcbc8f88bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c04c53d5b803c778481903b444f15c9d9ce7a2a949de608c97e498c1cc456739
-size 33910
+oid sha256:8577bf88cf106d0569cd6695dedbdb9b14f0a31b5b9b2d33bc13842d5c767f97
+size 33892
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en.png
index e20405f39b..ed490806a3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9472765d11e4b589e76f363a1a6b2f61aaa839e11298362fe1ec151b3f0b828a
-size 31091
+oid sha256:f69442f65f80d62800272354109687e076e243339fed5f544e71997cd0e953a3
+size 31087
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en.png
index 9cb9c5e62e..5787e9fd31 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5a247a0df2df64367017dfc7f21ad82a08ff45de249d0935c9a85022c54713d
-size 30865
+oid sha256:21e79ccc4f03264835064619178909a11dc7e0a036ee5b7e061bb5345394471a
+size 30875
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en.png
index cfb15d0f0c..df00c8fd21 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8b49f6d33ed58cb3c113e1ae9266ccde1e44f3dd19521e2875b7b6609bad16e
-size 11209
+oid sha256:af4c4ae1efe9797f8db800a1647b2e5445b3f99070bc5b2fd6a9f244e08ffd27
+size 11205
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en.png
index 51e638d95a..d6ec1b836f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e9bb04efef5ed47057f66846cc2f73db5e6667b67105cbb1c1493c5857cf262
-size 30127
+oid sha256:dcf5d7e78a4d9985129c10ca0691eea85d3efddb9561a85c154bda1c18addca1
+size 30141
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en.png
index 5ffacec9c5..53be5bc74f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e3d72a2a320ee6d241236df99f9707bdef11d20b3eaf5f968a9398b1aa92604
-size 29509
+oid sha256:7ea44dda5a5aa3979d3775cfad27b9d943b42d3e14e470d2767e3ba713e4e744
+size 29500
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en.png
index 8d3356568e..d73dc4b77f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:272b8f8271d1a76aaa72d3e6212545262e09ad564d7188f816b1d4a05b8bdac5
-size 82420
+oid sha256:e9a677af8993154893877312466387bff6d873e129219f1e411e2ce61d034b0b
+size 82424
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en.png
index 76f9c44c6c..68de7c7f64 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70965e0c46e61730330e846c2d5a04482e8b34cdb610e828f9c0f9ee74d30aac
-size 82812
+oid sha256:eee3eaed85266b6b68d793ee928d10ed443f0e8463db00b27b443bcb4b39bd23
+size 82808
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en.png
index b36344fc58..83ec0ca10a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a91405a5348ce43701b1de8f0c3ef92ce181fffc1f26ce70a8aa8fda93d021cb
-size 25779
+oid sha256:1d17b225e5333305335a0a40d38a10d49203923b1513b990214c651c181968d4
+size 25776
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en.png
index 52474bd8e2..ff40fd3989 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d86669ea45792cd180bf2098bed85b1064fa9119d30b17b72bd84a3eec96c7f5
-size 25221
+oid sha256:a0da965de89e5de92cc965a141054255e5744fb7aa9dc8be759e161f02db7ec2
+size 25239
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en.png
index 4cffc6d6bf..a03c70b4fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:397676b7d14e21deb2c45fdfd9e357d66b6e0b6d9799733294809ea2d3694ac0
-size 25014
+oid sha256:d98b55a47db62f317d33d8369cf754db2d8867a20b640f035206987e29d0a932
+size 25005
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en.png
index 165dbad704..2df586d1e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a14853b95fc9bb52ed1f867c52057b86283adbda8c18d24bf2891a663b88001c
-size 24450
+oid sha256:32031f85f2f8084ddc2620817499847e1afc9bb7f0f2bf54b5b58677c984c96c
+size 24458
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 c71e73eb42..ae5230de8f 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:e72d6a15e6d21c5b51614df61362c00c2e03ae0cce98618a31f03a7764b622de
+oid sha256:15ef0b45a784088e223a0c9996da6b6299277c02d7934f69bf1148f764390aa8
 size 364949
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 67cf94c2c0..81056bda38 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:e49d0338d23e6f44a52a7167e2495f5f5d1b5c2d6d8c4e144f952ac2b3c381f2
-size 370062
+oid sha256:5bbfe429c79f1a34534041928d5e87efb748d02e1000e759ce1a0ad58efb40db
+size 370052
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 79e319d8f8..2cf4424886 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:f979d79b9e4fd01201af33e767af0b28ad9d6abca5b240d06d3e068ec2cd9940
-size 363007
+oid sha256:a07e7bd9dd62fe64a558e583f3ad98980d09c7585509efa436e4df5a9d3dcadd
+size 363006
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 0b7db4f3d3..6aa48c10a8 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:3032f865eb8c46280359f047e4d3c7ab16d92cddc892b8d5493dfcd3aac42329
-size 368148
+oid sha256:c68ffdebaa08c9277eacad0a16eee158e72ae28d3ce14592174091068f0ea6ea
+size 368149
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 c125d9b881..cb11591308 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:7a3ac104355ef6ad83d6c4271fb1c666a4c625264144d8ebb577a625e0f5f730
-size 353133
+oid sha256:273d926ab913ac5e44ed986cad5484f14b6c78e3bab3ae6169e97521cc734eeb
+size 353127
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 3a90e26ac1..b7c6d2ff79 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:73cfddbb371d681801710788b443d6b3de733b026bc9421d994435e9191cc2e7
-size 363534
+oid sha256:a534bd9c790747f983831badb8dda126a776d9639ec7f9454e798e96d1be4954
+size 363533
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 8fcc1ba614..a1ea6130e0 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:52c4271018f6ef8dde2f4704c875b50b013c91e3fc9a6821bb22c1778a833ff0
-size 351724
+oid sha256:1848d32a74c570671557ac50dae5e43679a4f79ae20e69489a5140d5508f4ab1
+size 351731
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 0430452b23..a936428bd5 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:651e870ef260bfce2671d8179d4c2711cde8216fd933df14d55b49b1338defac
-size 361233
+oid sha256:5f0a52fb45860dd2ceef51a84a1b3ade90158f4ad9412c8ab5209e484d025022
+size 361217
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 fbfc33a745..75dd71ad5e 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:ed7ab7efe006792017dfebb212f4169afa51b121f0acc32f594cbf56fc13bf5b
-size 369628
+oid sha256:cd9f85eb61c206e7237f148afdafce0df78246916bf1e149dc14cfa7dcf9ad75
+size 369622
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 b07ca33c78..44b50ff770 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:f9ae07748ec931966b8be1aefd7dbecf533955d691dc5d2b75ead73b31ff0454
-size 354533
+oid sha256:523655ecb0dcc790c3f5488684f8818e66d67307c0fceb7321793ecbf8d6b5b1
+size 354543
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 197e68d532..dc49264f75 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:50b674cbd6cb517194e3e43b33b5415452c4f39370adf3fe318cf46ab841f7f1
-size 367912
+oid sha256:06054cadaae544104b0a7ffe7c5c712a68dd1075044b6a6558b732465e74af69
+size 367897
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 6d69b0ec43..09d9ab87f2 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:060e4a97bd87ff79d5464081684245d37af2733a1440b03f76ced429f0137d05
-size 345006
+oid sha256:ec07a302a034abc4058098981a884a2812b6fbaaefe43910f954efc2becab3fc
+size 345007
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 3286d23c1c..577a6744e2 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:0491d664d748ded2a77f037040e35ab7c304958abff962981b2c5fa88ff54032
-size 357524
+oid sha256:b6364afd08f2a1f744143bf8e1aa0a77585cfa8ff2c8b5b0a0eb2e01afbef0e3
+size 357517
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 5f3af564d5..d78ec33087 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:ed1e765f4ba4078e931572fc5df68655cdee951d021762ea41c4d6e867fc960b
-size 356674
+oid sha256:af1605ff52a6a6e92154312b00706401889d478c41ebfc7aa75e680412b8f65c
+size 356672
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 e2d37bbd98..14b4638e34 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:7ac74139d7cef830ebc68051502d09886e85efac2a36667f90a66c6eecd58188
-size 364486
+oid sha256:26cbb8ad35bb3746b931aabee1a568c37ec0f59052a36752af482149996fd207
+size 364483
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 255ea7812f..a58a3b697e 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:75c8fd9c2cb9fd654e9593d4763dc6d04184e1ea2f814e79fb6cbec7f231b47f
-size 397016
+oid sha256:cac3aea0874bd1c8e3c26bbfe7e6353042d248533e630b69644a02261fb2d7b3
+size 397020
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 f88757a9c2..ef4fe7217f 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:dce75ec016354e7e3243fde61f1bdd3520bad5a84bca84a160ec0f4dea857dfc
-size 355897
+oid sha256:a63ce064aad609786d444e55379fdab29253310b77012387e168ddfdaa583f55
+size 355891
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 3bfad7a881..8a0c80710d 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:920302e0281bbf779730f8ec779307cd8f034f181440fa694530c4a70990b599
-size 357719
+oid sha256:9b7bd7fa60c549e0f03d73cd67db352285ce02d050d465505ecee6b3dc535e96
+size 357735
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 1283ec7e67..3fc491378c 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:62ca94e55d4907b37afc1865955f4cab2f3e595827b361bb0612ae020ef3380e
-size 364820
+oid sha256:fa0b9eea253b1eb6c855dedc6dc444b482254e4b4d96a895d3e82ee10a9a38c1
+size 364811
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 2b66e7a119..bb6eb5eed9 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:04293e07b3ba253facde1fd495fb1fc5700d9fa91d55e6fc26407bbe80710c9d
-size 355148
+oid sha256:e7d978590295705191b23fef236aced625dc85165c23ae703bb9faa7ce2efa6b
+size 355139
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 23c44e4e2b..e0be8f49d5 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:e497584801b9aedaf49483e718baf913d9de4784a7785d4b1dbc931af15ca2c5
-size 367618
+oid sha256:9d0997895e84028a7433a3e49503e1bb79f675fa9ba5d80735fdff0a1a4a126d
+size 367615
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 5502b438e6..7e2202e70d 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:0c07b6043cac6215e0f1adb1f341fab2657f5989fc6f775c44103d767cdaa654
-size 352618
+oid sha256:691b5b8844c37c0a70bff7e2edb489c6444e6a3dcdbcd1fb1364d3f429b0ec8a
+size 352620
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 77d8418afa..7c53094f41 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:3decddd5064c5c31cbf5eef3313d7ae2d12b660dd7f31dd1348d0e2ea070f5e7
-size 366058
+oid sha256:a0138339ed9132c2ea93f27bcc163f838e24a94ab4e731d6a7baa3fe1e2c7e3c
+size 366045
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 7e86609428..60afd00b14 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:d7bf88755dc4eb1e9750f9556fce89ec3be77a51f608734e5ea535012221632c
-size 342592
+oid sha256:7876a6125d45647beb8cc5b5b125556b16560dab6599ed4eba9fd746fd4b17f2
+size 342595
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 2fb70bebb2..5cb708dad7 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:25b1a108b671c115a137fed5634ea523f2fc6a9ab02ed1124b047b27cda36e18
-size 355749
+oid sha256:2eb5334bd16dab1bd9ba111967aac6e29fd6eb3d325fdec6f6ff6b7b3dceaf06
+size 355727
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 1bd2b6d19e..cf56ea41d7 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:2ab6a4c7fdc6c3701c0a2fbd1ff2ac5b023d904bcd61604be63fc74db8809c74
-size 354859
+oid sha256:2f4fbc0a4be27e1f6b42f0f7d447e95662a9acffe079b5ca27b8f38971c67b7d
+size 354860
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 fce164367b..650725b8a5 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:07bb43aec17278100888d9ac7e4eff976eaa5bfd872324b5e62bd34f2d1164a6
-size 362576
+oid sha256:ce5ef1cdb3b466af1b445020cdf6b5037c0222430a37a6cf2bab42738c75dd83
+size 362581
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 8743d61fd4..1db9c6d9e9 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:7cbbaadca7fb46fa4f6483eb9760fab96611a2115f98ea6d9f6f62411fc5b4fb
-size 395148
+oid sha256:e801e2540bbcc28afccfcc9d57fbc6945b0b1a069dc7b7c9f31790134dc498ac
+size 395151
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 e4a4be9cd6..57b7b4070d 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:45d46f34b9fb4fb8260bf2154b8bee5112b94524800870ffed2488252ea0ecf9
+oid sha256:284c445b4cf37c26c9dab6b9a00d23fc1fcde5eca3b02bf7149ef50c77f07980
 size 353920
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 bff4c1f4d0..a3f63b3e46 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:fe07f621efff1fcf6f50d446ed55129af35cec6af5de32ac62c4d7dc9d0b643d
-size 356021
+oid sha256:22df78bb78f17d4c87ba31db8d335f6428d85c5ff80c9bd563f5dd6a6f1b762e
+size 356037
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 342b7415f7..c1c1318e73 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:66a0b023dfad07f7026219325d966375bf3f25fa0b3f8192f101828e8b4df2bd
-size 363005
+oid sha256:2791382f305e4acda3dc503b9c26f9fbcc2a5f587907cd440aaef0c37e37644f
+size 363006
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 ebb207c6c5..ff67beb656 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:616c6ed62e974a649145ffd0f540e45701f302f4881f6503b240746f1084633f
-size 353268
+oid sha256:21b77a16dd2e7d68c4f4cd8f2df9d0ea9cd55edb54dd48131bdedcee9c4e7395
+size 353264
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en.png
index 5695ab7dc3..1e545b50a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b51cd7375e0d9be97786632eb1dfc16b5023784ed0de616f029d782ca56aa07b
-size 68221
+oid sha256:6ac7ccc7a75706f50fb4af5cd3149665b9aa52ea3a69b23b6e71a9f802cb8699
+size 68204
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en.png
index a9b8b7cfc5..d636453a96 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cb184afd2b1afff7b2f5f24f555e8278e20bbc98fe8b67a25a005771c7105b0
-size 66908
+oid sha256:5f64cfe1b26fc3c5f294e68b91f0f0f785a945cb1cadad57152d3a72b713a9ac
+size 66906
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 0a020e7a54..2e950ada68 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:eaaf7a49b9468ce255bac466604eaa1af64719069df4c8cab8ad0ae311f7731e
-size 413015
+oid sha256:e913bb6286715abfc85d22febf5b9778b9d28748c027ae603030737a44661979
+size 413010
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 0c0f7ed3fe..a9cc8f014b 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:e0b290536f8e72365eff4afe412dff40afddb9285083f420f5a7e11bd0367633
-size 410181
+oid sha256:7479677833a912d187bd21c46d94df2320a553938b8db24bf22f4b9baeafd091
+size 410167
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 6953adfe33..b48f401fbd 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:438370c9300d7e815c2f7be3e660eeab7be87dc901b2b4344cc71072b52acba0
-size 55166
+oid sha256:388db7c306774d706f07e1d51e95f1c35ab9bede01c94437854295579c98e908
+size 55232
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en.png
index d1d74601b9..e6897ddb89 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea51d4279b379da23ee22768b6eb294224756cf595bd4453a46a8b0d47a5c087
-size 7981
+oid sha256:03f93ad92263521f9841675d4da798ffedfececc006dc6b13c457bcf2b16f17d
+size 7983
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en.png
index 3c0b0a0126..a648aea536 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7ea29c3873535d506c4146537b0207157769361fcb22f398af05a5bd3297b0f
-size 7865
+oid sha256:3d76c555f808459136e8da85818eb9d12b5475b4ec0dec5f5d4338ba20414d7b
+size 7857
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en.png
index 668957c751..c10d175bbb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:877442f63f493e78a89cffaeb1906521f9ecc7aaf60014b583846e8077d558dd
-size 17426
+oid sha256:157a289e788a480d0882edcfff4b11f0c223db8dc306e71ba29386f5596ba5fd
+size 17425
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en.png
index 8195de116e..1c52cdfa12 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a86c9b54cb095414dc0176c06b5ab0a4f4f43bcff4cfa5407334c97ebaae519f
-size 15939
+oid sha256:eaf5c6c191f73b07fac8ba1fafd44184db6f1c39a00050679ddda0ed5d527c54
+size 15942
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en.png
index 1c40c0fd4c..a2410404c4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8ff2b03ca60d876ddac1e95d64503e9764bdd7a2be08a783ed66dcd29e41687
-size 26371
+oid sha256:2a2a0bc419b45f3d9ec637a6234469b3c4a93d6fc567beb1574b8da53b30f70a
+size 26359
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en.png
index 03868ce12c..6d7871f233 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53de15baecc53594e618961bcba590e5f2311211456f41f48394ce5c18bb400e
-size 27432
+oid sha256:e00999d45264da7cd576f635d24eadc986387c14f7064c4f30736abc09f2bff1
+size 27434
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en.png
index 689de69529..a84115808a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9211a9acbd53701bc7c4e3588a0188b1e57a1daa8bc299df5fa7a5a8fbd71fa
+oid sha256:9dbdefb01f48ce2cbe0e681889269593eaa5c408db5a7a99601bd0a0d5e61cdc
 size 10648
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en.png
index 1f0ff922a7..2fa6c064ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b7c2b3a4e5ea77cc82ff1dce6d5bcaebfe7d7bd7bcf0a59b9b3471bf0663c10
-size 11165
+oid sha256:ead477235ddacdd12040addd28b386d530ffc484c917cd3c484129a56d547bda
+size 11164
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en.png
index ee5a4ccd41..f362d9d96c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8888f660050d1c1de48d56e81a376471c8526a3928aaa1b71a07260d673a0b47
-size 25282
+oid sha256:a33a195eb20f10bc915c84230682bf1ef7ef74060090a20dbcd48db844e81f6c
+size 25288
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en.png
index a8150b4658..79c3173bf5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:827d6a784aef5dfef7a88ee7cfbe0755fba9af4e1d8fcf7e9dbcaac61d184dcf
-size 26258
+oid sha256:ce7c8b42daf4ec0a9925c084cfff72580407983f31c43ce3feb12d6ec6de5bcc
+size 26254
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en.png
index f11faac4f7..e91b0d04b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37a8d8a6b3bfc3fcb527acb569c7348082a1b75e6f86945f1e0d393fd2128e83
-size 25263
+oid sha256:ca3542307e311f2445cbae555b7b84e4eb6ed1c77280cf3af1bed9f6d55da569
+size 25262
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en.png
index 4062c204e7..af00f0d361 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5f89259f5cdf75d495ba1539c605b4a2bba6ef2bf6484ac98d5ad1cc993c805
-size 26052
+oid sha256:74a25917175035c4c5538954e330214b0e2b11a3b2669269fd5098e012a7ac24
+size 26056
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en.png
index 0bc2ce3c5a..5ed1b95340 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc8f573cfca1ae072e311c04e1ff6dee98660869209b8215b6027a54fb39dae7
-size 6447
+oid sha256:209a8b8dc03e224db3315910ea8638bb6c54a09b6c6e1d6c9194fc3d9f139cb0
+size 6443
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en.png
index fb753bb2f8..02e145e8a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3aaa7e99c96d751f829f2b7e84f1d685b9c011d92017b99398dbcc3619eb75bb
-size 6787
+oid sha256:ea7bae9978f947b345eb1b0eeb2d79e22fb42b932ca1924589013e80238e60df
+size 6776
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en.png
index 5936485e73..cda7ce1a8b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46be84795dbfdf1323bacd5182d2aefae96567172cc95d884fa853e1c8e04fcb
-size 32875
+oid sha256:02d4e59d56510ceb9fc3f0c003133adeddf6c170f9dc6a345068f31d3ec0e0bc
+size 32890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en.png
index 5c12aa938b..0caffc92f2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c697ece14c19e09e7a227b8274586a86510175d5e78782196c1d7a1bc7e10626
-size 31421
+oid sha256:8aed802656027d4074652c9fbc507ed2ca3f307a9439f22ac853b5c1b318e66b
+size 31413
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 6ab1382b21..aff3ac9598 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:57204b870fcaf8c536a7dbc16e61d54e402955320899065dd7b6c79a792bc22b
-size 37969
+oid sha256:1d2336bff0be56dfb7f57e47796a6670bf30a5ab91784ab8b808b854822d450a
+size 37974
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 99a6bbf194..5f4d96ecff 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:e376cce36b4beed32d9a893a436fe59a1a9d2058e3fa28f6eb1298aa0d779ad9
-size 35876
+oid sha256:474df95186d2ef14749f89455133f657228e87d3ee4c749b24a9c9c264eff03e
+size 35887
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 7317dc9104..0d7637f311 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:c0ef56f95273ed17ff477adfe75f6f1f3c215ee729b0c77d02064beaa5e5f844
-size 51094
+oid sha256:9846a2de1a011007042ecb59ccefa772f5a9b5fcd83c7e26969f6cf06050f83a
+size 51122
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 c62df509b5..045158309e 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:ae4de0c30432b201fc4d46504ad88fff970851c4e5a95cab3dcc09e6dd599472
-size 333040
+oid sha256:a7cc766f85fc50781e2405f408b92c11d2c256137e26783487c9891091bcbd6f
+size 333054
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 2c874a691e..61e4e2e89f 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:a2be33818a19d5e430dfed21b07072b831f6ed2d7b1099d6bbedd33dfe4ade71
-size 89475
+oid sha256:f59f0edf9f8bc8a0274695cdb69760a09c737d9f8e1fdda68808eca0d38ab8f1
+size 89518
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 c4ecf526aa..83a2d9ac62 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:f6209a5ea20082e681f706be0e4127d363d93c71a68a0e4fed0db1afa5187596
-size 52545
+oid sha256:eda29dd71cbe93b30325107a47be6d4984d1bdec34efaf2cba9749899b262203
+size 52587
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 0733081702..f75517d9bd 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:3736958f500d301e25806abc29b096120024cff7e1cb74c0c5cd0d7e22e4adcb
-size 64556
+oid sha256:e8a60d12346d31d5b8563a05247800742aa1ef9f3e7edd0b06e4377f4c9cc7b0
+size 64576
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 8f7a40a344..12bd863d23 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:b702720155c493f25721182f068e13e90f6bdbf7b3447b43a4903181cbac0dfd
-size 49023
+oid sha256:29cc96ed2e31ec8036b895780233155628bb2b2dd05e8d66aec0bcd57111c539
+size 49073
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 b861a15514..4ddcffdaa5 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:bca6f73b30d8663617aa76729c112c2c78e25cf67f7eecdea8c8d2744def8f4c
-size 65822
+oid sha256:b4904ef464b4f163312a32edd94b0f9f58ec327d62b90de0f494149ccda9aa71
+size 65810
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 006b68abbf..c33aafcb3d 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:d462b090b7dcd089227682dccb2f35c9ad71af3a401f424104e69cd6eb539842
-size 56008
+oid sha256:623cbc6f3792c1f56344e3af1d55ef2f550918b2349fc57bda608ac3fa7697af
+size 56068
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 517b4c6e39..95a5920f58 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:4c6ac4f266879f8f2e188ba7931ca231ca62161788f3bd9950eaa9be174a254e
-size 65636
+oid sha256:742570ff0a1421533e72e4fb3ee9f61ddcf0a06caef598bd1e030736ed8eee80
+size 65684
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 240a65ea77..bb5b2450d2 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:36de55af40a1b82ae0860b1398b1350109bcf1b3721fbacc569a26dd78d5c036
-size 72331
+oid sha256:105b7e7dcb5951bf6ac7636a3dbf3028b11066953fa344d690dedc806f30c28a
+size 72342
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 904a0bb834..00f24364ed 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:0c251d40b6c2df1e4e3477f5b7e7929b7ea6fd797f30a494530f7bf5a11b2ace
-size 493802
+oid sha256:06a703b4fc807b3548b9a89ecf4c503f854cc272629140e4a3ff28e5ba358cdc
+size 493816
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 fe9093482f..86758ffaee 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:c6c5286cc1bfde8b6a4bee105fa03ae2073da0d968868d93883e4729188a868f
-size 489016
+oid sha256:8ca41c6c1ce931edac589c4693110a797b92d5a98cf64becf1a08d3d8754a158
+size 489029
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 8094011dd2..8973cba951 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:75e327c42acf84261af1994fecf4392c2c8b9d0ff60ba5f1f8cdfe63efde8907
-size 71464
+oid sha256:35ab2522ef90c9d048b0187e53925c3dcec8044bde0c4383f321a04434daf4b6
+size 71466
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 d6249f1c0f..cc2a832277 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:02c9dd8a7c1875d22ab962fcaa94500358e96f8d7999538755b0b589207268a3
-size 86062
+oid sha256:ba70f79803fab4ca87cc38aa2ee12377e6f0fc4c17915989af499aed3a3107a6
+size 86077
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 5a1fcd14ed..cf132ed54a 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:771a41cc113525545efd210882a772f0025db53accfbcf47c528ca0f515ded91
-size 74568
+oid sha256:a250f6ef758435740a70f3a1e3da9189be0619bf507d11183a1b43c3e9327d4b
+size 74582
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 1cc136f4aa..1192e59c94 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:323eab083e3b99d672baa9cae4cfc026942c58c5a10221c2a28a16634c555957
-size 104305
+oid sha256:61428931fac94b149b567cdf0cc63178d898a6542e838e35aa56c14168230ee5
+size 104312
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 405421460a..0264fd4296 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:99221c9ddc1c9a69f21491e4b4a2bfc788c00bfcea9cd4b9cf5051fb611c200c
-size 54661
+oid sha256:7a908b65efa9cfa89d121f3e23a0bfad0926d269d9600fe6e58455e2e70a4fac
+size 54687
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 9e454e8a0b..2b1a942b14 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:b370743779b2c18ab10e0e47df57281eea2714202fdb0d525b52b49d1103640c
-size 375282
+oid sha256:30a73e27dbfc8d0f1793d02deeefcf097a22ea8e0e8bca42a9024fe944a18020
+size 375289
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 1938b07cd9..ff45b26ce3 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:ff124b5e689f5955453037cb4a44896936b03375781fb71981972a4c7ab11251
-size 49212
+oid sha256:025e498b1b8067f57f11c037165910fa5a7c1522691fabfb17990f855cf456a8
+size 49214
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 6b24c3aabb..5e11c904ee 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:a1a74f223d6826bb6e058a792b8b0aca4a41dd297425cd40a3b70e62ae514467
-size 147867
+oid sha256:0a6232e5dd97c947c19fc9806b92302dec1797f7be70a3f836246911d842f4d7
+size 147848
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 d4c907f16e..d57eec2ddb 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:42629b96d4cb0b5be5ca59cf7636d0a027dc41e35ac38a2c7ff78cc5bb091b8f
-size 84580
+oid sha256:c91f272cfb53a78a6693ba27f899f1c1658b5dede247c7a5b69cfe5202a80cf4
+size 84553
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 c1126e95e1..f00f45fb68 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:8ded3238e294984300c32e7a2b5ffd501424385946cd74827f50fb7a4d89d317
-size 50722
+oid sha256:fd5b544afe4221325e86ec43c8b128abd062ec6880cc8b743cd69108de928d59
+size 50725
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 8218e720d4..1124f67f6a 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:5b92db79552b6e6b19a444c994e7f26f0fa1159e1d96a88ebbca7068b75ea39d
-size 61907
+oid sha256:1cd6430fed7e147f084f844fb38f172cdf843012a5a6f472d69603a8936a755c
+size 61913
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 d9f5e07c69..706aa95e00 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:9133338254dd482c96a1d6530d922a7d4e0a8ac437dd92eacd9934c374aa7aca
-size 47251
+oid sha256:39b88e56a540ce883440080d328e46d81a957c74f9c40fc22b07e84582891c5f
+size 47229
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 5289812ce3..af75244d55 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:3eb896a78edab7f0d38d4701a46499405373a005569336b69a6ad59f419e2073
-size 63157
+oid sha256:01a8f765a56e4753241a47b104c267ad38afc407ffb2a0729bdd3c3df34f0806
+size 63166
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 740ec863f2..4de86fb4da 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:dca58a71794536828a9cee8d13c919e11fe3c33530be5360560277b606483b88
-size 53791
+oid sha256:3a00b7b4a5a9ebd9f391e2a119cbd8d60bfcc287d1e42579d1585e6e2981a241
+size 53780
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 82e935dc50..a53e8671ee 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:1590d8590f0b1d2960e5cd2a8d544e72a109128b969aa94279e9961c61e0982d
-size 64558
+oid sha256:dde9e1fc9a3ec8f49f352cc05bf625bcb244d81882c6a1bb5116cbcfea03eb31
+size 64545
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 f69ede883b..7fd4927b7e 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:938750182bce81a79887f6091a81e6fcaff131630811a24407a0acbc3f57e42f
-size 69128
+oid sha256:c28bb504c14faabc9d3251ae50a40527745689df332d22defbc154a9833df684
+size 69161
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 57864d409b..0393d0e13a 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:2f8174942858ce33e00f2a43d31643cf73a8c8d33432b48ab7432ddd22a5840e
-size 486269
+oid sha256:bb655618e86e725e2f2cda7c350b94e1f780f94bb8551a6002dfb1527c7f1ee8
+size 486270
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 49f1b79423..cd2c53d50a 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:374999c13eada99283fd41d57985427cd1c7ee7295af99a35c65094758a7c3ec
-size 481495
+oid sha256:99d614e17be2d57e33027b58b82d86aff047b9ed626c71dc99b35f93ab8ea013
+size 481491
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 c74b11b376..c7101d1a29 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:cd3bf28cda93d3a6587a0b0e8f71d5a3bd91081365209cefecf316141e765bb9
-size 68669
+oid sha256:a01ac3984e4b1808bfb05ea403ab296df367ed74417788c1c14e5c97dec2c7ff
+size 68675
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 4cdb114dac..cf8d8d9d9b 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:5ce03462b8c2468f83ef2a08e61f118b35c4abc6cbb610d61472acdded8a8dc5
-size 82775
+oid sha256:cb0628bd397e42f37c2a6e0713e6e08100c3c6cd0aa52481e06532d204613fc7
+size 82768
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 67c77bdc6b..3d85fd4a7a 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:4203d7d13ae995ae566c24cdffcf3e5373bc9839788303711076992e65c5a05c
-size 71912
+oid sha256:a0fabb6646814d797b06c90e941db64be8586d13a0cf542ca754ee4ea22b69a3
+size 71904
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 259af254b6..dfa083d28f 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:ebb22fa7ff55969cbb5d1c59cba6599a804a14dd86df1e3fe72b610a9c4f3850
-size 100704
+oid sha256:5433403ede0c48c4776f10d5e407a79b14bb1730894bd9609ce1d5fab38a0cef
+size 100697
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 7d30edfb49..8708028b79 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:ebed33ac426575ad36ffe7edb087f3fa2d81a8eb4bab7d1eff2c6808c44ea492
-size 52580
+oid sha256:c40bba2d435777c6d990b8cb699c19a2384b64c4c27e65d8baee6ef3dfd8b86f
+size 52591
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 7a662372de..f8879bdc6e 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:bb6fb5916261a0114027c0c575f0f3836e2f9a84a0391ac05466491a1d962d5c
-size 152736
+oid sha256:81c65890017a860e1d5a35f45adcbc8dd529837eb81eba4ca757ef20016d6c11
+size 152740
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 1d0d580c56..899bf4ad75 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:c74cd385b81f7f101159b0ab3adb0c3493a8ce98b4b8cd944a166e9d0a30f8a2
-size 39803
+oid sha256:dca37712b4df739fea42e8070761c431da4163732caa1d005bf50fd98b79764c
+size 39730
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 dd62e04e2e..de5049cae0 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:b59fcb83f0d291b658efc88ce311a108655af03ca8382339c2a0d0c3a5bcdf43
-size 38201
+oid sha256:e1bea37c40c43b5887cc87e0ed95552a5e42cf0b776a1342d66b2f0b2dd7836c
+size 38283
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 47891dd5a9..80c46197cc 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:757f2a92a384f2084a1a1ea475e2a6743a55ce5ad7758bdf1597435ca29151e1
-size 32879
+oid sha256:010e299c5714b614b17b884796e93114f16537b7429c2845e37992ed4a5fcbef
+size 32915
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 4ad9eae262..9865b90d13 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:6f56bfe0e59c767102a8e079c31e90cbc10c00a31b35614cbb188e1d5008b041
-size 32114
+oid sha256:b03ff12ed758736e0fcd440a95d5d1a864fbdb3a77e9c566d1d2a2089924ef15
+size 32125
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 c0bfea95d1..0b3faac395 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:cc3e55d5775c0579f1275c1bf6ca97c9aa38806a6f72579cc023b9f2eda91575
-size 58510
+oid sha256:1fc7a370898df938b61cee850234b867d6a74087e1475280f177cc6c9e2e1d1f
+size 58529
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 11b3313094..826ba15d61 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:9571176fb73b9871b6db3c30679a46c776badb56d4e1919ea882b391d893b8c4
-size 53144
+oid sha256:e0581c343abffc4a71db827cdc5f8b183525daed8b17b80cd6b511cb70ae9a05
+size 66428
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..3fe678a873
--- /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:47c0b2a5dedb5b8ca1a027dfe93b27b97069f4c65b9e1553d7847f5f06348678
+size 68593
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
new file mode 100644
index 0000000000..826ba15d61
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0581c343abffc4a71db827cdc5f8b183525daed8b17b80cd6b511cb70ae9a05
+size 66428
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 1877049a86..eb74b4c697 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:68c975f99548d73b2d52875ed78b7681c9da841c0e84fd9dc37f8beed1a1b72d
-size 57577
+oid sha256:3917d9d2d5c67e840e613cc8dfc39212e11853ac8710e87af554e20dea31d34d
+size 39439
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 6f84a18e27..e65e33d743 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:bbc82a548ff49bd4bab0e3e07234668499338ab7379813a21599056e3b13faf2
-size 39442
+oid sha256:432fae13ece80f287afc16411ca162c2ea0b19d66b148adcb13c7710ac442b5d
+size 60866
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 9f59634b1d..97b59cf5bf 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:f681fa626a2c352c2e9503bab72947e912fb17e4cbf61e730a937d023eea659d
-size 60820
+oid sha256:cc380e2b1c75c5b38ac410a271ddb9c02d41ebf9ff037fc59f20d23d87241590
+size 56864
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 9c66b44c35..7873d95d66 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:d00f9f7b4e09f6fc24126220354ff097805b2623bb34338a1ae6203aff949189
-size 56886
+oid sha256:0cb2168ef240a788416f0f7d5cf949b282b9c4cf76338c4d547562b15ff3dba1
+size 55322
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 657dc6d2ac..648fa50528 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:f6a08f9b69ec278f8706c8de459fd6d2747cef7ed51da32eb7239667d0805e58
-size 55311
+oid sha256:17ec77b5053bff9057d6b122140f53c5384abac7998bbc8d770db95a04bc0062
+size 59963
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 3d2d2949ab..e2c39da845 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:1b298a6432190f54fdb824c7edc2f8cda30a746d2a13322793c84a5a3d42f5ea
-size 59985
+oid sha256:ac595ce33affb3eec6c465fd68ab1fa57eb942f58944cc16e5e01892a21ba4a7
+size 50323
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 e3b8e08ac7..c784b566db 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:61add48c03d1f4df4bc9010826c4a6f5adaa312ef5f910bc0b3a77211a377f66
-size 50651
+oid sha256:2831b5841aac7cdec50829002aa46fabf530163e0600185f32da0793c3637fb5
+size 61695
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 4ab2179c6b..7f20ff552d 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:983db5846ee050f682b895ef0ce54362b1214c5bee48ef94139ef825e0ecbab6
-size 61678
+oid sha256:ac8dd9bc435999370adc7b3d4a0eb96c7eeedcb500818b44e05aafe759b720ba
+size 63860
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 22fda1dd27..6fe7bf12f9 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:0fd783aa6c219e5bdc3c03579bd823a286e6048581728a6786ee724ef458050c
-size 63807
+oid sha256:67981be91a4736680a69b9d2dfe11cab3a69e0d375cf2589e38bed3630b9fc12
+size 53199
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 f1c7ebe44c..dfeefd3b9b 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:375fd7fcf7206f3803518dca0076e3212a91eb9a31db89e16ba2b243c60f2b17
-size 56287
+oid sha256:dda638a1229118141f342bcd297aee99ef196e997e2b58b4806c6a9d08dba7ec
+size 56301
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 7d33111f68..57fac247d9 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:d6ea6d7eb98c546dbee109d160e2adbbbd4d22d4844835667bfbab1de2060115
-size 52351
+oid sha256:c5d618df3faa09281e59897b7f478d12f5a0d907b47f58747607e1de8cbc6e61
+size 68146
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..5b2e6c0429
--- /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:1ea74e00b157d5e0f7caf71ba839f1523bfbc0684335ba270aec05187a88c3e5
+size 70237
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
new file mode 100644
index 0000000000..57fac247d9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5d618df3faa09281e59897b7f478d12f5a0d907b47f58747607e1de8cbc6e61
+size 68146
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 b3739cf0ae..9530e558ab 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:9b2a927fb47b12ddfc0df658ac675f9b338556e4e7706d08bd701a74a70f780d
-size 55082
+oid sha256:beb8fc32a4b048ba5c5053ad5d62da55aac8072234af59a2a1af6dd3b03be74c
+size 37401
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 d052afe886..bc8637095e 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:4e6fd782de40571f627aa20635b26d9355a7716abe05b5f102b85433d7e5bc64
-size 37422
+oid sha256:d654cda7c0f4df547ccf00fc3a8121d0c5bd2b337be17b71f7b95e5987833032
+size 58473
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 17c988f175..6078d81cbf 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:f69008b2f070e36f4b61ef6a53a66793894e2d0cfe32873adeb01c59d706a59f
-size 58477
+oid sha256:794ef2d62ae364d456930dc7879741848c8f65696a5b7676b032da70e3ef7330
+size 51156
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 9e9118e2c9..aef3f70a89 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:0471684872c45671b55e22108b44cb69944a25dc8740d054b7236306c31cb0d6
-size 51150
+oid sha256:96bdb7695db3a0476480e4e675dfc5d088d210b519a3f6b9592bbe6ec18f4ec6
+size 52985
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 c041fd7d11..d8299fa73a 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:c1534b9c3b6952c290ca20a2853e56be023e5c8129a10b9f3fd63c290c7ba9fb
-size 52977
+oid sha256:e12bc7c029daee03dc31bc889c37ebbd597ac61bf18bf13867a867983a79bb2b
+size 54085
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 7a6efabb58..4db80abcb1 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:7b50e874595cfcb65cf2a4f7146ed7c99ee06899d6512024b900a64439748a6f
-size 54078
+oid sha256:72023d9b9eaade788d33ef6c123a89edc079c4cc543421c256676b75fba6adc1
+size 44505
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 21888106d2..255e8a62ad 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:aafdc477f090674d0473076071049bba77bc57025c602cb6bc1cdfada03a1937
-size 44740
+oid sha256:1ad3ae1b79bf30293e306ebac5806d328569f03b1370adb39c6dec143d8789c1
+size 59027
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 0ef6da37c9..542e857d5e 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:bf12305ee99f199905e94e325743b1589f11d36815e16e86558691400e2991e3
-size 59022
+oid sha256:83a7cce4a92980220d2afd24d895154d1a463e685c9f81ee91707ae78c12809d
+size 64594
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 998c5ab138..e2f96c870f 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:01ea3893df495012f2e417e81d2223696ee11efe2499c0c2a112f015c1f72f7a
-size 64610
+oid sha256:7fb56dba32bfc9db1ddf201d118c580b21143f1f74575bda95ff43fa0914b2a3
+size 52344
diff --git a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicatorView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicatorView_Day_0_en.png
deleted file mode 100644
index 65dbbb0215..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicatorView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:282ac2d6ed77717b1544641bf57e742849bc3f5c83e85a0e88529975b138d168
-size 5426
diff --git a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicatorView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicatorView_Night_0_en.png
deleted file mode 100644
index 3fecc48b16..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicatorView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d1efc9570c735cde4ee4711d0aa239a1d49019823086171a961373147f8acca
-size 5374
diff --git a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicator_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicator_Day_0_en.png
new file mode 100644
index 0000000000..7201350ae2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicator_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d7cbce14d66654ba69cd6a154eefecebacf1556f29c5ccefb1d6f1975270814
+size 5427
diff --git a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicator_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicator_Night_0_en.png
new file mode 100644
index 0000000000..4cc90db554
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_ConnectivityIndicator_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14927029a06e7f4f5346573d5020fa7582ff716dd552db969bb84304a879d4f0
+size 5384
diff --git a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_Indicator_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_Indicator_Day_0_en.png
deleted file mode 100644
index 65dbbb0215..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_Indicator_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:282ac2d6ed77717b1544641bf57e742849bc3f5c83e85a0e88529975b138d168
-size 5426
diff --git a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_Indicator_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_Indicator_Night_0_en.png
deleted file mode 100644
index 3fecc48b16..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.networkmonitor.api.ui_Indicator_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d1efc9570c735cde4ee4711d0aa239a1d49019823086171a961373147f8acca
-size 5374
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 86c612c9c3..702bea6a79 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:4ad58bdea0b0c64570e83c4c9a4bf115a16b9ba11a5e6af7383668705aa5886b
-size 22017
+oid sha256:984bb5f1a5ad22e9ef43b818e59a77da423540430ceb087f3fc9ab85ea5c2c5f
+size 22027
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 765ba39e0e..78f356a0e3 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:83848720631bfb2e7f277401632ca05bbbcbf2bc2b5736a7e99deddbcc4ef30f
-size 21289
+oid sha256:01d5b4e7c4e69af90b0f8fc009a029cfa2ae9640550b6e79854fafd659b0b11d
+size 21277
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 17854fb90a..722e3dd7e6 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:3b22aefb1f2382e38a35321149c56ab5cd3856e09909f10e6adf1594ebd16233
+oid sha256:4a68ddd8142b4bb10dbfa06a93b3b6f38d3f35f0436e2c6fd02a18606ae9d145
 size 21752
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 152ca1078b..5b23a3c05a 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:2116aaf24fdbdc1a6105da609e4ff0d4808ebaa83a04253b3900522836966cd8
-size 20921
+oid sha256:e073da56d076e649860ad2e2325979d922a5722289b5b9bd68254b6b1941d1c6
+size 20932
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 f5a618d53d..1ee2b5a8b5 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:0bbca8a38f636100c734216a9330a196e88c798949693737e8c66888ba8753bb
-size 21823
+oid sha256:f55f454fa78e828bed9e00355d3ca40a2fe62798e54d0eb66699f6c9ae0bac8f
+size 21828
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 c0d877764b..87ba952b00 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:54256bb4a217a2f6b90b291559da5776ec80e35ec6d431a51d2c7c64bacfbe83
-size 21036
+oid sha256:f23029884185ca50f3ef9f1518b93edc288b10d729acc648e9dcb9b7bd95dad1
+size 21026
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 308490c845..f71dfc224c 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:45c0b938693536b5193f810feb07e24e45553cf08a2b358becb5d1c787bf4a87
-size 22065
+oid sha256:6e090902557006abf4f90f57ad4c3c70593a5514fdf10edbe95164cc3bdd23ea
+size 22062
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 03aaf57c36..bb52b4dab8 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:49bab71d4fe716e832ec138f4e9357d1189dbe746c41db3c00d1921e5d51e1d7
-size 21159
+oid sha256:0ce7f173228f74729a2cd058dcdaee259fd0ebfb8c6fe84c4c9e34c94203b192
+size 21167
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 79d34d647a..a917c03cdd 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:e445fdf2b0d32882c8673c521a736b56cf2d48ad1dc2d42186de2459cd0f90a8
-size 21926
+oid sha256:0c1d8324c7c948799ac646179eb62a58e1ee8abe940055ced5ba6c1fadae0807
+size 21939
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 0dd20495be..bc0794a16a 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:2fa61c8787e04149856489a2fd855c09a102e903f21db0c35d3590bb654de74a
-size 21061
+oid sha256:f96868450d3b692273a2f012d4bfb22775469e7b9f754f5ffb36a0bd4d53e59c
+size 21064
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 0c5c14f07c..6d16b49f4c 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:5921f3f27a24e9f11b5f6fce5fcd1617e473778bbfa640245628e887c58ec3a5
-size 19975
+oid sha256:54d07dfa46881363e2ac9b3778bc31bc65ada2ee7ee8e861c30ef033449b68a1
+size 19986
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 c589c4b42e..4e7f777340 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:6f103b131eeb9ab8a6618a561f54da4e2e254a73011d48e20d43579f1b9362a8
-size 19403
+oid sha256:52f4af263f48dc6b71ff47eb900236dcc2e438491dbd6d18fdba9dc5c704fced
+size 19390
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 2e2e0ee305..94ca449cef 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:f95898a290694f5aa80de65d1db38d7ee2909ee4f93bb8278374cc36d6c204c4
+oid sha256:a9bf619cb5ae77754e26bd308cf8183573c5ce8ec3286165810f2ad04b218a55
 size 19703
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 7e3439543e..a40351f68a 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:96a9b36b8945346efd1036bd3f50507c45809fbbf49e212332f6080d90125322
-size 19039
+oid sha256:059356f2bc3c9d7969aefcf00af50db66432ceaf59d8897626ec5536fa4bab2a
+size 19045
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 e2f9f187cb..00c10a92eb 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:4615e15410ee4ee94cbc6abf78da9d3a2788fc38502722075a01c5bac915c10f
-size 49408
+oid sha256:63aa4b0bcfaebb22647873b54f23843d3549e4b273a85ce86c976e868edf72d4
+size 49394
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 a6ef630f76..e4d145a9ce 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:6178e68affe343d36aa336d9dd0c4b05991a9a49878925b74a64d2ac55c2664b
-size 48042
+oid sha256:aa4bf33e628c1d953054c9c4d42e23739dbfe9efabef712e27ad7ffcb44d0e9c
+size 48040
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 7a081eeb28..59814dcc19 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:0fca7b0b016cfbfac03cfa72492879c7e3987b8c16c3acbdd0c43d71f058c9d7
-size 47810
+oid sha256:c81f35a9fd4b9c5432833bbcd9b18bf021f6b5a3847b2057143a570f9e36faf9
+size 47795
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 e57fc46f36..b118decb49 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:d2f4c8372224ca64569a384ec9f5133698470e594587097242b7c3446bb2deee
-size 45931
+oid sha256:2350d3d410a7629b74aa9fc10ac179d258491853c8417f2318bab8973f559d71
+size 45957
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 989fb9e247..fdb049d4cc 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:5d771112966c611b3417bfd14c83e3535c83a13182ca7f756e512a91c488bc33
-size 49308
+oid sha256:a0366b37b3371ff7d46dae9a569159618476d046b85ceaba523946539355ba46
+size 49304
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 409f56d162..9ffae621b7 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:0f09d6ab2eafaf87aff4d4af974632c803700ebbca5dc231adaa572227e8c4bd
-size 47964
+oid sha256:9149b8dfd77717ef1716727860b3cac431a4d34aa9377160010dbeda13f566d9
+size 47971
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 b8a5c94bc1..ddc0c5c9dd 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:895e0799a4d7c15218367042c5b6f3faf03b817d6f7c74c3236fa06e56f3d282
-size 47360
+oid sha256:55638e0bcad96a1aa5225d0cc01b32bca63c8dab1a7c284f8912fa63fea33973
+size 47363
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 dcd18ffc85..2eece14b39 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:55ae6865681d1a7b10e0093b2a901c1c1c994d547b33b82e574687ea513c8e41
-size 45774
+oid sha256:947baaeadbffcee1367d7e28e93135937c3a3243ca4b1afe3ffde35bc4281dda
+size 45784
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 7a081eeb28..59814dcc19 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:0fca7b0b016cfbfac03cfa72492879c7e3987b8c16c3acbdd0c43d71f058c9d7
-size 47810
+oid sha256:c81f35a9fd4b9c5432833bbcd9b18bf021f6b5a3847b2057143a570f9e36faf9
+size 47795
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 e57fc46f36..b118decb49 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:d2f4c8372224ca64569a384ec9f5133698470e594587097242b7c3446bb2deee
-size 45931
+oid sha256:2350d3d410a7629b74aa9fc10ac179d258491853c8417f2318bab8973f559d71
+size 45957
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 7476e6f5be..70242c5437 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:cd8771d3d2f61bf8d3b5439a5a0e1a5c15374701ca0eba4b9f55a2641fa4ad87
-size 45200
+oid sha256:c8f9b4e4aec76f60b25d6d2c83ac4949fb3987ff15a70812f8c31f07b545c061
+size 45196
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 956438e886..62c185fc4d 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:297ca4420824fdf1b605e929c3d7fc4a58baf7a2b77008dec6405ed68b2f3ce3
-size 43542
+oid sha256:02f030c1163289e3793a808dd581198cb5e2d36fcc89f33c38e1b69a503c2976
+size 43543
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Day_0_en.png
index b0e5754f88..6510fc759e 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:932e1d50fe32c1588355150da07f607d8e6c5a28264f0fdb206ce328ec3553a8
-size 9480
+oid sha256:dd6e857915a1f6ef04be705596cb365e43d0361b6cbd14ae92cf5a6161d8972f
+size 9476
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Night_0_en.png
index 944773716c..d3d2b60aab 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollTitleView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80c27066dcde47bd40c3ba922d09b0903dc3e31822415b20d958e2a5a161ac50
-size 9160
+oid sha256:06ffbabb8325cc6b6db82b6eb38a3c5ded830bc4ead3ecae3a164d3effd966a8
+size 9175
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 fec3f681ce..20de91a768 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:7a66b5d52835eb4f15f461435177c5a53910c5223ab8df096b1ba9cc4e493b6c
-size 32176
+oid sha256:5346e39bb245733d70e60d05eed028b5da570361e86b764106d9a0b14b200a38
+size 32175
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 5c075752e3..9aa736c0ea 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:bb4c9349ad6f7d754560ff0648bb26b261060bcee6baeb69a31c383362c29ad4
-size 36514
+oid sha256:658bbe46cde9b1c8cc7b5e67a21585e69d87ca4a09cf3dad352dda914b9d77b1
+size 36513
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 9379bdc505..d083e1d3e1 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:8dd830fca2d990cf1f297281ed83303b67af9f10ac7f12534d7c4646c73c157b
-size 39286
+oid sha256:2d60cf2028add0c159867b252f429ec92575b0ee4e89088046ecfbd3c58997df
+size 38027
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 2ad642b78e..54d431a158 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:4830e55d7f18bd54d03c46c493e66d26f0978085223c06a493a628c58a4ca6a4
-size 44181
+oid sha256:b7a164b54d7573f663ec11d2337a334d7e346d219e33fe0b9ce0ffa18970c515
+size 44184
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 a2a8fe02f6..78d42c2f8b 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:4de92c24dad984d58907083d39458bb375397100e492cadf81dd6b5030774ae0
-size 26839
+oid sha256:2398f3e0c75c799c45208ebfd54bfa935e00b43430c9748ff8fcfde461bb92d8
+size 26816
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 2a5a5982b3..4be64aa744 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:7fe4823c3dd32331182f1ed056a3eb8d53e7d6eae63fc3e2734d5bceeb91416f
-size 117492
+oid sha256:98d5e3889a33db8ac6e66c757032ed1567ee20c16c9feda6c052af6ae819fcc6
+size 117523
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 6bc0ab2404..e5c556bd11 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:2167f5856da8a41b89fd8b339fd5b8797d26ba37d436d4e7f18dda12f722633b
-size 32865
+oid sha256:ec83f3bca6fcf2527ef953d8e8b4619ecfcc80b49389984be83a2bc1306bae73
+size 32853
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 2c69a805bf..cd47ec1fb7 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:98a326affbe41a26d515bb3ef083ff585508cf9fa86f15af4c81b8660cf56d53
-size 33934
+oid sha256:69aecf226870e7c1d28f80ee79b787186331fe1b43d53bc531641013f65402b4
+size 33917
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 fe19d7c16b..51c9bed9c1 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:957c49121ea249cf77c2f43af4a2231ef831fcc612fa6c678f413dc380befe52
-size 31225
+oid sha256:3d57b49dc51472cb215c8126cedd98daabe96bc45ca899911ef7045e3fcbe004
+size 31184
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 fe65eccaec..2d1faed58f 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:88437962b85f28e7a8fc2812e47ceb98ae1896ba67f70f9c2325f0a70fd85099
-size 35396
+oid sha256:f73603bd9ed3b3acc7b969e77427df4f0913614334c699a09699edd3a501e7dd
+size 35367
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 97a6fcb6c5..0788da663d 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:ed95702bc733a11b296a251249a16c84101d1c44e1436b51fd7e03a64fe6b9ba
-size 36695
+oid sha256:223002dda410268fbe0c3305ed08749c7fcaabf4d5c3803503525811da2a2841
+size 35821
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 44492ccc28..61140e2e07 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:79c3b6b3c17860e34a8bf64a870392da2dd71383bd7a35ce3f7bb84eed35959c
-size 42931
+oid sha256:05e3b1451c6b1b6d96821553367bf80ec7034ece41e92785412fc1685bcc3801
+size 42904
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 670fc7988c..a5cf7fc5de 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:3a64aa5040685f122da49ad3471e8074a812b13d88172cfcfb6bb4abd5d64791
-size 26139
+oid sha256:02199f3679ed37b328122bd1a58fd593d5e74876341334c6374e017ce04c6418
+size 26117
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 961106d315..79f123a4e9 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:61f06595679171e77d98a12df63e102c32b4dda8f4c66a54d21beb8bf9e9a2cf
-size 113730
+oid sha256:2406c1a73acb2a1cee255a4c2999087ede97228c5f85175e888732d0497f8cbb
+size 113722
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 86728e3524..e1b55bcfd3 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:fbe5f7cd26060605b1e7acbc62710aa8b28b3d0061c8668a56f1ed71072bc68d
-size 31874
+oid sha256:f57072ce58c0e515e11038f93a324b9be762890e2817f2f52f76d1c17b95fac8
+size 31841
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 2d8e9d2e12..24db20cf90 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:cef968e64723ed7b746038e4e4d0f74d661a614221386936ac3f7e705be4dd5e
-size 31264
+oid sha256:32b66f80f777ba829c39716b22511b3f4d89c787380d5d9a5e20cc6fb7c53151
+size 31287
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 97953de36c..92909e8296 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:5cd50cd9ce91a7c5ef799c67dd2cd5a43f335fa52545ffa29afc5894b2a010ad
-size 57268
+oid sha256:6cdba584d3ce13a1301169994b567153561b546cb46fe139b1ade61cfe0c1b79
+size 57256
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 5a11e1374a..99e6845364 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:dc985d439b88712c736419264cc1771fb6de910f394638b774491a957f460481
-size 61250
+oid sha256:dafa4eeea4267bb0407ec1e563a1ae2dffea2e38a2ebf28579f0d2bc8c400b93
+size 61235
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_2_en.png
index 11538d9831..80885c796f 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2038f319b6095e90eac43e90c5db46d082d0b729d6d828f76eb1e042ef5666c
-size 14657
+oid sha256:39c9145548208f60f269c5be9495e118b624ebd8ce369be405781d044e425edf
+size 14665
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_3_en.png
index d909afdd26..5ecd5314c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4a35fc66742bb1d111b020cfc4b53e3f95a98965d8d7d84d599087b99690ef0
-size 14127
+oid sha256:7d50611e0281b6505b9297b14f50ffcf082cce117c9b97673651e7c22ea45f4a
+size 14137
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_4_en.png
index 6ef501117e..d1a9df36db 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65c922fe169e719dc4aaee64cde4ef5f26998956a4d67e977370d3d8b08d6277
-size 17593
+oid sha256:638265a66e41ac07d262c20966c654f435c13209698058e8ad3403b346c727d1
+size 17598
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 5d54d82cae..897f24ca03 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:1eefefd52a3df2160c9462ddcc28445e4d84155e5a6934217e549b2f9ea72cba
-size 55453
+oid sha256:d35d46ec512997f85640c86f7a00af9e9188386cf1f2a1e469a3663e83b9efd2
+size 55399
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 3492a8bf17..ac6bbc7d52 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:2d26c41c5f2dfcd73d8c67e53dc01edd366b44365bc675ae97efb2998eb46c7c
-size 59317
+oid sha256:b7242c1ebb8309cda64b36453479c23184fddc44a3f44980732cbfcde7bd8065
+size 59279
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_2_en.png
index 3605a6d189..b34c92d2cc 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:713ef1f9e1be4fe9515bb53d8ccee517c8e707c4f881d81b497dade360f363be
-size 14274
+oid sha256:8a2eb6cea5f2701b4d5602961e4d3f6c753952d3acf600beac3d3170c1d4e85f
+size 14268
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_3_en.png
index a4d2050293..180467b138 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d014ddb8025005f5a2d8d2fcfe5906e9711278276bbfa4a9c9fc68b960b3a7f
-size 13748
+oid sha256:705c82e3ceed06cf422350aa44d704a01516bd9fd79216daf0bebe3499542bcb
+size 13741
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_4_en.png
index eea22747dc..5a3d6305a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8827f46db0d9278320b94f0849df11df3704b696b5a2cec76dc07a2f48558c76
-size 17069
+oid sha256:9c50a74e8bf59d212d619acea3976fe0babdf291d15bb819cd0495b8e4261e9d
+size 17062
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Day_0_en.png
index 6e89270747..9bc942ff6a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89b75db198bad6b10b92a80003a1cd499579b5352c7c981ba013533f1e2d86e4
-size 19740
+oid sha256:c1265e49887cb6e39f45f0beafb3595b90bbdd19cc3ed1fcb03058c60bfa8ea1
+size 19759
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Night_0_en.png
index 0fdc681e87..4bd19f3b11 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.about_AboutView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ddbc5bad689bb28e2f876e69dbe5fef9907b640b955e6c6e5731cfc671f72ea
-size 19269
+oid sha256:f6411dc370e2d0cb1c43d825435ccf3693e7eb0316c70c0c26a7740388499936
+size 19256
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 b7e866f671..ae30993ae5 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:6a8d515ad7c83e780970e78a6d38be45a16368a0d37b4199d52f977dbef8989a
-size 47279
+oid sha256:d986fd93989b178dc08957270a75fee126c9910a45d067ca7c3353d188b69850
+size 47377
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 323027d6d1..e1c896297c 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:07ee23b4f4103e9f1df3d41baf2359db5e4d3fe6ca6d9073f47cb9d0654ce8af
-size 47168
+oid sha256:cb5c468b4f8235595bcfb3355fa29cfd43567d51e27785357bdecb13ab1dadd9
+size 47268
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 b0efe144ed..dc78febfda 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:495adb80ffb88ae25aef4d4a383253e1ae8e69e35c952fdce46a3e16e78ba6c1
-size 47157
+oid sha256:e16ace640aa43a2d6b923a46fec94ca41e1b9ce1632cbd0319c646c08dc1b167
+size 47257
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 ec2aef80e4..bc69773fda 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:b1513df7f654441aef5faa92f291ad25469003fa1edcb9710b4c9a61043e1130
-size 47146
+oid sha256:f90e8efb79b3525fafdee503a0aa5280e1d5bf0275ea3be0e79ee323c7b03751
+size 47248
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 d435435d4a..3a3942319f 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:b44e7c8e765d23afe4040a70990dd67aa59cfbc812a919ac0a8a6481cd30047e
-size 46990
+oid sha256:8afb2771627534be13f709b1e125d9d4ae26d4ca1a7db102b31ef14620bb45a9
+size 47089
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 4c99a2753e..4d87b9f694 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:10d14c0673d4a985a407edda821a04049610e329cd2048c65697d49850192985
-size 47281
+oid sha256:4e7b71b415175d4cae28404ca4aa361929df63fb670b9b5c86c327dd6df73ddf
+size 47379
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 f43a1adcdc..6ae9086f2a 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:6021041c2d6be888738a46d071f5529eca37b960f5ba3595bad76e8b3b23348c
-size 46936
+oid sha256:693180156b1bad6c7e0f1ef698ec8b6787912c2ca2f7d94326e2cda043ba6819
+size 47034
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 477ecb6960..fc1664cc49 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:42e6e3f54b18e3405d4a4604315562d6515c26ad19cc613b7d9af33355961dcf
-size 46570
+oid sha256:ba1df0d1d16e51d28ecbfcc34be2d7ffb6722efd8bc6089b4befb2d79f82ce5f
+size 46668
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 0ebd5e5ce3..76ed86b02b 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:fbb6c5180c9f72153f6c500f96bf65b90fc26f312bedd6dcd7f02a31ba452048
-size 53003
+oid sha256:3268b8e9c04a5a966f7d5b991299e783d6efe04cb05800ef45b2fd226b1d10bf
+size 53105
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 f74c5d8f71..b080444cda 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:4b8de7de515cbcefbd6d3b18ed575b8095bdae136c049011095774571a3af5c7
-size 48928
+oid sha256:e44bb25d897d6f4de241267c56c6e3bed1d68d3d21522c4d0200a82041ddc083
+size 48999
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 df9d88ddcd..4879d67434 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:43d21b67f5bcb2bc71ae3a36e6f52059799c1273d9aea0e0533d40859f31f246
-size 48809
+oid sha256:1cb9fe598d7bb977561b403e43acf2dc2ab943f17cd82aa57981c2adafdc07e7
+size 48879
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 bbee918059..f46bf72380 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:3955da5d214c9ba7f7c7d1e8b1e65e802f8bbe2e67044810051642c27cbf5bad
-size 48825
+oid sha256:981005ce4565843a041995c6c69cc9503a983de5df82433019fa33dc5ce3f597
+size 48896
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 142d6e2661..0645a6d0b9 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:2231410f1e636818c7034bf9b5fa4f5f7e10135618a718ff6cb239ebcb69e64c
-size 48810
+oid sha256:8f80185f3563d3e74abd3a1cccc79fbdfe47e4cf0e3bea98130698e74d09eab4
+size 48878
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 3109ff7d41..a0d683dc0c 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:e48575d3d3314102dd7f84464a9bc05d0245d8a815cb0e031e191d006ad10c84
-size 48731
+oid sha256:1cc613718c250b031c8bf551996bb528956894fea2e2e98619b5f45361d6947d
+size 48804
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 9224deb474..c611d7e93a 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:647e6e41cb9dde8e12e08569104619890ccab88334336c8ebdc700526bb7e95f
-size 48929
+oid sha256:badb0c35e0c1f6b3121a2469862b5559e061023513771a65ebdeb94ec7b98078
+size 49001
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 b8f8375e2a..74bc5f88d8 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:5f005c085cb32982d17e4a79a7412a65953d2476ed0d331befeb6becc7c25e85
-size 48750
+oid sha256:aa36e842c20867e60424763ec0e2d9ed7f01030cf0525df3b0965273ad3e7e06
+size 48823
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 b8f0124f0c..03e8601f97 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:f4a1b96cd65efc781261b0894c8c5fcb83de3b35f15d9b2302affdd82ef52a29
-size 48434
+oid sha256:6f9a0affa7a07696ce1a0be56e1264b8b7213dd1fa5627b6af3307ba9ebaca36
+size 48508
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 3f480561a4..8f10026eed 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:1de9e83c5ac5192c55e9147a2704caf20ce9d8f2966ee89f90f4e89a1b49b4fb
-size 55180
+oid sha256:d0241bcb4fec4fe87d0a161960726bc9a33987b78c4748a6670771ca3e9b7584
+size 55254
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 bfb1865f5e..4f17ed2473 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:ef12abaa1693e7c7ed48939f92ae27fab1e09e86353b226dde15559e118c0cb8
-size 24727
+oid sha256:bcf7f668a5eb1219174557bb87ecd103d4bb9ba5f16f868913e5e6963f3a38ec
+size 24735
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 cac6d8fd4e..925d0e4fb1 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:ef67156b56913f960373ec041e7461b1d5c923af1bf56d2392a368bef2fd37a1
-size 24120
+oid sha256:7db170b71d5aae1de161510a7752b5fe2f2ca0f4c5dc366cce48f5a8c5bf8e1c
+size 24108
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en.png
index 6909998647..cbe9ac4af5 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95c8e1971970a7a70466f1449148a1eb861100f88e81ef70a2b8beb0cb6a3170
-size 58901
+oid sha256:9f6981c35088873ccc506975aec10c62ecd706ae4fa73f11a3fbb7a786e8ca5d
+size 53394
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en.png
index af5bbfd797..ed83508084 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7662f00b590d3b780105eb3381b8f66bef6443b578898f170bb0d3eb16d6110f
-size 58618
+oid sha256:44935e8bb95a3c4967cbe23de7e067519e9123edff1129276da7cc73067d83a4
+size 57956
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en.png
index d054d3381c..c90bd912c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b7af9e3dd7387ee78cf08a66186a6eba48e483556e4515585349678924405c0
-size 7673
+oid sha256:818258174e9b50108b303b05d444efaad32712aae144116c386ddac7adeb37f8
+size 7693
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en.png
index e2b1efc9a9..7703f26bb4 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0617306c6764d1100de98a80be3d4765e2b05f41d014beb551d440b175d36a87
-size 55280
+oid sha256:ad5a2a0849cd17e90124a20fa99e79e05182a518d6f9789f16e0a83e1c06bf1a
+size 50695
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
index 3240f1e4e0..74796eabbf 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:782afbb5b70f327f05957fdf7768c564d89cb99fa55e792157a0024d83b1286a
-size 61740
+oid sha256:3b04ccd9f43fa8283e62d43de910bcf68ceba81cec88fc1e20710252e0828c85
+size 56290
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 e6a89d487b..062db915ca 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:46a6bc3db1b7767017a63a5fe61916af956762275ad8ff3b8eb03750d37c51ce
-size 61245
+oid sha256:19b57b52597b1663725a6681facb0e98351b4bcc482b21722539762ef4e26e21
+size 55782
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en.png
index 6909998647..cbe9ac4af5 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95c8e1971970a7a70466f1449148a1eb861100f88e81ef70a2b8beb0cb6a3170
-size 58901
+oid sha256:9f6981c35088873ccc506975aec10c62ecd706ae4fa73f11a3fbb7a786e8ca5d
+size 53394
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en.png
index be44905f81..ae2d011dc0 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93cc377e9cb711c43bd541f5c86dcfd3386a2b5a16c32254f47b5f8f09d68a6a
-size 60069
+oid sha256:26da644c71f1fed42bffedc56d1bf23c5454aaa8bb8679fe705567670f9c0e69
+size 54576
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en.png
index c62b4c98cc..96b3bfc0c5 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8deb372b394a1a6c72eb3a0ece24ef91a57ee10f4908fbd4deb66ac40a1786ce
-size 59305
+oid sha256:8838ca5825b2f21eff9332f2b9a21d04f5cc8ef22bb809116a19b5e47863f0f6
+size 59050
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en.png
index 980921b7d7..5f803fcf38 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d0ff437021acb868aaa252f857c3c0692d635d169c0216ee9bbd6e089dfc637
-size 7460
+oid sha256:db3103c669f69acb6e1b65e2991b8cecf81e02eb4a9287609f51c9c470118233
+size 7453
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en.png
index 92003a7fe9..3a3cc98686 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:111aba0b19696f83c4aab03969e3ae18903fa24c710c2f7327a3331c8ad6a373
-size 53051
+oid sha256:baebdfc57e32a6cb4e7a9dc96123056428a9304fd70d3b121c9f463d287a5ee8
+size 48584
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
index dfabe900db..a81ef5cd17 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2347642161ef1dcff757e10a428cba0709065e7a004595a3a2d7560ad86c749e
-size 61779
+oid sha256:2d7121455aa0fe2cfb095d3c0a649813473752a0cf9c588059792f97badd1a3e
+size 56285
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
index 95499daa72..db65f781ce 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f5861e5e37ff5e812e19ee53b30572ee76468521894a23173f11b1b991970ef
-size 61511
+oid sha256:8fe4eb205597b6e39a99e78c4eaf8fc7805509ffea6176b02881e179f5269306
+size 56034
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en.png
index be44905f81..ae2d011dc0 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93cc377e9cb711c43bd541f5c86dcfd3386a2b5a16c32254f47b5f8f09d68a6a
-size 60069
+oid sha256:26da644c71f1fed42bffedc56d1bf23c5454aaa8bb8679fe705567670f9c0e69
+size 54576
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 9da2df7e98..176ba2c9ea 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:e8c417f2c0b856499c3a1733ef6d7415097a324139621fbbfc8fb9d0fe6d1a82
-size 46108
+oid sha256:d4d03e543f38658338d7fedcc7f290ad973a68e1ec4a828d4651c188769e6769
+size 46130
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 9da2df7e98..6678623bc5 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:e8c417f2c0b856499c3a1733ef6d7415097a324139621fbbfc8fb9d0fe6d1a82
-size 46108
+oid sha256:84e4c7fd597e4cdcb043514b370b0fd1e3b65f42b8c7811a206433ad422841fe
+size 42445
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 68c365da4c..63d37adb4f 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:9eda74b1b65aca54f03ed4a07230d49ff6495672747975c5efa1da1c60b29f56
-size 44657
+oid sha256:5224724026a75d42d76bec27d9db674c5b0aefbaea3518056351deccb58bcdf3
+size 44679
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
new file mode 100644
index 0000000000..9f6f9bc434
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77847b759a0795c7c4f6ed529c0d20ffa060983c06196061f3ff61171774d1ab
+size 39412
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 b442c94aa3..2f74fe63fc 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:657b03d76516c88bf748b70287b9270266b82064918463c71dab6df7eae23bd5
-size 44817
+oid sha256:c8b5df08672db5d6c6df1daba79166bb3251edc6e612b29eaad881a2b2dc44d3
+size 44788
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 b442c94aa3..536d5a22c8 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:657b03d76516c88bf748b70287b9270266b82064918463c71dab6df7eae23bd5
-size 44817
+oid sha256:8880ddfe80d8062bcaceac1e9d1407e24d365e9c6b69fc8ce65e3ade973e8acf
+size 41037
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 02c1eb313e..4b95d5e70e 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:38f81f8a388f31511ec4b6479e0f188e852d8c5556a38661f5f666e1b191d091
-size 43357
+oid sha256:af623a2080e8c067cc4deb182481557cc5165a590689d239cfc0399109b4d496
+size 43329
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
new file mode 100644
index 0000000000..2d9b113aa1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dea0cb97b7f8363fb4581da232c2ec6cd5c7ad17a9dcbf5339b275f590e53a8e
+size 38794
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 e6662e8213..08a1c1cf3d 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:f8fc6f61ce73823af4b4edea7bb031fb15bd600b231df1173d33bfdbd09b5000
-size 43405
+oid sha256:bc501692ee40937d1e02249e8cf93d15991ce0413d1b13237d41c9207faa5039
+size 43389
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 73fd95a516..6d3b6d9844 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:f1f3b861b5bdf266a4844248e54d36b7d47eb6b43aae2e877ef981b955b97b54
-size 37476
+oid sha256:6fbb7ce1d418d67b20234a47ba2b79e25fbdd80e1d9a687f62081d2933181da4
+size 37530
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 12fc2a9e3e..8a41e84027 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:73a6573fa506af844b8327a6a0da53a9a1bf4e222baa1281a992290423b22c5f
-size 42187
+oid sha256:b15295833313b4b14b14f1bf8f21440b98cf64cf01d631def6798f0a85273e3e
+size 42214
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 182e90be47..b488844237 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:f4f0d016343bce34896e7983877c9166ebe97e62423e177cacc0f67b467e5122
-size 35121
+oid sha256:ced0553d31178a78204615b68259d9ffefb08e3071eb1f06ab4181a1e4436b6a
+size 35114
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 5ce358f5ce..21e745ffbb 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:c90f923bc9cbdb3f795efc4e802efe1e86f5418bf299ed58986980784df3f26a
-size 42738
+oid sha256:5aab43165121802dda77a416ed76f448dd2d0f63320e2999c1beba81292042b6
+size 42757
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 aad7b52878..45e0ce3ea2 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:eeff7a440d4837cd15b9daf0516f4c26a34016ab521e41cc55549136532bf029
-size 42600
+oid sha256:64b8d1487a31a0790c85da538d8d72043ee2bbbdf9d2b776927d0f4fa02dad7d
+size 42616
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 20a6b7af97..75fbb2449b 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:b5e94c82e77af5a90406a6685279bccfc2930b5b8ff46b2e73ae962807a051a6
-size 35717
+oid sha256:c8a1db34ef6fc01501510eda11d084583ec0bffe77206999bbf373e48c3f4816
+size 35704
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 2ddbae1a82..08ae79cd61 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:466d51d09b3170e1adc752c69d44ea826172ee0e022157f2f07ce1ccbba48869
-size 38169
+oid sha256:30bf855229d3574761b06db3ea6f6501c82150e6b08ffd94a5502d091d02fcca
+size 38158
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 7ca9785147..b9dddc5660 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:92cb291de76e3b46db7140b99aa13428b37fa24c85fd32da3ed26b97d1e76621
-size 56162
+oid sha256:dd6fb2e51cbb3219898874f42f79443f55a4dd963e7fd75a57e7b06671147809
+size 56179
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 408862f76d..a70ddf4eeb 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:8f692da502b966ee6799f727b7432943991899098a142b98b92adceaa812ccfb
-size 42252
+oid sha256:4adf25480b5d29c16d66f893becd1555886c4ecd938e05e72af60164b96e3050
+size 42227
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 73851cfe62..6ea0fb44a2 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:f463bbfc39e96d10c1fe134d17aff582f856ec412874eaa3d806b9b947b09a52
-size 42112
+oid sha256:0228e650ea2fc2318e3ed901b1d135fea916475a251ff3b0d5acf0da62ed02ae
+size 42100
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 2901480252..dc474b013a 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:8c2c0716ec20b57d6a5f5e40276839ab564675f9cd7ce4a5b6ae8606f940a7a7
-size 34445
+oid sha256:67de04f81757f61758ec507e5521ef5b125c6ab7d1212856ef46e7113a80dfbe
+size 34462
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 abdafa90bb..4a7895e76b 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:4d9270a4cfc152cdc1e4898802c1e037a60e0b9b4d00072997c350e170f6c9a5
-size 35486
+oid sha256:a28fbef95dc2a1775ac83f95a4e1d60bc06a6ac166827764334e5b9e033c2b09
+size 35498
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 0f18221b9c..e4e333404d 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:eb0fa467e51ec5c66d1e0aa29d5f5043cb0f16624baec677f0e52c44de2d83c0
-size 55384
+oid sha256:22fe53fee1c78e3f86d5a3f27e71eb92d99ebf6c1f13ddc437f56820cdd68ba0
+size 55356
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 6efc2e8a77..28e58d6e09 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:9af6b6c981957b7db15f3a08061dc8205d5203cd2e5223b63c441e5192048ec9
-size 54739
+oid sha256:ab9b62e2d898807b6ca72248b3e257d17589b9284fcccfdda44e860eb54584d6
+size 54745
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_10_en.png
index 1de4c91611..4b4f94c46a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32a709c7b494f0420bbd3557607f3cf96a695ad1f6ed0bbed1df7594870eab2c
-size 45291
+oid sha256:04b51cf6a696ce9e0d4ec596d7a575101f3d6a5a6846a65d7d13a41eb2cada79
+size 45305
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_11_en.png
index 4d6d6a5977..1c821e440d 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd974eacc5625082c6ef669d6c3611d6e22728a64c0ed0143c78f28c44e9162f
-size 42371
+oid sha256:5859892a39f1f86b49f1808e83a94766b1fb7cbd2df144a255b38dc7630c30f3
+size 42347
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 eae3939727..d4a6cf8141 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:15dea48acfac85a0b3d7871cbb6adbec55bd859a20e37a7bc879fba8edd67423
-size 59389
+oid sha256:38dfe9806ed44684abcea02aace2fa273301ca4120d1575ed46feec6bdae78b5
+size 59406
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 fca474391b..130cec7e14 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:c88c4c9e103b31dc4f3f07a26dd11a54d851671c47fc71355e85e2521d238c84
-size 15297
+oid sha256:3949cdcb874749bea6187e2529bd1ef2df9eadd4592513ebec4e134d10e962f6
+size 15313
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 d33a9b5ad2..fa828c4227 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:92c8883623af497b326d5aab8ba962540b0929c74c5a56fed2a443e527f0a058
-size 43882
+oid sha256:a1c102f844a70e9b7571a412b192474c2d68de2d5f4009c2f76ee4d37f9e0a9e
+size 43896
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 592779005e..b6be00fe50 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:ee9e411ab9ca61fce88039c0629d7d8bb61753a0d44ff52c69d1476b0349a58a
-size 40472
+oid sha256:fcee98a749aec37864bf37045f2764efadb1dd76af07b04ca57d921f4457cd0f
+size 40442
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 0321051c22..a11f38740b 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:caf5b5da3be29b02a3a390f4475f22eecba6e6833f7401f735663a1953b92257
-size 39885
+oid sha256:829be44b8cdfe094fc1065f220356d440f8f989c6020bac6ff77e0e9882a5d94
+size 39847
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 0321051c22..a11f38740b 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:caf5b5da3be29b02a3a390f4475f22eecba6e6833f7401f735663a1953b92257
-size 39885
+oid sha256:829be44b8cdfe094fc1065f220356d440f8f989c6020bac6ff77e0e9882a5d94
+size 39847
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 d33a9b5ad2..fa828c4227 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:92c8883623af497b326d5aab8ba962540b0929c74c5a56fed2a443e527f0a058
-size 43882
+oid sha256:a1c102f844a70e9b7571a412b192474c2d68de2d5f4009c2f76ee4d37f9e0a9e
+size 43896
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 d79f995fa3..0d733f0e03 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:a049311411b2e8bb777d2fefc74c06e943c36931e24419c1b9155472643a6f90
-size 39868
+oid sha256:1700ad425b71773f0129fa255a8d596a844c30c47c43397d50d05ba518f8becb
+size 39835
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 ab1af1559f..95e0f695bb 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:f6a577b1e7047237c485fbcf49d238478f638e471e5f637721c7766eacc89799
-size 44275
+oid sha256:424f8cf78bf0e21424d73072976793e20c0939bf62ba117616dc14d78e714b1b
+size 44243
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 d33a9b5ad2..fa828c4227 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:92c8883623af497b326d5aab8ba962540b0929c74c5a56fed2a443e527f0a058
-size 43882
+oid sha256:a1c102f844a70e9b7571a412b192474c2d68de2d5f4009c2f76ee4d37f9e0a9e
+size 43896
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 d33a9b5ad2..fa828c4227 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:92c8883623af497b326d5aab8ba962540b0929c74c5a56fed2a443e527f0a058
-size 43882
+oid sha256:a1c102f844a70e9b7571a412b192474c2d68de2d5f4009c2f76ee4d37f9e0a9e
+size 43896
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 68425b3ce1..bcb5ca4703 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:9db0d49441c613c91da5d167942242f7860234988dd201efde07e865e8f34698
-size 53149
+oid sha256:355c7c01ab17708570deef9e6dd076d6912abf9dad98499362e8f1ef2e22148d
+size 53116
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_10_en.png
index 87bd37830c..84c9bc0976 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f41f0ec66a13468368b968f8d7508a69827612c61115c19136db14eb2be3e542
-size 42666
+oid sha256:8bb78cae481c682f466edb3423395794755252f9148c81d92d0254a88d0e8868
+size 42644
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_11_en.png
index 0629292f5a..5818185a45 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0221cb8f774a2edb4cd312ecc9088aa2d802fd5db8660c835fcb25c196e62241
-size 40023
+oid sha256:029af74627492ef13fa3a2e1f29a849c7b994595497b4f034ec21b985828fc5e
+size 40040
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 60c5f43eb8..92fb373c3b 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:c206b528b993f7ecdb15b34a018c0256f1ad4fe39c2ba249a7a6c7c0546ed6c2
-size 57757
+oid sha256:95b5c3d3d6b419704ee7edbc3f9e596e5da09291e625efb66c21163fb12c234e
+size 57735
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 b4e57fa998..465fe2d62e 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:60b2d81deecb0c895ba5b544ba4265a62458bdbb4e7c0a0abf6a15872572931d
-size 14807
+oid sha256:41e14856de72417deb09f439467c9692f288e3bae9513cc674f5c29fbe17e780
+size 14781
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 cf362c6ede..2042ba0459 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:964649d787a482caa519abcca2086335bc4d78d9b3a26ff9d5e13bb9e4f0aa96
-size 42184
+oid sha256:e2b401419199a4e28801552a939a658f50f4d0d142cad0a435fcbdedfd4f344f
+size 42159
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 91ea58263c..443a6dab69 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:317f4ee0abfc315841b571aacfb78ce714fff00b3915bb77272dcae17134d8a1
-size 38444
+oid sha256:f3ea2e6bea4d39455554ee4c0c37a9121f5af9483a6c32bd376c686aa211394a
+size 38460
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 600fba9697..6b438562bd 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:39cfd2f56c72171b0fa68e98d99bb4120a35c8869ac987775b48d55ba530738c
-size 36921
+oid sha256:6f46c05a31cc5971285119cb9d07f4903280bfbeaff6ccc2fb56d9d6a59be04c
+size 36938
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 600fba9697..6b438562bd 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:39cfd2f56c72171b0fa68e98d99bb4120a35c8869ac987775b48d55ba530738c
-size 36921
+oid sha256:6f46c05a31cc5971285119cb9d07f4903280bfbeaff6ccc2fb56d9d6a59be04c
+size 36938
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 cf362c6ede..2042ba0459 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:964649d787a482caa519abcca2086335bc4d78d9b3a26ff9d5e13bb9e4f0aa96
-size 42184
+oid sha256:e2b401419199a4e28801552a939a658f50f4d0d142cad0a435fcbdedfd4f344f
+size 42159
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 b515219e5c..28b6274f76 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:5d1b3e8eabbbd4ebfb3dd14e67aa0944d7d291688d458423c4bb45c47056c028
-size 37280
+oid sha256:cd1192d34fcb0885ed1ebbd9bf61d0fab01c27708c58dc5a01ed740348fa7cc6
+size 37294
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 0c6d1d86c3..0e99bfaf6a 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:ff548b1c9c9d4fc8b376ae12be6c8468483715726bc0deecf4fc4f5854d727ad
-size 41418
+oid sha256:77d8a6214d737881b2d5ac890835176a9567059c5b200dba9ae5592da356c848
+size 41434
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 cf362c6ede..2042ba0459 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:964649d787a482caa519abcca2086335bc4d78d9b3a26ff9d5e13bb9e4f0aa96
-size 42184
+oid sha256:e2b401419199a4e28801552a939a658f50f4d0d142cad0a435fcbdedfd4f344f
+size 42159
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 cf362c6ede..2042ba0459 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:964649d787a482caa519abcca2086335bc4d78d9b3a26ff9d5e13bb9e4f0aa96
-size 42184
+oid sha256:e2b401419199a4e28801552a939a658f50f4d0d142cad0a435fcbdedfd4f344f
+size 42159
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
index caa492261c..78dbf9344d 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b77e3ce009dcfac0e41e7f28e5beb934ce39ade1ca85115912a5029b46f47f0
-size 58278
+oid sha256:7065bbf0444b299bd8f024f1f1c9143a1b7ef5b20eba22d95a573f059e5f502d
+size 54175
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
index 06ecd42cb4..6914065701 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4228cd39352d4efcee45866839ff4b1c63426bfd45af083af7b2f57286c2181f
-size 59227
+oid sha256:d55ace579493a40e9bafe3e212918010f9b285ee3ea0dd5ada6c25d21e3aa622
+size 55288
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 cec26474b3..1ce2ca38bc 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:c0e3bbf4ad7201f993d8ddc280046d770812a969bba407e729a4726eda04072c
-size 39369
+oid sha256:8276f281154b0efb30086a0a29dd2151ee877661bd777d4ef8a3b42fc997088a
+size 38904
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 9c5abc5b8c..3bcecbb003 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:90094980761bdcb3ecd10666af31f45be487cd06b81fd46710a6012610d25329
-size 39204
+oid sha256:8124cb5722fc04a67eed1c0c6752fae79e0c442e5e6195cfde84849cf9312756
+size 38732
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 6d1b50bbe0..2ab90ddeac 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:f98bbf43c73a0b79c7113180e117e8a7b391d4e4f1cb358aba8d1865bec5bba7
-size 40281
+oid sha256:39115aa6c569076f4ffa7be324f10c9de9029e3c4c73cf1b9ba203872de27175
+size 39830
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 22b46ce794..3aa263b83e 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:597ba7fae13fd3bc634aca0ef93e2e3626f552225b6848a5f7cff70fa04749de
-size 40327
+oid sha256:ae265a9ba682229a1c598e9bbeee515799e09853f62c5e6351f15b70b065aebb
+size 39876
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en.png
index 85de939c48..b509b7fff7 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63d0cc780cde0d6ed57cde9a15a397940a56912656a796ab467c5ca887f4efd9
-size 20086
+oid sha256:5896d5e6fd21697d6270aedb4389eee0d57a9796536b847ae657f57e6c2dab3d
+size 20974
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en.png
index 70a7a53c8c..c7aa6f6105 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8123501391e84366cf6d9d7521819ee05afc5189851a3c10a8a132d7f3fa04c
-size 68357
+oid sha256:95100c25fb085329f8968a765a4f4359678be67309d5e086ead311c48cfda29f
+size 67826
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png
new file mode 100644
index 0000000000..17eb214c80
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b6869e6026df038d739cc14a0a585563d595b1430ba23a985ec57680506ead2
+size 29857
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en.png
index 9ee3d8a1b0..3920f3fe0c 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59fd76b6c7027c3da91adaf37046325a291be0dc96adf46c70ed3fa5674d4d45
-size 20268
+oid sha256:7f103f89c71cc97a837cf0edc1035c580bfdf2d682857897241a6dec23c91436
+size 21163
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en.png
index 3e4841e5ee..1a31286fd6 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a984c6eec2f2c80fb0b6671d17e829f9241c6384872336017c94e5fb86d8c67c
-size 67359
+oid sha256:9989d429a1ed9f3190a19c0678168de77aca597ed8fda5208e19bbe109ab9ada
+size 66391
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png
new file mode 100644
index 0000000000..8ee822b18b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b3eb9e8908deb84153b19d3735dd2338fac2a7998793915eeec32d7607a0b94
+size 28671
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
new file mode 100644
index 0000000000..df6127b08e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c229f0f963e247de755f45e55432191f88a51ba79baf49f0002c2c12dbdc09e
+size 48613
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
new file mode 100644
index 0000000000..830b19be50
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbf1430985870c99c6e6a2b427257235219250e1c6805bde44de64d1382bd30a
+size 113544
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
new file mode 100644
index 0000000000..cb45797e1f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bc84691892f956b6d282ae5aff0a7ef7900aad754bb7f04e25582c25a256342
+size 45892
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
new file mode 100644
index 0000000000..df6127b08e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c229f0f963e247de755f45e55432191f88a51ba79baf49f0002c2c12dbdc09e
+size 48613
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
new file mode 100644
index 0000000000..625d293aab
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26a5a053b88110ed76a59a99a199ada720fd7a44ff3b95546c4993ae3d8edddf
+size 37496
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
new file mode 100644
index 0000000000..d1fe942dc1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1020f77055e3369f012f73159be9e8c7bf582d4211b3b22f5409ecba46b6898
+size 47180
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
new file mode 100644
index 0000000000..fbbcced394
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47c2e74119bd6f2329f15ee3b7dbf0115c69293bd34ed5c2e67de77319b7f820
+size 111436
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
new file mode 100644
index 0000000000..b0496a7ccb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:984d43efa545fb9f104ea6d4eba87e768ade025eee8d1f74260049a64c7e7a7c
+size 44401
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
new file mode 100644
index 0000000000..d1fe942dc1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1020f77055e3369f012f73159be9e8c7bf582d4211b3b22f5409ecba46b6898
+size 47180
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
new file mode 100644
index 0000000000..c6fed6a85c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41c5eb671aaa7c8666942dbc808eb7b03f81cbde98906c5c17cdee61b1d9566b
+size 35446
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_0_en.png
deleted file mode 100644
index d15018df6e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f4b40d4054fe07381e4fab8f8aaa7b7117877b604320368391ad1110446a7a9
-size 69516
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_1_en.png
deleted file mode 100644
index bde6b53c5b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2dd6a1108f431d55cda82bc3e407b061a0856b0a9540ae52e2b05a60129782d3
-size 108785
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_2_en.png
deleted file mode 100644
index a165cc983c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b554048c436741d34b22497e3826b36426f21d54f15490b9cd597260c258de57
-size 66328
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_3_en.png
deleted file mode 100644
index d15018df6e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f4b40d4054fe07381e4fab8f8aaa7b7117877b604320368391ad1110446a7a9
-size 69516
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_4_en.png
deleted file mode 100644
index a8bd00637d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c24a31b7edafd60ab0f12c82047a61a7164e5aa4098de8cb658400a286ad7b85
-size 49587
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_0_en.png
deleted file mode 100644
index 54603c98b3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e9ae25d8136e8bbbb3f25e09914e530ff826431d5f97f47ee7a669948fcbc5e
-size 67629
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_1_en.png
deleted file mode 100644
index 3d4b4cc46d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d82c13029a56ec62c01125f567020a95dea4d1396a88347cb64605f5df7fd79d
-size 106480
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_2_en.png
deleted file mode 100644
index f940027da0..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70b5abb97021c685bf1f766db4b10d6436e3129ff558bd2c6e2b3dfd919d4dc6
-size 63682
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_3_en.png
deleted file mode 100644
index 54603c98b3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e9ae25d8136e8bbbb3f25e09914e530ff826431d5f97f47ee7a669948fcbc5e
-size 67629
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_4_en.png
deleted file mode 100644
index 86e76becb5..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1838c753a7c55d31fae0e16b2211fa0af893525ed269461da5637654f3c7c8ae
-size 46388
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 53db951021..8f57e2e4ed 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:be58d7d4b0d23e2494c0ab210740d8929c8418272e06f9724df970cca7e432d7
-size 30484
+oid sha256:5a1114e981f63a95dfc3d0c8a450fce82873e1d98fa80d8c9201711bc4a285ad
+size 30499
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 eb3093d4ef..e46c025e39 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:82c69e8716b6f9e82d345b4fe8f426eab98b5e13b14172ffe514bf3aa3764aa0
-size 29991
+oid sha256:c8b7be3ef9e6fb215885ef8a5b28bd7a6ff6ffe361e30dfef14df57ca14eedee
+size 30000
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 4d85dbf9dd..bfc3f748d4 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:0ba6720620c0e54acdba9e696eb4e2e11f2c340249f8b4ef72318baa89fc6e48
-size 30151
+oid sha256:d87ce452ed7ef4f488e55a5fc1d93d77ca78339b34727304684bae94aa111334
+size 30167
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 f7fcfafe6a..6dab87ff8f 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:e886c5d31391cb69db81fb134269f0b1b1eb3d2cbaacf199b8ed432a80eb05c1
-size 27416
+oid sha256:cb48b7efd78a16d7adb7d5cd17a788be229bd62b02a6a721e2a91de3abceae79
+size 27394
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 b0605f4f83..e4500fb2ca 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:81b480562188e94a7efa60a7a6c6a1ca0e57fe641798bdefa950a402a3b3b4f1
-size 33264
+oid sha256:0f02f8336cb26b1c3efbc07462f1096d630f311117ef0ffaa5037acfcff00bbc
+size 33241
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 86cc6c2312..64c0190924 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:5c4d05bdae61fbf6d9be269cadb7b837696cd774e71546672d88e9165515673a
-size 29598
+oid sha256:7288b1bd11a6b9fcc1a516fabee4abfaad3f3ceb886d777514dfc6b5ec911109
+size 29596
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 05c65aafc2..aa60522823 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:9d63a1f46b5e8af83a70e4c1c66b25d00091e16e0f2b8d9d80d7286b08300920
-size 29140
+oid sha256:286f17b508268decb84f1769478d2e468b4884bf556aee3f7962ef5554d7e4ad
+size 29135
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 3be4bef5ed..dff927f2e3 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:c729c11242f95a81609fe29dc430398b73b4235d7854a712296bef6f53274f7a
-size 29142
+oid sha256:d73f40ab897587380598d3c433ba891b3ef2743b8d45c6bea0ca4d8f0a9905e4
+size 29135
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 651fa44f2e..1e28b59bf0 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:f4ab1cae16b2e22ad7078c16f29bfd8b02b45d7fb1f9cf91b08d9f73f72ba515
-size 25634
+oid sha256:36ebc9cac8de0e3683b2af3c886e20824b6dfff4c44915832f0f3dd5f18c4a73
+size 25652
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 c15adcd8ab..af71ab9c02 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:a567b452dd99226aef065b82496cff19f0a3e37d3c89a7d351432e72e5acd403
-size 30761
+oid sha256:89341188c1f6774fb660a95138d776a502b86b86a5696defdbddc78606eea13c
+size 30783
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
new file mode 100644
index 0000000000..49f38a28fd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd8976b009775ac64496007232f9771bba6b8afbb588c621c574a91b399bc4bb
+size 49734
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
new file mode 100644
index 0000000000..de8c905de2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12c69b646ec09afdbc6e90873ee831adbd62ea7c45679c54620f74a9bd74941c
+size 48321
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
new file mode 100644
index 0000000000..f3ef799045
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f82f648e9f5d67abfe2cf783df7e70568a74ff5dcae876e80b54995981a65886
+size 49650
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
new file mode 100644
index 0000000000..83b5995ef4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ebf86fc0ac80375edd1730caab4a669aa2cc545b2ea946981901fd360114320
+size 44555
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
new file mode 100644
index 0000000000..0c1593bc85
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fae74539f53342110e50a077ad78b8422d08ba931b948b2b167d90f6cbe8ade6
+size 43535
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
new file mode 100644
index 0000000000..5a6d410ad7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61bced1ea61f5952e83956b4c4447a0371fe99c874e2a20df431bc59e02dc838
+size 50316
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
new file mode 100644
index 0000000000..16c2a363d8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73d9461a1d51964ba1a912376658e3e550e952821f7aa1d9bff765ed11deb920
+size 49123
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
new file mode 100644
index 0000000000..865c938ba5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f096dcda405a17c90bad22dc6340543d8774c9ba65f1cd8cbd03a2077186614
+size 48626
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
new file mode 100644
index 0000000000..b261774095
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e72874066861ce76c76134dd84b9ab058ea3c7ca1c54176f8863c6bc1b8226fc
+size 47273
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
new file mode 100644
index 0000000000..cb24aa2578
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:192fce45ea8d83d8f7aa40f9337b2dd92c3b1194da611fed1c42fd771d74fe0a
+size 48534
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
new file mode 100644
index 0000000000..b16e4b3ba3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3ed16d04a1106b82183c4fe6ae741b598448050e2ddae2fa842b0b01d475e0a
+size 43230
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
new file mode 100644
index 0000000000..7ae9ff70b6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cb2f7d7cad98d111ed2c1c0b8120e5837f2586f845594e581b41b7cb96e00f2
+size 41555
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
new file mode 100644
index 0000000000..1aa08a4e12
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0862da8d120e276afd6bdef6a9b247d3976ae70adab47077d8749600dd695884
+size 48280
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
new file mode 100644
index 0000000000..25c50a55cb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48e5f7460a13798d2f2963930e4e7a95c6a1ffa704d034ec21e33ba1bde6606c
+size 48123
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en.png
new file mode 100644
index 0000000000..c0ff48bae0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a58fa86e0a2cb291b02c2ffb3f76fe0d57017b5220856bdd0713b6ced0a356d
+size 13406
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
new file mode 100644
index 0000000000..bea20a3048
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a51cf55a538fd985cc0420d732c11b3c139d0df90d42a6d42a90bd62f9881169
+size 50271
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
new file mode 100644
index 0000000000..9be716ae53
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2ed03c7103b4e27c4d7d63434d8e7423b50873e313eaeb70a1d9336fbcb8414
+size 52721
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
new file mode 100644
index 0000000000..c84ce11429
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:037afed9109f51f4ce85e229fb93a4a77af4b72c2cdf98b4031d9f5fc996f090
+size 54418
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
new file mode 100644
index 0000000000..8e1a2a9e52
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d197fa0244d1559df5cbf81d0e7d481ce082af2b217d37b38c889a277af00a37
+size 58933
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
new file mode 100644
index 0000000000..03baa74419
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e6ff8fea6c46b55d6cb44b30fb8b9d4a5684772f2a9a4477b0eb76c1b7f96c0
+size 67481
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
new file mode 100644
index 0000000000..af17aca8d3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05db7ff5f96294dd9cd6c9b60c3d438c6fede097d7fdd4b426e64d3251201fc9
+size 61271
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
new file mode 100644
index 0000000000..f9fe320d41
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3bedbc4de85e76b8304aefb7b34d14880fcecd11d524b6bc087ca3166d739bb
+size 61218
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
new file mode 100644
index 0000000000..a45c9e8c94
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2efc1ded97f446b8e94b61dfeb8a96e518e627042c1886dafaf777b90cfa31e
+size 55050
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
new file mode 100644
index 0000000000..b0a04a76d1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:043a2bb306d01e88f3825540bc7d6c1cb4c14d9b57ad2f7ac0173e9aa5a5ce3f
+size 12495
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
new file mode 100644
index 0000000000..958cd1c0e2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de9f998278b6383dc82be6ae41847bbcc835fc74c07bcb7c4130a3f81075ec8c
+size 56993
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
new file mode 100644
index 0000000000..859072a854
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a57f78edff78c6e31e2a8edecbd4579ce0cb318ed99101d51c4bf584dbd3185
+size 61434
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
new file mode 100644
index 0000000000..aa0d0e395e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a754cc6e9656b57ee4728abbf3adbe6249284336fc02a50d9d4e6c2cbde2b43
+size 52651
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
new file mode 100644
index 0000000000..f9fe320d41
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3bedbc4de85e76b8304aefb7b34d14880fcecd11d524b6bc087ca3166d739bb
+size 61218
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en.png
new file mode 100644
index 0000000000..4cbb688206
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70f773618ee9ec9eaed88bed76c0a03b4823f14bbf1abc11df82463495be679e
+size 12736
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
new file mode 100644
index 0000000000..0ef0197cb2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3dee1cd8e570f79740948aabecfa11f58267aa6601ec29e1ea8f68d3202f0e6f
+size 48652
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
new file mode 100644
index 0000000000..810c03544e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8a6c9311fcee79df31ec8bd3bf6df3369e32939910e10cabc35a721b3ec43d4
+size 53565
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
new file mode 100644
index 0000000000..51ae61a851
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3cec78363008275d905da949ca9eea583f37e31ec687e3dba336bc0aef51f43
+size 55104
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
new file mode 100644
index 0000000000..5ef22333b3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9abc0395c4295e6f6a23a67cd8d53a8aecf965326ad98f3d0b98646dd27f0851
+size 57061
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
new file mode 100644
index 0000000000..7d5b8826d9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16645d4cc9fd23d693d13f073b4c735558a269aab8314bb72224897d6d5d42ed
+size 68041
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
new file mode 100644
index 0000000000..12c282df4e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:014e26a0823d1bdcca32c483e45b8f9d3f35a904b8aaa449e0bb71f8fc1c2423
+size 62026
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
new file mode 100644
index 0000000000..8a712bf578
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f82351a84d8f262356afeb9f07c4dd90d675042c599f4f6f5d028581ac77c173
+size 61956
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
new file mode 100644
index 0000000000..98aabe3df1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aab9343af69ebc39fbfb90acb71251983172e76e5708d2db10c13236287cf97f
+size 55418
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
new file mode 100644
index 0000000000..6dc63fc622
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4363afcef8e7ad7ff66c3071a22cfcd102af99cc548382872f3d7197e26f0e8b
+size 12510
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
new file mode 100644
index 0000000000..2c451a9c90
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39f48cc37c35b3c8c39e44c5936712277f467bd1b8c774606593d6a678f28353
+size 55378
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
new file mode 100644
index 0000000000..bfd00e9c5a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ed24adcb2f35d6041a64ad143ebc56e6429ce8967c41990204bf5b04b6c4817
+size 59493
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
new file mode 100644
index 0000000000..f711e4c89a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1caaadd9b46f40c555e06c38058266b7597c50c8c59f1d5ca7b266f05f874f5e
+size 51851
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
new file mode 100644
index 0000000000..8a712bf578
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f82351a84d8f262356afeb9f07c4dd90d675042c599f4f6f5d028581ac77c173
+size 61956
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.changeroommemberroles.impl_PendingMemberRowWithLongName_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en.png
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
new file mode 100644
index 0000000000..64076f3cd4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed4c8027b7b3d7d17f77ba4ff845c420d90abfdb1fc396ccc7b12b22797e5839
+size 28573
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
new file mode 100644
index 0000000000..1246e10f0b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a336648d40fdad606066d300c04dd3defa6d6ca400d54a8cca79dc4882f9a98e
+size 30407
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
new file mode 100644
index 0000000000..27c90cdfd5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:918d5a95d89d2b41f7e3d74c87bf0667ef952e09b14562c64450700f644b068d
+size 58887
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
new file mode 100644
index 0000000000..7e240e5f6c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b65bfc591bef9d8b46d6d407e0eddf66cc7592388d420f47db3ea8bc77a4965
+size 27843
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
new file mode 100644
index 0000000000..e2a4906a7b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97720e50aaa0b343a1cf10ca75af15bcf486cf0c65c6424ae001f70c75318da1
+size 26885
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
new file mode 100644
index 0000000000..502eb2ef21
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2aabbce8dd10ad0789539933f8283c05c55a038c1d6c0b45e117d7deb8a38ef
+size 37001
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
new file mode 100644
index 0000000000..7e240e5f6c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b65bfc591bef9d8b46d6d407e0eddf66cc7592388d420f47db3ea8bc77a4965
+size 27843
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
new file mode 100644
index 0000000000..95d95b3def
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9013338b4dcd6c872dc2cf533f4951b90db950464a955d7d2b59d956d7032f6
+size 27178
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
new file mode 100644
index 0000000000..02f0d0a536
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c43f56630d427ce823f112060499da9be2dab65618af50b942c84ec9622b9b0
+size 26954
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
new file mode 100644
index 0000000000..115e9b9be0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fad762ca7f4c2aa42edf63c44b00180e9a2bc2d11630733b357cb61a83afdf6
+size 27800
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
new file mode 100644
index 0000000000..e7806b3b5f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:030f8016829e8d8151608ae8da926f1b746ff8cbe441b14dc56df038c070421b
+size 29525
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
new file mode 100644
index 0000000000..8abf25d0d7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f58d77bd8987c3edeebef9f1dceeb256856f7d0db4e32cb9894004b811a12302
+size 56551
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
new file mode 100644
index 0000000000..9c9a81e48e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47d4472625e760d10f764fa935401d9722b5f84d1415721a27790b3351cb2ed3
+size 26322
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
new file mode 100644
index 0000000000..eb863493c6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b8b326d29b93973b97dbbe68be5909d72b69b9545b6a50aa0c1ac6a94ed6499
+size 24938
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
new file mode 100644
index 0000000000..1440d80e95
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d40314670a46ad29840bb187c0126121ab1305889f42324aef83d45010efca6
+size 34481
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
new file mode 100644
index 0000000000..9c9a81e48e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47d4472625e760d10f764fa935401d9722b5f84d1415721a27790b3351cb2ed3
+size 26322
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
new file mode 100644
index 0000000000..0ccbdf9458
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd524a8c02560d19eb8268f3355a309c4ede2e42de835925cf99a018b7264728
+size 25260
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
new file mode 100644
index 0000000000..8929893927
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c17b097be381e4a81197a8bd55b0d919a70caa7f8257d956f952daddd0e3382
+size 26212
diff --git a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en.png
index 31eb958563..536e74db6e 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d4663e9c2c439b05d6d1abe7ae7098539f5263461e9051b0b97305a31b5aa33
-size 8395
+oid sha256:0e9ced8663df865c6bdce2e2c05bdf11a48f7b8273a0d34ed7da775bce87568a
+size 8428
diff --git a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en.png
index 947b0607e5..0cb402b1d7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5365eb3dd7e10fde8591e6d5ee6dfadef88a9fa25339309ce08445f89af88789
-size 29187
+oid sha256:56c9ac5e7b9d851e662e4544f961ca82685e1f4c93b3df84f44426e4ab40ac73
+size 29166
diff --git a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en.png
index 6faf40fe01..119a2bf6a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c66ca10f770fa2f29716f7c737be0acef03e364e9a27a85b81e4ef63e768b6f
-size 24012
+oid sha256:97a73b393c4aa2eaebc39809cc2cbc368dec4baf1d95f08b118b586a60aca841
+size 23997
diff --git a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en.png
index 26a56fec35..c0269290cd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5b7cb8b7ef8b58a5fa77b7c1c6a911798940337ea9646383ee0cb082dc68f7e
-size 8263
+oid sha256:38b209ff4fe8aca1f46b3ce1d140c1a83ca1620affec81909eb2916528d9974c
+size 8250
diff --git a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en.png
index a6bed8f351..4c6ee1e461 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c02fa02a7f5787d375ffa6e9bb69cde0b23ca87512ee8120d318becd6de13bef
-size 26763
+oid sha256:44492987b98ee92ddc9901ed766fdbecc346bccb7c10e0ee942b7ea79bd481da
+size 26789
diff --git a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en.png
index a0b5cf90f0..90e9f99470 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5852e500de1f27083f033726a89d2dda594497d2af7fbe843091cdbd06ddd975
-size 21628
+oid sha256:8217409aaf7e1b3960f0af4491b71db2f7fd59fdb58488c366e8d6f485955fe0
+size 21653
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en.png
deleted file mode 100644
index c391aef711..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b953eac8ade925a0f9c316c8b47dd5e471063f70897916bb3d36f34d625ed96b
-size 27826
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en.png
deleted file mode 100644
index e05a2d7ad0..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:370f116fe43e9ed2aa4e2b29b6d50a8b62201a36b62b71dcefd42629f6774edd
-size 21676
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en.png
deleted file mode 100644
index 76fa94d404..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f849c7983a0c67dd26874b4a595a665b781f58e857b41eaa12190aa78949fb2a
-size 29308
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en.png
deleted file mode 100644
index 10df941a67..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89a58ecd610f46c4ff0d9c366ce3d51a7eef9821931271920a8a685843f58af6
-size 53536
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en.png
deleted file mode 100644
index 0bb33b1d3a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89b4dcfc85081c180afca7be96971ff8758ef5aed6588ae68e65f920ebdebee5
-size 27788
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en.png
deleted file mode 100644
index 7e5333af49..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eba4aed9a79fc9dc3dddd3b89fbed11924e6d620eec8ec56c4e373b98641722e
-size 27871
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en.png
deleted file mode 100644
index df512f936b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4f6ffe8f3d1e0287f706eb6be1d67597296f0ec52ff9f2e258442c1eea461db
-size 26287
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en.png
deleted file mode 100644
index cefbec4147..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0de2b1fab6431b6454406ccfb29f3b781eb70da590e57a0ef7f556dbcb303fd4
-size 24680
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en.png
deleted file mode 100644
index c035a934a8..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1e1bd10d3cc215bb66b0bdbfc932773dbbb8c2e0f5c14daf82432f4ffb70e34
-size 27309
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en.png
deleted file mode 100644
index 992f7a9ed2..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17874964eaf6a8b6bb5fd2a6cdd727223c3def32f06a31538a9ffe2d54d860f1
-size 21441
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en.png
deleted file mode 100644
index 130b2cb3f3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e40ce72965b5d76e538743f7cc032f864b91da50b0d1587cce737c323200ee6d
-size 28841
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en.png
deleted file mode 100644
index d4dd19eff3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b06ff504b5a01f78ee92b4cdefbcd368dbd3512ec0749a1352c1b09f3de5d37d
-size 52506
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en.png
deleted file mode 100644
index f5ae14ddc3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:549e3c54026e650c0cf4be79ab3e00df9b74d4d65a5d12b782d022b4f08fd096
-size 27290
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en.png
deleted file mode 100644
index b4b7604fef..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5afc5518c3f26f262ddd3e5d176bc1dd22f1a049e55f1971d00a141bca3bccd2
-size 27279
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en.png
deleted file mode 100644
index b8bc29fe27..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7ef530d55af619805d70ecdd851d25fb13b421f76b6d953e42e248f7c76fc79
-size 25361
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en.png
deleted file mode 100644
index 8f07770e74..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b7bcf2b275a3f8cb01fe703331922573930addd4f515660df89f1aeaed6fd23
-size 22827
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en.png
index 4149be807b..eff3bc9eb4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:611314345ea0f68062800755783e790ad452adec1f1dd01fcae1eec4cc5322fc
-size 8188
+oid sha256:f1c287b3f7f10a4e30b9ba4250b2637ace26106ad14a9a2f972c12bfa1bab4b2
+size 8200
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en.png
index 39ff3000da..749a9ddfc4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86a07a08b2bd2b6672da54bec6183ccdc860740a24cf43e88d3e40c0b50138ed
-size 8110
+oid sha256:961e47e8858c58198d4d227126fc470d2a33c7d14868d62cf0bfa5284392d8d8
+size 8127
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en.png
index 4149be807b..eff3bc9eb4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:611314345ea0f68062800755783e790ad452adec1f1dd01fcae1eec4cc5322fc
-size 8188
+oid sha256:f1c287b3f7f10a4e30b9ba4250b2637ace26106ad14a9a2f972c12bfa1bab4b2
+size 8200
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en.png
index 1f179c4be8..08659cd742 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a809a8792d519f93df9a15c57c06d3fd4f3cb7c84245e80cf61ff07ab1c5d620
-size 20363
+oid sha256:5b23a3efa28a37800b1b040ad41aad470c4dca1d74a9c5ffe080bdac279f2b78
+size 20339
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en.png
index b27727ee2b..18fede63fe 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ba9d3cb9a5a601b28ad9ff508c3179921cf26fcee86194c582092b1d7bf79d3
-size 7992
+oid sha256:3cae1f39c2e725d90b00d03bd6f7ff94187f568d3295e20744248f60d65a4049
+size 7973
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en.png
index 3f5cacc2d0..2152a5adeb 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cb292850354b8b6ba5ca36334d1664dccd617e7a6b9b55ecf3ac7d1b9729d90
-size 7872
+oid sha256:ae4ddaaf7d0dc35db82d816b26c5f8f1e0729f8f288b37028cc50379ac4c81d9
+size 7862
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en.png
index b27727ee2b..18fede63fe 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ba9d3cb9a5a601b28ad9ff508c3179921cf26fcee86194c582092b1d7bf79d3
-size 7992
+oid sha256:3cae1f39c2e725d90b00d03bd6f7ff94187f568d3295e20744248f60d65a4049
+size 7973
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en.png
index f326451237..fe39284230 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:433e3467cfa0c0f4e737ec15a1c41d6bbc36d4d2c2dd9f2f7f22bb457208f280
-size 19180
+oid sha256:2c9c97d8a3c0dd11e1d1e8b138e9d7c9828a728692a637457d5ddf84110b2d09
+size 19189
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png
deleted file mode 100644
index 3cbbc49f07..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d1216938fedaeff20ce66ccaf07aa58d40a78af9687a9cae8a1cd384810c525
-size 11519
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png
deleted file mode 100644
index 16e835b343..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f1e2c79a442466832e20d8a3a46c56c54e2e665c98ce99857cd2cf5715049e2
-size 11754
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png
deleted file mode 100644
index 3cbbc49f07..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d1216938fedaeff20ce66ccaf07aa58d40a78af9687a9cae8a1cd384810c525
-size 11519
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png
deleted file mode 100644
index 3609e34598..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be6e6a6e80ea81318c599ec2493c50cf09dc6abbd39e708a495f818a92ffc90f
-size 10857
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png
deleted file mode 100644
index ddb20de451..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce1af21f57c6b7a1f7851ee82595e745252b4d2c4d8cff989b3323dbb8d3d039
-size 11070
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png
deleted file mode 100644
index 3609e34598..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be6e6a6e80ea81318c599ec2493c50cf09dc6abbd39e708a495f818a92ffc90f
-size 10857
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
index 318f89b756..0a2320e58a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:300940add78756d5c26ea23c9c2b18136fdcf50faf89da15e829f4a3a15d89de
-size 44275
+oid sha256:367bc0df8b1839af2b434de55ea3815af4a8c112cc96e98ee76c3b9a4949fe52
+size 12985
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
index 38e6f71394..96ed928dbd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a5d4752df6c97093232e64e23d7c834bd4d565d4b84a345a9e6054626dba1ec
-size 45514
+oid sha256:1700a0f9e6f9115015849c900d7faa27f70fa29752bde7666eeb36cf4eb1a6da
+size 19463
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png
index 16e835b343..36bb8cffea 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f1e2c79a442466832e20d8a3a46c56c54e2e665c98ce99857cd2cf5715049e2
-size 11754
+oid sha256:1b654ef6029e31f4c5de17ee69807cd10ca307804939efae3c8a5859eb94c8e8
+size 53744
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png
index fd34fc3e24..9a15041143 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92446c1396217fa0684aa9e8897885ca5287ed7fdf74850f1762c2359eecabd7
-size 12692
+oid sha256:0dfa48cfb76e2c62e9eef83d5d3c3ffb1006b0d68a6898f79117e137ae55f942
+size 30267
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png
index 16e835b343..2275ac754f 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f1e2c79a442466832e20d8a3a46c56c54e2e665c98ce99857cd2cf5715049e2
-size 11754
+oid sha256:8b281cb130783d24f386536badeae5d669aeabe7f74f65042b13202dfce14960
+size 54623
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png
index e411b6af24..636e5f40e7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d4b9de6435fd95ce140bc0d7f2318c280fa7ed17e702e3b90a3afcc23d7db99
-size 7616
+oid sha256:f74dd5cf34442fe490ef8277851a330c21b1456105d64dcbbc30015631cfe83f
+size 18568
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png
index 87c4379585..e75132eece 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:644abccc89e0f92874cbfad066c4584dba3337050653c99faebf5e04990ab809
-size 6512
+oid sha256:acfaec83e840845137f9c07d1325e24f106bc67ccdbf6c548e77efe1d490596b
+size 29428
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
deleted file mode 100644
index f59492b8f7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31285b06f39a76722344c3636e9b048df4f959cf4cfd0c01c94128fac7e4e3c0
-size 24524
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png
deleted file mode 100644
index 1e5b7d9b97..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e9b1bad8ed601e1511517b63915ca814822b0b9ea07c679bdf0a0d229514fcd
-size 10982
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png
deleted file mode 100644
index 71269db327..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6ad8efbd1ad71e063097a9a4598a42a9d7050acceaa44688d232360d0f7d9bf
-size 18246
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
index 4bd09bdc1c..aa53274f42 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8887fa18291d5c3e68a7ad68738dc5db924231c7b80303dfafc4e4556c120fdd
-size 44282
+oid sha256:7b01cfde0e59d64a9e6d576e22e2ac9eeab5ab1a99cb0f9f54d1c8cec80ac4bd
+size 12154
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
index a4401002ff..56cecab8e5 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ea957bf883ed74f0fba1f6b5ea7835d0a0c18a14ba10ab51c35abd426c9205a
-size 45391
+oid sha256:2cb19c23879eb9698729561fb1ef79c1e65a36eab0f24681e4cf72dfdde45d04
+size 18281
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png
index ddb20de451..8f4f9a52aa 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce1af21f57c6b7a1f7851ee82595e745252b4d2c4d8cff989b3323dbb8d3d039
-size 11070
+oid sha256:b5f222a27028cf852b3c92985b2ed70c406adf950fd4a9c3fe11885ede4b458d
+size 53832
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png
index be6f41ac15..5a6ac97cf8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98fd6be6b52e03e81ba5257336ddd304ff7b5e6eaa51b8949d92058cd7e23030
-size 11926
+oid sha256:8385e865dbfd322194631f9716761b66d94b86b47d351e777b653818a0a6fc3a
+size 29291
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png
index ddb20de451..f470fc5e23 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce1af21f57c6b7a1f7851ee82595e745252b4d2c4d8cff989b3323dbb8d3d039
-size 11070
+oid sha256:4dbfe0a0cc6a956b6288a82912e2de32a9555ced9a31a67ee63fed29b09b78fa
+size 54701
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png
index 1af7879624..d53880f9da 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbc2c5cde5338fa40ec6867d1e2a4a509a5628d8a023f5d817ef2e5fb02b4661
-size 7536
+oid sha256:a7826ffc4183453ef0d969f92cc1a034e0405732910c203213daf68a9870327a
+size 17991
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png
index fead205ccd..8b06d03eed 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66be6948d1a617e3862da5c34ec98e872bfdb7361a7b393975d05497aef7b76c
-size 6323
+oid sha256:3802b661c6fc656f621ba3c368eeb93f004561b01926faa572c4ba5ee66d07eb
+size 28474
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
deleted file mode 100644
index a893745106..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:475d12058c5f70f34c36fe9e5d4742da4f2a2386aac1d92408562c6fdb1db2a5
-size 24480
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png
deleted file mode 100644
index e34c2e6570..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:291d3d607a2cc36ddea86de2309cb5da81c69da426db714337ceb4bfa25154e1
-size 10663
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png
deleted file mode 100644
index 7790be4225..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_9_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f416065ca537b104746b138f4108cfb76e77cda5a5499353122b4ba0abcd0fc8
-size 17207
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 e67fca7833..ab2db27752 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:675c0c02e42a3cb754993218f11513fea3353fb2090b93e5a22c4d31542f7c11
-size 31900
+oid sha256:3c17a487ae8929396f0df8d93b0171abdfa5ae963b4de9ed377a3bfc22c63e4e
+size 31915
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 f7611ee8ba..5a300dbf11 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:c45717a6e3d80735df1e6b59b1bc33647c98f07d1a9acd69cae53a3e7176d371
-size 36129
+oid sha256:0947cff89e840ac34939474e1b450c8de4615f8853120162a66f3728310fed15
+size 36152
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 d406ec9330..cae7ba1845 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:f401360a58bcb6a62a6579f809bf3da2646161188b19d634353d5f7e51c8851a
-size 30236
+oid sha256:c259c1bc40cec6a789e36bbc96cc36a3dde072100928ce579da0f9900a3c7f33
+size 30209
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 b6850ad21a..e06aa838e2 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:73d448497b30a07b42b14a34ea557242fba2f5377840b24cf2ce1afa422f7dbd
-size 31776
+oid sha256:ad6442bb6e6c71dd5b3e206ce22fda4ea546f3439f0e1d5ad06696e4fe44a059
+size 31743
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 d406ec9330..cae7ba1845 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:f401360a58bcb6a62a6579f809bf3da2646161188b19d634353d5f7e51c8851a
-size 30236
+oid sha256:c259c1bc40cec6a789e36bbc96cc36a3dde072100928ce579da0f9900a3c7f33
+size 30209
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 b6850ad21a..e06aa838e2 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:73d448497b30a07b42b14a34ea557242fba2f5377840b24cf2ce1afa422f7dbd
-size 31776
+oid sha256:ad6442bb6e6c71dd5b3e206ce22fda4ea546f3439f0e1d5ad06696e4fe44a059
+size 31743
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 e67fca7833..ab2db27752 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:675c0c02e42a3cb754993218f11513fea3353fb2090b93e5a22c4d31542f7c11
-size 31900
+oid sha256:3c17a487ae8929396f0df8d93b0171abdfa5ae963b4de9ed377a3bfc22c63e4e
+size 31915
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 5993268497..4430ff2572 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:c272f1da79452611b1d34d847c6f3418ecf54c96808f347ef81db40b0b429d50
-size 30946
+oid sha256:84299116e3c3dd76c2772bdb8d9a10252a0fc41dab1f55895ce0ce2aaa776939
+size 30924
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 a16743badd..461023a30c 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:62e8101f166dbddf64cde8abdd7dd4e8a5e1c76ab4b7ad4d9c8b8f0487fb3524
-size 34688
+oid sha256:107bcd40822d1d93d15e9c26075e9c86e6efabf9177a73b35236e7e64f1de507
+size 34664
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 c9efcc5a24..cbdcb3699e 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:9762161747dafe345c793a5b8f6f14ed48ff7d27a3e2d95ed80bb785d4a93511
-size 28548
+oid sha256:5138bd2e888ca8ce54c2c4111a2db368379588628e76a78c8329fbc2765454db
+size 28563
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 7128ba05ae..6dd5511fb4 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:53d08bd318b5336cb7de1a309299f1778f9ba1ef9c173139ad5d81e9358a91b6
-size 29391
+oid sha256:764499d413b3fd4e5bdfaeea3f45565c82b9635859285ebf2b31210656e7f5a1
+size 29407
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 c9efcc5a24..cbdcb3699e 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:9762161747dafe345c793a5b8f6f14ed48ff7d27a3e2d95ed80bb785d4a93511
-size 28548
+oid sha256:5138bd2e888ca8ce54c2c4111a2db368379588628e76a78c8329fbc2765454db
+size 28563
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 7128ba05ae..6dd5511fb4 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:53d08bd318b5336cb7de1a309299f1778f9ba1ef9c173139ad5d81e9358a91b6
-size 29391
+oid sha256:764499d413b3fd4e5bdfaeea3f45565c82b9635859285ebf2b31210656e7f5a1
+size 29407
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 5993268497..4430ff2572 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:c272f1da79452611b1d34d847c6f3418ecf54c96808f347ef81db40b0b429d50
-size 30946
+oid sha256:84299116e3c3dd76c2772bdb8d9a10252a0fc41dab1f55895ce0ce2aaa776939
+size 30924
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 ff9859841a..e8a8539cb2 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:c642b85f3ca9bc75fdbe185d672f34ca1fc62ca1ddd3d8e67c696c872da5d35c
-size 22754
+oid sha256:819698bc798a3921c8cfba9af3c85a6f7e0f083ce0f2b1e01603f702793fcbd5
+size 22765
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 63b9d46751..8bb7bafebb 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:79dcc8a5cb2ff0151fbfa02c2e3ffe5397f2bb2beb539576d331d10fd9d4096c
-size 22096
+oid sha256:a371a90d88a5f2324a6a6c73224eabdf3acb275c199ae5a30f8e67ac2f469683
+size 22094
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_en.png
deleted file mode 100644
index 02207c2e1e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9494f872a46ad3be37b4a4f87dfd2608e85abb3f7d2a0ce981c9f4950111e7df
-size 39928
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_en.png
deleted file mode 100644
index 8824aeebae..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e756efb16edb27b2c96d53b517b9b856dd14493ec7b2a74af1d7455539cf5e7b
-size 36243
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_en.png
deleted file mode 100644
index a8e10247e9..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:074ad5504ff8c83fb8045bc0b634a778590802716e4e6cd7f9dc399a8b90a4ff
-size 46644
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_en.png
deleted file mode 100644
index f9ffbd372d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2701328f6f8a5842caf5e50e87b5e244b4ee747e7258e71616274555da67a1dd
-size 39832
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_en.png
deleted file mode 100644
index 7ce673b174..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ddf83a5648af44f9578684e37008d04e9ba92858bef9e0d05ec96e3f303dbbb6
-size 36309
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_en.png
deleted file mode 100644
index 009cafb636..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c73dec8a0f078964d83edbadb9a0891925553951c2488a845d0b1258c5202ed
-size 37226
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_en.png
deleted file mode 100644
index e2f67353d2..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:146e40d680e33105cc06cda3a113432f29b42bf7f3b539b4ea17fd6ff9a9265e
-size 44093
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_0_en.png
deleted file mode 100644
index 520f9abda5..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb8cae34d06c27c533ac17f9532f42461b3cd9874130686e2e9f99606ccdfa76
-size 38710
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_1_en.png
deleted file mode 100644
index 27040e8feb..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c19aecd9ef2a74f6422578cc14ad493c793d95e0cce8f77215cfb567a899ca01
-size 35198
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_2_en.png
deleted file mode 100644
index 54cf5c061d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab1f7dc6952d2107931123de039ca51499dd30857bea4e4f4ad0599c15260efd
-size 45065
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_3_en.png
deleted file mode 100644
index 15a62d4f1a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:868eb921ac33a4ef54b57413700f6e55dd06c8c7f69bfc9385dd899be5b8ab10
-size 38570
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_4_en.png
deleted file mode 100644
index 0aa7a210c6..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f2e0a488a65838ed88398cdf03fae590755fba60f42e83de70a810f4dd54107
-size 35180
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_5_en.png
deleted file mode 100644
index 3dc1c56477..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e6dd87ec7efb2236890b1966c2ae2bd7f51ee9962b48c977623d782ae3fdfe6
-size 35422
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_6_en.png
deleted file mode 100644
index f6dad027b0..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49f72fe1ede6eb11c2e1572af27086df4f9c7eec45cf3ea3cfe6235ea89f12cf
-size 42150
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_en.png
deleted file mode 100644
index dce329ba42..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3dc2312f75755a78f421e3762bc9e8b2855245e98f6a86301c55d5f211c9ffbe
-size 41002
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_en.png
deleted file mode 100644
index 82e8596a02..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f6e5ef63d398d1bde49db96a040060965c0c2f04e5876591975c4a6f54e98e3
-size 42772
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_en.png
deleted file mode 100644
index 5082c3ba55..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d97b503413d8d9407021525019ed2804be3db79fe52d6e7ebc7dcb7b86568027
-size 59067
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_en.png
deleted file mode 100644
index cfcdf2f7cf..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de22311362e553395b8378efe46a0b0806acef5ac2b58047d6edb0eac47f2a9f
-size 39573
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_en.png
deleted file mode 100644
index 11c1a0a413..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4d1322fbbae882c76d799f17a6727b940ff8989ff33e7a64234ad5591170553
-size 38427
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_en.png
deleted file mode 100644
index 083c6db26f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c017878fb3cf2428e1f4a36aa56e3b6a230e0f527f4e67300264c3969f7d37f
-size 48477
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_en.png
deleted file mode 100644
index cfcdf2f7cf..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de22311362e553395b8378efe46a0b0806acef5ac2b58047d6edb0eac47f2a9f
-size 39573
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_en.png
deleted file mode 100644
index 11d28447f7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57fb7a950245881975dff356a879b20c2d8c7de3d2ab3fb713bfb5881ee5529b
-size 38748
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_en.png
deleted file mode 100644
index 2c02ac8913..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e9e858c64c40b71fe33178f16b092a2d324028481ba99120c023b6c0a965405
-size 39122
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_0_en.png
deleted file mode 100644
index 8874ab64e2..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36cb3f8f39258371255c0ad9bf9435103bd1a41101a0208bb200326682792637
-size 39761
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_1_en.png
deleted file mode 100644
index b059c0ab70..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfae932428e12791f76fcef42b3d2cc652ab3b4dcb779080623fc8310822b400
-size 41506
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_2_en.png
deleted file mode 100644
index a9a3a69e6c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ab4fc64b904eee3314f8bdbdd1be88abcf4b74913fc601c1b0f3c9f0d4dfa81
-size 56674
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_3_en.png
deleted file mode 100644
index ce788b7ccd..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8aaf6b4ebe4d5f6271fbece71ff719ac2167c39a752387d29cf1a4107002479
-size 37783
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_4_en.png
deleted file mode 100644
index 7165c72842..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff2c50c0d2a83e1a4f35e7c5bbb4fef7c60d986e2a27cdf0f2c49bbbbd8ed02b
-size 35854
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_5_en.png
deleted file mode 100644
index e35736c376..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59e1ee6d1313c208b1a0e50d961f1b849d3276c0ea55625ef08f5e6e3f2f7f0f
-size 45344
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_6_en.png
deleted file mode 100644
index ce788b7ccd..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8aaf6b4ebe4d5f6271fbece71ff719ac2167c39a752387d29cf1a4107002479
-size 37783
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_7_en.png
deleted file mode 100644
index 740211ddc7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2944e3753374e258ad8650cc32ccab4818b1d64d5337792d886ec78f0716f579
-size 36191
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_8_en.png
deleted file mode 100644
index 505d5cefff..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0735f16bcd68d771337948c837a41d3090232ffd09ca589702beb9fc50f3ac2
-size 38032
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en.png
deleted file mode 100644
index 82712a63e8..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51ac5873e21b8ea93e20c6ff81040ee3fc93e2b02baf22ef6335db44bb591039
-size 24597
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en.png
deleted file mode 100644
index cc7743e207..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1eab7f2a2a63ced77b87380bedbd146b2bdbe2a4fb1d2b987d13834b5281a87c
-size 28595
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en.png
deleted file mode 100644
index a380ef7ea9..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:540fe5b04694b81b0315ee551008bb72645e977538668f8aeebca83a921a5084
-size 30943
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en.png
deleted file mode 100644
index 6795b2c0d3..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00de9807d1c6d93ff17614422f9e9784e59f83ea00306c6c79b7f30ae8049e3f
-size 24476
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en.png
deleted file mode 100644
index 4b9a05718b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd13e2ba20eb7dd3f8b19554b959720d8ba9a9a0fd6d5060fc53dc2f5307b03d
-size 26621
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en.png
deleted file mode 100644
index 5e99f812fe..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0407ca38ceda0c4554ed4ef578165129793337377fef1fee72c9bd2ba0143f2
-size 24214
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en.png
deleted file mode 100644
index e99e557fc6..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f0c39b5b8c03298d94d5937f9a062da1d06be572644190942ae7961ae492c09
-size 28024
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en.png
deleted file mode 100644
index 54233f9b70..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8eb6739926a528c63fb4f734c5fda9912cbb6a2022ac16c3a25fe17b2c9fc29
-size 29785
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en.png
deleted file mode 100644
index 7623622fc7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f431a0f41ec54c87703a786d1e79bc84e69aa1b091cc6993fcf156a35ec1cf5
-size 24115
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en.png
deleted file mode 100644
index 618fbc6e79..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a1ae81a4538889344d3ad43646b81063fac320c1b25ee2e5b513b758bedc948
-size 25148
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png
deleted file mode 100644
index 400ad9ba6e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:657c8d384a535024a7aaa0e2d56e4e4e576c954c5f44570206ab967681a28a86
-size 40682
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
deleted file mode 100644
index bce7c956c2..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29fb77cd6d4321fee7580f88ac5b83e755ec74754faee10de88f835bcd7f034e
-size 62990
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
deleted file mode 100644
index 8b82c8a06b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36cf813b498734d339af50f008a30b48f54f9de0128b3c3d15ac2ad9371ac6e7
-size 63119
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
deleted file mode 100644
index 05c7cc64ed..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:275eed3f32278ad8c777c2d49700ee9d5cf0af2be9c1440a41a743f9bc10d968
-size 61407
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
deleted file mode 100644
index d27a67ad5d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df53ff0386360e547b04ea549cfcbef8fe3a4d5438f9d9c1955ad86855a9d316
-size 63153
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png
deleted file mode 100644
index 9b4dd9113f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5db1860ad7cd0214558f9a95e94e30ddb06cd5da64e47bd8c55aedc3e59e671
-size 40524
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png
deleted file mode 100644
index 9b4dd9113f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5db1860ad7cd0214558f9a95e94e30ddb06cd5da64e47bd8c55aedc3e59e671
-size 40524
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png
deleted file mode 100644
index 5d92595fd1..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7a16f107a2eac551046e9de5dbecd126c92466562f4c0d2fea2c1688248f680
-size 44197
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png
deleted file mode 100644
index f7f9ab0c97..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc952470726800a34a70a733b8d34b7c895acc2e52dda54f807d93851adb2e8b
-size 34852
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png
deleted file mode 100644
index 019a516f02..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59998acbf3f43492ea6cc8a5f25e03c80adb8f877ca391a7a0712999d00804f9
-size 42303
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
deleted file mode 100644
index 9d377a453a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68009b47c0a6c8f19f96d0f11c7c5e4951a52b60d32593db0507d26c8deb6e87
-size 65067
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
deleted file mode 100644
index 6dc230f625..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83a26996eef8512df6baa81966ae545ee4ff59a372315e18950d556c685a373e
-size 65304
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
deleted file mode 100644
index 445ff7e514..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56f2830c724bafc8fbf88249b6072f5716a86a0dc91735f06ec6a5a609576829
-size 63314
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
deleted file mode 100644
index 42db3ee942..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f3ef5fa7449e8461bc5cf15e48200376ea381f02b771b3ea436a66e7bc5f314
-size 65218
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png
deleted file mode 100644
index 17a6532b50..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f023c57456630ffc1ce232858e1560a094b6b2085f6951d96e83a13c05a1b07
-size 42137
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png
deleted file mode 100644
index 17a6532b50..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f023c57456630ffc1ce232858e1560a094b6b2085f6951d96e83a13c05a1b07
-size 42137
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png
deleted file mode 100644
index 357404e2c4..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18aa3763f9f69ea3852038310237c44a35687b633af1c2caba8438be87b8cddd
-size 46320
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png
deleted file mode 100644
index 0ccb4cd215..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bbda7179f96cfac0acfcda43217cd1a593e408bd18c3a668f09e890a58ee79e
-size 36361
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 f30caf1a06..07d4c6fe34 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:04beccf40a5578814d4b66171f2b310451bfd988fb4ced126ee2b748744e8d5b
-size 43047
+oid sha256:a7d094485bb16c1e6bec8376cb788aff4c67e73aa103c91e9c588ee7d239b011
+size 43004
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 12eb61a007..28173d1125 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:58a36534f86bfdea1d7be42d12fb796dade4fafdfb8273a41dd88646fbea8e68
-size 41966
+oid sha256:807fdac63cf66d0e22c3be3bb912fb813dae735ad80cead01a41226063476131
+size 41950
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 40e3a84f30..ce2c6b58bc 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:bbb670d7f0a664e2b953dc97ca57ff39d0e3484e27790b4628eb669ccf8b074b
-size 40782
+oid sha256:19cad5807c22bb3b5137b94833b9355edd2a4e2dc3bd4e2fec6de47ecd91b2ff
+size 40845
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 58e1299cd6..fbce4844b4 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:75ac80012ecc16c11b4e6267d7570e141060b01991aee50a6bb26316f328703e
-size 42304
+oid sha256:ea37a3e4130be70df81abd1d91603630852eafa888588441c8caf0c6ffeff6bc
+size 42296
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 0dd451fcc0..9b6ab6166c 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:2a36a0f925a192549574d48ee893a4f4c3148fc82ea8e89a68d83633783f898a
-size 42206
+oid sha256:20574055fdf6970508234b241e2ea0af5ebe94b4e408d652591e5a1651d3f152
+size 42203
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 9561e24565..e8fea24d29 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:7a987a565fb7e27f99ff19a36f0105d4e737125eedb0ec0e2f811bb3cedd035f
-size 42749
+oid sha256:9a3de10ccfb402fcadb87903c9c81aafcee0836eca4aa8d5c19093f8992addcb
+size 42727
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 ae59ce6f56..d7d584fa5b 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:6ab3bafbfd5b40b2f00acb2e1cc4efacdad4106fa112683d1cf10f748754090e
-size 43282
+oid sha256:2ba333f2b5d8f8d2483ab2e1d42b1bbc73341bf8777bb2fdae558bb9d5567684
+size 43259
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 c704367fe3..9b8bde44da 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:17c1be5dec283dd583a2a104d48ab424d584ee06edf8f8e6fc8939307d602922
-size 42532
+oid sha256:c6158753a141ac5759592eb50da522ca65cdef9749019ae63a58ff56e34022c8
+size 42530
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 5c931d6dc7..a6565094ab 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:9c6a55a403270091155d998f317e1bd1d892dacf49a95c7d94497a4e0eef88e4
-size 41813
+oid sha256:d2ed86adef0287ec1ecf024743ce53fdd04df8df6fc3519beef1fac6514a368b
+size 41806
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 48e9970c26..c955529169 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:bfde38ad1545892cf9bc74c09ed880ca6059b18e77cb324742c14a65c4979731
-size 38977
+oid sha256:2b41b96a24c27b4b4996b9c12f8c9947c72f6ce80a9298a9ca0fbdb34b659862
+size 38998
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 25b3613a26..bfd9888358 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:29ef6b8dcd6bf370193253a97c5d0b773ba1f2c0391fb2314f34fe626b03c4fd
-size 38911
+oid sha256:4f07e230e571042b96a6747357b90c692276e5817a784f1bd1fc8a13f7bdc05a
+size 38955
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 9abdb7168c..aeda6a9e8a 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:88aeef28b15094c2758a01d565e03de8126d0e065d858e9962f2a7208863eaf3
-size 38170
+oid sha256:656740357bfe51573ba3f6faa5387d64076897bf4874671889e5c9e2b4c51e90
+size 38139
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 6d47e2a520..ac5031e91f 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:17323d4ac977f6546cb44b572b50cad6d4271bba5427734c64e3c59d12b03144
-size 36657
+oid sha256:9673aa3cacb1b04e09f94f265a7c3a0128c205026729cc618fb7552bed9a4bcf
+size 36670
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 53ac64270a..7920b86025 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:fc0e466e6ea864cf800db4e2f52a2fb8c1006d210df9bad9e5c78b2651a284f1
-size 42560
+oid sha256:abb3ac4c9ebc66d3f1b6457695147a59965026eb7beda75e2eba22a84449e0c7
+size 42485
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 6fbed96841..13ddf88701 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:78915e2318b404c27836fb02e15a3ead1280f2bb19157cfb76f076573ad0c983
-size 41451
+oid sha256:3315b18fdd823f1e30bd5bdff6c8c32e076f6eb1e7d45d2014dc012fd9bed95a
+size 41475
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 83cabb24cc..1f2df272ef 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:7e2c423bc8f2cf0cdd554e24ddfb54995f4fe79cec3eee6bb2d9d22ea7e145a9
-size 38608
+oid sha256:f25d76ec7ae901cea990606f98ce8bfdc4e9d35830ea00bdcda4be39d8ec12b2
+size 38644
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 a5979ea4b4..6e978a0b86 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:539a040a601e19596bedbdca4390c95b34d13df206ab798d5fc8bd7145015698
-size 42040
+oid sha256:69384dc3fe2b0343762a7f26b6a88f6557043061d1c52ee6662df7b11965fc64
+size 41973
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 fe20c9dade..d2df6658f0 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:949a711d11b34c7c9ea7c5fc4d0532718a3ebe735fefb27d5bdff61b46722355
-size 43222
+oid sha256:0d42f0d35ed1d39ce248466da8e78e334b8af321ae46d2f556cc438b72a5a598
+size 43201
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 c7ed35b8bc..3e17b67de8 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:55b02613bc0d8de924c2ed2f660290d8d477bb73bbe9a941bc953d0b33ae1d1a
-size 42250
+oid sha256:eb28bb52f2525e56a9878a15f4ead5082552f34c949478e9007daa99b11672bd
+size 42242
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 8eb4b60382..7fc97a68c7 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:24a95da5916ac94ff5db6cbf2a67123024f2c25ecff9d4c1969a27e7b0c1f6dd
-size 42328
+oid sha256:1a6a449f71ad2b13548c98239197e9b41ff69dd61883165436c2536328f080ce
+size 42317
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 8e8f37b5a6..27e877354d 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:b2112b6bdb53b62cfff5eecebabe11ce6f4de26c42204a8e2b4b386a0f165125
-size 44037
+oid sha256:7f747dfcc1231f58c0ddf1bbd65a371260ddc235c5154b813b9c160d48adf2fe
+size 44008
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 142c5fd6a6..dd7a9d62d4 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:22010e05151e11e93148c36a8262bd7b008aeadbc8e54071b741da3cf2678e63
-size 42962
+oid sha256:85de1a31b77b063d45e3bd8a3d9295258d7aeae1c718110616f3b0d070866115
+size 42941
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 96fb29ebbd..1028b93a14 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:c00b05d81ca0dd04b9150dbef2ce5121e4bd20313c1acdb4523ed4522ac1b4fa
-size 41769
+oid sha256:4da08f2a8b9028b010f5aa6f6723f62b9628e2934ca5f63b006dd4f95aa42c26
+size 41775
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 1058100bcb..09265aa6a8 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:d60c7c0e5a7926142ecd2da8166708174240045a5814545114ab8e3fea5aa871
-size 43317
+oid sha256:004d09f28f9557dc4777ba570519953617a234ee8e81829da6a9e6c1c859e34a
+size 43271
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 22a2a7557a..aecd669aa9 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:ed6f5afe68ab3f184214e638ca96be6355ad56c39275b6b24868eadb7eeabc95
-size 43208
+oid sha256:4fefa1e43c387aff8b21898d7431683710678d23f75ae66fbd5a9674b6dc6aa9
+size 43166
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 3a2f2d4da6..27ecce85f9 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:1232df1d97d4141d82a099a221d6a64c056f5cbebc73c49213b759a471fa6a63
-size 43701
+oid sha256:1545f2842633d9257ac4d04e156136054d83117051836690c769c8c140df4aa7
+size 43668
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 e6d6597974..6099e3dfea 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:ba1bf0e4cd8cf0400e7288bf450338614ef06d44c903900bc4592a2fe0a4210c
-size 44307
+oid sha256:750e5212166a2037d7c8781bf3cbc26f43e458045e0adf4bff0556d4c1b0fe35
+size 44271
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 0771de5c1a..c37acd6257 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:aad944166bdb4b48390e10589a6b9b413a37e670f927c225336343a5f2a2c5c4
-size 43558
+oid sha256:745513bbfe1ec194c8245c3dcfaeb622e2035ffb901c221e4417ee68dc562926
+size 43516
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 b2cedec0bc..1dfe867624 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:5b01db94766971472a61c9d95f1e5152291ef0eccedc37623241528502a6dfe2
-size 43060
+oid sha256:fdbaa5a809e49505bd65b3a80d58d34c86349bbd232b19670737cfe71a341626
+size 43009
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 8af5e349de..49c174bf4c 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:22c8289c0c40e5416156fe132917a4b15c56c567459d30ad25edfd31ce155528
-size 39828
+oid sha256:09b3d8e59d77fb1a56d2e3fe65ca4653f1ce0e83e2d1ae66af5b2fae894bc2fe
+size 39844
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 d78bff04bb..ff1e4c85eb 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:ff1ce38779f6bc3297b37c599bcbbb06c4bfd02efd6ebc88ea79a76fcc71650a
-size 39702
+oid sha256:7fa29b5231b97749c6768d36f278a53fcf7dff7d3f19d7800a1ec3fd785940dc
+size 39727
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 9f5186d1ed..3ae4895e73 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:a3eaf5ee08264b0c12852ed2ca3b6a5e271d4f8b855d8e56608045d6a44d3089
-size 39309
+oid sha256:de557bc7ff39c13540f6caa70807065a5506f67d983661a247d8da7bee0e8437
+size 39241
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 a5a0edc6c8..50bb5ae415 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:38b13288d896a437a147c9711c80316939816645b19c289d9402d7dd46ef44a5
-size 37714
+oid sha256:f1dd2be009cf074cd5192630e69f94fc75ffed71c5da5f6fa41a49dcee5b33d0
+size 37669
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 f5fac04061..526d814126 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:00066e6bc8aca01a5306119b1c284ae2b36f45895bd32d6a1617c8b1d068746f
-size 43494
+oid sha256:02805cb9b7642e8d227b88dd5384efe5e95ea58c5049cae8f60cd6af11fdc19c
+size 43388
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 256505e8b9..20e2d596cc 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:17a14837ffab9a1c1f94d7a98ff65ad52fa2abf52ec0dfaba0f585e9ad7085da
-size 42388
+oid sha256:9d85ab1c7243b178d24b2716320d6a005f3f56f1f2953e1ca29879af2d923311
+size 42369
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 e7bcae276e..2a4e8a2789 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:158a782a5771f817e02024f58e704e7e43618e17b46d992b226d64153b3dd30e
-size 39367
+oid sha256:51b8a65fa1ea90f0f3227d11dab9e02b6821e159eef5288ed2cfd4d04ba52fb9
+size 39390
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 3a64f007ae..9420f03ae5 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:0af41becbdb1261f9cc546bd5072aeba50a3235c2c47c1a8e8882c2c140f93d0
-size 42941
+oid sha256:5ef4eeee1c2d48fd0b4bc2db2b5e63a1669a7b1347340c70bd08f82bfa476a99
+size 42943
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 ab79373e91..733da0d460 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:6276d4ed1b35aa80b4de5ad155cd8d764388c7fa5821aa3b4a268280382e8355
-size 44381
+oid sha256:f276d3cc7714d47086eff53cb564d8a9b604cfd0b6dbbcd4eb906326f5b03110
+size 44373
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 15001817fc..7088632f7a 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:a93c5cb2446a3610b13b1fcd7cdc21ae6d8072a18abcdb8dbd73fbe9bc6a89bd
-size 43328
+oid sha256:4deed8665be752e542a35fa10fbfe52912c439989ae021ac8234f5641a6e952b
+size 43284
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 ff9d178c54..cd5e1b9bd4 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:23459c1bfe29eaea2373687c2dbcf8afbbc1a7e1bf4e817385804e6a5f3f14e0
-size 43336
+oid sha256:494e81f1ca9e65950f3f7811d420154f3df9cb39749341b845ae873fdc0c34b3
+size 43300
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_en.png
new file mode 100644
index 0000000000..98fffb180d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c200761849da1ba650f38adfeed65fcc35f4fda94a4b1302447faf55d4196c16
+size 28211
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_en.png
new file mode 100644
index 0000000000..146d245888
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:282680791aed814f49e25134742e55270ffa155004d48a4f4645ef160450c529
+size 21933
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_en.png
new file mode 100644
index 0000000000..f9fb3f287d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc04e9e69f8111c2837d998f6503e2ea146d91284d1839ac8619d5d9325645d7
+size 29613
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_en.png
new file mode 100644
index 0000000000..169e16037f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7579d7b70e81228d997f8390285210a6e6a7c764523a82b59cd68b2e1969656
+size 52193
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_en.png
new file mode 100644
index 0000000000..fc9cf97e30
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eaad1ca1ef992a03aae784836139963e5ac8867d5fc70871eb63d273acf05948
+size 49266
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_en.png
new file mode 100644
index 0000000000..817b7943b8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44331b9967290ab96c55cce7a5f8a3531564ad0c074ea6b25adf9299a6ec0239
+size 28165
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_en.png
new file mode 100644
index 0000000000..74c01ba304
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d037d7c70b304980c4c0a2c292fdcf800eafff15aee8c3c3adbf180e7e47a557
+size 28293
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_en.png
new file mode 100644
index 0000000000..a01340b169
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4467db8409103caf24b97dab28e5280da60ca420d951d689d353ebaf63841bf
+size 24737
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_en.png
new file mode 100644
index 0000000000..e3e8f0a8c0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:109a1451e031bcc46e55c2c111a4ce65eb5635a3b66b1ba6a5e6a0980184ec0d
+size 26087
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_en.png
new file mode 100644
index 0000000000..a1da37b1de
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3d196d9b4946165718d8a4ad37869d1d81c6134e94e05dcc1b23b71338482cb
+size 28941
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_0_en.png
new file mode 100644
index 0000000000..de17d9174f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d797584eca407120de11bdac2792a4501dd414274e5acf786fab74b7df668209
+size 27518
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_1_en.png
new file mode 100644
index 0000000000..df8188c586
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ba88593c26798de646f331f68c48b4675f33090e7533b88f6a31e0c5cfbd081
+size 21538
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_2_en.png
new file mode 100644
index 0000000000..da0a0553d5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16c5f05bb20e9a1f5b3480827fe7c7c4384daa60496da0ee0dc9bcdd77ccdddd
+size 29004
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_3_en.png
new file mode 100644
index 0000000000..9cd03d2914
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7616b1926b6b6f1c6aa19d797866a74cb7db487fa72e59b291e715f22d961607
+size 50787
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_4_en.png
new file mode 100644
index 0000000000..ae64071349
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2c9d431942b442b2620268cec8f06166db18b5df732b7a77cd71a11228106c6
+size 48325
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_5_en.png
new file mode 100644
index 0000000000..051a142e26
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd244116c434d143950d0bb7c291d3a4faf4540f34112286b9069c41eb7de576
+size 27509
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_6_en.png
new file mode 100644
index 0000000000..c0fadc78e5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e98e5bdd03bdd7c2da11595416987398ec4af4ba88010a0eab25f11da149ea7
+size 27520
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_7_en.png
new file mode 100644
index 0000000000..e7c94c7669
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd96a05649a403454636d07168398476b25aae4aaad76cac4e41265478ec4791
+size 23768
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_8_en.png
new file mode 100644
index 0000000000..4e8cabc23c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c95f90eba87b390c09894087d4c55dfe8e7797af712315ccbee3f927be4e5d5
+size 24314
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_9_en.png
new file mode 100644
index 0000000000..1643569702
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetailsedit.impl_RoomDetailsEditView_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9187a1e5fc63707a2c1a9804411e15439469f8562eac2c9766a4e033e214166
+size 27289
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en.png
index 093528f94e..3d22946557 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:518809c2c701e60901926344906438d2577911fbdb478e28205f4b236d0a5421
-size 12124
+oid sha256:018d40955120e99b4d8327dce82241851a38f84143b3e48f3366f8bae34bfef6
+size 12135
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en.png
index 9751377b25..54906bc4f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:810c83411d4715117f055d0a6b8b585249cc7d392141e798989f7260755bd183
-size 28230
+oid sha256:1c5697f72f801bbb96f92ee653e5e539f5fb33fbdc41433b9812e75af72fc480
+size 28219
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en.png
index b179718f1c..2878e41efd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12d54664b7bb9019d3bdd874ce01c594d9c0463a25a75214d48cea8da8f4d209
-size 29854
+oid sha256:b02c8b878a856d4b197c7123bb924cf4e4b2736ec0fcb2fb8fb19ebf5a959e2e
+size 29845
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en.png
index c3097241d3..5331d1cc42 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df87cd1659f6a7168ee798cd005535917f13e7a8b5eb9020d5d474b23128dc95
-size 11852
+oid sha256:3cf6437e4f8bda1019bc382d83e6f4130f0f0bb74a02ed2fc7966b7ba99673e2
+size 11835
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en.png
index 6418a2af69..99144d2d27 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65470060e8a48d9afd3fc08c0fe45fcdb20f473ea1bc26058fd6c4a4bb9844d6
-size 28049
+oid sha256:6f9a6acf3d5bdb55a353b779f088fc1a522afe44f26e3ad0318fc31c2526d56d
+size 28040
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en.png
index 6c3a5a7e5a..f715f3b7eb 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc072224e72efae4e7381112ccfe6fee836b46d9f06014ed55d5552d003bfd1b
-size 29657
+oid sha256:e5ea57d521df7b96c6a1a57d0eca576ad4b734e4f3a7682ff168e0b6ede4ac8a
+size 29648
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 5a4cc461cc..95a89c2a78 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:e0cbc9cd3e34e04dd02193c95a4d456d7a4dea35c9e8b8f9224e30e0acf6b90f
-size 17079
+oid sha256:f333d59f48ec9ff036e72c727c3bfae32dbb919c35b854906fca153bfc1c84e4
+size 17375
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 8cc551af5c..a99bf703be 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:4e6a0bb41a7bc84b0c56c7b7094e4bc9f0012b407d0f15b913d9d6001cb5ec0b
-size 21100
+oid sha256:dd83d242f9099de1ae0c84b07cb773e08dde1ae535ee2fd2bcb002e2e0e22132
+size 20397
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 96b4790efd..ea3e995ea4 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:bd631ba5358bb05d69fe15079a4e75a494a61107fe31bb38abc42244b96a1260
-size 24136
+oid sha256:0f3d63a5c888eb1b951be3c46c4c51f7c622d7e7838c35b3de388ac1cd20789d
+size 22793
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 e3422de664..b23185f4fb 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:93ee3b0275f1a023b0faf4bfdb25414fcd234f216bb450a46e6da373da5e2ebc
-size 24249
+oid sha256:e5ce9706fbc30f9d99c35c9d1f145c7f933295fe3eb62063c640b303526649db
+size 22915
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 edec0550ca..e8798e5d63 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:e4063555b9c55be91104f51d5696383aba383d2b7b8d6ff490058f0228e45f81
-size 30659
+oid sha256:e8f2b0a758dd5aa20f5e54a1c2e5b094dae58cecbd51b14e6badee0de0d4f47c
+size 29661
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 14d1396ac9..2fbf80638e 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:c09808dc63bad05bc97a6d5d5f62a4d0fd3db86c17e4662aa2b56eb50143361a
-size 29415
+oid sha256:3ca2cc0fb3cc31ee9d15b5c7d3c723b94fd4877bd25d419808d7c48f8e358496
+size 26527
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
new file mode 100644
index 0000000000..7742fa05da
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb71efef332043ae5dd633a7bb877e3ef23123fb86550c0519d41ed05f737cf0
+size 27284
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_9_en.png
new file mode 100644
index 0000000000..5c597300e4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
+size 3853
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 ea9890c817..608faed7c0 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:e29951458d851a03eb63da0d3eba66d59534449efbf14d561b94c5e40ae7e9ae
-size 15981
+oid sha256:06aad1478e9096e5215bd3116a7bef0e98037383c835de73f57d46a9cfa86137
+size 16415
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 b71ac5dc73..d1328d932a 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:90dee18c6b1efe1661fd072f0a088d3a44830297d3f6ce04ace847c1e91adaaa
-size 19723
+oid sha256:71cd9c85c33cc222836ec26f39e7209a954728d5beebadf53a784bd5a0813709
+size 19390
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 5adfda727a..b4c1e1cbee 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:17199b76b91cdeba19015e2a4b4a718a6609e64ea48bca8e6dce8bba58b916f3
-size 22675
+oid sha256:66b527092681543f600725e508213f59524b5bdf3f3ceff2bbc47d43cc9d66e8
+size 21685
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 f941baf571..1b47b493b4 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:65348c064a11dd0e85cb9daf4a87de0333f29684a60f73098cb3d6fffa9fef04
-size 22752
+oid sha256:47c1592948df21f0f3d69dead320f50e47ebf8da3bb86bc8302ad392d5813c57
+size 21765
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 9c6513bfd1..4dd6dfae72 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:3a7da5666d690d5d9a6be61225b169e4703626ebc15f2f8f4f3e98d2e322de39
-size 28831
+oid sha256:2708604aa1f4d6549b80ff388c45449c73577f39903810c438361fc068e440f9
+size 27813
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 9f70cf870f..4f696f4f06 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:97d7e385717dd0ebd7beac1fbd5c205e13f7785febabee15bfffa0026b8d530c
-size 27616
+oid sha256:7aa3113919aad2ea9cb7fd6b5b4aee6c9aa1ab600ee6cd6d18f75cc70469d1cb
+size 25084
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
new file mode 100644
index 0000000000..fa9d70ed6c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2b314504a8f4aaf92828290706cd42ee5f88db1174b31d0652ea6bb8ddbf38b
+size 25648
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_9_en.png
new file mode 100644
index 0000000000..d47bf90664
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
+size 3664
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en.png
index b72abd5ef5..19fd814600 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:993a8a37ba1897641b63bc2c7964ceee5c233b9513c9f377e91cc40afc84ffe5
-size 66284
+oid sha256:9bc73020479304a8fa8acef0e1664f7eee8e38b086c5d5cfe20ad6035721b069
+size 66314
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en.png
index b72abd5ef5..19fd814600 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:993a8a37ba1897641b63bc2c7964ceee5c233b9513c9f377e91cc40afc84ffe5
-size 66284
+oid sha256:9bc73020479304a8fa8acef0e1664f7eee8e38b086c5d5cfe20ad6035721b069
+size 66314
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en.png
index 13ad9c0ae7..b554c702e0 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce8747cb90012a771a3bdfa009df8abad6bf6565aad43a9a06fbf8e26ea892ed
-size 66832
+oid sha256:92b1f9d0386689b8121fbc2a30fff8f52a8e0eeb31d9575b58bd5f52e7d51a4f
+size 66861
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en.png
index eaf56ed56b..8ebc592381 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b24e0468ef7198719df874e697f788fcb4cb89d6b683bc607b2b749fc399e33
-size 40132
+oid sha256:be8fb8421c794fd8265d6ac12ab8c268eb626965e58b5ac4272f971701023745
+size 40123
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en.png
index 7fde7dca83..9dc02d6a44 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1450b718fbec30cbb9f26a4d3eaddee81a6519f002547db31ad1396562e2a4ee
-size 63902
+oid sha256:197c5e077b172ff2363a87a426d238ce707b292cf1b653a165856af65ce32d2c
+size 63863
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en.png
index 7fde7dca83..9dc02d6a44 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1450b718fbec30cbb9f26a4d3eaddee81a6519f002547db31ad1396562e2a4ee
-size 63902
+oid sha256:197c5e077b172ff2363a87a426d238ce707b292cf1b653a165856af65ce32d2c
+size 63863
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en.png
index fde8d75d65..fd88b5997a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a42fa98119396e545abb8fa8c6ebbf99955258aea778b8ea4a255d9aeb4ba8f
-size 64465
+oid sha256:78164033218f14940820f6729f34d3420b18a8aab2ef6e18ae53a2548fd9d88e
+size 64428
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en.png
index cc4e4425e3..1a2399e975 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dc88d3fa9a858fe9f60885fc5fe1546b8935d546f4a18c6ac1a8d10f425eae1
-size 37450
+oid sha256:9c868cce3e1604e50e1a667a16c94117e448b808e4406805ac2aad8edf4f140f
+size 37466
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en.png
index d38568103a..edc3552892 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3518f4ff808d3e61047834161935aa3603e3f8161288be14b87a1ea48c5e25f
-size 31968
+oid sha256:d076cb6d47c7ff6e4b7d84741be4df03de15a9d0e6152d69abfadf8f2c524f6f
+size 31994
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en.png
index 97a4fb8c5c..3b9a82c110 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bdd192ae952875c6c6882ec6b02ef4855e4862431c78cf29842e25700dd3d0e
-size 42791
+oid sha256:16830a73c3d7bf313b2c23f800e73a4167f539a573fd2f45d0d4e0a6c84674c2
+size 42834
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en.png
index 07477ce1d8..e4d9d86634 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23dce3fae5178c45a70171f762333a3e0f16e26b9b6c585ba7943a519de6e0dc
-size 42771
+oid sha256:e1ae2140f8fe60f91cfcc09a499f2a698c892e61eba5862c28d8611c72827244
+size 42802
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en.png
index 30a1a4772b..39f613779c 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cea381806f7903d56640938ccf8c6d3312c8d27cd768629209db4f8a4b2fb75
-size 34891
+oid sha256:13fe904a23814a5d75517bf287b4ce2e7513484f353a220024084c7bcebe9218
+size 34870
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en.png
index b58662de25..fe002dfb48 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7e9ad9b6fe78b5028209f9f9683553fb6db2d2fc2e64f215c6abc02b19baecc
-size 35633
+oid sha256:2cf8010c36a9e0b1cb941aa0f224fe53813cd7692194850118ed1a5c39ccaa88
+size 35650
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en.png
index 2c25983f1e..a16335d4ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5e0e27543c3247402719dfe0bb0bcb2152b0d3aef7dc006cc55b36746c2fd67
-size 30923
+oid sha256:e5b89d9834f3748333a2dab0cf9db6778fb1002827762d80c2c5cc46521fa208
+size 30937
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en.png
index ea9f5b8b82..6b8f776d86 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a081e06078ac0ef89e3c9f643766bc9c48474168227fbf011a92e31517344d8b
-size 41374
+oid sha256:9f055974b566dc053fc0a0052670a4198f82078172689c2702d9b7566d499b23
+size 41381
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en.png
index 6f83ccca30..770f07a013 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2cb1156bd56a8602d17d6db4e7e7089e244e6afbaf129d9ea02ba625d8a944c
-size 41173
+oid sha256:b66869c93c4e93dcfeca01182b34742e85540e0d8c8aa67a5d1c847d8c7eeb0f
+size 41163
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en.png
index f661545528..d0a685a194 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a8e1b4d80a8144e92f047259047104c39e3e03ddb9f49ce8b643f5ee074b772
-size 32384
+oid sha256:f5b0dc05abe24c73a97d76530b357a7d9f2f7323a242a6f2f50e5ca503de7b01
+size 32396
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en.png
index 954236de8b..b695f7001e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69d2b8e9f30b06110a735161faf6e20b505ec9395c57349fb19144f07489a03c
-size 34700
+oid sha256:38b112e77bc37697456731f633e2b2ea6e25f4f62a5e5a0563ae9b43129ba088
+size 34685
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 59befc3cc6..3e8cfcbcf2 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:385012bf5f912f5b99c56f75cb77dab3dafb7d097778ddb324a2e8c9e5deb0b6
-size 27850
+oid sha256:345b4bbdd52a378af6200113e72a1896e02db11e0ddcca64dee2b8d0b1551361
+size 27860
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 35402913dc..87fd6ee3b6 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:4a88348451e2392613f2726180aa1459a1aa6ac71c0396b68cb36606438a422a
-size 27115
+oid sha256:7be12c4331e60d39fe224e2cc7ebcc6fac27a96113c4ddf54766e9c81c4855de
+size 27096
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 35402913dc..87fd6ee3b6 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:4a88348451e2392613f2726180aa1459a1aa6ac71c0396b68cb36606438a422a
-size 27115
+oid sha256:7be12c4331e60d39fe224e2cc7ebcc6fac27a96113c4ddf54766e9c81c4855de
+size 27096
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 dec226073c..41bfac8fac 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:ae1b03acfdaeaee18d2383f099117fb8ea2fb79b3d2a83a8926f07ef2b4abea5
-size 39593
+oid sha256:1bcdc96f75e0cde1f87fa43b0f6812676ec27136c49998855efd344c0f7eeda3
+size 39606
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 d89e764d51..cfca989695 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:9bd5858afdc11c54e730e8767a11c609be1ec5302180d8a7271e8c8d51f7d651
-size 26907
+oid sha256:d382fd339495c3b019fb3d993c02938f754e336e17e553e78602697795977af9
+size 26870
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 b05863eb7b..0192caac72 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:bec1a67878c03a8e0dfa833e34d738eab85fe11e51483e8018bd3daac357af9c
-size 25067
+oid sha256:f2a25e68685bcd850c28f23791d19117d424ed52e73f96b1e37c90927f888b43
+size 25095
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 b05863eb7b..0192caac72 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:bec1a67878c03a8e0dfa833e34d738eab85fe11e51483e8018bd3daac357af9c
-size 25067
+oid sha256:f2a25e68685bcd850c28f23791d19117d424ed52e73f96b1e37c90927f888b43
+size 25095
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 9fda3205d5..4871806397 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:060c5920610518f1a66a3e808c15bd897a4acd7d0cad441046ba08839e474277
-size 37776
+oid sha256:6ec548da47b2c6e0d8c61ef6746a26dd4a45492fceefa21c260c62bd0adefbdc
+size 37722
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 6fca58fc06..75aaaa0358 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:e92789e9aa616c2100b55ddc06e400efb7225999da012d4c59306f734dab5e10
-size 63640
+oid sha256:dd4137b1e05eec7c660e2897701e64086cde8e5ea74bf3d5cd05d3851614f950
+size 63659
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 e999349e08..14bf90552c 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:1b50f2f588c835adb9d2025fd904e8cd9462fb5b5f6952249b3b1fc0098e7dd2
-size 54688
+oid sha256:e614d0f658060959a35ad93464372df4d0148f32c1f850f22d9aa96d1d2a0f26
+size 54668
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 740847c503..ebcf54cd11 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:a917a1b7dc4eec1c5f3ee890ac43b217e6b077381c53490c52140d408dc2b3c7
-size 62388
+oid sha256:4d28b346407eb06b2632d81036de4bdc57101c7dd67871cd8965137f0039f1a0
+size 62378
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 790641766b..da1f35dbe4 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:2584a9ff1ae31f50e2c7902e2a04995c7c96d8085328e262d50be8a2395f71f9
-size 52541
+oid sha256:71b89c010e401ba246ac904e8569f8b8541cc882d796a208d0ff41537d57a72a
+size 52557
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 6bbdc26481..8da60ac87b 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:21dcf430dc6b3236796a9a4d2795a539efb51db9e18c71d5cfb8c82faabd3aa6
-size 34786
+oid sha256:8bdb2e07212a22c382fe74ce45004c869934d79c14bf17f760ab4ef8a1edef46
+size 34788
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 6bbdc26481..8da60ac87b 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:21dcf430dc6b3236796a9a4d2795a539efb51db9e18c71d5cfb8c82faabd3aa6
-size 34786
+oid sha256:8bdb2e07212a22c382fe74ce45004c869934d79c14bf17f760ab4ef8a1edef46
+size 34788
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 2fcb79869f..b4197c1ad6 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:029f206afa4d885bf03b6366ed352ff46853fb82db25e2989339b92a272bcee2
-size 55664
+oid sha256:5e97f6537620dd6a11a9d99ceab2e3ce42d4c7235c592ef7a67534ece9da0d68
+size 55665
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 ed2007c789..15c7da3026 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:a3c2fb44c142e52cc760a9649e6599951476f832b09b65a4cee3294026548c17
-size 54036
+oid sha256:fe50fba9db07c85e01f2ec725303480efe81632620ae7a46d9396b1d6add0cae
+size 54037
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 a5efbbd241..ea5787009d 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:13fdad735702c063d825b1a19cd57342631111fa0ef9222774b3414180d51cfa
-size 45377
+oid sha256:2bee96b713aeee00a5e6bdfd3fa66012c5cb62099a3785f6e4d5ccffe9b1bd63
+size 45378
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 efe228fb28..0ebc4a38e4 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:5657553aadda5f61c86e868586a928ebbc3a8552e23c4058c55a72ec535cfd0f
-size 54627
+oid sha256:a1a38cb0c353026c933ed18babc6b3e6c7e8f89c96364af8b141288707c8cd39
+size 54628
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 8cc53adfab..75f0088b1f 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:196cb2de4ded6abb8c2dd3e41421be3f8d70817d2db9a1596e6323e1f5171d19
-size 41226
+oid sha256:a1b3737b433faab393002f8b80257a5ee86b68e4d6673cbb5192a71fe88c0381
+size 41206
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 fbdd44a002..907016b1db 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:9a108ebec4f8ba340a9539ecc44625efb6114b6a7ce8ecdd2f9c42d054a826f5
-size 36089
+oid sha256:48e69632c223ac3953a1d1fd5e4f8cafda7468908b98325b34f973b898560c47
+size 36090
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 2da84bc438..a560c53410 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:dfec11907f34b008eb30ce7cd744d318ec2f0d794c8d90534002c9206a439c43
-size 34893
+oid sha256:2d7886e4c24a42cf0e2f04486a82d87fb10e8d869d1e305f1c3d9c0d65cf1002
+size 34894
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 6bbdc26481..8da60ac87b 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:21dcf430dc6b3236796a9a4d2795a539efb51db9e18c71d5cfb8c82faabd3aa6
-size 34786
+oid sha256:8bdb2e07212a22c382fe74ce45004c869934d79c14bf17f760ab4ef8a1edef46
+size 34788
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 4bc853021c..dd839b2672 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:0417dd04abbd875d48c9df3cf534a61be3626d2bd821f3d68989d4461e5d24ca
-size 35116
+oid sha256:8180802ed8ca16cfab0c07a390281c6d0f91e7b470bc3d6a31a2a3c8ab546546
+size 35094
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 0b324e417b..1bc0ab8a5f 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:891afd09df2c761801b159ace76f1d6c6323d44cbd654629ba0e2cf6da28e54d
-size 35668
+oid sha256:1e271d61a7dab4d1ac8b696734f1965225c4508ab7238e32f72b31310d810ad4
+size 35669
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 df5d55c54f..03b949df70 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:bc4ffebd3cbbea60724def0b7259765ff994da004ff133bb60e401afb4ebb848
-size 34229
+oid sha256:8996b740806d301bca7d9cedf156baead7c088646c31c88bebf050ca0be9d0e5
+size 34221
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 df5d55c54f..03b949df70 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:bc4ffebd3cbbea60724def0b7259765ff994da004ff133bb60e401afb4ebb848
-size 34229
+oid sha256:8996b740806d301bca7d9cedf156baead7c088646c31c88bebf050ca0be9d0e5
+size 34221
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
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 02f80c42f6..8672b27940 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:240202255059f7e086cc903789a6689c324fced1484c53096d29fd04c1d1ff76
-size 54686
+oid sha256:95f4b8af3495480887ab1134f6bbf3289f57585d5a5c2b9ac934ccc5785588bd
+size 54678
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 94cecbb1d9..a8540a5258 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:cd7e07db0e2b20ce2edb7bef0663e73c1269fd967bd902af5f101c0bb404e527
-size 53252
+oid sha256:326c4bef98e2ba16be03866a4ec93c50dee4f386826634a15d030ea1db249fa5
+size 53243
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 7ca7ded836..8006c6a2c1 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:92055d910f357811c6dd7a1193637b568986192dce08e6f0e692092840ce2dd6
-size 44325
+oid sha256:86d3d340a2f948c74ef229f5d2d651d60e4c003642f1d0589e44e7a52edc3b25
+size 44315
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 e3ead7a6fd..4ee88d54cb 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:aea2552a7fd3a920e50c2b167b470df4f596bdc5c6f1bb2d5d870d47d5145b7e
-size 53634
+oid sha256:e9763278611839601d4fb52ba3ed3e4b7b02b86e4c3d199c759caf12d9ff4fd7
+size 53630
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 ede7b8c389..5064ba6410 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:cb7b02b683c290672be4603de6d57f28d4bff253a51b9f97871ebbaada92501f
-size 38791
+oid sha256:4ad5e8fffba2a3329b7b170b1a18f05bb0486d6f25467e1c2e95d2e1959f3896
+size 38809
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
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 2ec8d7f9b0..a6601a4657 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:37cbec2b0f84f410d2151a393264e0b89e4a12855841db70789277545a8fdd3a
-size 35400
+oid sha256:add40967c221905131d9ee73d67ad3deaaa4b429366242fb6062dcfb519d92f7
+size 35395
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 ef79fd74f3..b4076ccd71 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:9fa35eaff3e8fc6ad0fda9ceeb4a455e6f1be65e2a2d552269cd49c085efbed7
-size 34293
+oid sha256:9e60b97a0843db11e2df0eee4db8e5795df8c57de2640ad41446cee4428811a2
+size 34284
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 df5d55c54f..03b949df70 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:bc4ffebd3cbbea60724def0b7259765ff994da004ff133bb60e401afb4ebb848
-size 34229
+oid sha256:8996b740806d301bca7d9cedf156baead7c088646c31c88bebf050ca0be9d0e5
+size 34221
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
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 a2aa264e08..f6409fdd3c 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:d6e8ca592dc7c22f639b5a0f8d573c723cef114fc3f046d00197c65dde43b636
-size 32836
+oid sha256:04657ed054e2400c8982f4a4e21dce33c2baab6e23db5bc2eb2a93ee7f75cd97
+size 32853
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
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 2e3c01b6c1..0433bcd074 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:0dcee5fbd606926bfd4455fd02965c4035cba66750d9c767f3b50fe8c5e3031e
-size 34876
+oid sha256:c5caf158c1e78bbb4be3d19a7f539f41b18cb2c80a484d45d97c0bf9d1cc220c
+size 34867
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en.png
index d2a3e728ea..464e78818d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac0bb1a0a9d500f89d20bed5190f7d4e442fec7cb8bd6710f21657ef0c298fe2
-size 26672
+oid sha256:a4755d2bbef946e868b55354878abf65ae16d27250574537fd41f9c4caf26057
+size 26674
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en.png
index 03fdd554b3..05736c8f0f 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:910264e17c8737b5ee4efdca0853450524f21db7e7dd5a45424bfb87d221347b
-size 25796
+oid sha256:9a1860bd2fdd78f44aa53fd5360e9d32ed4a4c2b7db90ca58e789a10fca399f9
+size 25792
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en.png
index d2a3e728ea..464e78818d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac0bb1a0a9d500f89d20bed5190f7d4e442fec7cb8bd6710f21657ef0c298fe2
-size 26672
+oid sha256:a4755d2bbef946e868b55354878abf65ae16d27250574537fd41f9c4caf26057
+size 26674
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en.png
index 711a3afc79..1a1f3a77bb 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fc08c8fa05f681d48ff886883aba32d71a74aa3db52e92964ad69f7fb367fd5
-size 21717
+oid sha256:b2e1fee1506f383feb048d14a38f004f68914cdf019b71806ab6efeba21c1fe3
+size 21714
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en.png
index 46a653d8c3..699bcf83f2 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1347518095b2a8abdd67a0843b3f4d06bc685dd37ef113035864e3d74cc28740
-size 18955
+oid sha256:1f34ba5041e128bdb21045e8697e3c84b9f7c29d21df8da25a3e1c0ecede2d0d
+size 18963
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en.png
index 8599592e32..2130940ca5 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fd5183e7442a8e5945b8ffd8585204ede5b69b91ffb8944585678b4d88dcbeb
-size 16528
+oid sha256:d56ffb3eb3d88ac71be62e72f807499d6c81daff0e7cbfb9b852fe3a3c205a7f
+size 16526
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en.png
index 0a536f441b..824ca8e47e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2b2f513d4523c1e00f8508c5531f300a71b7a7f2396d1d4e40fc605e4075e6c
-size 16235
+oid sha256:a88380c3d811291d2c13fe8934a6388d2027c271d34560bc061f2df9a06082e8
+size 16239
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en.png
index a1364f2599..1291bcb046 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c908fe1b613b28a3d12d49f98f2363e361f2cab4b8c35c89482802525c5ef34
-size 25773
+oid sha256:6a76057ecb66ea72f9f9ef34f3a2f17e3af8310870ce26540b3f7d92b2666f50
+size 25776
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en.png
index 92ee9a1542..e8211294a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fb8568e2cd07f9c856b1e3beac52a1e6979878fd8c6fdb6b57b4faecaa2c3e1
-size 24961
+oid sha256:e985247f0494f9f7776c2e9020e28e3fa7f3dea2b11c04c964c35543244f18e1
+size 24955
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en.png
index a1364f2599..1291bcb046 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c908fe1b613b28a3d12d49f98f2363e361f2cab4b8c35c89482802525c5ef34
-size 25773
+oid sha256:6a76057ecb66ea72f9f9ef34f3a2f17e3af8310870ce26540b3f7d92b2666f50
+size 25776
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en.png
index 2eddd67b9a..791097a921 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3465fcc599b8fea97ad6347abd9525b983df5d2f4a28c0ce4a3b9743ef85c65
-size 20600
+oid sha256:524bc8970068d265fca5585bc4cde5306435fc64955379d538a9e7cc187809ab
+size 20610
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en.png
index 241824a45e..362b5fc24a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba81a7ac256c647460e5661ec36f78a4abb592fa98f9a5e472590d7234154dd7
-size 18101
+oid sha256:de594ca9a6e605acd2ede0a9f0267d4467d6b3b5a64379467602bf8744eeadc9
+size 18100
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en.png
index bedad0a35c..fbf6464434 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:963c535c88475dd6f659ce4f22494314f29401b70b2a407a689bdccfb3b062c1
-size 15723
+oid sha256:f67a022b7bb931e8e9ed8b3ea03480b832289a04e390c7c3d839c250304a252e
+size 15728
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en.png
index f58c42a999..1443e74654 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:985b5897ba1ae81ff8de6ac90daec70584f1586f0c5ff762ec154a9fd50e2cae
-size 15664
+oid sha256:0b337dedbbfabb7a75510443f47b3ceb11513096afff2cd06c5481d77eab37d7
+size 15658
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 5039993db6..9f39808f7a 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:6ec3cf271a8b012c03fea17dc176e377958d97355a43d04fae1f00989e4c9bf2
-size 42564
+oid sha256:9fa2dfe5463ed01906ee8548f43847433164d404ab6ab43071bbe30fdfbfc7fb
+size 42596
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 da66fc3d46..7050a52d4f 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:418b6106a186341e627ad739fbcb435f5b86ba05d8a97488a013aab2d871a8c7
-size 40123
+oid sha256:aaa07b0a497cf9c90f18ed37f243bb51b986e17b0694a7ef6430d8b589361fe6
+size 40151
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en.png
index a53b841520..0509e9c2bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88a372d1c98f2978c2d70907553a5d0de0022ee205bcac492b635bd9f2e859e7
-size 54331
+oid sha256:db46848dee7a332c80f57a001b8a53782a548c5f246a982432285181b299c6fa
+size 54327
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en.png
index a53b841520..0509e9c2bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88a372d1c98f2978c2d70907553a5d0de0022ee205bcac492b635bd9f2e859e7
-size 54331
+oid sha256:db46848dee7a332c80f57a001b8a53782a548c5f246a982432285181b299c6fa
+size 54327
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en.png
index b7b6ca3318..fba4e205a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a8cf71b7c7ac794bf6f0fd71fe477cb0dd651ff86ad649fe4eaa9e8df83b1cf
-size 48594
+oid sha256:4786dcb6c8c2afef0d6bee12d801e36a59a1b4cb7a39bae3dd0beeaa5a41f5dd
+size 48603
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 0d260a0a24..f51d82eb66 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:098b7a3b50e1bca8c03c55c8b118694339b6cc9033f4f94847c66a59e0629743
-size 35835
+oid sha256:97a3e8b57ae642e36e8b8c68d77838bce6dca0e20f81c54079998532cd610c1d
+size 35818
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 52b5a523be..281894f4aa 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:b628fae11fc7d0d1b3f5e7331158fc5c878d5c9b3751c1b80d7f28fd8db45214
-size 41415
+oid sha256:6b134d3fb4eb2adaa379a2855b0e312862d89c71351aa39fcdcf3ad08aad59f6
+size 41412
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 aa6e1cc81c..1330db6ffd 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:ea9242a1fd83eda9dfbc8d0dde70e0893a1ba1e748e1dd1e73bc2773c4143f76
-size 39043
+oid sha256:6fc5e8da50002259f94ef17ab431dfb8fd463427c46f0a89ea364e20f1892231
+size 39037
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en.png
index 0edcd3d7de..1f5a51748a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af52db2ba874608c5c905d6deb102664f1e4101714a52945808ea35660ed51b7
-size 52411
+oid sha256:d8e2afc7cebe08b5ab070d34f2aa1b54ce509c24c0444394fe5a7963253e8775
+size 52416
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en.png
index 0edcd3d7de..1f5a51748a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af52db2ba874608c5c905d6deb102664f1e4101714a52945808ea35660ed51b7
-size 52411
+oid sha256:d8e2afc7cebe08b5ab070d34f2aa1b54ce509c24c0444394fe5a7963253e8775
+size 52416
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en.png
index 8e3198caa9..6d31adaa22 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a31fc85a97482f83147f8db4b3dc95ac5c96d16fbcc849ab44588bc2462377d7
-size 45963
+oid sha256:adeb68f1d2adce6625ab6cca4f590764d0c550f3d61abd5ee248f5625241b4ce
+size 45953
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 e1c6673840..c0a94b5a07 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:01d4b4598591373cbb507fd4074aafc7a0c04d84bf89ff1bc7e4eaa7bde71a7a
-size 32880
+oid sha256:e4dbe58894a6f22992b10f31650aeb2252857866b01917dc50391dd46c1104bf
+size 32901
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 43fb24a248..e7d2f47891 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:2b77c8dd93e0d9807714168fcb5b993cbd6008a72857c62f292abe6a0753511d
-size 44135
+oid sha256:efd3f69bf092cf19e58f616fa2b2a4a32da1976af1fc5dc23fcb4fcf4c961f4e
+size 44171
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 6345788a81..97a5cad21b 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:db95e2a67a0cf47f0cde4731016a2e64952a8c40817334bf683d44c673165f37
-size 41853
+oid sha256:d46fc4a4c699f9178da3feab20b3e6af1922131c697ebae818acf53de7d49433
+size 41886
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en.png
index a53b841520..0509e9c2bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88a372d1c98f2978c2d70907553a5d0de0022ee205bcac492b635bd9f2e859e7
-size 54331
+oid sha256:db46848dee7a332c80f57a001b8a53782a548c5f246a982432285181b299c6fa
+size 54327
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en.png
index a53b841520..0509e9c2bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88a372d1c98f2978c2d70907553a5d0de0022ee205bcac492b635bd9f2e859e7
-size 54331
+oid sha256:db46848dee7a332c80f57a001b8a53782a548c5f246a982432285181b299c6fa
+size 54327
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en.png
index b7b6ca3318..fba4e205a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a8cf71b7c7ac794bf6f0fd71fe477cb0dd651ff86ad649fe4eaa9e8df83b1cf
-size 48594
+oid sha256:4786dcb6c8c2afef0d6bee12d801e36a59a1b4cb7a39bae3dd0beeaa5a41f5dd
+size 48603
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 da055ab499..61583dcbf1 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:f4317eb9258f74756d4ecf3aa430dad3ee93cf446588d6fac9bbc6cc12c2c3b0
-size 34467
+oid sha256:7b614fbd391330b8e6972020ca01c7471f95091d17c21f325c80182625888547
+size 34450
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 759d8d8cba..6906076e20 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:bbcc542568df1f3b78a579bf0cefa6573c10b04c0dcc83182b3e8011e73bfcde
-size 42951
+oid sha256:6efecc2dde978426d33a0b287b15e39de27ad936591fbe449183a7f8ac859899
+size 42942
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 1a9af013dc..8342bcd823 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:9924fba7287a153c5be0b370a1e406cf5323409d27464a10f873e22977516a8d
-size 40747
+oid sha256:8bc8b0f00e875228aa3624de652a33baaa5ddb3555878fde36c9439c763534e4
+size 40738
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en.png
index 0edcd3d7de..1f5a51748a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af52db2ba874608c5c905d6deb102664f1e4101714a52945808ea35660ed51b7
-size 52411
+oid sha256:d8e2afc7cebe08b5ab070d34f2aa1b54ce509c24c0444394fe5a7963253e8775
+size 52416
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en.png
index 0edcd3d7de..1f5a51748a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af52db2ba874608c5c905d6deb102664f1e4101714a52945808ea35660ed51b7
-size 52411
+oid sha256:d8e2afc7cebe08b5ab070d34f2aa1b54ce509c24c0444394fe5a7963253e8775
+size 52416
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en.png
index 8e3198caa9..6d31adaa22 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a31fc85a97482f83147f8db4b3dc95ac5c96d16fbcc849ab44588bc2462377d7
-size 45963
+oid sha256:adeb68f1d2adce6625ab6cca4f590764d0c550f3d61abd5ee248f5625241b4ce
+size 45953
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 b556abffc7..49ee697889 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:d233d12ec3b268a3b0f4b902a784708dc4ddbf804b37d72111c5b7677e346ade
-size 31620
+oid sha256:c2774075286a8a79c6486c5d6a7993bf9389ddb530d2937deb19aa0497cc7e16
+size 31628
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png
new file mode 100644
index 0000000000..aa16ac4ac9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed9409dcf626c1411139c55e23a744a89dc6a1cd9fb06d9978ade6a1b90dae04
+size 23901
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png
new file mode 100644
index 0000000000..622160ce5f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:907be816e4ec634dd081b42017ec078a551994bc21f30476f879445ed6f4a8d0
+size 27840
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png
new file mode 100644
index 0000000000..be103ed609
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f945aab6fed3931b76e3888954ddb4e8e1bac84be535b389273503c6ff42cad0
+size 30005
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png
new file mode 100644
index 0000000000..8f694aa097
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5823b02bbf16643999d356bf9ad8bec289f405a4d1e3478f1db69e5885332925
+size 23816
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png
new file mode 100644
index 0000000000..c52bda8126
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1d4b2dfe71bcc48ee1c69dd06aa0d63e85c94ffc8f0a5fb158eb29fe5043b08
+size 26034
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png
new file mode 100644
index 0000000000..2f9447ec7e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26c535b775d8e0bf864b2991e51bf337d2d94beffb40a54d2a2624047f4b53fa
+size 23487
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png
new file mode 100644
index 0000000000..77c97a4a32
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edff288c25fcdbead5e05756023f34dbf3b2c113f2b0c83312f76deccc6a72c8
+size 27265
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png
new file mode 100644
index 0000000000..5b8c281c75
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:509730e2c16f870cd2b93438b4976b25d046a48d46e89ab1ba3e8c77bb3c2eb9
+size 28896
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png
new file mode 100644
index 0000000000..da46bcf066
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a611d574ca2fcb53ce69d89168c08c0ae5736f8f2a00948cef8c979bf2374afe
+size 23390
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png
new file mode 100644
index 0000000000..4cc579f9b3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c85bc5550c85109ac643c11888fc2c0708b2aca348a5891a5f07394fb169bc46
+size 24587
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
new file mode 100644
index 0000000000..840ed2ce67
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85a7f1e86ee77355ada16764c0cdaa96193237e1e0936188b00b99247b67f272
+size 39232
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
new file mode 100644
index 0000000000..5015b5c995
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bef6e6c4cdd362577cf5dc91914a84c72465014a71a08f48c1f4a526be44c85c
+size 39535
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
new file mode 100644
index 0000000000..fbef6afae3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39222fd299a2dec3cc60863878906eba5c9d86100a3e4bad781633a1a0372cc5
+size 39874
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
new file mode 100644
index 0000000000..8abe7a325a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c9bf91f57bb68ae3341acecd62d418d1654a8d4cf271eeda9e87bc5e4998891
+size 20225
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
new file mode 100644
index 0000000000..3989ce8d6e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:495fff852c9549125b3d3a681a880147f680d4604eee3cb13a8fc3dc47e7c729
+size 40476
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
new file mode 100644
index 0000000000..fbef6afae3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39222fd299a2dec3cc60863878906eba5c9d86100a3e4bad781633a1a0372cc5
+size 39874
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
new file mode 100644
index 0000000000..8bb18a4153
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cdd805d857d590437bde9be2a7df252ff42571d3b08be8085aae81dc75e896c3
+size 40235
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
new file mode 100644
index 0000000000..81ed09d87e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:507eec1e5125056ca4980ae67f904dd30bcb88ef6d66d5968aafbb3c1449e4b8
+size 33779
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
new file mode 100644
index 0000000000..14683ef0b0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d300a9854096634ea0e6722db487607a75f6e0c46d7341f044a190a212d95307
+size 32373
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
new file mode 100644
index 0000000000..810bb5531a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b42e3df9fec259210b63431e295e8c7d1a7640149c9616b572b90c0b40392a60
+size 34637
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
new file mode 100644
index 0000000000..0bd3c0413d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bb107a37b14dcbc6aa530a8d47f58c809df7719a0c8a416a268ffd2df165681
+size 41602
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
new file mode 100644
index 0000000000..08e21cdeb5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a2d21173c63d0b9b3a558d23acd380c9d15fe5c4dc1b62f31644817318e049f
+size 56061
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
new file mode 100644
index 0000000000..74531a6a2d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89598f3f1149cec915196f1abb1998855c3dd161d6f05f32bccc7bb85cd1938a
+size 55715
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
new file mode 100644
index 0000000000..d71baf5a13
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ae448a2c6f5da0b563873a683884d75a74ded6157edc56e91507a1857ff87ee
+size 56298
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
new file mode 100644
index 0000000000..beeea22486
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b67ebf4536e36571b0867e71533b2fe1953ca2b88f15fe3531f3ddb9043f69ec
+size 39418
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
new file mode 100644
index 0000000000..b39a2f040c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5fb16ef839b9f93caddbc984c8be260846e7fd7d68ae3b31dcc97c7644b41b4
+size 56670
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
new file mode 100644
index 0000000000..f29bc630f1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9402ad99b181b99083abff78d078e9fbb010144e07f80ff995db7884a61fa853
+size 56060
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
new file mode 100644
index 0000000000..e5fda5dfd7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cadacec9344f3ca2c029006c620cd8c309bb7f4b38cbb7b47c7c336ca265a141
+size 56424
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
new file mode 100644
index 0000000000..46ad8a30d5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67bd76421dcb3e8a6c2c0a6aeda024dacb392b2f6d8bea278d6ffae7de5b4e8f
+size 20023
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
new file mode 100644
index 0000000000..6b5c72706b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48f50c8053f0f15228899e8bce1656a90cfaf936e6bc8ca725c676aff5578575
+size 39874
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
new file mode 100644
index 0000000000..f366177df5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc24db5d5659ddee2787ffc6a3371351478c9ccd7cfb909ede6a06f1e72a907a
+size 40756
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
new file mode 100644
index 0000000000..da192161cb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:342cc313605f43325a0720fe9c9fa969ed7edd41258ce0768dc624fc4e74d66d
+size 40636
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
new file mode 100644
index 0000000000..4ddc1b913d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adfd4213ac36d904a8a31b1c3bf5463ba72ad4760d084a4c412370d6d51cf250
+size 40996
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
new file mode 100644
index 0000000000..32138581f7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ef8e92812f6b65fc09ea4e77d44f9c32a74daebe8e2ef2a9e499588e46a43db
+size 20823
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
new file mode 100644
index 0000000000..d274eddbe1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5547eb8b7f7ca596edf65bfd7703d1cb91fbf2e254374b9ea41d5c8754030e34
+size 41628
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
new file mode 100644
index 0000000000..4ddc1b913d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adfd4213ac36d904a8a31b1c3bf5463ba72ad4760d084a4c412370d6d51cf250
+size 40996
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
new file mode 100644
index 0000000000..e939df2248
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40c6334e01cc858f343f9046cfbb5079b79369002f5194965b6c2e75dd37b134
+size 41437
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
new file mode 100644
index 0000000000..0ba776c5fd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:548950d915f6fbfdf1a17b81619d3d4cbefe93b79091d259bcec41ae6bbbc652
+size 35422
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
new file mode 100644
index 0000000000..5932151ec4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b47bcab08cded6e857fe213ab2c90602e557a36feebb45b2b8d4d18115ac68b
+size 34582
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
new file mode 100644
index 0000000000..8919639fe0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cd5de47e285702bf3d2ee325fc83a1168a0367d9c6b54018565daa0ed503a77
+size 36876
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
new file mode 100644
index 0000000000..bce9a377e8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59b6d7d5e484b34e1ce7814432144df34b1cd3323d31c90db439cbb5d9f8dc83
+size 43588
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
new file mode 100644
index 0000000000..663a88741f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01cab7fd5a8b4e10a4ecca8a31b0f659fb9f2db9260272b0f6c96c4e126050aa
+size 57895
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
new file mode 100644
index 0000000000..7535035974
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18e03a178666b24e95a9cd0ae5d95d0fe57db49d11b1b1f3cae5ed472e94b6d7
+size 57550
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
new file mode 100644
index 0000000000..dadc0c2de8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4aee340402c5fa0cdcaf2603ae5999f353eec734a1ab928c242889a1d5d2425
+size 58272
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
new file mode 100644
index 0000000000..a3ddf8b354
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3bebec99f2b870e7a38333590f5cb776b30f4f9b976d99601a7fb3bfd05a71f
+size 40913
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
new file mode 100644
index 0000000000..085ac47033
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:853218e7ddc4d18b260f6ab047beb82778284851e230babc14113c6cb329d29a
+size 58504
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
new file mode 100644
index 0000000000..0914a151e4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7caee4430244e294b75e3b6a5830088dd25397b1c272666eb2bec47ecd1f382
+size 57895
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
new file mode 100644
index 0000000000..c9a3183eea
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbb4224047c88d838de227e61332775e5efe0ce1380a7446c701f0db5b2d2dcc
+size 58323
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
new file mode 100644
index 0000000000..83f51a3be7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8303e863849a00c16f00850854e8d4d7ceaf3fb097c7b20fe349127d8ed3b082
+size 20651
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
new file mode 100644
index 0000000000..eea66871f9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1626bffb649c204b0dcb1c92e7344d1b7f119b61ecac3c49840385f3a9a39515
+size 40998
diff --git a/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Day_0_en.png
index 43feda89e1..9af6964cc4 100644
--- a/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d902aaa8a6dbdee611822750ff63da9e13913f25d07b820f1a8694805d83cc3
-size 55952
+oid sha256:e7de50d060184ba83430edf59879f4c55f9783b0fa2aeeeb514e629bebe87ca0
+size 55942
diff --git a/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Night_0_en.png
index 675eaa1302..866989dce6 100644
--- a/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.signedout.impl_SignedOutView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c07c5d44f2b15a7fc54b892fcda0ba320bda8a8b84dc9cea6409dfda82bbccc
-size 54996
+oid sha256:db25ced8591929c050fb6501816fc1c432baf550164b05f8919ce506bc16a0a5
+size 54982
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_0_en.png
index ba768c622f..2c1b9ca8e0 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c569a42e638a49554127d3dc59c1dda5306e50406a6eaf1033345b44e2fe037
-size 13941
+oid sha256:51d8d0648c4fb58b7dc75ecc60d59a0a7abb5d79aee5f711f163b05f8188af87
+size 13970
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_1_en.png
index b42cde52d6..e5cee223db 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b43c73a9da70133fdff8c63dd6ed8b130b76fbbc28977fae9a34733b0f64faea
-size 15840
+oid sha256:8f39bbc5e4ca32400555a3c934e18ca195f7d0c3d5d1e69753956a921e9ab017
+size 15873
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_2_en.png
index a6ed2b4caa..205ad9ef22 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02ea4a02c0901c3d31a86272659f251e3b9299f669177b7a46a9007159989519
-size 44313
+oid sha256:890519f50978232445ad53ff654ae53ee06a9811c4f93903c9b28edf4b922c04
+size 44357
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_3_en.png
index 78de62dc26..c1e295cab1 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a8d851c9393b9a64642d08be96b0c449ce894fdf69d52d0eb664d83c7005520
-size 44211
+oid sha256:6e494e7ad96ca581fc24109d30eb45dc94ffc8f00a65e5c437958a723f50a5b3
+size 44247
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png
index 9580492e5e..0e2b81065a 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78cc2ef488b13f72da4d1d149329930816e1d91541bbe62eb48c78b61564dc18
-size 35868
+oid sha256:def5cf57cdc01aecc58da2dc78a693d328db67ad1c67a80fcedcdad00ee658be
+size 35911
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png
index 434ea3b936..76a111f70b 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:426847168cf1cf81df60193ba69d1c02cad567f0a72c03f0b2dadb76e92f41c0
-size 42600
+oid sha256:be2282d9efed268e05ec6ab9f54b1f24260b4adc5ebc95ffd942bc30aeb075c7
+size 42642
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_6_en.png
index ae57be48c5..9ad785a01d 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:479fb84a857b3fcb15a9bba6a6fac3f8e1309a7d5af9c10c1cfe1d16c2eb678f
-size 42208
+oid sha256:27d182389507043106053e120a8fb9f6dff6dd525bbb1da0043b74de84cd8309
+size 42196
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_7_en.png
index e2a34d1b7f..a0ac90c2a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba7631fe1e5d20946256829e8414f5a305e3a2755d79fc0693fd932bfac40f4a
-size 40182
+oid sha256:db70500bf818299ebe264a9ce3e600107b0b0d3ad4588c7ddb384b308b0a3f0e
+size 40173
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_8_en.png
index 58c84eca38..a32a6ae2bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d5be43f0ae09dfea01efa28519b003c6c3bbd8a47c8329ccc9721acdc84a116
-size 16531
+oid sha256:969272a4544df5be09e42dadc3ae18b2526ec203947a74b5505c194a8c545351
+size 16560
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_9_en.png
index 8d62c122e7..930061aba1 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:520698bcbc65cd2ccbc73aff01132a6b5d39c7d349a814e5a26e584cec5f2eeb
-size 26083
+oid sha256:08e629078ddc8fe761305d7e3b1ce22344187a9b6bf4e729b85cfc6c59d2fde2
+size 33271
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_0_en.png
index 4b003761fc..29fc6aebdf 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1935a53ffe3653f9c094996a7b62359fe70c18ea0b46a7204969f70ce439b5e7
-size 13924
+oid sha256:c3f33575c7ad3ba99f4e571b6e9810b48c79a23d462b7a2cb0a305f7f7f32307
+size 13919
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_1_en.png
index 855181d5fe..93b3edb129 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f90882b794619797d17c9bdb8ff2e56664a5bd95ab9bee0bb59371f954c0e7ca
-size 15395
+oid sha256:b27e0253ee16c90b0ff9447366702b72b1abb4d19aa01cc521ff35206888c948
+size 15386
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_2_en.png
index 8f6d72cc9e..3a4f89b5b5 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4071cfff533916af1c99636ce6f61e2fbfd8d945dbba1b11e449ce55fd4bd7b9
-size 43148
+oid sha256:5a3d199d941e84e0d70e18de23375629dedc9b74bc4bfed2d7353fc85f9fc496
+size 43143
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_3_en.png
index e4a21c1d3e..6328d868e0 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03dd230a42399b5db39a57dbde170955c7f40793fced9420e2fcf8c55820b8c4
-size 42948
+oid sha256:f7e276ca863450e76ddbbc10ff6f22fc17c35bd6414a47a1ce33285a3f46b3c8
+size 42957
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png
index cd30a49899..f48ae7b759 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8d4a0d5f17cf6781d34af68ec0fae1c64cdf88d59ddf4306db411c4c67fcfd8
-size 34945
+oid sha256:8cc5d0edd3dc205c3af67390a15697c020160294548ee96fb3d89c2a1e8706e0
+size 34940
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png
index 6038b2a50e..53a1d062df 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26fcf6cfae843737df553b143d9cbb8049001548b0c3479e1e24a28e0c5e6527
-size 41632
+oid sha256:c66c9ce57c7679b1f2b32c11789fc6050ee5d7ec251d77f35aefe988fd7d850f
+size 41627
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_6_en.png
index 64dab99eb8..3b3686d1b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc8a9e1d6fd7a81cf1ef718d2f3e38babcf96e58e00c2c92827cba0aadd8903e
-size 40613
+oid sha256:0648f116f14434da9708075d4a225d4d2b9fb8cdb55a61c217a2200ea5c3eb33
+size 40640
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_7_en.png
index 5629c9bab1..4384cbfe3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f0ce9d4bbe5a8bdadee5663e8ad8b9b189aa25b5eec7e7c1a40430c09f7d1d3
-size 38108
+oid sha256:3cd90931fcccd226921e51efa78c026dfe5ca230b6ee56cf2236c2f4c5e1f7b5
+size 38134
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_8_en.png
index 501d938326..bfc370319f 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16d9c0ce7ffefb7825efb5e824c06bc721f85f3ff88340abf9c41b2b4679492c
+oid sha256:ae93fc35355b1d16fb7be977bc49d2937da7b60f2ed76e2a184756b900afca17
 size 16435
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_9_en.png
index dc1018d69b..e4293e23a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ac66ddfcf3125726d2a9a7a83ef23880339f56c12bf2cad68bc969a4deb0f38
-size 25776
+oid sha256:5fc7f07a583f9dedb887ca83c67543e904d7bab092ebf70e06bc5292bf1e95b3
+size 32414
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 79e9d22715..0f62df3d20 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:b9c9e6833668344ddde682f0dde551af1f862647c7a3d749a12813d711ef2ee8
-size 34609
+oid sha256:c55277089a4447b618a0e8c058718ecf9d3da6d437322f0e23e5fd70019f6b00
+size 34585
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 64fc57b85d..bb1c9d1947 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:1bdd937cb84e29f1f05c1d718b4350694c65d0c75c0e599effd6467793e331a6
-size 34771
+oid sha256:241f5500cb7212fac174466bbe7855ccf39de3e3764a83202388b947d90ae807
+size 34770
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 fb4dc3941a..6f624546ab 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:9d3ee4db00d7432da4808aeba2cd0a5409d0aefecf66e76366cf60f6096cd443
-size 35073
+oid sha256:92785cf3a4010779b0fbcd58be3437a22808b0a2f02a19a5cfd50eb3bd58ed26
+size 35058
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 753fffb205..8b5b2f5f27 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:4b095899fe3ff11e393923a8101c986eb3603778f1a4ded135c3619f6d83771b
-size 64666
+oid sha256:de26882f13bac98b2cb5365d98e06e781d516d179adb8328cf22cf524e6fd79e
+size 62568
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 fabd2b2255..cfa8381d77 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:91a3e568c74bd2b7a9d99c481504025290866d0335e38cacbe7340be7a4b61cc
-size 65360
+oid sha256:a121fdb9473512b0264e48294df1799a7a6bf9b469df973fbe41f31bbf98f1d0
+size 63248
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 30517b5dc5..f20b7c4048 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:f19d84a37f3c570fb53ae28b185cbe73b4fe94f69ba57e6935ac8a078f20afd2
-size 59751
+oid sha256:a3506b4f646408262450ae51b612f86c1171ed972c1d7ea8871c4dc090556c7a
+size 59702
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 9a8a9b4d8c..e8f00148a3 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:008f4e11e7bd9cc91e46381cb0509329e2299de22b7b485e3036e458033f9bb9
-size 34036
+oid sha256:f2407444889af236ef21a90c47a5d3e05df8b15b9cc9483e84377e3af8794772
+size 33996
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 aedc302e87..6f012ad603 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:2270b4da2b1e55027c253422c04f31f6884cf8accf273ce08efba95fec40d599
-size 34177
+oid sha256:fee41efefc2ca1d6670d8455ac756c6b314aab54510eab8a4e597f1cc1edf3f8
+size 34141
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 ac12a9caca..24f916eac9 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:39afa43d6b9b8ba7d5ff83ba5a956fdfbb62510c57d34c81d65dd558e0501269
-size 34508
+oid sha256:ea955839cbd1aeba5de2780cee413628c7d46383398b10125cd3a900fb41d5a5
+size 34459
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 885b3097ae..153b68c3d0 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:e6396f10b0bfb904eec898b0085af56f802c0f5a5e50af36313a31fa20a1dd0c
-size 63449
+oid sha256:cba2c99744aeb2a869ae2ed700d7241b1d0b6ed979b16d2be9774ddbc5f8f28a
+size 61381
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 92edaf6970..f36d90e33c 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:c9425dfd394a554bdbf43c021ec1e26d0e7f273f4ba89df670170c73641b51a7
-size 64049
+oid sha256:b32d65accabc357208efeb2ec61374182479541299ade28184f82938e59bfdd5
+size 61932
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 0807dfaec2..66a7762467 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:93ed6d05c199a886a53ecffb7a56a586f4fba874fbf18afb4975782eb2d10744
-size 57977
+oid sha256:7c161ff55e8a235fe403e53ee179b299fd2563d85ef64bfe6d0dd9295228685b
+size 57925
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
new file mode 100644
index 0000000000..24c00cb1a6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a573dcac3bab78db152da81c0a1b7803fcf70c2392cc05a20ae533edfde76730
+size 21620
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
new file mode 100644
index 0000000000..13d9ea54d2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a17f1005bf296f04a2d631c6d19313bc864ebcd6832a788f8fa6909b7562dcb5
+size 17874
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
new file mode 100644
index 0000000000..f408da9f38
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc34deb76678be310df0beb512d91fa3b6edf2d2c59a7daf46267f1c8012e12c
+size 25422
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
new file mode 100644
index 0000000000..189eb42ad0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14d4cabaf98490e35bb75a12c3d37e3c499158b6d6b639084059ee1bc999e831
+size 26018
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
new file mode 100644
index 0000000000..d163b60818
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b13402b213b595b8a0a632eeb96263db7e8f7cbd3f56d8d235c38abf6df66128
+size 21235
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
new file mode 100644
index 0000000000..77db74b048
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7031872033a6c12acd7328a5ae0820ac2dfa00340f8a8b6cac746c98004b285c
+size 17444
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
new file mode 100644
index 0000000000..9d45abb1c6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:053e0d74fb1c01e5e434aa48606b5f0d24fb9a950b56555783b618679c4e7ad5
+size 24925
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
new file mode 100644
index 0000000000..9c36d80cef
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d201e92db03d2d0d1b7d786d472d5d0f3e946ba7b610b9769ceb597b4d827eb9
+size 25467
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 dfa930f47f..bad2ab5865 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:10da292ee61043de44cfc3edfdc671ce923df0788765d9a63e846912a876cc6d
-size 82806
+oid sha256:0924b8f2a751ed562e73a259d7e28b341b20e4760004f1af11b2965355aa208e
+size 82663
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 4ab19894a0..9cd5f8301d 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:a26f805eabe4d885d15acc2981617197bce78205af70efc326cd1515c483d35b
-size 42404
+oid sha256:e95c5ea5faf80c0e6c74bba083bce824b9e5853378c0c731cc14c1f53829da9e
+size 42992
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_0_en.png
index 697fee29c7..86c631023d 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80b1f414a5ddcac48eef770b876f530bfcf290305b31661891a1d070e411d58b
-size 8971
+oid sha256:f49c7171d025cc381b02235bba5b9a09a805f8dd4c4327cb74df4186db6afd59
+size 8986
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_1_en.png
index dd4a5e679b..7c03a9a421 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:721f7effa69fa976958537cf651afb3e5b5023bd31adf2d27004f98cce7949d4
-size 21525
+oid sha256:c5fb755341f8febc8af23ec0615b70a207b09f574ded58ae53f8680923ea03f2
+size 21541
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_2_en.png
index e411b6af24..2007352940 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d4b9de6435fd95ce140bc0d7f2318c280fa7ed17e702e3b90a3afcc23d7db99
-size 7616
+oid sha256:78e1af4146305a5b9ba0b152814d845cf19a33c3748765bd52c07a39dc6d35b1
+size 7839
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_3_en.png
index 87c4379585..4c836e32d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:644abccc89e0f92874cbfad066c4584dba3337050653c99faebf5e04990ab809
-size 6512
+oid sha256:c47a9d0c4eddd09c8ba7f1b2ae186031d617d5bffd6095a3c708cd887de99439
+size 6555
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_4_en.png
index 87c4379585..4c836e32d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:644abccc89e0f92874cbfad066c4584dba3337050653c99faebf5e04990ab809
-size 6512
+oid sha256:c47a9d0c4eddd09c8ba7f1b2ae186031d617d5bffd6095a3c708cd887de99439
+size 6555
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 637699d509..19bec50639 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:d23eacea6ee12b3727963e65562a2b25ec45563812f35f6580f5609916c9926e
-size 38448
+oid sha256:e284430f5ec6dc52040c7e0504bc1aabfc5eb9f6bf3674d1376458aef1a830ec
+size 38587
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 9f7469b9d9..c758fc946a 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:2f894f9818cd057c6ccef33948cff0d3d55b2478e30275af9a6406a31fecdb59
-size 54748
+oid sha256:c65c68d8eb01b9eac31d1f728f90d7c0059991803c05e8401209f4b999d656a9
+size 53155
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_7_en.png
index 1e5b7d9b97..f4a7c108b1 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e9b1bad8ed601e1511517b63915ca814822b0b9ea07c679bdf0a0d229514fcd
-size 10982
+oid sha256:8e455a78983e6e8f26920549181999cffeaf4daa7bdcd4f5774fb7419a27b0da
+size 11057
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_8_en.png
index 87c4379585..4c836e32d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:644abccc89e0f92874cbfad066c4584dba3337050653c99faebf5e04990ab809
-size 6512
+oid sha256:c47a9d0c4eddd09c8ba7f1b2ae186031d617d5bffd6095a3c708cd887de99439
+size 6555
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 297cd16bfb..2ce27e9c08 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:a137133ce6c61e0dd6d4e7bfcac4cb8b93a607114fbc9c0183a2d97b6cd25520
-size 37207
+oid sha256:60d163e2da18bab22303c7b896ebd6dce13b900b41d3d1ec8b2779ec171ec7ac
+size 38163
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_0_en.png
index f600ef94d0..edf7df7749 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4af7b43200b9e0bb22568cd3470aea970aceab36b9669f5e3c4f001c1b4b82d0
-size 8544
+oid sha256:06fb99d011d4d2353d4d0c7149607e3aa32f2ac17d96046068db74777c35e12d
+size 8638
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_1_en.png
index 39f3f34f90..4841f7b5c0 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce7350e400a50ce7fd359a17240c816ab527e5296563f87eeb6a2aad50640e47
-size 21982
+oid sha256:ad0fefb47520389e716e738d311a0fe5775eefc817dbb96cdc1475855527145b
+size 22073
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_2_en.png
index 1af7879624..7b6434a90a 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbc2c5cde5338fa40ec6867d1e2a4a509a5628d8a023f5d817ef2e5fb02b4661
-size 7536
+oid sha256:f8a0acbe3d78cce73592534bd028fef6c5477e93977369b77069532b140de811
+size 7740
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_3_en.png
index fead205ccd..df5bfbc44f 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66be6948d1a617e3862da5c34ec98e872bfdb7361a7b393975d05497aef7b76c
-size 6323
+oid sha256:ba84e8dce8c457afeb24d03c82ff95c9ce5f3b6633fc1c03914e50f9e9615deb
+size 6369
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_4_en.png
index fead205ccd..df5bfbc44f 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66be6948d1a617e3862da5c34ec98e872bfdb7361a7b393975d05497aef7b76c
-size 6323
+oid sha256:ba84e8dce8c457afeb24d03c82ff95c9ce5f3b6633fc1c03914e50f9e9615deb
+size 6369
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 f79066edb9..e9dbe6cd19 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:62545589273f0371a5de91382d700874aa10657a306c7629d60c64dbffb26b21
-size 39120
+oid sha256:4165b4fb98a9e10c9b4b47d6f90d578799ad84f15b2cfdcddeb705413eff52ba
+size 39435
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 5954e7a5f3..38a17c8d2d 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:86c7495d6b7ffb86f64ec3f5231eacf1532e4104c529de3569eb0d155d45fc34
-size 55722
+oid sha256:51eb6665f0fcc83c9d740e46538ccd4625c276f63513c2229f87583c04a49a29
+size 54361
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_7_en.png
index e34c2e6570..bfd097d1fc 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:291d3d607a2cc36ddea86de2309cb5da81c69da426db714337ceb4bfa25154e1
-size 10663
+oid sha256:f6c2a5dbe58e76da9ffd1202605c73f769c47da3d9686f5c773e92cae77cb086
+size 10743
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_8_en.png
index fead205ccd..df5bfbc44f 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66be6948d1a617e3862da5c34ec98e872bfdb7361a7b393975d05497aef7b76c
-size 6323
+oid sha256:ba84e8dce8c457afeb24d03c82ff95c9ce5f3b6633fc1c03914e50f9e9615deb
+size 6369
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 d116dfcc48..006a06d9f7 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:8b0cff302bbc1d6fc45d7615737e750eabee54d7881e5e7aba7ea6a1a8045762
-size 37135
+oid sha256:3a07e925429267ac01fedf8ee7d1cf2a8c3db867a2d97ad4f486cc3311203bbe
+size 37912
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en.png
index f2e3fc0f00..6eebf8f467 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e7990287d021e65bda0b71fe12bfa2084e6151773e18e50d6fbdf61c09584bb
-size 17206
+oid sha256:9767b5f03340feeca34c861cbb76248f9515c32453e07df87fb686e658a91ad5
+size 17229
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en.png
index 5a60403684..aa64f42a54 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0509111d5091c262860944391a2e2427be688a9293de579b2c5d3e2ce0b81343
-size 20197
+oid sha256:303db83e13d6a5874af16edf045100d99fb125408fcd935bbcd2c41137a23432
+size 20193
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en.png
index bc5985f6cc..a504957334 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52c7d46387defefbf9ff5c31d55ee75a84819f59e4ef4f69da80e27af9478063
-size 20341
+oid sha256:a61c3eef857cf3b4e035f158a79edef85d3204dfae2abbd7e88281e1c4a8e6b5
+size 20347
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en.png
index 59c499c679..76a2e7c100 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d1d33f456068d697a8ee35054eb284ba391613872d34d5f27e3329d48de890b
-size 15972
+oid sha256:18a3d8aa7ba0cac55595b865b89695fd7b43e9f3f002f27875dcc242511db15e
+size 15964
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en.png
index bc2b819fd0..452354924d 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2d48d0391750d3bf114ddff0dbdd062dd0bfce936e52142fc8e833dc9aa1c26
-size 18933
+oid sha256:848092617b8034f4789f7afb33d35a303dd4f5b2018bc96832897de4a2f877ec
+size 18932
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en.png
index dc421459d7..6d0f1f2e2b 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:493d601e8d2268ba99cd1ff1fbed42a1e9f71a94e6d0c399d1c63978ef911517
-size 18854
+oid sha256:2fc0606fb8df2ae9739ef2f787ecb52905c95c9b5142b48d7cd1ffc4046b201f
+size 18872
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 ca64ca0c6a..6d0b806999 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:c35f93a1870625fcb0f03b057d5734c5f5b489266ba3e3a0f7f0a24c7164965b
-size 25895
+oid sha256:dcf2720472a299395a7446b4002f7171d1af42dc5946e4cec236a9b4fd9336ee
+size 25877
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 33b03c2bc1..4b4406609c 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:3f831cdbfbd1563491a48cd3b4a1c383801cfc71a7c76b7586a081eaa3063e47
-size 19789
+oid sha256:41e8c2615bf34e656b9443368ec0ca26e81600be917231d8e8b7d2f9ea2058d5
+size 19868
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 88f21b77ec..01837fbc87 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:5204b6010d6c281655ace353b20f2a3bd47b34ba9fa85937fb15e0c835bd691a
-size 26642
+oid sha256:6bb5b17082fc8a9d3a9a31dac2e5565755f33ef7690c3f4c04e169e44ba39b4e
+size 26722
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 2afd26ca0a..83b2d91eeb 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:d08d7b43abcfc912e53e40490abdc51c7448ffe9856ec71a49b82e9eef38c921
-size 53203
+oid sha256:de87402782f0895d1192d801266a7d2bee1b6e79395eb39c56aff23b36da8839
+size 50232
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 de737e8491..b39e40108a 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:09ae7e358588f8cf9c1e474f1591604e8867390c00b680c5137ef472e5c940e0
-size 41944
+oid sha256:d09b9d85ccfd65576165b0f918488e3ffa3af1ea5d244b104200bc8bdaaac5a4
+size 41942
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
index 146630ba0b..75de482fbc 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c161d0bef20bb153631fc1cbe30fe15882da10662ea4510421a5dce9c5229ae
-size 29365
+oid sha256:75eff686fb001b562a69e131a3b96d1818c1fc148dd3a86675d949e08b53b835
+size 29376
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 db7780fe3f..311e260e17 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:cd578d0b478ca0bd91f23b8eec98e66991ce880e3acc0704a34024187e617748
-size 24853
+oid sha256:79af7dbe73fa2f66b7feb6cb631417c9222a6f12d8ca197cc13ce6f7f4ebb634
+size 24901
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 c119172630..035cf7bbb8 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:05e09a919b6f04aaa0b7c88a68620bc72880f3491b462b039e62ccc93c29fae9
-size 18696
+oid sha256:379de8fb86ff06daae9cb3ecc9f24533da65885eb3360ed499b6808274896668
+size 18747
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 a5f5a1cf1d..3db3027f93 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:cc0bedfc3e4c56b0c96a0b70f0f08afa59f184abc38fb3db06a3c3ef9dbf27a3
-size 24967
+oid sha256:9d0969ed7978c0f86aab5770723ea62a58ba6a5f639211358dae3517c7395315
+size 25007
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 417aa30334..8e5a7731e9 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:46150299a20a6358d93ae1b3abe0c74e34ceef58e73eef6b1b0965518893a97b
-size 52813
+oid sha256:7e8a340602a16adae67049fd1b647d524bbfcc7572484117c97ddd6b38b87f9b
+size 49804
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 7101f9cd6e..a411f682a6 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:0595e9bb8590de5c22ab2ffada57a903f96d7a25c7cd564d8f6f38d3dac3e3ec
-size 40567
+oid sha256:7f851d2cb9829e8217cd6841a6831e2643ecbfa5b1fab9dcfc3e3ad0e70f8ef8
+size 40558
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
index 9a593313f8..d7dddd9f25 100644
--- 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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65fd0fa56c99efd2d701425184989792fb2d8258ecb0aa067fc2ff72abf1759a
-size 28243
+oid sha256:6b9e258147897ea127ee00473c5d60f881985519b15a8ecb52a300a66651374b
+size 28308
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 1773ca4042..1a480242fd 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:6235b0c4b5e86145d1649511c1124fe26006cd26da473f4f7615683e3d6c66b5
-size 15954
+oid sha256:a003185cde12085777ea4d8e9644340e6c33d5cfd5f28a334505ddcfb2ff086f
+size 15988
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 86078eda98..0bec1fd952 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:ee929d6cc941b8df13943d869cbbe6505e78bd5e57bcec1788fbd405075cfe7f
-size 15302
+oid sha256:dbe0459f90845db50c49a75d93b557242cde82fbc5563d1ba971f307efe6310b
+size 15353
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 b816011261..c4f23e2672 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:d16148a23a67806f70cbce103eadf1148b70e59aad87111a39b97d6d22813bd3
-size 24153
+oid sha256:888ae99a8513e95bb4d64c4dc002b71995d2b2109e076330f36746d274e19e04
+size 24151
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 3a5972d920..3ae4adae84 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:ca460fea3b2a0d13479106ec35a0bb72c99efca8dc7fa1a8abeb86cf74a21b15
-size 21997
+oid sha256:8015570876eeaab09bdc2d21299afa3f3e1f45cb33266a538d721a7dfde7bd85
+size 22023
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 3432705c5e..5adea69646 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:1e287c5ef60b971020d39f9bed5e9a2f5d80b178bcc1d827f98582ae2e526a82
-size 24221
+oid sha256:570e2d342a5783c6262ec635ca77a4c9b9dbc350630c20ab6c12b18b2a4a4629
+size 24283
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 3f2bfbb905..0b392f18dd 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:6ea8049d885578e736bf8ac3cc880c33946c91895630808d32fd0e83a8395a1e
-size 36315
+oid sha256:a41ed2d014865eb9e2c529cb2b5ddc8f32aef11b106b5ac01c0672f703c72e96
+size 36290
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 7bf7fa9c18..c55b2641d7 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:eb41f6eb124e593f85febfa073c652dfa9710fa2ecfeb14eb28e2beb1823d6ec
-size 27830
+oid sha256:594176939cb9f05ba6f2ac1c3966ab508e3dde147c6f2012bab8a95684845568
+size 27801
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 286bbed7bf..26afee0691 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:ba625a846cf0c1ccf2e904e1a1d68ad2eab9e087478a093b4f23871eeaf4dbbf
-size 22495
+oid sha256:f716bdb65e20e9301860fe826193607a4890d67d38b9267f1458f4df63a4fb74
+size 22479
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 b2bf4eb756..aaff14cf68 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:942638e4d0ad123f95918b662bb35f7d68e9049ac755a88f261690563af978c5
-size 22905
+oid sha256:2ad55c796929a0c4228e24672644c84a39cf851ece050ea0d4fb565cda65044c
+size 22857
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 7d200af153..013d4df8a9 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:6b40f877f774dc5e62b2c8b49e7037ad5a746c5256bd36595c56792ae9a087b8
-size 25117
+oid sha256:8f2cb52cdfcbb1a5f0a5d5ee077d47998994a7e161961a731ed38dde0e016591
+size 25111
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 a0b96fe588..52c95986ef 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:1fb902aa52a99565cc333b7f17bf9d03585f872c78d848eb31791964bd67df78
-size 34922
+oid sha256:45f8dad194e1d2099d6b822367423f688be952c73bb9bee6d98b786048aec7d6
+size 34932
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 c09a166076..d7aa34f82e 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:7b5c64e5aaaaf5d2452d8273a12a543e8f1b81cd78186da8f3c989186b4d5282
-size 31557
+oid sha256:726282781384d09fd20365dcbfda965e083ce126b5161d3efef096901ee0e8ac
+size 31597
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 b94258abce..562298739d 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:f2be01d9a4b182fb3e526d63dce150f2037851aa649f8ff1b7cd06e8aba3c6df
-size 23482
+oid sha256:b3832e8255eb7dad6fa567429b53797d2cdff3997cd287dba12c1724077b793d
+size 23471
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 8b4e5be089..7c62d91de3 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:1547606ae3b430cf80e12f086a33ecedd99f611b9d5dd0516e0803c7a35e8391
-size 21481
+oid sha256:3c8f422996370cf47a4baaa9706d8d116ec780327ad098cdeff62c3ae8c4c743
+size 21444
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 411084df0e..2b32d0dddf 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:97e991358f2a8d26dd3898126967d6b45c8fdf2fc275ac13801ba91457bb7080
-size 23379
+oid sha256:0115719e51a0f718c7071bd01798ee0212c73c04d423e0893a6abbff816a879c
+size 23420
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 6cfcbebf65..80dfc53eba 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:7dbc6a9cac90b4ced6da46266264e1685f8bde02f221440745474f5ebf516cb6
-size 33563
+oid sha256:d319a5ffb88d1f85fa525037fb5ba5282140cc1038051fc3e3fb14125139c7d6
+size 33583
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 98679954fe..233796fd0b 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:721dc2a45484cd7c82e08d82f793ff8879e1b041cb127fd185601181b1d4a40a
-size 25397
+oid sha256:7a08a8c6e0079d40ed729757c593f43ce594b83ea13711f00386478535c7a694
+size 25422
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 2519134a16..1798fb66a7 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:eda5414db14850e3ca281adaf54c80c9d0d8ff90b7f3ec0f46684cb266bfb098
-size 21826
+oid sha256:02dd056d232b3ffab7cd75b036ac033ed7c34a5ec638bfb3265b999ae3bfce73
+size 21809
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 1d6817a04f..d850d4484c 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:2a76d37170fd771ff344c3a45fe12cff4fb9d9dd35f135abe322d6d8d25b5ebe
-size 21060
+oid sha256:a9a5a6b726944ee7219b3d0bd424eed410cac17e95835f0304399d4856a47b53
+size 21072
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 cb9d178e63..6937e51adc 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:2028942750c60f2709ecf404d4f9fc45fe09a9c6768427d4b62c0cb99fd0666b
-size 24402
+oid sha256:6152dc990d8a42c14891fbfc98cfeb6e9259a7d8e6af9034d12c2d0ac05353b7
+size 24376
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 ca2ea35dd7..7a4a05ffc4 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:97ef6bf2a04793f3a4dd528714f351def2ed07b9c45fa78897d0934676746157
-size 33602
+oid sha256:b7a3d244a4d92c95487c35ee9d3328dd6d2b5086a4988665312f0494b1b67804
+size 33625
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 96c738f5f5..a079a812c6 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:0310ef0d56abe8aafdb97450be7b6f44aacd175070ab24d2a7a6b7cf7c65bf7e
-size 30468
+oid sha256:e86644f2ff75b31620cbee143ede30b644791d17bc9fa499bc5a444728e72105
+size 30480
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en.png
index 8208ba5369..7935171085 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:537781aec261b622c47345b48e8fbfd68e3cf0817bb36bf0e34e83769d6d6d21
-size 24337
+oid sha256:ed263282e2bb7ed09463066bca0f982df6c932ec704f2e839580b537b48d7c04
+size 24342
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en.png
index 7b095b8e0e..ecf35ee794 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e5bf90db9ac805e4054c8d9c759181768a61f13bd30092bdf98fe0a962144f8
-size 23678
+oid sha256:8eeeb9628cf14879df65b15b49ae30ade3e2f23b3b90710c9b1eaf5947f34cc6
+size 23679
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png
index 87517cc357..48d1f990a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2eecd4b52a31208444d14b5017e42fc31df0391bb0ead311c01c9359a7e42f03
-size 74367
+oid sha256:fc82b350fa0905ffa7fdb86042157aa9577e4b60dd04cd0c875d6c26f8f18a05
+size 74382
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png
index b0381d75ac..8ab592672a 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aca42b6dc3864028a7896eaa5f410e68a320bfc55dbebd1662b9c080b2c22ca
-size 42100
+oid sha256:2c51ecde00a75a74fb6b654f58f8c6507fe1af50f5f996c27bafa355d01f3f58
+size 42097
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png
index 9ff94627ab..c12918bef2 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:897c738d61c159cfe70380e92617b014947dd8d683467b741562271cbf838234
-size 23227
+oid sha256:11df4acac503d00011ea5b0c3bf59495f5ad50268dc88b253bb60e4f47dcca10
+size 23217
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png
index 464ef2f2c4..d281cca5e7 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3351e03450b6d4c09975888734630aa36ae374f8163c45ff0b5addfa540a8431
-size 24494
+oid sha256:42a9af1521e18b0edcd05743b9dc598324c68657afa293e304576348598f4b7b
+size 24492
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en.png
index ad2bb17bc4..599b77283e 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c1cbe54b5810265d8fdd57275b4eca39ec8fbdc9cc6fcbe3d03081d22bc5171
-size 24473
+oid sha256:606d380cc99f8328d6a8ccf93a01a0c91a1abd510cfd2238a70785eab7c04306
+size 24493
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en.png
index ad2bb17bc4..599b77283e 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c1cbe54b5810265d8fdd57275b4eca39ec8fbdc9cc6fcbe3d03081d22bc5171
-size 24473
+oid sha256:606d380cc99f8328d6a8ccf93a01a0c91a1abd510cfd2238a70785eab7c04306
+size 24493
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png
index b0381d75ac..8ab592672a 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aca42b6dc3864028a7896eaa5f410e68a320bfc55dbebd1662b9c080b2c22ca
-size 42100
+oid sha256:2c51ecde00a75a74fb6b654f58f8c6507fe1af50f5f996c27bafa355d01f3f58
+size 42097
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png
index 61dcd44038..b4dae88c36 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0d95c8515dfe38a3de02fb68a035e41bedac03abadae44e371a85e6f32c9174
-size 38460
+oid sha256:c398ef341651bd7b0b067183b0b6566c515df3204512fd8f32df5abfe71f2e2e
+size 38450
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png
index ff09042d40..71a7750d12 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbe66a6550d5bc3ddead231447d7fc234841d9c8c8b7e049c326ee2b1a80aca8
-size 37108
+oid sha256:6d731d3b312cd4535d953365b1de7817c2c6d07c1ae460567f3e333cd00f8d2e
+size 37142
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png
index 3accdf3380..090d0d88c1 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74ecd0909c13895cd8d2e3827fb05fba98bd61f315735b281fd5502a9ae02bd2
-size 32354
+oid sha256:323370a1128d2629752159610719fd49de99a448f0278bdcce85f4f836bf3ef5
+size 32384
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en.png
index bf8e3849c5..7869addf85 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a832cdb8459b626779d19424282b52624e3e76c1943d0e5131049f27fe45e0d8
-size 46376
+oid sha256:ef3b30dd2f1346736f9eec2a1f4a0aabd97b459f24f623123651873310e8cc52
+size 46403
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en.png
index 89556aab16..6511073955 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9249e9a2c912c3a2f5cabc9996d608cd0801ec67629c28de656760f278bdeaf8
-size 46985
+oid sha256:88cefce497a8158d23d3302091f7b2d0d2972d83ae6d78acfe9043965e77f0c4
+size 47015
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png
index 39eacc3707..5402804a6a 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5a1132f3b99b4a047839e752ffc6675df91f5cdb750625ac6a15483b7a376a2
-size 40058
+oid sha256:2cb056d627f504947058b3512873e91a792c98d6cc485d4d866fd63589c957bc
+size 40073
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png
index 34f3f1c059..2a156d2e59 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fd10ffe78ca3e141eb3f762a7eb3b7f4adff035ba10ad106b5bd88413cfbf06
-size 40662
+oid sha256:626d47274ead934c9c4d2831d14abc011954a627d63dac7193d881826371654c
+size 40688
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 981987a5cd..d833711422 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:03253d6ef18ad145a11922300e3d94b95ae344c9dd5d6f4159a77c981e47df5e
-size 31569
+oid sha256:51827273873f4bb1f64b6775789b51e73641aead7d2138ed9990897063c75c4f
+size 31598
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png
index c1cb6c04d8..2917893392 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a9c13276724d2343111a065f4f6a3798206f6bc6016dc5314c87448ab74efeb
-size 40891
+oid sha256:a008fa7c1f333a1ea380d6d7b2401bd3cc3ac70e32c2618359640d73962c31a2
+size 40874
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png
index 00fa43c729..1a73c71f81 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ada343f41dd5f20ddef032216f462d851aff0d9a94f7545e72062e8b316683f1
-size 22570
+oid sha256:f739091f305037dc09fb7b6a083a30172f45c576a2ccbc08b4de1d97c37523d6
+size 22569
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png
index 29f9b44c0a..5987a85f48 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cff7d0bec60222ab3189805f844d14a18de28382d542706705ac91eadca99b7
-size 23873
+oid sha256:320fecc889eb76fb0201dec4c299d2fd82f6a21e48544f5d45e537bec49fa3b6
+size 23870
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en.png
index 10d89ab1c3..eb7ac53f13 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34e925856ebb4ff52ae09d96c0bdcd945bebc9b317de0ba9017d51b193f3e99a
-size 24257
+oid sha256:0cb86895b2e696966eac667f1ee9e373582ba222d7e360b74e8779989274c6e2
+size 24250
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en.png
index 10d89ab1c3..eb7ac53f13 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34e925856ebb4ff52ae09d96c0bdcd945bebc9b317de0ba9017d51b193f3e99a
-size 24257
+oid sha256:0cb86895b2e696966eac667f1ee9e373582ba222d7e360b74e8779989274c6e2
+size 24250
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png
index c1cb6c04d8..2917893392 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a9c13276724d2343111a065f4f6a3798206f6bc6016dc5314c87448ab74efeb
-size 40891
+oid sha256:a008fa7c1f333a1ea380d6d7b2401bd3cc3ac70e32c2618359640d73962c31a2
+size 40874
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png
index 7d7faefc03..6c99c4bacb 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18e41a828de1e73f0909449c096bc7d9660e5b677075845657267db731b913ab
-size 37597
+oid sha256:d077bd218282f4d5d17d319efad0b921c7e3a17e94bee4fa220390f4988d7295
+size 37601
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png
index 17fc06c07b..d1905ffbdb 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e39f3fd09d20a9a480217135ad5cf8b45d167d78ff3dfc4119600f662ab1b132
-size 36176
+oid sha256:5d87afe654be2a6d0cfb9a1fe5a900f01809dacf23f0639b87cfd08e90650e09
+size 36161
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png
index 43f97a426c..d337c136ef 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6242746ae0ba35d6e2e4a9c1d4c2a5e9433015eb7711767342afe4386edecfa1
-size 31701
+oid sha256:19f1f3eb197a48bcd1ec0ab3acc1d46ac2597fb3ffd325f221c3a87a2ae56b6b
+size 31689
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en.png
index 4ea7e1d206..14f9081895 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d512f3d1029d30265688b126064ac79fddb295fe7cc14f1e3bc198eca9788ab
-size 45377
+oid sha256:8f5e28eb5d19d8acd3161fb4d8858c17e946481ce7d6451490a5090cbe12adb4
+size 45373
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en.png
index 8dd388d696..128ee63be2 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70adafd272f536a934aca24486bd95c1364184d28308f57f750b6eef3dbd5fb2
-size 46001
+oid sha256:b8274750adcea6f58b005eb3c0f2f20f247d7a9e9e6f0d898410a6025701b1df
+size 45993
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png
index 3d570edca4..9005aa52dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05710ee6f0dec48f80a7e2c861b3f56208a707bb20ffa94878b56e855dc56da4
-size 39302
+oid sha256:08c9db896d4de76c9466675bad777591985e9b9d6d39dfae2711a95ae6de6be7
+size 39285
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png
index 3a3b83e5ca..fad6ffe0df 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0263ba7e2ea86f468f1ae1cd97b20a560eafeba80251bc99c97c85796923126f
-size 39949
+oid sha256:fcda36810020f172928338753ad986294b17ff705b1720d3f358ca471a8f8fb1
+size 39930
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 23c0ab9b55..e8416f14de 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:2cfe8e540f5c39f238b022e69a7340083eddafedeb24c78a336d6cc8b478e558
+oid sha256:34f5989f00cceb744fbdcc3163c646335bdd765b4d6f2dcbb5a488dee9b7280c
 size 30826
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en.png
index 0489f19b9c..a632394ec2 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:400c32e0e5c11ff77f12c6af7240aeb06a883101c8cfc451428123e49b49ed4d
-size 31563
+oid sha256:e2f2e2518b1ae1a6581b83eb0a2923dc30d4a7e3a0e29ab2a8576cc407ca5cef
+size 31590
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 f721955fe2..f1872614ce 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:061efadad844117ed72a1bf22e2c61687bc01a93a8e8f290a12b48410713c0f0
-size 26555
+oid sha256:4db4fc94f8c80bc45d241ccb8e67b18f687b2fb00fef5f4c7de5fbfbc07ede05
+size 26551
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 c10cb27b6e..59d977bcfa 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:9bed3a515fd0ea2194230d2387dbc05ac177e3602e34be2a043318e16eb68fd7
-size 25165
+oid sha256:ca7819814008b5365e1c11cfd530587277fa8636e183eae35464c627c0a1d174
+size 25163
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en.png
index fc31b553ae..f491e5afd4 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb94d13c7e1b529f0acf42085404d4884038d4cf152dd235d4df054da7501aef
-size 4020
+oid sha256:5c0c57ed1d96e6654a25e4f47c13b34d2f80ba441a20795b6ec1ad7bdbf2fc5f
+size 4041
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png
index 7b8cfa308c..63af02a9b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:951b9e2b142c5be37bd2f1ad9450d624c561e59dfddd28b44c0fd11f8902cb81
-size 33015
+oid sha256:db7af309219038951c742535c24f2bf6995438a3e9850bd9f69aa8ac2636cbf5
+size 33037
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png
index 0495a7d1e2..ea3b9ed3fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0ed215b0a3894ac5a9f1f6653392da992992bb848ab50d0b2d2eab5e3235e05
-size 23184
+oid sha256:da0a3a6b89ba22da85d8834a8b9dbc4216ee0085b7ef6f8e55203e0abb789b57
+size 23203
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png
index e6b30c5a35..dad425d03d 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2137fb292c84d28eec149edbbb627b0b2b7db867e733dd8ddf8a15ef2ed9d7cb
-size 20392
+oid sha256:d2993f8eb15e1d7dd869bad474a954db52a2b8f9769f4d1d3f0c6ab0449b7fbe
+size 20421
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en.png
index bf8e3849c5..7869addf85 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a832cdb8459b626779d19424282b52624e3e76c1943d0e5131049f27fe45e0d8
-size 46376
+oid sha256:ef3b30dd2f1346736f9eec2a1f4a0aabd97b459f24f623123651873310e8cc52
+size 46403
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en.png
index 89556aab16..6511073955 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9249e9a2c912c3a2f5cabc9996d608cd0801ec67629c28de656760f278bdeaf8
-size 46985
+oid sha256:88cefce497a8158d23d3302091f7b2d0d2972d83ae6d78acfe9043965e77f0c4
+size 47015
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png
index 39eacc3707..5402804a6a 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5a1132f3b99b4a047839e752ffc6675df91f5cdb750625ac6a15483b7a376a2
-size 40058
+oid sha256:2cb056d627f504947058b3512873e91a792c98d6cc485d4d866fd63589c957bc
+size 40073
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en.png
index a56767d4d2..eb57374e86 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89b0d63e742deb8efe57df9d156d79fb14cded72991ae1942a1eea0da7330b44
-size 24579
+oid sha256:aa0e8f30864050f2388b1302aaf099768451a7d3073eabdf665d9baa23ec2d91
+size 24595
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en.png
index 690b86bd28..8ba1ee2e4c 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3359d6a0e36208ee49ab30774e224534f1371a65a90da877b9afccda1a81b69
-size 19263
+oid sha256:3cec76a9c828e9a3ec3eb67637c4af8145a520462e7a590418b2255ca88db813
+size 19291
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 981987a5cd..d833711422 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:03253d6ef18ad145a11922300e3d94b95ae344c9dd5d6f4159a77c981e47df5e
-size 31569
+oid sha256:51827273873f4bb1f64b6775789b51e73641aead7d2138ed9990897063c75c4f
+size 31598
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en.png
index ab55be7692..9bf01ebb14 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4056a8e90acd36563cacad2533ced3a6f53abf257b963442a424cba101e2e68
-size 30692
+oid sha256:7c13bfb60289897059d3230235949f13a6add9a9b1bd40f7e0806cc01a48fda5
+size 30685
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 1bc1cba469..de49708cf6 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:83c1691efa952ea64b00fc794bb082b4975c037d8ada71053a352528c688cd8a
-size 25903
+oid sha256:8ee603c36dea38a3adda22c45294a45225e44f9638f7292159019993aafd1ec7
+size 25902
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 840b54551c..45e9f22955 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:7bb238ccbc68e6224f3e34d624d7d22d77ba15d30e7b6dae7a2a9d694ef8e0f9
+oid sha256:bc1980e0ce3bc900f6703fe4f5f12eabbcc351b0aca873215e414af86125a0fd
 size 24521
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en.png
index afe95c9b70..a3bcc11ad7 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecb393a704e98895bf561ec7e5b3fff96f1ea5d51f2b47f4dad002d8bf5eac2d
-size 4020
+oid sha256:789be4f6e2b0e3a39acff02a8e8e20345839e646c009086e6af39b7f840d1a99
+size 4007
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png
index 69e50cc51e..addf2b47cb 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cbd454afca0db1d17ec4b8582f0422a49d85ffab537a3256c540818e33e5522
-size 32181
+oid sha256:d4d968e867119149bb7cfcfdb2c993603c60b427f4f3810ecf9784198c6804b6
+size 32158
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png
index 3139da465b..9e3ec35297 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7daf0eb8325560c0a2039e201cc2e4c41f07d2d4984e8b65a904379eb4612df0
-size 22700
+oid sha256:352e0673fd2802c418657e9a0532a504d736234f28df1119437e3035dde06804
+size 22685
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png
index d723c7a048..b334380e3d 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36fa5bc0308e80826678222998cf041d042c7b255547b370c2510aba7d735dbb
-size 20028
+oid sha256:a477acdebee14e91f9e15ef9f10f318ae0fcb081a0f6bdacb91c68e5d9234b30
+size 20011
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en.png
index 4ea7e1d206..14f9081895 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d512f3d1029d30265688b126064ac79fddb295fe7cc14f1e3bc198eca9788ab
-size 45377
+oid sha256:8f5e28eb5d19d8acd3161fb4d8858c17e946481ce7d6451490a5090cbe12adb4
+size 45373
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en.png
index 8dd388d696..128ee63be2 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70adafd272f536a934aca24486bd95c1364184d28308f57f750b6eef3dbd5fb2
-size 46001
+oid sha256:b8274750adcea6f58b005eb3c0f2f20f247d7a9e9e6f0d898410a6025701b1df
+size 45993
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png
index 3d570edca4..9005aa52dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05710ee6f0dec48f80a7e2c861b3f56208a707bb20ffa94878b56e855dc56da4
-size 39302
+oid sha256:08c9db896d4de76c9466675bad777591985e9b9d6d39dfae2711a95ae6de6be7
+size 39285
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en.png
index 45c4e74c78..ef526564bb 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55dbba1cc972d142dae5c76a1122eba8bc6da15d02b24980937b418fb4cabdfa
-size 24303
+oid sha256:5be87045ac1f27f71a4162a966a07920b982de91891b889f1033b781aacaf05e
+size 24295
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en.png
index 4c4aea659b..292bc46a98 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6445a8e3df4b273868f21903357b1a1a570f66269661b3c8ba42fa7f1e091f59
-size 18759
+oid sha256:5d0fe14b6d6ca0d4f2d2f7a820a98cf4faab261d4974e601d30d1e0e49e8a5e2
+size 18755
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 23c0ab9b55..e8416f14de 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:2cfe8e540f5c39f238b022e69a7340083eddafedeb24c78a336d6cc8b478e558
+oid sha256:34f5989f00cceb744fbdcc3163c646335bdd765b4d6f2dcbb5a488dee9b7280c
 size 30826
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_0_en.png
index cfe7b6f1a0..62bca74884 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5810865dc494369505af5b3a158b1ff1c07a9d7cee604ac63b0194d3201117f9
-size 8689
+oid sha256:fedfac46d56f4cf9316ab0e0b8e3c2c2da539a7646c9858c57c078c40abbe4fc
+size 8700
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_1_en.png
index cfe7b6f1a0..62bca74884 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5810865dc494369505af5b3a158b1ff1c07a9d7cee604ac63b0194d3201117f9
-size 8689
+oid sha256:fedfac46d56f4cf9316ab0e0b8e3c2c2da539a7646c9858c57c078c40abbe4fc
+size 8700
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_2_en.png
index c95d16443a..0914e7247a 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7edc59eb1335b7824d0f11e09b4b2894054748990fba937948932a9fc6b6021d
-size 8769
+oid sha256:5c1bbe99d29efcfde3310ad45b2b8217806c34d6ee30a5684449ed87a5553d02
+size 8787
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_3_en.png
index 59d17071aa..f84fe29d6c 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6bc783c43ddadb96f0fb1995ec0f2852fc9f96f3018d1ac971e31715437fcde
-size 8825
+oid sha256:9ea70b10876ec654c94644281674b41c9b0d45ff5ec9f79d1efe0b55a49fc6b7
+size 8845
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_4_en.png
index 9d9ed6ec58..d51967caa3 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:536c78f1e5a68200ed6286f0175b0788ff9baf46bee77417767e9d6169d81900
-size 67594
+oid sha256:3ecd5cfd9ef3597d3f51fba0fdaf164589c6a2ebad086805c6e0607c7c0043f7
+size 67614
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_5_en.png
index 1fd34049f4..8dfd859d52 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edad66745b92d68e58dd187942e573e717c12c9dd45a0e7f507c217219ce2ded
-size 62442
+oid sha256:2d5d01185543fc2081fc907ea20ecb04897f54e6807968dec44d80ce2294b5aa
+size 62440
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_0_en.png
index af6841353b..857bd249a1 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12624e8dbf0f2991adc8f00a3a834149824b9ec87829b60d128a741ee6fb45f5
-size 8458
+oid sha256:0adb9ef1ac968c3544e1a83c7a1d125d618355104202ed6c05077fe67c86c0d4
+size 8447
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_1_en.png
index af6841353b..857bd249a1 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12624e8dbf0f2991adc8f00a3a834149824b9ec87829b60d128a741ee6fb45f5
-size 8458
+oid sha256:0adb9ef1ac968c3544e1a83c7a1d125d618355104202ed6c05077fe67c86c0d4
+size 8447
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_2_en.png
index 91a403668d..9014b0703f 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d83de27597777e34d8629300e8130894b0d54570ea0f57b8ab4a7637db2e3e19
-size 8487
+oid sha256:bff2973eb03130136f0f659fa2c0f7ed5c80de9394f8f272f4ee75cac0266488
+size 8486
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_3_en.png
index 23f21b41a3..dce1596180 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fccecec05c678dbbd40fabeff0198a2a1083d3ef2648ae88664944cf5212fc85
-size 8571
+oid sha256:542677ffd4c4da6662ea7fc5997763ca27876a0633db760814541cb81f29b20f
+size 8567
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_4_en.png
index 600afb6a0b..e85a99e49a 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dfe5d6dbe2227fda854d22734036b046fa899bae4569aed1fafa678ec3e1d28
-size 68853
+oid sha256:a3d2a757fa9d7ea03f0f954a0f75abb363621f3332805e16400555442de9380e
+size 68849
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_5_en.png
index 7155f4b01e..7822af7810 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.file_ViewFileView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:249b17ff7387f06f321ffe0efabba966524874d8d5ad3e37460be373c4526954
-size 62604
+oid sha256:621cd7d33104bcc3b7fad5c031c68e08b5bd7091c37383e2c2caab4ba991eedd
+size 62591
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_0_en.png
index 9a8867c7b8..0de7321113 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81d8a4ecece42318cf4a38ae49212b914cda03806a3a25d94d51ded075c55dc5
-size 7884
+oid sha256:c0f4bbe5634b8622d9f2f9f8ebbdb29ebd53f7fd3c0c9339dd42fd4df9b11e11
+size 7910
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 6a02b73892..1b9e5a6536 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:38084d5a19bc081cd6ac593cf47164df00baa9c0e94b016117f96508a9dcfadc
-size 9647
+oid sha256:ab0477b6a4fdd4eaf522a87e4cf40820ad506d3f7eb3d0aa0ada979151a3166b
+size 9677
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_0_en.png
index 61cf4e9f6d..022774f1a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fbb634421972d5b8e74f845376754976d854d13f552737aba968660bce67ab9
-size 7759
+oid sha256:0f05e56804ac1212ef47f8e015f5057b3ddfdb3ecabb03f0b9b48e74d4130031
+size 7756
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 9aab5bb2ae..01235592ff 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:a5f596f85ddd734cc0d8c27839db17b5d94d575ec71a28e5e431f43bb0ef3d30
-size 9417
+oid sha256:a421d4ba0c63e1c7fcaf2c9bc84a6c230b4bb51ab0c3c7aefd468b4f05077bbf
+size 9420
diff --git a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_0_en.png
index 17cefd666f..8842985824 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:215df53e6287ac32df6ec3a4b910a40035c8a516e89bdfc7b23aa1d45320ab78
-size 8285
+oid sha256:7e17dcebe83d7d50e6cd7fbcfd784e31523138a5b6b66812015edb83c0f8117b
+size 8303
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 815ac1db6d..2c3d86ccf7 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:848f7d81f4bede07d697ad326a0d23845c8446ad49cedc81e985044ad4b45a5c
-size 49048
+oid sha256:2fb60b8f3e1e7a412434b7914d8c68c5266d598e9fa4f3f1a3b243a16dc7da4c
+size 43723
diff --git a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_0_en.png
index 46a95f8bd7..29280f0e89 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6bfaebba98b5b9bf083e5d29eb9a2a835ce774e26956b582d01b54a1799e507
-size 8172
+oid sha256:82a7e0e3ec48c4b3eb1644bbf7b0c778f39f051297f1e5394a4511f6122640a2
+size 8154
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 8a250d9439..3897f6c49c 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:87003f7f0c981f0fee9f0773914e2fd99e18f1001045c13f52bc33dfba2905d6
-size 49941
+oid sha256:14e02b252ef0fd343b0d4cc6f7745a36dc15351ead4d3920a9e78b0fd329f04b
+size 44581
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en.png
index 9957d3f2a8..3cdd56a15a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6453b165bca4b509d7a2e1749e0534f5f12465de3b32bb0513cf377021a57a5
-size 5080
+oid sha256:6ac466625bd9985cc0c820a99b30fe6e9c0e3ef738cb47d5eec9a92a5ed1cda4
+size 5100
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en.png
index abea5053c1..ec803d2726 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2431e2c666af3353ae85d9a101d8dde1378b4fa3d1828ff23a7f4753f6fb2725
-size 5112
+oid sha256:40894153477d0d133746def9003533095c1cf18f5284974bfb268790eaef4e4d
+size 5122
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en.png
index cf50ed4785..f255f6b584 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdfec762d99767f81e9a9d1aae0a26291715fe8d9b4e4e50174a85ec6e982273
-size 7042
+oid sha256:80949f82856fae9017643fb91a9247fbff10360e738e5c1e1c8cb20964319a53
+size 7054
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en.png
index 52254b6eb3..d14e225325 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7ee1c0f2d9f0334776ed810095658a85c701b89ca6cb9d083e5a89d1f7802d9
-size 7128
+oid sha256:b7ee25f4b4fd3faf4b5d50211aa7bbb029c658d329acb51093b39a603a5d9037
+size 7077
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en.png
index 7c2b773885..bf2102f292 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74fea2953af839c4ac12186efceeda14e45d2a84ea20f28814323d873c8383d7
-size 6261
+oid sha256:fdcd618bb02d25de5e74991b69dbe665591e4d6f47e0445204104ba6d5db3748
+size 6241
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en.png
index 0a689517c5..22633e93aa 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:025bcdbd6e2a04a1a08dd31f676005dd1ea3f74a5b67fc3ed79570a9ac8733b9
-size 6356
+oid sha256:ce1f2cfc4a0c41a528b1ae190c773ff9402f3c8f0c84149ad05d2ebccecdeb38
+size 6360
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Day_0_en.png
index eaec9e3318..cbb16b65d3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d031bf5a32c96e705bca293970bab93020c0f930ffba447020182fa2cbb9cbd
-size 6524
+oid sha256:da8c84bce2caba0a96f884e09b6c272a6a05b3676ca35c85e4d384e983440608
+size 6654
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Night_0_en.png
index 3bb3765ba4..8b1995db1c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f3e049ccb735894178c131b47b0a89a4ebd51aca9b5c06b6e5c90134194af2c
-size 6535
+oid sha256:944fb28c55313433e7ea435c9c5041825814c1209ab1a50067fe56f85386aebb
+size 6574
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Day_0_en.png
index 36179a81b8..a38c890d57 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7aabda5311fc84ec8b93ce5091afb6fff175c23ece38c7eb05b9d5d6f59ccf2
-size 6102
+oid sha256:4937e2e3776d515f9a1d661da96c0131229772f3965639e1f79d84cb4a7645ea
+size 6132
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Night_0_en.png
index 239ab412bc..e96ca6adf3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cfb78c9c2eb2219adb57e05eb3ffd28699b3726cfe3c3af551addcb27bfa52b
-size 5891
+oid sha256:86c742e833d91d47bdf3410b7c24a369225bc43f222adb578c7abb3babfe9e1e
+size 5986
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en.png
index 70f466737b..0803b25df5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ee6658e8a53951305707f8da51ea469c8b315358761271567f5836594f64e01
-size 5100
+oid sha256:b78f3742650bc7360e7a202ecdca5885b7ebd552533f2d4569f8524e17f6aa69
+size 5095
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en.png
index 6af55a1b80..9bd84c6264 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a5025df3dca423d557dd5cfbb62d773de7fcdefeca035e5d9561d2e664f8824
-size 5196
+oid sha256:24486d441a36b9e9c7c8df6c8cc3c9b95fc11ed1fafbe3a90136e41f5630410b
+size 5192
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en.png
index 4cd52747eb..e59d661eab 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eda6f086863c3d3f7bc76448777768785cd69b1ac685ee1db8f95cacb3389a30
-size 5564
+oid sha256:f34d147a2d85f5e7286b093c292b53d7045becfd2acf2f30f5363f2ee7d1bd85
+size 5572
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en.png
index 2f6a9869f5..e8fa213fba 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19db99b73c148ad3ffc6b5e522510b8b64a3ed1de3614510c58ba7f35a4a610c
-size 5338
+oid sha256:dbb4b8c734cb9f62dae5ff81219d7d6a574ae8b941cde98bd9d864bc9c69b0d4
+size 5334
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en.png
index cdbaeafd8a..d8a303b660 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d11d39de74eec2a2bbae24932051d3601334bd76c0dd130c344ee0da5dcf9343
-size 19987
+oid sha256:53fbd6f92429d3b896337a6fe8ce42b6236e2b254baab6d49fee8349e8849082
+size 17551
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en.png
new file mode 100644
index 0000000000..b89e7f5992
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:244b946fd3cf520ced76297ab66cae6ce0588b23082dbeedfc98df954d09d669
+size 19657
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en.png
new file mode 100644
index 0000000000..6985721c59
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b876487f0e69c5a52679254306610ac11cbc094e23ca9919cc67c073ce8d02d8
+size 17395
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en.png
new file mode 100644
index 0000000000..b3e49c2d38
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c58cc25cbc6cd4375aaf010b97c016a17887da201ee9e00e5a28777a938e825
+size 19374
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en.png
new file mode 100644
index 0000000000..c0cde40f12
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6867123a35845631c71a206f6711d19f98949b627fe08a56edca906d0cf39d65
+size 19357
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en.png
new file mode 100644
index 0000000000..5bf51729fb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:413049effec9e4dc82d8cac1f1e81ee82c27b557110810adda2bbfe4ce2fcd5e
+size 17062
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en.png
new file mode 100644
index 0000000000..cdbaeafd8a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d11d39de74eec2a2bbae24932051d3601334bd76c0dd130c344ee0da5dcf9343
+size 19987
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en.png
new file mode 100644
index 0000000000..6adc247c82
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04ce1ddb3d55cc50c81d45b0609e407cb06e66135435b0ab93f4276f84be2d5a
+size 19785
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en.png
index b748e2a3b4..7916e14233 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dafd34b746c706efdd85810bc2545ff03eb0b62fd098d0ab7d770dfd8e553888
-size 22448
+oid sha256:34eb7dce40c21e9def0982f82645cbc2e1ae585a56033043bae7ef25a883ac40
+size 20951
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en.png
new file mode 100644
index 0000000000..4f941d515b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d94cb49717cb7d2428f611160d3e170d7eac72352d9cdaa9c697e58fdc76b9d
+size 22963
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en.png
new file mode 100644
index 0000000000..f4282a639e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2cfb17927107faff4eed8544f0673d806e7bf93c84ba0cf536bd3108d510739
+size 20592
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en.png
new file mode 100644
index 0000000000..b1a3f054bd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:406041edf077219d0006397adb4135a0b0ff5cf012982225f8a8d65e5b538214
+size 22886
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en.png
new file mode 100644
index 0000000000..f6b4b1cf78
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f6bcebbcdba8ef2e472d8d76549631508d3c36a4a9ff3fe0a8a6fae41f06a26
+size 22518
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en.png
new file mode 100644
index 0000000000..5ffb95979c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57228a1501e9325aadba0e1fe177039c899a13922a8df2bfb4f0b19670908259
+size 19485
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en.png
new file mode 100644
index 0000000000..b748e2a3b4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dafd34b746c706efdd85810bc2545ff03eb0b62fd098d0ab7d770dfd8e553888
+size 22448
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en.png
new file mode 100644
index 0000000000..166d40fbe5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed4058d71aefa09c5d804aabb8a337ece373146672a74aa1cd27d7539a02c556
+size 21995
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Day_0_en.png
index 249645ba52..38bcb807c0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43286e28379826fc82e9c0a2f9196785bb0e837a69e31e92231fb25750a606e0
-size 8464
+oid sha256:b496cf9908aaa3a37c666633b3671b67d4829a40265dab71d2482afd1fac8a01
+size 8454
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Night_0_en.png
index bab3aeb454..e793e25ef3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_IconTitleSubtitleMolecule_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e52968635ec1f068ebcbb63201838e0511c1efe25a4ecc84a119e566710dbcb1
-size 8072
+oid sha256:fd19d2a26f886af371b804580610f14eac3e688996abdea5dd6db84b148c3397
+size 8067
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.atomic.molecules_InfoListItemMolecule_Day_0_en.png
index 7acfef1c85..08373fadbb 100644
--- 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.atomic.molecules_InfoListItemMolecule_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff4b52db0af659348e97de3111c4fc47046466ebce156c9a7062191b0de895c0
-size 16924
+oid sha256:9ccf168c73e696ecaa0074462d7c571567a5e4d532aabda5e4c7575461ea6eb3
+size 16912
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.atomic.molecules_InfoListItemMolecule_Night_0_en.png
index 29ccae01e6..fae3956cf0 100644
--- 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.atomic.molecules_InfoListItemMolecule_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0243bbe48f099933fc6ef7d65f43b424ae4cd792514be973b067a3b70960d4ce
-size 16494
+oid sha256:46701034efe3e8ca225dcf77777142e4b47b51a6e7cdddee9fb3fa440577cfdb
+size 16516
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Day_0_en.png
index e58a0fc7cf..77e37fc971 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae46c638b46cceb6d36e8aecd8c039c41cf684d12732343af220abb98172a700
-size 11574
+oid sha256:67aaa7d9e289a31b4341b8aaae35d49014f5ab73b32e2c9edfe9d9ef0133cf6d
+size 11565
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Night_0_en.png
index dd3a44d065..1f56d356d7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_MembersCountMolecule_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11799532cf664c735e06b4d2e916c40735dc2ea4069668e85e2da441d6ae362f
-size 11213
+oid sha256:ef3a114a918b8b0dd7e748f4565d557eba345fc5c4510cdb2e59712b8beb73f5
+size 11188
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en.png
index 0eec5f4386..528da71582 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a1aed2d88cf9aa8a7734a9af24b41d0226fb777e00f721b6404761c53277e48
-size 15620
+oid sha256:75a9f63b163ce8d61806e9e46a5336399fbbb82c0bbdc4b4572fe1e757ab627d
+size 15637
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en.png
index 4048246e2a..c501481057 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5bdff85dbd1d1443afa57dbce8406b4a085334c1b902890ebb8bc805302f1e5
-size 15252
+oid sha256:19f35361fd45c1dc7ac451449cf0c2523732d854b1e2cca632b51ed3de48ddca
+size 15244
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en.png
index 5675d2d042..841e849016 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4d63ff0372cc430ca0f346cb46554cc5a27f5d7cfeee3bf6bfce711fa67e01a
-size 7665
+oid sha256:869e9a1a57a1b47ee817dd7041da38606d86c94648661d698bd04c38da1da73b
+size 7661
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en.png
index d94805fe21..c2864d2251 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e30b01297adcad3a501c670a7155b6b478da30aa59a02cae5a1ffd512cd1ce1f
-size 6571
+oid sha256:5c609a2d0b03bc0dc6f387c1d6741bd55fe69dc75b4d81388481478e7e0252d3
+size 6569
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_BackButton_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_BackButton_Buttons_en.png
index 08ae0409d6..87ab3013d4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_BackButton_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_BackButton_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4c39706028f31019d08a8638e8d993cd4e190c20473e2320f0563d64266101d
-size 5548
+oid sha256:900adc3273030b62725e4a81b903ab7d13eadbc5a055226765f1bfb5affd6319
+size 5558
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en.png
index d540d63351..ca8b99159f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d80f86924ec6e6f93d5bbd1ec64cda868a1384f011708065a242424fe1e4bdd
-size 10516
+oid sha256:45e0eed913d8987940b6745620e229c8ce1659f2603b3bc4a1d19d6753742f6d
+size 12394
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en.png
index 77b472f79e..39a307604c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb5d3733f0d79bc2537e4bfaa88c5408ca37bc0187c2c152b0bd2a7c211647a0
-size 10475
+oid sha256:98302375a306d4a396888cdbaecf358e246f25dcc5e300a2548b84d6fb9c4974
+size 11745
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en.png
index 1b3a28226c..a9ee021ab5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43cb38a1e4eedf30040d18047eaacd68c205182bd2e731b020c7bc1449ca26ba
-size 10577
+oid sha256:52ddea2d8936364fe4b8fcf9c140830cd4354db214cc43f737eaab6070b84c6d
+size 12713
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en.png
index 97148000cf..0857be997a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33e14ffc50225feaff57262343de3e8bfcace194184aa8738f12353f4415eb0d
-size 10530
+oid sha256:dc4d9958f19470f82c43cc7cc2eb6ae4c0b2ec954a66bd654c76759780c0ae22
+size 11873
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_MainActionButton_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_MainActionButton_Buttons_en.png
index b42ba520e0..60fa4dbf16 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_MainActionButton_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_MainActionButton_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:754fec886b601953d2fa1a506639e2d723080151fbb681227ba6abc3a0f07dcc
-size 22057
+oid sha256:d8e032c741493a4e955f125a1b9e63673ff41ce3bcb102193dbab127e9a22685
+size 22062
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en.png
new file mode 100644
index 0000000000..7d4045ec02
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9849f4591df3218c78c91e6731a864b72abaa699caa6321c818197faaf6b85af
+size 18326
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en.png
new file mode 100644
index 0000000000..e2700312ba
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d47c650eae62a550c80aeed85775062304132debf33e5279fddc74c787ad40b3
+size 17211
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en.png
index 68c1434850..1dadf54d84 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f6a751ee69ed1900f1393d3237fec689057848198b05c03bd63009d3df3618d
-size 18160
+oid sha256:19d6e6d0a50bbf00ed4ea7ae90948638204274b9be9282012ed522068db0f4e6
+size 18161
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en.png
index 66a03d03b1..cf2ac10757 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afb6ce554b0792aecb5ea97cd31b2f43ef08b79a7dbe3e61e0501f108d339be8
-size 16611
+oid sha256:98aac477a21522632fee596839ea71d52ae01f494ca91204da34a00120fead7b
+size 16620
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Day_0_en.png
index b54f89bef8..7d68bb0570 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f162675e687af3aa9c352cdf7ae177f4760d1ce008cd217641b6722a71d34d49
-size 10271
+oid sha256:837bb03b66cccdfebb039b36da1096589da31e898de36975e413782349896ba0
+size 10167
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Night_0_en.png
index 6690e37706..3a689c5959 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.media_WaveformPlaybackView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30328b9c5a43508d135d086fcbafe5ad5cf9989e208f8f25b1450e61df08994e
-size 9549
+oid sha256:091bd502d78b80633e267670e2cfdde1696f22d26b9b729d8e33d6d33b8e6d58
+size 9469
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 f5694840fe..104fca8396 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:1b41f7235c9aa037dea64a67f87ff688d4b229f1b5a46bd563f57a7b6c690d9f
-size 24926
+oid sha256:321c0b750862d017100c61f7c4e5656fcc6d8566e0cebd81586dc6891d971b76
+size 24932
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 1b4ee926d1..97c8f9a589 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:20a85881942bff954dbf326116eca8c2c1d9b2dae3c7a8adde7f17de01c6051b
-size 65875
+oid sha256:cf70f35d11eb71737f0d33bbdad1073a3ce15bbb6534f4cda3a8c8b8a21f3da8
+size 65858
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 be32cb24a3..47d04e19bb 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:f02ee83a49656553dd59648442bf4d558f6257fff3b30b768673d531cbe10150
-size 30928
+oid sha256:ed643834f8fd2bc167dfd95113ab9098392f4d626ccdd58c9fae2cfd264f70c5
+size 41611
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 2557649364..b145a008b0 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:30823f256c71fec1ff322e0b0a199a86c943e107b1bbd89e8022415bdd8d6650
-size 22324
+oid sha256:f44fa660c80894392dffe711573d536ab8e71b82411f339b45bd29b1823d4919
+size 22325
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 840d7f173c..a3ffd3de6b 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:dba519fc8b2d87ceba9cb1cb6759946e8d09b7765fdf07dbf6949a3e3d1cd649
-size 21569
+oid sha256:442c03aa8abe7e43ccbb1c736349d606353833c3b33535797b3b2840d46b7a6d
+size 21554
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 6f225a09f6..9a7c6945a3 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:df629f6b4e0e245a3dfa751b100a695a4d076d64b4bc4b73129720dc5a30d574
-size 23715
+oid sha256:3ebd14965659606bc2a4f250062e87e179ef38a6bf5d470192bb91dc74f3c1de
+size 23697
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 ae07f25c42..f3671582ac 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:ebc0ab69be80185ce7987b412d47bf01c8df140a346bd64a983b6c51fdb0b23f
-size 35700
+oid sha256:fd6ac8137997251a9f8800a9988d0fbca7d8adfb1e7a862513e09dd02faa931f
+size 35693
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Day_0_en.png
index b07c496207..1660420157 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0857a81b5b9189239fe4ab1c3f18bd4c7549ffc375419531fbc2269ab29693bb
-size 27206
+oid sha256:2abaff032b182aee8a4b156583086b163214d776186ff903088efc6eedd11532
+size 27135
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Night_0_en.png
index fe71677aae..eebd7e7048 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Announcement_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee22afa3065e722bc4d9ca517b75e36f3cd8ded33566765ee96146a001025ca9
-size 26115
+oid sha256:f0f327a74f4b6e2d1589a65d9c367eeecc711b0d069a88f7dcb83613cb7a0731
+size 26071
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Day_0_en.png
index cc01119ebc..0e350840c4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23b038ebbafdc49692ec30cbc1afc30b6dba35522cef46c848236e7d71f44678
-size 6023
+oid sha256:0a81766956178672485c43d1a904e7d3e14ae767c0e0d26ac2b4bdce13c0559e
+size 6090
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Night_0_en.png
index 3c6c5c97fe..3ea800f130 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_Badge_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7535d05038c0072747472f937bfb754d387475416c1adaf7a8f453f77ed46aea
-size 5853
+oid sha256:37f1b0274f4f011736797196e268d5c07c19449001faeb1ee4e9950c2f956c6f
+size 5954
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png
index f21a3f2af9..cc09282faa 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53b8ae4ce5ad4a73070ef42b486656b5d9d96e9f0a2612375c54ef1f3203d097
-size 14225
+oid sha256:3ae5556afe4e26f417c598e116dee6c7c913fe668a15ec2d98d2f1ed81b5371f
+size 14269
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png
index 7ae8c76155..fff990dc70 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22196fa49991877eaca7cc672a5de71b2b93689a788cd1cb28b2b9d6b4260a2d
-size 14387
+oid sha256:7ec9f20978244f8b933140f074bf586a174b9448a602294b95f4773ee7758323
+size 14406
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_0_en.png
deleted file mode 100644
index 506fda7126..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e989a1e07885d04965cd7d8e27d6fc3510b2f35f7fe1fa2a6a4c1423cb1694b
-size 67654
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_1_en.png
deleted file mode 100644
index a6c94e6481..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8acc35da7fca7546fd87b3a034f7f89ce061fce8c233c95ecf91ec705fe53b25
-size 68602
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_2_en.png
deleted file mode 100644
index 30ab75cd1d..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9f0862af225594eeb5917d0dce704d9ebc0de5c451671831f040c2656ca1902
-size 73062
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_3_en.png
deleted file mode 100644
index 6a5b127085..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d44c135cf535d0f6e78f963a5818b3d66f30ca04eface202cdeb9445edcc345
-size 73798
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_4_en.png
deleted file mode 100644
index 891496f2e2..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20ff698d49f884d1ce0689f905e8c23a9e7ff0a9df8ef468124d211533bbb7d9
-size 73225
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_5_en.png
deleted file mode 100644
index b007ff3c74..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25d1cd2422793161383726071583996f36343f4e8f0e2a1c365f545f8eb82692
-size 53757
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_0_en.png
deleted file mode 100644
index 9eb972b8e8..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6db17e80da0519b6ad31ac8b8502dfa420350c1b6a280cd945faab2f23b1419e
-size 64482
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_1_en.png
deleted file mode 100644
index 227ff94ca2..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3a8bf43c5d6e7636032ac14eff16e0e5a377e72a80f8ecb77b07fdce2a7df79
-size 65167
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_2_en.png
deleted file mode 100644
index 3c1cb3014b..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f17e77bfd58d34898ea96f1d8a66d98eecefa26ce6b1ed4785015d745e5011a
-size 69691
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_3_en.png
deleted file mode 100644
index 92a2304046..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f445434c56b7a4afeff5ee248365e20894d595b803da95ebf1785cad9ff331d
-size 70653
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_4_en.png
deleted file mode 100644
index ee83f61320..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98f1974a902f46a80094143bc22b344f2c5a447a4ac46647c117806202014be1
-size 69760
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_5_en.png
deleted file mode 100644
index 30300962d2..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsCompound_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:320057558c433d8b2b1595734fe9c3121b2a518cba1745519c1632f9f5b0c267
-size 51847
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png
index 98b70f5c35..279c1855d5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e71f4f5c0d8f299ff91699612604f5b285160f5830a2b1e3e0c4092e85bd8aa7
-size 14064
+oid sha256:49f3e81d0a713630723c463c8705463e1ba04266624f71d6e29cd7d3a693c115
+size 13789
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png
index ed0853de74..e396168a4d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.icons_IconsOther_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e526b48b8f340e5e5c31e0e976286a5d64f27928d3cdf00b3175e5840bc494f3
-size 13282
+oid sha256:76ecf55d5a354374db7b9ac14fb64fae7637b35b2908efcf73163b514710fcb0
+size 13127
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Day_0_en.png
deleted file mode 100644
index f3a0c39c8e..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6f581db727c01b084bc60ddb19cfe34e1f097cb91e6ac675c7721021f1d48c4
-size 8446
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Night_0_en.png
deleted file mode 100644
index b9746b8511..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.modifiers_BackgroundVerticalGradientEnterprise_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad28a3e8f78ccd0263eff3c3d42f506ea4ae54eea88fe81849eac71fbaf0dd05
-size 8458
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 c4953b4c85..46343e3a6f 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:bdca6338a1a730fcb3177220bc739d6e528169fc5287136cdaff320d15a4b973
-size 33506
+oid sha256:f156d3940bfd60b6edb2445f4a57b69a203c33375817ce38f9bcc6bcde0fa46e
+size 32141
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 1ca5f1c742..27ebcf92ac 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:c327e27f5b471a9413399818482be76bccd87fd5f2a9c53e312d8900587b069b
-size 102657
+oid sha256:813b2ee132d7de92e384b185dea13b366a6760095e03c52a9f127bc21402c383
+size 105960
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithTitleIconAndOkButton_Dialog_with_title,_icon_and_ok_button_Dialogs_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithTitleIconAndOkButton_Dialog_with_title,_icon_and_ok_button_Dialogs_en.png
index 2cf052b576..e6b39e1de1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithTitleIconAndOkButton_Dialog_with_title,_icon_and_ok_button_Dialogs_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithTitleIconAndOkButton_Dialog_with_title,_icon_and_ok_button_Dialogs_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50b7926c50d08fd36aacc31deb1ae4d8dc61de4b776e4eef9b7cda3a2f1fcde7
-size 53541
+oid sha256:2ae04ee0b1958295bbaa6df125ad733c25c7bdf4b82e438184d1639beb02df7c
+size 53540
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithVeryLongTitleAndIcon_Dialog_with_a_very_long_title_and_icon_Dialogs_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithVeryLongTitleAndIcon_Dialog_with_a_very_long_title_and_icon_Dialogs_en.png
index 460e856f24..9d4f72b9ff 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithVeryLongTitleAndIcon_Dialog_with_a_very_long_title_and_icon_Dialogs_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DialogWithVeryLongTitleAndIcon_Dialog_with_a_very_long_title_and_icon_Dialogs_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b77f17f245a60b74cfff9e28cb0f5d0251172332582e00f6bcf2767c867bcd8
-size 56167
+oid sha256:372484f28b4a118537d4ecb8ab96710749079e4808b371de6db6ded8d3c43550
+size 56165
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 0cdc99e554..5bc5604946 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:3196d24cfc2177abd434e1b391591c3c897799f47364ba90e9224b42509ee868
-size 23961
+oid sha256:24127d724d2ab089349bcb850faac947921a138a92fb76442d120dae05443843
+size 23916
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLargeLowPadding_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLargeLowPadding_Buttons_en.png
index f315a15773..d18fd21f6c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLargeLowPadding_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLargeLowPadding_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e804de1e6096152847cd7eb98cd1edefc5fb59d7819605f7f7d35fbfa87959f
-size 65199
+oid sha256:0f9370fb4ac3675cd697525505a65bcc408d65ae995ac42d5d7670f9313af3be
+size 65210
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLarge_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLarge_Buttons_en.png
index 7f6eafc68f..d7b647a866 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLarge_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonLarge_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad35c36a82e0052ca7d4401942a7f32ccb29cf1ba22c6960b9d49f08f10f96b
-size 64209
+oid sha256:3db0470da11b75a2d2ec76f687d3c549c977442cf478310981051ca99e39af04
+size 64202
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMediumLowPadding_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMediumLowPadding_Buttons_en.png
index c65f5a16a5..0f92e77522 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMediumLowPadding_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMediumLowPadding_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9bd3008a33847e7229eac98547b7c90d12e96ff1d45db2ca7868d7e4af484d8
-size 62056
+oid sha256:4fca2b5ef83626dd735d5b5c6bc1c188b1e3a0ae0fd72db7db3d317d0a11fc77
+size 62062
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMedium_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMedium_Buttons_en.png
index 3552823731..5e9d98b596 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMedium_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonMedium_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1549e5f950197e479c488a08d5a44412a8d30fcc1f65e4e8683254c0ebf0a03
-size 62153
+oid sha256:1698f1f5db4a220dd552f1b90053690b19540162bd6760b0a5de31930b0d1ffa
+size 62154
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonSmall_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonSmall_Buttons_en.png
index d64467d879..a0449f3af3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonSmall_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FilledButtonSmall_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31fd18d9606fa892925390428b334ae7b11460ac3572dfba805217f520322e0d
-size 57411
+oid sha256:f4b525788d3e4bb5215a1f17874cc963b3df8967a6baba355d11c36d3185083f
+size 57420
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en.png
index 0a5467f1b9..5f43309327 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc777f37cd988e577352cf542333f4977456351d8b67220a85d6d1eb810ab90b
-size 8896
+oid sha256:b47273874bf76a6d3bc7562d50028bc13f4ff63d2bb9349aef113092f12f836b
+size 8845
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconButton_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconButton_Buttons_en.png
index 7373bb2d4a..21926e9ae0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconButton_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconButton_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22dab465ebf62d804858c504efcca8cf4128a2e30495b149e5f8d3e4dc2de06d
-size 7995
+oid sha256:70d97dbef9b05bcf673d3e3ba74889bd13652f0a0ce0b5c9ac82b7c63fc4f389
+size 7875
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Day_0_en.png
index e3642b3e2a..2f2869195f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fcdae0f336a9ba65a850176cb197e720f46fb1a64d3a5797123e5ca330fbbb6
-size 13195
+oid sha256:9ea6ab6f9abf7f125565559770ff45d917f9a6fba7ef7862433a56703a4d9fe0
+size 13186
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Night_0_en.png
index 1918ba3d11..f85a5cad7b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconColorButton_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:babc8acc92efbb0ca5cccd796da82905db071f83c9e29bf24e9ae8174f1e5e9d
-size 12574
+oid sha256:27b481f43d211124fa2872aae6494e5869d42c7ffdd9b872a3133c3d9e07c8a9
+size 12578
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconImageVector_Icons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconImageVector_Icons_en.png
index 1f9e838b1b..c1797959de 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconImageVector_Icons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconImageVector_Icons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f174cb08e4c10df2d2cffa79113f4a175b6e2b34298e1a725b649f10effa36f
-size 4879
+oid sha256:fa3dc00441564fb1187842d5b37aec60d23fa762023914c5d0cd62a3dc171996
+size 4799
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconToggleButton_Toggles_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconToggleButton_Toggles_en.png
index 4497d8f376..bceb05678a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconToggleButton_Toggles_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_IconToggleButton_Toggles_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:066a52c84375cba3ff9022c8434f4bf7617b8851f7add39948787837d5e81bf6
-size 11200
+oid sha256:88c2d0a5a8d79a9db063c5e5c9686c562e92a63171ec133cda42fbe380faa2f3
+size 11160
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 3259009885..8576cb03bb 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:5e19af48563d04515fb0f5c746fcff108c0f5be715bb7cb7312209a8ed7c59f6
-size 13439
+oid sha256:800baa3ebeae5452a023732ab12c2269dd03ace19e53dbfcef5414f75cfc7976
+size 13481
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 b0a0ea4f49..89656e8a9d 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:7592fdb6022b4e92def174804a60d77187f4b1c6b8ece968af5834d880b14d66
-size 16855
+oid sha256:124e4f053e4adf11cafda209eb7201a3f67399409f14bcf3324c08f568143075
+size 16854
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 dcf10bf9fb..41b9617d30 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:97e369f77ad42a5c48a3ead324bc6ca560b01782df4313499c8752a9489f5cb3
-size 13657
+oid sha256:73298ac971dc5a550763d6d2b99c6109a24b21561c92715e0cb0d5578ac8a233
+size 13679
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingIcon_List_item_(1_line)_-_Trailing_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingIcon_List_item_(1_line)_-_Trailing_Icon_List_items_en.png
index 5242011ea0..b85a1e0c20 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingIcon_List_item_(1_line)_-_Trailing_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingIcon_List_item_(1_line)_-_Trailing_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b463737774887ce90ebd0f360157544213c509dbeb0c7afd6ce0ac7f30ebe049
-size 13281
+oid sha256:660e28a3ec00c0b2ac50a4327476b201f5db406c1b484ae31e59132302df9275
+size 13286
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 fbe78fe9f2..54e9faa5a9 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:d872527198e3b0a2d01e0a0c4b458d5a027cc39b2c9631568d01337be139ae89
-size 47339
+oid sha256:0260e748da7fe9c4ca391ee22d1e992a8b6627a965083550d7749d51edee5d28
+size 47311
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 c5c8c6a023..100eddcb9b 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:cbd92aea23bd56162d5dd1132256fef62867b0bc9320ea719367f077456db020
-size 44288
+oid sha256:b72addec29ded5f88d608dd453d2a70b77bc7fe74c08299c89d5112350e95ae3
+size 44302
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 91b6d75dec..45180e57e9 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:e29799e083530f4fdaf8b485b5fd9ecdaea272bdaff2fbb356a9cb5d85323d62
-size 43816
+oid sha256:ca99f9c448c1f6dd074179bd1c70ffc4489cbf40e090ab7fb98515d0d0abb040
+size 43806
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 a0b32b7bd3..430bbc5b1d 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:4a0f6ad27fd71f5d522f539430192bc3ff85298b46c24eda0d9514d8ef52c647
-size 33921
+oid sha256:f455aaf6200b1b6ebb96e1839fa4d247879adc9411d72daac50b7c3204c6858c
+size 33965
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 8d29359573..94d63fe1c8 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:5b7ab586c04d9e61042ab4717dc749bca53a2b47f7f97ad11c23a70135244967
-size 34121
+oid sha256:e00eee4f28b535ce3946f2d2e9d12db7c4deab57fcf6407bba793e860d6cbdb4
+size 34145
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 a125ef0d62..ec8b4fdb32 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:4e6c59a456e2112d6f6c6a93e401104d4d795d7c2bd612f0f571ae6a15943d5f
-size 33661
+oid sha256:bf2e832a78b29dc39d73c9de3a5e0c9802a6e92edfc5248adf717d583d2b6172
+size 33675
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 297af9fdef..bcd31bcfec 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:332f2f0dc558a5b71afd2d1dbf96cece78961ae954d5965979a428cabc1f762d
+oid sha256:f0c4504df26740535e7c15ef97f0f25c9a2b4304489f26405f1dcbf59ded144c
 size 33694
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIconError_List_item_(2_lines)_-_Trailing_Icon_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIconError_List_item_(2_lines)_-_Trailing_Icon_-_Error_List_items_en.png
index fa05321204..0f4025784c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIconError_List_item_(2_lines)_-_Trailing_Icon_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIconError_List_item_(2_lines)_-_Trailing_Icon_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0af11f2da1501fecab5fef763ff79b393be88e0359bd4eb71fa6f7be2b8f4631
-size 33736
+oid sha256:a3fda2ef1786dd0032e8f4852edc0716598a0f8e9fb1bb861df1239e5c44f89b
+size 33750
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIcon_List_item_(2_lines)_-_Trailing_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIcon_List_item_(2_lines)_-_Trailing_Icon_List_items_en.png
index 53661a204b..40aa4dec6d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIcon_List_item_(2_lines)_-_Trailing_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingIcon_List_item_(2_lines)_-_Trailing_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c84a8325572f7be5e135c99ee9c756b19ea8fc7be2a72dc54c9ee701f7ad8bfa
-size 33758
+oid sha256:5d742eb8174941d7ea865f0e2e5bf32a755236bc76bdfa5539947945c5ea0116
+size 33784
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 ec8be9c856..6a6df93690 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:f208f81f498f7a7ad3b760680b1a2b669b3ab1564e3f91753c95e8c4c89e56cf
-size 25450
+oid sha256:c584f2f82c3db78de6eea29da448b6c3288bb94cfa7ceb65ae78ee178e365302
+size 25448
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_MediumTopAppBar_App_Bars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_MediumTopAppBar_App_Bars_en.png
index a4d0a06bc0..2b321bfabc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_MediumTopAppBar_App_Bars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_MediumTopAppBar_App_Bars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6316f9ec3deed8292b490e01861a422c97f7e410706b36b4dac24bce609aa39a
-size 11509
+oid sha256:3385ce3bc23cd8ab410becb8bd9f49b1f570f8975ece14ed71593afbc0f05d97
+size 11532
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png
index a294edbe84..0841a444b4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4e6b8e8d8bbdeee56bcc5758ff186b401b35f3c6f964063fe596007fda23c51
-size 15957
+oid sha256:51e76d99bdedc944982d95de63981e76feea07f0124cb26d0e586ecc8cfd8e06
+size 15948
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en.png
index d40cd42dc2..26f8cc1363 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab23e66fce9ee176c9f5647ee8403c10c9b65f188efff073511a2b7915e3d2b7
-size 78535
+oid sha256:7a87da5ac79e11324a01bd94f334cb895c8769c6bfb5fc7d2d51e2f600baeab5
+size 78537
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en.png
index 15563d6e2b..4d8cec0447 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb0137fe289598ac693f97a840a13ab197d3283f8589fe39f0a26b29950cf41b
+oid sha256:dc1bec4de6bff3007700e08da729c1dd222780856677ed1357788e3d72855af2
 size 77771
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en.png
index 469ff2bb99..419a1a0a4a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9ced7a16c1a97f322297a9049f117c1af25f8d1fd3ee4c8c461a5c2b43b81c4
-size 74291
+oid sha256:c45084fa5cf6b886d3cf5d807f0964b16f4831da66b72f34d9fbf38f68ad509f
+size 74292
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en.png
index c156f18785..1b582fc2ed 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c647faf6c8912510d8df230c2ac6b8d9dc68554fe9dcbdbda9ff93723260ee2
-size 74708
+oid sha256:31b9a2ed4ed34d6b72655dd1429b2133f9a27b9e3bfeeb8bdd96e6b6eddb9587
+size 74729
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en.png
index e2270d7843..312e07d72f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba567c28706dcb405326dfad2be9f2291dbbc3b09ef89a07e151f80944972ce2
-size 67575
+oid sha256:6c7d180bd42f6c3afd611a6961c2a653d0b43f97456729930a08c6da59239ed6
+size 67614
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en.png
index 8cf6b80af0..960c3f7758 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86b5a42065e44ee7f5e97a069bbc488e12141cde8f6c128768cb9f807eeb05b9
-size 7499
+oid sha256:4e3209a390865cade44def398116bdb1149f23fd2b716ce3f1a3aa00e603a147
+size 11715
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en.png
index 63ec7731bd..8b30d765ed 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73d76124b07583e65a46df8a18b633761e17f0f96b2b351cdb8ded5a7a7dd351
-size 23767
+oid sha256:13b2d8af57efa72eda91df6ea9c6648fb2fba0160de5cfecdbe0eafeb9125302
+size 43657
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en.png
index bf07e97661..1ccfcd86ca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07cb265b59834326e52b90e6c99b5fcfdbf745c332d899e5109f2c8957c61934
-size 9135
+oid sha256:459357b401eea08435011256f067174527e256b5cbf20787ba9e16b747ced48b
+size 14606
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en.png
index a261b1abe4..0ab7ea4f2f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04d64bab3ca9a72dc261c3d1abb8e559671bb4e797055e8167923a06d3a110e0
-size 6861
+oid sha256:f9accbad68c93b7de73bdb7452360efc721b35af49835864661b0e481355afaa
+size 10005
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en.png
index 42713989ce..b5f456f9aa 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9e8d5e58b67b063d557077bcad90ccdd0e7257ded27dd038e9a59fd1e595923
-size 7211
+oid sha256:d22efa94c41ea6fefc87634aa3d576f80c90057c37a1f99bf69a6e0b35685707
+size 10666
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarInactive_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarInactive_Search_views_en.png
index ffe44a90de..1d9f68e2a3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarInactive_Search_views_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchBarInactive_Search_views_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3741f1cad560c9d8c841a21d0177ae7ccd023fee426732a40678e9d271be41ea
-size 12993
+oid sha256:3b681cf0d6af2ee5fbc4851f70c84f61a41fc07092eb7c85cf8a7a64284fd30c
+size 13108
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png
new file mode 100644
index 0000000000..c147670cee
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39e0775e5c569a95653ab922084c4056635bec2056441771af3c8a3739a84901
+size 8143
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png
new file mode 100644
index 0000000000..21ed56ed1f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a97489a6af869148d1daadb5948f26d00e888ecf0373e6ec45eb8a5ed8b12173
+size 8383
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_Sliders_Sliders_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_Sliders_Sliders_en.png
index 868a0e24a7..88a8298dfe 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_Sliders_Sliders_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_Sliders_Sliders_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb1f983126179c04a73876c58642108f90a88fe628f21e14d309c0caade12ad0
-size 14109
+oid sha256:67e1704236a59267acdcd3b4882c01ea2eb251ce1f4f4a9e7d3aedbbd96f5fa9
+size 14112
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en.png
index 3c4e6927d5..d28d4f0414 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9407099e3f2d3aabb2585b0b39779c6441ada04ae849b292847fa49c907970c
-size 16866
+oid sha256:3c57305e57982f84d00f853b63a3c62d9c5ef2e910af0c699c3972de57d9ecc5
+size 16893
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en.png
index b1d1d28cce..2610db5b61 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:128b817fd88d75ba2fb8f1d8da0f2c47ee706a601ef93d21bc13827abe567834
-size 17273
+oid sha256:3c07c093227e0f04866a3249b5f8624044a6093991b1f4d5483c52eaf34d4f2a
+size 17229
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 7596bfb963..2a110b383e 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:4fef4e00aff0e4369ad4e3ac6fa37c99eb33857ddef14303850cfc2f8d3c9443
-size 43361
+oid sha256:47a29425bc68f38af6a41af6d4aa4db94ac703ea70c1d125b65f317043c6e229
+size 43367
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 81a01aa9a7..05dc583fe4 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:af5c5ea5b405c26d0beb70dc1da280f89b78c050b09432b03b3f7665b4de507f
-size 43341
+oid sha256:e64ab09400a3d77e6c72c84396cca1344968b94ae00f867b8cf9bdf1787fc176
+size 43344
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 7596bfb963..2a110b383e 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:4fef4e00aff0e4369ad4e3ac6fa37c99eb33857ddef14303850cfc2f8d3c9443
-size 43361
+oid sha256:47a29425bc68f38af6a41af6d4aa4db94ac703ea70c1d125b65f317043c6e229
+size 43367
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 0c795d4c60..ba0d80628c 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:cb09a6127b664dd4d17d00461fbfc0ab9195e7f1305f7883640388d541d85932
-size 43483
+oid sha256:56c942e24776b1a4e9263a6864c8f2333caa0d7301b846adcd7cbed8dc79aba9
+size 43484
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 dada359eec..8a06106c43 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:c579046d25bd437f1688684961aed0037cd7a8b77c2d81f0c7acc15d2aac7ceb
-size 43372
+oid sha256:d7d47ec36146529c3a96ff972f2ff847edb906274086977df5230771bf25402d
+size 43398
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsDark_TextFields_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsDark_TextFields_en.png
index 45760c4876..2f396f3d33 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsDark_TextFields_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsDark_TextFields_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:932bdd6212a18713ae43604a97401bfac38ec270890a5acf7e0a69737bd6b0bb
-size 44568
+oid sha256:701e12262cc7b385524ddca957a29d91b2d6d8f3a2a1b9a69134306965ef226c
+size 44579
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsLight_TextFields_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsLight_TextFields_en.png
index 2eeb7396da..36c6d99110 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsLight_TextFields_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextFieldsLight_TextFields_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21719aa977d940f8f54827515529bccb74547ddcac2d76f77faa03d0d018a10f
-size 46317
+oid sha256:40186fef0c2ae7e5ea9c95a8743761b2e47fc7eaa255ba906eee41c34f498475
+size 46322
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en.png
index ece6a425d9..26a49d5344 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1796e8ffe7e104b5aaed32df1e9d6e3261d954d0e44927dab2bc8514def4d36
-size 13370
+oid sha256:014b1b87b118180e8efd96cef9a0bbeeb7f861d8197926bb49f69756e0110b89
+size 13391
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBar_App_Bars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBar_App_Bars_en.png
index 32812ba14b..3031f6d8b6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBar_App_Bars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TopAppBar_App_Bars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d02ce8d8faf7d0fe5c0fd7383aba5c01b71f4e424ef0ba1f44f7ecc8a62d49a7
-size 10938
+oid sha256:5e2d057f0811b3ab49e4087d0a9128bc577d074f346c47e6e0751f1177830846
+size 10962
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en.png
index c2798576cc..185afc0b98 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37367f6c760b1d1e30008dd0578beb8585990b9d651739fea9e0b4f61eee211f
-size 4294
+oid sha256:d1c2d43d306fe8cc4ba77ef19ed1f47651a6b339c7b7b7a126d110662c5ae781
+size 4284
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en.png
index 4f4572f9a8..29decd57ac 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:355c88e8a8e5f50d829158d23ec74467a4ed8b325d96d2946b0e3c404c0a9ec2
-size 4266
+oid sha256:dd841b8f21782e401acbb18da803da41c8f20abd97eb1b8c9ad9c0ec528cd208
+size 4267
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_5_en.png
index 35112593fe..ab1743f7cb 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4d613ab80fdd9dbda8acd56990c6a812f4596b08fb2e81168d82c9fe48382bd
-size 5143
+oid sha256:381bba0773a9b6aacb21d64e7a495eabb3fa50818f2fff6ca3b373283bd6d1a5
+size 5135
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en.png
index c4a5d4ba69..e9056ed60c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de68bdc8abe559fd0c95c39c58701df0b28b33bc7ef55a6a06b1fb90ab0e0c39
-size 4504
+oid sha256:662d81fca46d18cf38dc6a3e2bb582c852d6ef08c58c807c4b63bde60bc93703
+size 4501
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en.png
index 0d055e246e..e590c9cbba 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d644702e513b57c10005e6c72986d4095eef049796c42c7541ce8a50e83ad9b
-size 4175
+oid sha256:e13b3a9a92efc92abb20a2e73f5308e23c3248424cb9b3d1181501266dfbb1f0
+size 4178
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en.png
index 1d4452fd6d..49ba49169b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60a195cd0b61378623ad69c0ad132f2e2136935aa59afb28ac098f3f74b87508
-size 4326
+oid sha256:afb0435bd7404a79852013d0f2c82748b8c3d88e829aabaf2fd018a229855955
+size 4337
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en.png
index 339e76aac0..8616d4677f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bf63c828e640fc34beac9e225bc3bd9430a89a974277a4fb7e5ebdf48389366
-size 4338
+oid sha256:87a54d09f804574e44b5eb07392f31fe08ae9634be36d64dc0f2d8722c1dc2f9
+size 4337
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_5_en.png
index 974f6ef22c..cec5f14819 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee6be33f193245be5854ca9084e95a7bf19f32df0a576b2bfa434de081287ace
-size 5029
+oid sha256:48e5de65ab7b65576def19cf8985ff5d4caa6039c75dfd13458c0c0c164f9b09
+size 5022
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en.png
index b64681cd11..bbd1c726c4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5674d48a145f3f42861fc915ed5e48498b7a405b865b7941a0531b8e50bac64f
-size 4549
+oid sha256:7a155ad497108facd7731dd23d9bf4535d9138bcb3e070c645e9b9010b8a81fb
+size 4546
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en.png
index 429a4e372e..30a0f521b3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ca79913f4a1837905107da8212d7f5333c8f4f445032215fcbcae3ccf5c8877
-size 4237
+oid sha256:1c435893724c7c694c5dc91c26704b31c4d70d134a8c690944dde90d19588a3e
+size 4242
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 9fe526e6ad..02ba68ce79 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:514bda9db756e738e602f79e1ff24625a0cf2823202bbb079edd70592e4fcf3f
-size 13581
+oid sha256:cd09e66348dc5f79b612423b7ee37944988a8f0bc4e74287f8da55a627a4334c
+size 13588
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 4752e16c9d..df20f85bd0 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:2063df00c6a8c5b297fa205797dbfc3d8a9af02796556fdec19d4acfb9419c2b
-size 12330
+oid sha256:f7bc602ca157f4d99df586537913291564b93493d62db0ad2ac76efd4342479b
+size 12337
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 7b98ed1529..2622790d8a 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:10796b9478b53030d106b092242b2fb29432306c975cba899a4a803468a102b2
-size 50455
+oid sha256:afef26d6f1eaae9c9990095ff76081796ab408b611fc6d5e54eaf4e5149d5416
+size 50236
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 0bc23ac100..2fde0deb9d 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:68571ead8897090de9308062686d608333d9145640214d0f5661d87460007b90
-size 108334
+oid sha256:58e898ed1ed67402f639f61628729bbabad0142c9047aeacf3e1312ef2d1a469
+size 103204
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 6d4195faae..aa191c2f9a 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:e7c387a07c381c29da66934014bf4e0536b2e5b03e83c9af57b8889ea0b2aafe
-size 26343
+oid sha256:a6c3b5910b821eec3ea5758c6fc63401d6f06c0bf4d1f85e0b9bada848b87647
+size 26338
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 fcc21fbb39..5bf22dbe5f 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:07a6c864d65542da0a35b9d39c544cb60f50a746bcccd7624c05b8decce78b04
-size 24497
+oid sha256:40385a6ee4da1d93019d6ca8fc916e652833edaa066c1a2d750e850873b3aa3a
+size 24500
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 5934a6f8a9..cb19a41593 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:ab4f410cfb5052c5624de493f2579eb32790c8600ccf30aba356b6a0aed07cb5
-size 25476
+oid sha256:6b6ceb3018149a1f8b6f2902e5762490b91b6aeeed3c013e27522f95f1c45dc7
+size 25470
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 a09e90c27c..277711dec4 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:626b936e2bd309f4cbd76b9727e391ce263337b2c7653feb44f2a4e17ff01890
-size 23566
+oid sha256:89002b489a75bd2f131d64841eb9991dd6e9aa233d2d7cec5f14903f17cc60ba
+size 23557
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_0_en.png
index 4f781d4577..0e5502a30c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9607dfe45474d0546ea5b5bf63fa52f79cebda5202ed1157b66ba752283fde61
-size 7147
+oid sha256:a0635fa0f0ca2b150f598279fee291f25203c6313f8d5fe449e4c1629c96637a
+size 8528
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_1_en.png
index c7e796832e..11f2b08dc7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e30386b76fa125bec2841b4e272a8859d12d9f40542688d79ab34c3acefa1d5
-size 9039
+oid sha256:1f8fe5034ae0b5bb611df443e7c1054f3f5e61e608894b14b79aba287eb6fa47
+size 11643
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_2_en.png
index c7e796832e..11f2b08dc7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e30386b76fa125bec2841b4e272a8859d12d9f40542688d79ab34c3acefa1d5
-size 9039
+oid sha256:1f8fe5034ae0b5bb611df443e7c1054f3f5e61e608894b14b79aba287eb6fa47
+size 11643
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_0_en.png
index f0b6c0e466..bb5b9d07ee 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a7b4deb6903b097ce5b14778817ab6769691a5670b2601d0e5633f98a270c40
-size 7185
+oid sha256:66242e5546b6f853a2d78493ece0bca7065c036246cd88d83301887b9edc362e
+size 8628
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_1_en.png
index 111d90028e..27f54811e1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:add3b78f33e8c5ae9c1dc6f62619585a79983f3613986c14590cc52ad9f83e55
-size 9074
+oid sha256:9f3d1e3d3d5212df16af61a9ec5a8904fe71bfff4bbfe5086f08e6a2dbc9e58b
+size 11823
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_2_en.png
index 111d90028e..27f54811e1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableAvatarView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:add3b78f33e8c5ae9c1dc6f62619585a79983f3613986c14590cc52ad9f83e55
-size 9074
+oid sha256:9f3d1e3d3d5212df16af61a9ec5a8904fe71bfff4bbfe5086f08e6a2dbc9e58b
+size 11823
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Day_0_en.png
index 7bff485c2a..7485fc9f9f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b9bd735000eda1054294863bdff79d32b391e1511f025bdc05ba4374be3f27c
-size 31769
+oid sha256:dc14db03999322b373da52c04e4c0a7a72b60193fcc0fc6d7b60d43a4a3db9aa
+size 31763
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Night_0_en.png
index 8b36a5e259..5ceee6c945 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatarRtl_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8da76de0773fc62f7eb73dd16756d6ccad8229db121eb39d43f7c27d4ab8b48b
-size 31339
+oid sha256:71c9ead9e5b797dff6ca72af5b61e0d2ed950c71c27ccdf6f297917b63877a6c
+size 31332
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Day_0_en.png
index 1771b0fbd9..297d746acf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a7773c27cc488967a4c8c526f4d19ca3a78e15c1efa2f7267881c2e9798d5c4
-size 31223
+oid sha256:68f0a2e19252402b60ad72f72e5c22959832952f42302b84c0e1f73d70c4546a
+size 31225
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Night_0_en.png
index 5b5950e4c3..447da51af1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_EditableOrgAvatar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b5b92e446d5968fb115e49b2b2337a46a9a7f43577413924e7a1b1f3b752646
-size 30692
+oid sha256:dcf5a478cccc4e3277c83c93961b756790d019c059908379ec534fd284262537
+size 30681
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 c3a2cefc62..1743c14ddc 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:9ae8f733f41116d35d039edc8243e11eb4175b1485cbfb72b02d0e4d1caf07af
-size 9587
+oid sha256:3d5708861e397d6d20cf6900e4fa566dc86961eeadea6ceeb13f15f5f9e93caf
+size 9796
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 afd7a35b27..26913e3446 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:eace16f819a0fa1aa10a859315d86c639abc51367295e8ea2d2d3826415152e1
-size 9569
+oid sha256:bc971461b2e57aef9021633759cdf7e3771d52bd9d9a23631765da0e4ece028f
+size 9495
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 adbd45547a..77fea21917 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:c128b9907bb834a08569f8cb6c93c2c97249f813a405b4dff0cfa35b23793112
-size 9663
+oid sha256:d45fb1723e9b0a1a45618f68d18697ec8e5cabeab1224447913a366510aff352
+size 9828
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 05615cc2e0..d66fba44a3 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:24bb6401edef8bd83a6f5d6854a50c13039553b042db690dc5e1763f364764b9
-size 9529
+oid sha256:99964776c4a2be5d5fbbc9d600516fd758238c382e9ae4a7e49bf91193d10898
+size 9420
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en.png
index 185c02ca0d..4ecf6b4fac 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:096dea8789c339ce57121433a5ab07e4a8a387a00c2a1a7e2cae22864e194884
+oid sha256:894b6a08f4eaf4f4fb00cbf60be72371bc0738cde1fa9712027cd0fae07b4b0f
 size 7123
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en.png
index 8a801fee62..f8849c1283 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b7c8c2bb6fd65dc8309c5ce38620068064cf2b905f55024d45b730713664b39
-size 7930
+oid sha256:cbef8adcda2e7b47dccdea182182a04e6edaf0aa9db5343a4ea0aab42010c534
+size 7928
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_2_en.png
index c7dab07045..462e611884 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5537f922d2c5ed7b9a0984c8fc59d0a8714a8fd8c59f8f3ccfa4d86c0c031858
-size 24427
+oid sha256:16051eecf7cedfc2c0f3a1d8317c7167755c785fd6a800bb006ce9196c43bc1f
+size 24424
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en.png
index ef8ef021d8..210a05a3ad 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc6bee8dae3dad28e9c4c84f83c0cbb869ebdab62e1a423eddbc1acf5622fbeb
-size 7372
+oid sha256:7b400abe6cea733a1dd41e2edebc6aa82a93004a8f484b4964c0070ffbb5fb32
+size 7377
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en.png
index 374c2c5d2b..34ca463991 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fdbaa1c4aecc9c5b8373d9ff22d88f8552ff40569961e246eced7b0cfcb98a7
+oid sha256:e4cd2beabfb995a84f838a1a23e1217e3e4a623d901e87b27a8c3f1478886fea
 size 7831
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_2_en.png
index 14dc55610e..9fbceb155b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoomRtl_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c661596938da606edbf9bab7951eb7b15f438c8af52bc5b8f915db640ebe6bc
-size 24098
+oid sha256:d0c3f72ba70ec33195c4e8df06aff88733469e78a1d02d94629f26eb08861ab3
+size 24101
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_0_en.png
index 2daf359887..9a33f2f51d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddf94690a70ce16c5956acc02e799a9cf0e9a25a9e39e232ad29f62b7f42b10d
-size 7146
+oid sha256:e3bbef583f2ccdf7671d8cc8132149c8c74fbdccb27187b482606c885a73491d
+size 7125
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_1_en.png
index 479ad32923..f101619144 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50728380e53730d17d11f354f0922ef7d3918d91952a48ccbd80d150b7f9a561
-size 8019
+oid sha256:4b544ba6d6f272779d8c1f6409fd1c106b72e4cec1e00825e68eb22cea8800dc
+size 7995
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_2_en.png
index 9e3acefa43..bbe9a3a80c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdb4e762013d17daea7a3f5694131b59e503cbe5a37f47512b6a7e4029815eee
-size 24169
+oid sha256:0af14934a70e52d8490048588891b56f22b1950489f25b33dba7ec6ad27c437d
+size 24148
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_0_en.png
index 51083d077f..ef7a9c75d0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad290caf59b3b03eb0c67e228bc8e24da846e1650d7442f147a2e973caa44b92
-size 7430
+oid sha256:7af9dde38a9292801247c897a27d43fdadcda6ac2882ef61c3bd7917906ff0f4
+size 7408
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_1_en.png
index 2d8b75a87c..6f6619c08e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7f2bb6aaa4385cb230884fcd41df28ac38a88e12cc30fb215812fca82324deb
-size 7922
+oid sha256:453ec5dc0c49473114eba4fe94451acce6a97665975d58955d74e92839c61313
+size 7904
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_2_en.png
index 01fa7b6759..67616ec212 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedRoom_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8a72f53dc0c94e364d094f2bf911e9d39777d51c81e02e384c868e03a3df198
-size 23860
+oid sha256:4f7d649e7a34a71f8fe9e7a70fabfebff796fdea957fd3fb8ed4be4a96a816cf
+size 23836
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 6c272ba624..6ae20a4c16 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:08493cd3243d38eeac09a13e4fb5db97361bf5677db251cd4b5887b595379ec5
-size 7700
+oid sha256:74fda3a650543bf4d27b47b113069ab9a20cfd260887efd26a39f68e65c4ed6a
+size 7702
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 11ee6b2140..1a66c52f37 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:ec043b99fa7a6a622784a17914369f499feef1818501e582c345c0ecd8a9f398
+oid sha256:d4fd3ba95e228e9edd73552c7502afd56dbd1084e8c1d978eb9aef007cc3464f
 size 8132
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 da73aeee9a..128ba4d57c 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:eca67b4cb2a2fd6526bf9fa6fd89b643fcd2c227c5abed2c4f32db81617130c8
-size 7723
+oid sha256:bfddc1854cc5b11a95578f78903498058083278d10fd46984f4dc010a6fd1852
+size 7704
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_1_en.png
index 2db6c5ef59..f4465c8084 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8ae13a72c3bd657db2a1d927856d74103e5e046cdf22b7dd6b887f77cd19f5c
-size 21442
+oid sha256:bad9eff7fb9ed73c5a9209cfb27fca88bf6b08fc8cb3aaaf5617feb9eb1bb82a
+size 21440
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 05a4c7f73a..bc51094b3b 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:71f623b4b4ffdd5b1be1e94e12ba908f323b809559f62b6c9948e2d76ddf127a
-size 8142
+oid sha256:c1b5331c80177c6f983930dc0236cca4f2e9e8dd072649275085c20d617fac89
+size 8141
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_1_en.png
index 9f2748820c..02e81d2e5c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e40a4a4a8db9c2b60b91bd1478c7555534d3a3473e06489d547925f8a9771b1
-size 21203
+oid sha256:e94f0bed02f3ae231be0826e8fc39763276aae016904246be18a672f8571ccc3
+size 21205
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en.png
index 2e9cdfa5ca..4a79b0cd94 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c68ddf678e534f385f03565cc764c276a10b3af2a3292de775740157d1ca88c2
-size 66549
+oid sha256:6893f1c1afa4b85ace1ac89f63f8377b1e7df4910e0bf0095e090e839e797125
+size 66438
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en.png
index 1b883b8781..1b8f1f6f6d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdec02458ef526f62be74baf71f6539d266592267e93c61e20f035b7528fc65b
-size 71172
+oid sha256:19a3bc18fdec256499d8ea86e880fe455ec69f1abbbcebb65390f75c557103c3
+size 71122
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png
index 4c16bb72ca..e01d0007f8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4e7d8316854658fca2e0edfc22bd844a7972543d0049cd751de31767ee1cc2d
-size 17325
+oid sha256:aef8c463ca0c87911dcd75a94d850823a5e8f2b260c19efdc5786a0a0eacaf79
+size 17294
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png
index b17f53e338..ac2d57c280 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8952a3e1251c854f7b59990ca41cdb11c2ee0f36545e20237057591b5d5cfc58
-size 16481
+oid sha256:90497693551062dd0b3f7241e4f8fa6dfeaf52e256a4607c87738c5d9aec9a4a
+size 16436
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png
index 7bf24eff1b..7be7187821 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bfe638b75f253649e2d591bf174c9afa176c400e8826ba30f7e1eb50ad9b69e
-size 60450
+oid sha256:b763f34f0c1d5aff577c818cba740440ba73fa67496dc153029231d27874138e
+size 60459
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png
index 78271cc12e..aa00afe2f4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f958cae6847bb68aa751cb79d3ceb0c2ea6d112f21a60d8c19633e7008a0e724
-size 59606
+oid sha256:4b149a40b1c01a99f5e7ff188fea0917b2bb9ff2170e57709cb302b2c7640783
+size 59616
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png
index c5c9ae1eda..166a8f1d2c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b20135fb6973d9d435fe1bfebb654d23ff2e1487b3863387c0843a5df63a6d28
-size 22858
+oid sha256:544c615c793ee84aba8cd12f60ad392ccbbc82d3692fecb582818ce1f6423243
+size 22865
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png
index 59647a9419..4c5d249828 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ea661953786398d16100c2209c7549f0dd0798f452947b7f74204319fa4e799
-size 21626
+oid sha256:bcea3a64fea3ae241f2e7210a2a16708752cb93244557d998e6f04309ef6f79c
+size 21653
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en.png
index 937800912c..a44cb90aaf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9df673a4073b6806332b3181987f7ff0594eca818ef4a2b760136582d16de476
+oid sha256:e91c16d5742c2e2398dcf3944d0861566932428c70eb134d46b3c54344f7b157
 size 6191
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en.png
index 44709bf2c1..8f7bd365de 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6a4bf38d356974df822f69f6de85b5b83b4622395c98b1c72d2d352b4e820ce
-size 6093
+oid sha256:60ded7cd57b91a960d391cc9157da5ed7304e11c1c9e6fc5c9404f7693402fa0
+size 6112
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en.png
index 53e8c50c72..71e06aee74 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cb722a95b3ee29f751d053ea1cab634c3181b07678449600a2c23a97de0fcd1
-size 16496
+oid sha256:4d62c0c47ea78b89611244bb6e37ffdf2298b7b161de69ede59871089bd946c1
+size 16617
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 2268d59ba5..e1f8d9a655 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:684f50c937b0ab7413cdff653a11ed11796583bf2182bfc1bbc1725f42d3a0ba
-size 13073
+oid sha256:efab4a3c85b9f762647c5e577c23a49f8ff40fd754171c90b670313f4790cdcd
+size 13063
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 a8d5daeed1..0e6921fcef 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:333ae4e1f2e0ad7df938dfa3f0b54137ed641d327bcd7c316965fb4b4cc049c7
-size 8937
+oid sha256:4a5255962b310c60c62192391f4bf184955827022687f74efa21afda623e0b80
+size 8902
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png
index b90c8c5ba1..ce6472cf85 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f6b5eaa4a84fc70cab57d37737b390583d3af9f6e829cecffbcf36351bd40e2
-size 23562
+oid sha256:8be1a1667726344d330d52b8b4844d9007d291b8f2a3aaf1e296a16be98c6b2d
+size 23741
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png
index eeafaa0dab..fd8068cecc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f271f630d93fdf49436509d08276b6a444db92c06fd06129af93cffbb4623d4
-size 17931
+oid sha256:ba2b344818e0b8d4b9224639be09c06de8585622be8dda20ad2aa1bb28e0e44d
+size 18052
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png
index 450015669c..0743b882eb 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a35bc50a8834997cf3bfd3884e82297e4f27d95462e23997e1887e8bf782c59
-size 13535
+oid sha256:8ab0601bf05f66e91b38774cb77b744bd426a2b083ab43b930a402e3c2b9ddb1
+size 13486
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 770acda2a0..744a626c00 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:ad1cdaac2d2f1e42e3ca1b17c88b7c9a2ead134a7004885a3c3b3dcd41b13ce5
-size 33645
+oid sha256:a53eb404b797a91747a92a1fa2ae9ca23cbecda6c8d96991b38c28bb43cb51dc
+size 33603
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png
index 5ed4c60ea8..36f2c6a3fe 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f5425b12bc2902847c5b3b7e4b4e727e2e67f9a776cbf059ca6ba4777f81696
-size 38569
+oid sha256:aabda293c6a242618e176b402e0d5bf8d84f1c6a75d3537b8e42f3abe2f68212
+size 38567
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 cd9d503167..3ac82460d8 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:f4df538763a96fb5511bbb175856943539951b804b7ca2b5d69d7033fa5d3588
-size 11012
+oid sha256:bea4702ff62ea222a2ac4a2801b0fb0dc603b8e9f2ce97843d927b21f98d7994
+size 11136
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en.png
index 3663e98d52..69be21bda0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f07736b16ece457794cdbd3859ede26ed0aa4b53acdc69d7f913df9a9b0fad1f
-size 16002
+oid sha256:821e281a6bcbb637e713b31fdb6e8bf3b30eef41507d25adb84d9bed4d6d9be0
+size 16083
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 244e0ce786..8298f1cbb9 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:ad16996462532092686f1638f3ee1f40ede99b5ccb2bc53e57931f50920e62b5
-size 12629
+oid sha256:4b78de1a677347827c1447cb459c76a20398846f4f96430b97ef3c3024d6b5b4
+size 12519
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 6eedc6c22c..866915721c 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:05368c1bf4caed7d565daadade2dade7046fce15f1bd37eff4b1ec0faed5e948
-size 9163
+oid sha256:8cc0851e3ea07010cebc83ac764239e9ab6e37ab2a2ad74039e542f117bf08b9
+size 9110
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png
index 5085864cc6..3c6aaa8312 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:690df48431acad687f2a2e72aebba4fa63de433ed68b7b9e19818a78973cd211
-size 22676
+oid sha256:3c41209aa36b563a8cd8c5a6788612d17464524b930ca8591e9e29b581a520de
+size 22747
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png
index 1e85e954f6..3da4e3172e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34073398379389aa862c892e6eaa33574606071597a0095dfa5c84b99154b5df
-size 17218
+oid sha256:53cc573decde4598fcc2c02cd6c7a925af464e215e8589bba71923cb54c0c687
+size 17148
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png
index 252a083540..2c60ca6e31 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dcdb9795595067c90efd2c3e3d34d740b5c1ed5e02d487c7e03f10f9653c3a7
-size 13134
+oid sha256:c8d2611a87e3b9804c0538d4f3d7988f39f37f038b2a4b0c66f0676b4d03a1a9
+size 13017
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 73e31905c7..bbacbbf72a 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:cef17e2d54dd9c8eacb9e7d3206fabf9acc91f1d4192bd9e13da0d9356eb536b
-size 32669
+oid sha256:c8f58003ba5ee7357c33a8e8d995f172ee12f50a6d07fadd6dbc3423bc357272
+size 32582
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png
index 5a01e301a2..abf335a860 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b55a103be0ad883d0aaf31cceac1a5b33f1923dc4d96778c261ce98e5b0d435
-size 37334
+oid sha256:f6c3d7f0f259fff0089dd4d9f1b9071f43de8e21d5039fe95ab7b9cc37e69a00
+size 37269
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 3e5373a5b6..4e1c38866f 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:59a2703c34c580655ff8e8c4681ad3937d7daaf9211e899ac8ade2826fdaab03
-size 10782
+oid sha256:f1f195d869be456f5eeaf9a6395f7d6e16b7449612c75b2493fcf9ff003ef512
+size 10810
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 41eed18ca5..441b38a3b8 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:cb1d078da743c900a512987314d72aac77fa6565fd28cc970d52443298c77605
-size 55164
+oid sha256:228ec3cb50e9bf8079a1e484bcc36b84dadd3ffd0c790257a98f05b48e3e423d
+size 55445
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 b47b27d0b6..bec6b4770a 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:2845243de8a6a7b90c047dc78f8650501012142e416625c90c998ec2fa36a3a1
+oid sha256:9f78c81ca24c8bd97b47a2dbf06dd842555c8f161468108280a264be94ebdf8c
 size 10043
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 31b9128bc3..9610d93b0e 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:9d455e3ab7d0bb9e14ad634303c682f7aa0ab6d1738e44cad35c806a7c8158ac
-size 7018
+oid sha256:280392694e46a91fbe31b965143bbf48c6720245b68200f2018d0d906314440e
+size 7017
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 e2a6141f5d..0a3e5412b1 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:74a4aeb31ddbe33aab72cca9fcd12d4a676b44c8410c4a163eb28eb5e3796135
-size 8918
+oid sha256:c6e80ffd69b8e3016b4a7cb057c5051eb1da315fe3ba5907a81616202c463af4
+size 8917
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 1428e4cebc..9ab5d3d26d 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:fe3c2b5dda93cf45070fb92da112f2503d157564429b5dd2e4e3951a3ca675d9
-size 7041
+oid sha256:a93d4cc053115ff79217ab929e07c35a5a4d305ed1a5442e8cffc4c7c2de49cb
+size 7047
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 11097da9ef..42dea2dbc7 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:785d4e8bbfc32f6c2c6561bb215ca868607b89447990dcbb41504d1e57eb36c6
-size 9780
+oid sha256:e2c91f9283d23d22840abb10037a8d80102c9547faeb45496f982a1ae474d0c6
+size 9771
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 705357f3c1..c8d6ce8cdb 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:376ab1ccb61cf77eb3754ec10049290cc60d60388f78dcfbeebdeb089a0c8985
-size 6974
+oid sha256:4a61041e547d646c2786a61071dfb558d07520aca6c4cbe45cfaf77a46e45e79
+size 6968
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 28a948d198..fa367f9e71 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:d1eccddaa5bacecffd4cbc9843264d0cf20d0b797e8ec3d3eb5bd1fe1002d2f5
-size 8766
+oid sha256:3e6ab5f13bffac45ad6896abc73e9f8ae80b2bc86bb3ef1df2ec71c43e4afd32
+size 8767
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 f1c01f2045..52b7992351 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:c88dc5a5abbafddecb1dfa2abddc0b88f0b62bbccce183eb0c9193e1a9a9e37c
-size 6968
+oid sha256:0175b0ee624ccae7a857840ec1b9362da8e74b253092fb92c8cfab0a55c24731
+size 6977
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 bce0b43927..bee7a65ffe 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:e5a47c2bb7d8261de46fd4df1f35d589ca482242efbe16d47979bc2f3dd1964d
-size 31501
+oid sha256:d13fcff8ca8e2abb7e9cb37dcc083228cda5a497be66b6f24b3b796142ed0045
+size 31498
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 6e5a4b4036..d7f664df03 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:daee946e24b0d25d15598acb53af4a9bc2a29fdf87970e0e3b4be945dd4d9153
-size 29872
+oid sha256:91815a31d6daeaacea5f41ca2dd1a885a751643dd83242513e3919712f588228
+size 29879
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 3f041e2a9c..9ebcafa2e0 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:f1330e6892fbecea5e9790399b53c36fef60bf2547dfbafa1a85844bc6effbbd
-size 38121
+oid sha256:81bdd5170870d3ea5874960b12d9548c36b105a95dcb018f648182b9206f17d6
+size 40196
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 8c5fb823e1..03f88988e5 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:2b6d12e6b57d4ba5df1b59709a980df940c43623f87577cba8b2dfd8e82c2a1a
-size 36784
+oid sha256:51594e2535dbe22f9085ff3443fa89ab7fc39c22beab5f592b1a4953bab3a1c9
+size 38931
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 6ec01a6971..1b1c82d220 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:469b386bda6f76a355cb2facddb407526ba2f7f8b6b37b70db43332f88cb1e34
-size 8981
+oid sha256:17af56198a052fe7fec859d96f2404a025f6ebb43dca4609d1657d9e523a2be9
+size 8985
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 e118d89add..fa6160b7aa 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:0a9ed439adf04d32f66e918085e70a401720fa2b0968573685e440d6a06b7c85
-size 13407
+oid sha256:15b5d0a424a594780d07cddd4623ccd8723c835679c22fcf7fe7ac90fe635e99
+size 13418
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 6aed760ca3..5e28c57a86 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:1762653eb08d8121eac27eaa236359a909952a9c6d98b78a3431a4f51fae4c70
-size 36407
+oid sha256:42481b7292da539a036c86d52b029a5fe8457796af81fdf461512aaf7ad2d9bb
+size 36408
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 7b6110a453..9f0dd781f2 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:cff8ae242d447c9303c4d644ce5dd8723626b3c5ddf1e70eb03ad801155be4b6
-size 8719
+oid sha256:bb07613388a62a2d87c62453b5201b1647fa3383c15d25f1a56e646de859b834
+size 8712
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 175839313d..5ba59fe9fa 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:4ec7a989973bcd4fb5aa62bc09e6944c1ec188ff72b88ada1142a781c8884c80
-size 12829
+oid sha256:4ca2d472eb599b7c7db212891fc3a8a4c8709b1fc48576f49f4481fbdf8f959b
+size 12830
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 5b173f08f6..7b6c1c327f 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:06195a0890d3a59b94fc26ee7f3c46cad890b9a218a814d94001b6c12bb6e2e4
-size 35015
+oid sha256:0dc4677c46094e437ae5052eca497e7584228833a143ed6c2f93944fa61c8672
+size 35009
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en.png
index 6391f8088f..1f471f9659 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c3e37a42249c5c91ae57c61fc68471b05351a46d4d5b125e405e0b8f0f262a5
-size 508579
+oid sha256:9e935611b857601937350028b6fc3dbb6c50f8056d9a155c9e333b62900e7048
+size 508578
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en.png
index 94137637de..d4b5662a26 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af93ef59df5aada10a9dd92c7fc0fe1a788e1184a3f9cd9437c6aa8ac309bab5
-size 508252
+oid sha256:fc08aa25d62cdd792ca6b7f705bc7bf291399ccc6fbfc35b2d6c973af6e2f762
+size 508253
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en.png
index a0cce78b6a..3443d0da69 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66bda26858132dff123dd3411ba83622e19bd4447cfb191fd466364926b1f58b
-size 509476
+oid sha256:3566122df6e9318d6fc8b20078523da7832f50c96e0d7c17ee5c6aad9dcdde0e
+size 509474
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en.png
index 9db6ea0754..751ca0284b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b68f66128b2b2fdce695718b62b469ab5d4f5f62ea76b3ad89dbb41951d31e85
+oid sha256:c23a263167181348043866b689f4b24821a580d3806f7e837d89126a74678b65
 size 509008
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 06008e4e27..9d5231f601 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:ee54586d0e00db39706d98d770554d1e258c06a0d75cd1f641f62f65c3568e0f
-size 9220
+oid sha256:a0d9b0271872bb405ec0d6f8afa475404c9612b8d42dc5bb835ce8dcc8b1fa0a
+size 9223
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 f75bec8efc..643331cb01 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:df27bab431fca8be7eddf34b6abf17d76488b7ffa3623f92924e80dcaecae9b2
-size 8894
+oid sha256:9f969aeedd303cf4c6b90e3ab3b2144c7eddb7860e69af2c1ff395ff2202793f
+size 8892
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 03a2fb2024..4a13245252 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:9dce0b902bbb302ab3c4254794f0571f3acb0676ccefe5e642be81f431517c45
-size 9212
+oid sha256:c4d16acd7a9caed097bb7e352c290cb543f70b330800ef2b29b235bd52a0a4dc
+size 9213
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 fecc8dada0..3512b11bf8 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:330560755116461f84b9ea916e52a821676a0d50c85306bf0c3f6cbbe3888c94
+oid sha256:f36874223538e2d4e5ee1c383ef3c1b83638a6e3c2d1791b46f9393e4bd7afea
 size 8675
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 c14791e81a..b3ef224941 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:77a75cc84a1642cbe3bab245c879ccd545847876c3a2b3982ae7f27d311436c1
+oid sha256:874579b131a2956564603ba279803c4f753736a4545f50f9a1eff93ff2e414a3
 size 8417
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 5283a571d7..8c61303e96 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:b4dafba8d98daf0bf181a961cbbd69b3dc980fee268ce6f5cdf99109c74fc695
-size 8590
+oid sha256:cf3ab6dc97d3f34b7e25062885a49eeecc563a69f6c337d346ad1d9ad0c45fd1
+size 8583
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 58ed23c416..35651f3733 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:f53d3624c9e52a66fd94ab84f973541b636cfc125c75d66c6d19fff1f06b03e3
-size 8673
+oid sha256:83593ae45c35e34d5057d45b8a7e66b582b3b52adc7f05fa2d9c3ecdc0bece9c
+size 8676
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 f1f22b0b32..c427f30780 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:c7d23ca16528c6cbd86af34b0a4a49930009aeff231c4516f901838a459b5aa0
-size 11007
+oid sha256:69a4678aba6913f981f344eb730add0f4fdbe0529f7be015019150bac15f4709
+size 11009
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 25f214be2f..d9b62e60e8 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:648949b11535ba306cb95d3dc4ed1feac2f49f06957f9b569c096ae8bde57c76
-size 36503
+oid sha256:dac10693719b9cfe5f3644c25cbb9d1a59ed7c2f89e791eec17bf635c4d59efc
+size 36507
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 ec0df80c87..4a7563b96d 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:2685b3d4d61f83d32758800c0f0353654a726b1425637ea8f524ea56d5e38f30
-size 6945
+oid sha256:d234492829a729dcb05657af65a3fe97fe025ff42c79d9cf862e4e9925ddd832
+size 6944
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 9eb165c834..1e9225a8b8 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:278eb8cd35d2cd5772e734c06864af5bd85250c5cebd362380c94fa90b74e416
-size 8110
+oid sha256:af28ed6a8b9d3b399531bf82d7be3c5a5b23ecc750654c241b7acc95a036132b
+size 8115
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 3b73e0a6a0..423ae8cbd0 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:79d2c232319a6959b74fc856d00c0d1d723d0012817f1d8f48d9f1acb6f740a1
+oid sha256:44b0989e9ddb097d3a5ef0f331221a12a90f69ff017e3447e31ef5cccc53af68
 size 10290
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 273e00f565..f234f447da 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:a81e44815716eac0fe75d924e783c6501d6a3c758cd4b37c123ed1124546bfde
-size 34879
+oid sha256:98eb5d83d322022956b684699683f25ef6c09be55c60224689685589e0051983
+size 34883
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 69e7bc8ccb..b7ea22436f 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:96f995ceac798ef12e2b4e721cd3b025be1daee38bb52e72f72b236aed5a85be
-size 6558
+oid sha256:263371af4d0ac7efcd840a793e663505865d32c425d5b2efe9489a63655e33e1
+size 6563
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en.png
index c185da3acf..1c7a427e07 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac8be8f9a01a8f1fb80e217ab1b80106df7a11c946779a51a14869ec88411170
-size 62644
+oid sha256:ae506055a01b6da3a5ce8443616d5209fa53421c89392caf8d783c6ac516f403
+size 62650
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en.png
index 4cd81a7d43..efff3325b4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d73197d295f9181e6f297ecd5da016775a7fd669016528527af5d37f52f1a2e1
-size 14572
+oid sha256:9d9553cc17040d32f56316576aa97bb4f857fe617a8b77b5a86650e280d1567e
+size 14579
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en.png
index 40fd031175..c4dd56b783 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18230168b1fa0bec2af54e2be2e385b4f2131e772894d67a816d6bc02c667f5f
-size 59702
+oid sha256:06b7690d3090a3c42f65325ba7370813dff12e515dc855a4ca625d2428070c6d
+size 59711
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en.png
index ec74328ac8..2a93b1e41f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8cb07c1492776dfd7da13a2c44b91f7c07b4702fc4e610e292a8025d83631da
-size 59367
+oid sha256:ba5693fb53e3fa812a9f6971adb0b1c8b32a4e4fbe8fd6ffcf7979ce92e7ae72
+size 59376
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en.png
index 40fd031175..c4dd56b783 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18230168b1fa0bec2af54e2be2e385b4f2131e772894d67a816d6bc02c667f5f
-size 59702
+oid sha256:06b7690d3090a3c42f65325ba7370813dff12e515dc855a4ca625d2428070c6d
+size 59711
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en.png
index a95574f330..e96505b929 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ba8176c676dbc02bd37e03678301c84356d3e199af12baeecdedbbc5e74d26b
-size 70307
+oid sha256:04647630b90936dda88b84b5edaecd9fc744b15f9688d2166c69b2f680ac0ec4
+size 70308
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 30b4e19f50..12377e36a0 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:658810296f0c1ef52570c1276bf43c302156f4ff4adc1edfb0de8f6733281358
-size 528446
+oid sha256:da1a24ee1e1c8aed4fb262ae21e1febfe2663168d7a04feebfdb285f533d0677
+size 528463
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en.png
index ec74328ac8..2a93b1e41f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8cb07c1492776dfd7da13a2c44b91f7c07b4702fc4e610e292a8025d83631da
-size 59367
+oid sha256:ba5693fb53e3fa812a9f6971adb0b1c8b32a4e4fbe8fd6ffcf7979ce92e7ae72
+size 59376
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en.png
index ec74328ac8..2a93b1e41f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8cb07c1492776dfd7da13a2c44b91f7c07b4702fc4e610e292a8025d83631da
-size 59367
+oid sha256:ba5693fb53e3fa812a9f6971adb0b1c8b32a4e4fbe8fd6ffcf7979ce92e7ae72
+size 59376
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png
index bf3dcebcec..356bf06387 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee03b5142927974650950352f3b89a7a284033f531e90d39ee27903c981618e5
-size 73031
+oid sha256:b0ef69d4e49b7f7634f21c6c1d737336caf4c062b7ebf000ab39169f8ea08558
+size 73040
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 58c0d73bd4..d92b8c569d 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:3e8fd4696beaa27404872495ec9929e0a1618fb4102ae5240c97cb8a30ff360b
-size 32637
+oid sha256:e4d1d09321fb1220d1be07e6f0ba54495764c935dcf6dc75bb3e7e5879770e46
+size 32646
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 0528cf6c16..2f643f7ffd 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:fa516481ee9f8c8bba25525f92af61d23d5dcfc33472a6de91e96ffe0d3ee108
-size 40884
+oid sha256:0309be2e3e391a852cb00d5490c92b45255b64d088fd1ae8a5b8472a47ce9f88
+size 40129
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en.png
index f7b9912cd1..44de7cd39e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1645075b7bed6fe2fd712996da3860b8db43915f848a53abb8fec2545ecf158
-size 14576
+oid sha256:8368b66fcc9346fec86f24bfee3f53dfe01155838d799be93d2b094f1dc2dfef
+size 14580
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en.png
index 137148440b..58c66df94e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d42e4c3354762885d7f6db75eacab32a8ecf9b9a8afb5dc2265c5905c9c1f04e
-size 54886
+oid sha256:54796bdaf69e4290f008a3fc76034d15c98e46847752c64c3584a4e3921d3287
+size 54876
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en.png
index 7953623173..5a5e88d09b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:624d1a64dff25fddae712e14ec2f7c9a1cdbc89fbbf9e9938e4eeaee30d588d7
+oid sha256:3a8f4a8be55e1ffded58141bd5e5dbcbf914964b52a395563b83aa06f623350f
 size 14048
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en.png
index aa2408676d..820d9361c6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2219544950d8be2e656f8cb6b4f5852e0a0811270ce3eb7ff5408b60fed5afc8
-size 51919
+oid sha256:c52bef009a4c31ec6f297d273c8b1c8bf97274777d2b52a4c56dd646194359ca
+size 51915
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en.png
index 685b14639e..b899383e64 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:138c9f2bcb0866eab4a07e6488a34f347823bfa30778e0ae01f60a025d1574fb
-size 51516
+oid sha256:a7d6df63d6e364c99071d1b627f7dcd9220c71f23b51ab4c238c0878fe414448
+size 51508
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en.png
index aa2408676d..820d9361c6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2219544950d8be2e656f8cb6b4f5852e0a0811270ce3eb7ff5408b60fed5afc8
-size 51919
+oid sha256:c52bef009a4c31ec6f297d273c8b1c8bf97274777d2b52a4c56dd646194359ca
+size 51915
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en.png
index e919d36b7c..e9f539fd94 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ded2ac6dbac31cb5e3c58209c0bedb8f59eb331d8b10d19f4c96d5b84db76a1
-size 61975
+oid sha256:2e7deb11838b50a4eb4e97aa908d378da252b71ca3dcac16176670c3bc4304eb
+size 61965
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 78f29eb25f..fb940ea5e7 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:9ecde8b92f88ee26caf68220cf54f97cda46599b5be8abf25e3bc1ee7845dfac
-size 524872
+oid sha256:b4dced64ce3981eba6011524b34cb394f180c9c0e06c1908c2cf60633fbdcfc5
+size 524873
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en.png
index 685b14639e..b899383e64 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:138c9f2bcb0866eab4a07e6488a34f347823bfa30778e0ae01f60a025d1574fb
-size 51516
+oid sha256:a7d6df63d6e364c99071d1b627f7dcd9220c71f23b51ab4c238c0878fe414448
+size 51508
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en.png
index 685b14639e..b899383e64 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:138c9f2bcb0866eab4a07e6488a34f347823bfa30778e0ae01f60a025d1574fb
-size 51516
+oid sha256:a7d6df63d6e364c99071d1b627f7dcd9220c71f23b51ab4c238c0878fe414448
+size 51508
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png
index 5146ec1129..1a7d9292ed 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fec6671774db382ddaff516d71ee53e08880a6a40f3155c56b0ba026fab8b75
-size 64512
+oid sha256:185d7cffc26032719c113a917965489097a890675ee06ae533c5d8cce9b903c3
+size 64507
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 114ed2f837..0c9b92ca30 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:4d1e8214a173cf9a33c9d38c02b8965781dec82fff2595d9369d979e4f6d5cde
-size 31142
+oid sha256:46ab31307298aa5ce72f71db8eedefbde78eeebb3ff1426833bcb0a7c6af9ae3
+size 31131
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 c9d525ef29..9248804599 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:d08ce3c46efe0d90ef0b3337f492f68eb60885ba054fa289abafb7735e9d321e
-size 39304
+oid sha256:add239fbe0f1047435c7ad5df8b62ba765098eb0c5b9703192a7276b6c4e0ccc
+size 38692
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en.png
index 5caea13b50..80e582b6bb 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:176f723c4a2dd25faf869d3a13cd68ab1bf017367b4a74ab100651693c7fac64
-size 14140
+oid sha256:7c6c0ffaa6182a3d4aa7866d8ef740f631045691f1161d00eea8ed0db49440ec
+size 14134
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 263644023e..ad087e34ab 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:47272c82fa4d9a43cdb1c6865677783a0fc2746b01f603d451f3356bdc7fe65f
-size 25524
+oid sha256:23eef78c132aa7c9180bcc2b7826ab5791f70550d291bcaa0eea5a2bdf370a74
+size 25522
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 30d0ad3021..d043c6ad06 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:ac07f23220511bcc526d261d5da14623789b222c56784cb670283d59d139d9ad
-size 23172
+oid sha256:f08e299bc6ec4385eb280d0c3811cddb3ea9aec149c6154a2741e123582f1120
+size 23169
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 a38dcf0fc8..f473b79020 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:f1f6c8790f079791d3937e3b5765b7354f59f873cdd2d2dde127e51f5053b34a
-size 24956
+oid sha256:f01628cdf5ec7fa61832e212455ce1aed10dffd79482420b6b1beb8dbe30fe27
+size 24953
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 5a0b86da23..89021a93f0 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:855d83c0f6b521d3710e9c1389bb72df8892a67d8ad26b48272f735c6fcfba12
-size 22816
+oid sha256:f81d4ed1ad21bf4e0b91b7613d1e48d93c8aaf762abd699b52cccba495810e82
+size 22814
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 f53cc3085c..513c6ba6ed 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:91ce0546fc34bf013d9af83b5aedcdc348a5db589dabdb9a6b744431d0c362bb
-size 12344
+oid sha256:ed4747a9b0525f9c9a4a00b78f5a20610c1bd5200ae3e15d4dcde6330dd7e8ea
+size 12341
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 bbe5fd44e3..873e974e25 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:92945f9a28a3731424dbd1fc6e394e96435d89b2e801eb4584bd57d021980785
-size 11961
+oid sha256:f3c3b7b5947b63485a1770a4001ba7c612994dcc1a48621785dae8b9a4a8a2f9
+size 11962
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 1d0ef0eeb0..405f84198c 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:5983b1bca18981b5a52fe519bbb4a5a2fdcdb099301986af9f6253ae7a9469fc
-size 8234
+oid sha256:5b19a8ecb5b5178d9c4eea324f480a29dbb7ef7511b9c09af02e383c28370c17
+size 8247
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 c2744b4821..8c0dd9af37 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:933b64f19f16620a1839fe6e3de765b09f9cea31d22e8650d45df5f7c8700a28
-size 7587
+oid sha256:828d1bb8415dd14e759cb20ca117cf4995dd2848dd08333e7a70076b992b97e7
+size 7576
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 d9f5ba0095..5c6bc1ad24 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:46ddf7bdf8c2c4e53bac78600595aa436e594d8d4ea05de572bac3cac04dac29
-size 7667
+oid sha256:f1a22daa18ca3c8e7d4852b4ca19e7cec1b7e7fc13f0734dda5dea85b5368fe1
+size 7675
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 55024f3732..da09120365 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:bb5812efd2306d5ce21bc55f482d8440c73b9ca7a057372ce1218653ecff815e
-size 8159
+oid sha256:d7f88af8d8cf850a3757aedcbef59585cf75f6efca5a1e5311a6f7eace79be41
+size 8138
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 117c19c764..419da353bb 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:c7707318af5b242c939291d82a6d95e2f1ffa2db415937b36faac706ffc85cdf
-size 7710
+oid sha256:491ad1c4a5e78c2787b8fb4b7f3f292d7715730a16e71e3ab702d645a0f5ea68
+size 7696
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 16deffe019..8c496c89ef 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:45cee58d197fa4717ecab80bd4e7e58170258d9064c8ee33949b7ea58086def4
-size 7582
+oid sha256:74f2d7840c5eabc479e3324471a253fe10d2777473ee6bccf235c01eca6249a1
+size 7591
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 f86d45eb86..6a35df05a1 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:9ec56d6ef0c130d47a9b03c9c3d2b3aa6bc01902cea1cd6da6324ff36c017a7c
-size 13610
+oid sha256:8644ac1aca1696960a98bd4e3e0fa33a9df50fd9e786f4aa52d9cb41492e81c1
+size 13611
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 b38b9a3d64..995ed4c6f3 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:9389e0ce12337211ad89d95c51409fc27df4b3185ab58eff64a6b1f1c9c6649b
-size 13267
+oid sha256:bf51d2a6395ab9985ce9ad448822635c6d29a1e7cf4f66887bfe5e35278c0e7a
+size 13271
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 4912e2ffd1..c9e7d7fbe4 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:f5cf363cdba9130e028d9c9a0b1f02976afb273507f8577225e5064781225647
-size 389402
+oid sha256:3362022a7658fb15d3d07981a9f74f95c603a37122a50978d7d600255fe01ad7
+size 389397
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 7ce62f4ce0..59ad68ec4c 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:51749c8228540d2177d787517de07f597e22a1894e0f24fec5cba134db80d71b
-size 388675
+oid sha256:30ada7c55e9e8847a57271aede957573187b56c4ebb88289472fc34d8c037d3f
+size 388676
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 db7817f849..df4212be1e 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:624571e42e8002d9cffe0c4e9117742412c4dfe0c20c8b9e6ba4aca639ba1916
-size 38076
+oid sha256:d004bb0bb2e6dec6e5bc28038cfb2bddbd68f0c430b9bf3bc1c08de1d90a3301
+size 38738
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 07beeb8c4e..05caed4847 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:0118fb76bf7cad8def14a606a43d32bf39ad15c025b63a19767a2d16abe6e55a
-size 31240
+oid sha256:b7515fae2b17ef03ee0b1df75b17039d384981b9fb6bba001489fb910fb47d84
+size 31214
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 a89e332b94..5e4b3d7e69 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:7978a06a003272f6297c97968ea6081f6dd80dc6c86a3f7e9f2740ac4bf5356c
-size 133999
+oid sha256:1c5878a19565187330b31a1db7a50ab6cdb5db1435b3708a7a918c9a8b4818f6
+size 133993
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png
index 4cb51651c4..5c6823b216 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19e0987f38a0b867ac30898da90fb28c5c382b72a03639cc74817eb684de147b
-size 7918
+oid sha256:5057c4c9727a8a3207d037cd237847b7584b2759ad0d40a5c0dea31868e59cb2
+size 7930
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png
index ef898feace..8fd757d126 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58634665793af557117c70203ed96690f6e9291ee1b34b5b803efa707a961080
-size 5085
+oid sha256:e73e1165c92876e1ed698d8413bcecf1b79a7acd462056bce00fae010061cb27
+size 5078
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 0657d13cc4..03775399f5 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:2f6d280c183141d78d915d08458aaa69e89c96f3227fc14242b16953d5c8755b
-size 113622
+oid sha256:94b53650124f0144d574b3cf2b0bd704d870e982cb3fcc815fb11fbecce0b7a7
+size 113619
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 ffeaa5b592..47d6261e42 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:ef92192531e95d6d7bd99bb9045a6f1a412962ef6916331304a4e573e7bff60b
-size 389425
+oid sha256:bc72d0cfb4553768e7140480b09c6f3097dfbf83f61fc196ca8a3749ae3d64bf
+size 389428
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 18c8eb5b85..b993c242dd 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:a75faf9a65b556f6452073ea4d0767a04bc22674a757575044c36ee39a641172
-size 95179
+oid sha256:b567985a03675ad251e0049dfc3fc1c783ec15ed3e316e66afe65325c8829d12
+size 95202
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 dd0718ea9d..9680db4f02 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:edfbbd7f3a8412cf04ddd72f5249ffb6af94e4c3dc41be89c6f9ce7004dd2784
-size 396233
+oid sha256:a1aa430ed6eab3ef2a269f68b068df32eeb1c46429ac62fc33ae5e4815789b49
+size 396193
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 4ad09e4797..29d7322473 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:87adc7738bbd20286fb1a35a50ca5e418821d5213eb8edda41d063547e311588
-size 131626
+oid sha256:e0c6ccc68d81e59036e56c6c55f0754b240db20d9f268cf3690ace3a989fdac7
+size 131584
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 e61d8ee31d..5755c1505b 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:5786f5ed547c6338719e76aa4641c81d5f73873bf56752b8774d8d7db28a9275
-size 112186
+oid sha256:e58e78d4153f25e1b9a4413c8ca8dbaa5c9fd9623b12a29fddf86b3e80564f42
+size 112146
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 5f4e81b345..5e58b55817 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:146fb5b0bf222b3a8157466d24d9f8cb42b26f1a81837fdbd9cc6180a9c1490a
-size 123529
+oid sha256:b5871938f60b42a59b5ec578e2819cc2030414931a3e4565f84fc7425760459a
+size 123512
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 c380fc587b..a372fec266 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:e8e45bf213f7ac94fa7b41ca9c6372f5439472b6122cc98125f463f16303bc2f
-size 14573
+oid sha256:e9f75ddced666a2efb14a04704d464dd10eea22709d75e7997cfaddacd544ba0
+size 14563
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 a3d03ecfcb..49c441cbc6 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:1b032939bd87eaa5fabc5e9b42043f2a85f39e69fdc922c13b50733004f99e1b
-size 136667
+oid sha256:992cf084d455c17d756da2655e610849b216db508eede45cdf615815db9bd357
+size 136674
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 9cbf0238b8..0cbda00dcb 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:cd87506200f79e6dcb6a03990d021f744fe6b855e22b704bf76de0f3954ed53a
-size 136824
+oid sha256:ac9ea210af259ce406855ec961822348f3eb675e3315e339343bd3bfc9022f94
+size 136820
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
new file mode 100644
index 0000000000..beec069b37
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.qrcode_QrCodeView_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c07e9a4ec69a889b003bee4293a610c9fe0fd0f83c10c0da01322e076e9c980d
+size 10750
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_0_en.png
index 39d089fbf7..f6706eae10 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef22b8601a7ceccb48ce49ff6addba3ba9fd16cc2b19463bde2c6e0aa573c12f
-size 13175
+oid sha256:84d3dd594c06c53ead7c6cad57f9d56fcb057f808aa1ce7a44647ac2de7eac0b
+size 13178
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_1_en.png
index 1e539ad384..78526680e6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80ccaf514b814b9f753312686da420ad144c8f552382e8838ce22ab352c6f5a1
-size 11062
+oid sha256:dfacf0be8e017585a63cd3aeb2f6ce3acd9195265404a2cc6ee420dfe60a486a
+size 11079
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 0766c3a5d4..250d8edc07 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:5ae7336c92a0b1a8a4ae642a52a4d029c229012a920afb43be056add99380ffb
-size 31180
+oid sha256:823507454e39c241cde2ce6918a178bd96c3fe6f179d11005d7c92dcf6f306a6
+size 31187
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 dd20d908ab..e97d05a8b7 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:573e7f8600bc4177ad7fa3ad4e4eb0487ac6a95594358254bac0c20fc4b15b6e
-size 29389
+oid sha256:de592becf90c553388ded840d09775a5817fb785ee91ab15f88776cb9299978d
+size 29403
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 1c637dc6d6..234909bb90 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:bc6c0bcba6d1f694473cf7bd9279a004acce376a84959d63c5a5d52b1322f3ef
-size 33756
+oid sha256:bd72ff98b667a2693afdaaf0dcf583efee7f4f772a7db1576fc9344c3b0e8610
+size 33773
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 0bf5261601..73452063d9 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:e9c7597622f69a2724eb968519153f1da456ed368e11be427f81d73c7f268b9f
-size 28861
+oid sha256:c3b0333a9fe1ecfd2db961cbcab70959252d25db3b3bb5433364d4e52ebb62f1
+size 28871
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_0_en.png
index 2c1da59117..f612f0a3b2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6808be54b6e19ccfcf50c45e0b88ed3d562866b1c9347d19c3c807c74f916755
-size 12564
+oid sha256:6df05997df8049e9a6e2b8607cfbdb27e24d5bdf1515a4d4bde4943ccd8bc37b
+size 12593
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_1_en.png
index b568868fda..a86ad92906 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0352b36f67c07a4e8191767a79aa75856bd96c16bde69e2a57da9738fa16f2d
+oid sha256:59aa2b4def89d50b3ef509d2eeb45c02924073b1d141da218c7381365086432c
 size 10843
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 3062948da2..146018e289 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:98854f24cc7efa169dcba63d3c52140c7ca18116e7888a807d39af004ef0540d
-size 30424
+oid sha256:a04d96eb2d9186b49f44f2ce6c12f170567d7cbe4983441404d9a3edffe2721d
+size 30460
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 4eb095db78..5cdee95ac4 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:34ac7acba4137726296a415a5168a560905ad6fcdc0b80b3049b1cf440c88e62
-size 28988
+oid sha256:476f7104e9115c37b30c72e2697ac6418f405c14b6352cb9987aaba60bb03f93
+size 28982
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 43379b722d..a9d01df8b3 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:e1d16b4735f630c40ea1ed23daf71f6914fda48fc8c70d35d50037c50e93c25a
-size 33350
+oid sha256:e9b41aec852e53187d209837ce593a33a52df9a6a315722c33b9ecfb3ab3b850
+size 33337
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 2c54cbef0c..6e8ceaba0f 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:5928245d4c77abb0679b07ff9921f976bc2fcfd21f60fcf2ea9f322c16776dba
-size 28078
+oid sha256:7bdb980672962a528ff01458bc60bdb708861e9723278248ddc4ec59aa15c6eb
+size 28104
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Day_0_en.png
index 9593d1688b..acab23929f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2fbfb88cab0f11683f848da65158cb30652e64abe64b57049295e7fd72c719e
-size 5371
+oid sha256:90d46e9f3b74d14fb6096ae7aac783725d7b61114f77ef9aa35bfabc47fe6a21
+size 5368
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Night_0_en.png
index 3d61f06288..964d0b9516 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_FormattingOption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0528a462e61239e3dd97d6ab161cd7a545ff028fa7dbddcff3949b300a6c142
-size 5242
+oid sha256:1d750dd430d8e6d0e68a3b323cf9aea868c7db41f9b4f64a3b5f84880dd41c8f
+size 5263
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Day_0_en.png
index 4bc0b976a8..3a38e2e177 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:504944010ae77a2d2cf1596a1dddae5b7c41c18c3f9c5f5047b297d5a314f603
-size 8686
+oid sha256:5fecd68ea15af9dd73ad56fc65b65c8b769212307467a190730648b47fe7cc55
+size 8671
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Night_0_en.png
index 99a75f2e17..aafaca1f10 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_SendButton_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b689df7b4ddc608907cd0c82412e7ac1a61ac6da905047a5e7430c24e2b003f3
-size 8541
+oid sha256:55b02c8ba432b768df833a7ba2e4745b7a48f47bb1601df3bf423e369f95bb65
+size 8495
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Day_0_en.png
index 3870a7600c..7af6181c68 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93559b6d362a1c3b47ba17e6449a74a255929a21de4c231f76965970f2d90ec6
-size 6105
+oid sha256:b4bad23f7855b77295365dede75beb8a22819a11e911a3c98608198ca140abf4
+size 6121
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Night_0_en.png
index fe48adfba0..0f5cbd1de7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_TextFormatting_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53f55c8e64db37ad263152ed1a743b0b4fdea77379ebd7b4fb1ca62692ca49be
-size 5805
+oid sha256:a53fdcf5cfeaa08ace83577aa54b4d9722566bcce624442491688ce24dfed255
+size 5806
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Day_0_en.png
index 221f519eaa..5b29c9a0c3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:532fe4cdbf0103d4a3b06b3ea0984bfb2e30c9aa790d6d0e197dddad1e3812ac
-size 4418
+oid sha256:86e37d826ed0534e701e7503c7a8d0fbd3958696d12fff063fe71b97b32eb07d
+size 4416
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Night_0_en.png
index 130d1822b2..a7ab0d3e6c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageDeleteButton_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ea47b843bcf47b6de7889c172ea3cfd72fadf868b28fff5c196d4cbc7618535
-size 4359
+oid sha256:ff9f438cc08d80e6a86fe4deac276831b52439caf876279af13848c8703da6af
+size 4354
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessagePreview_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessagePreview_Day_0_en.png
new file mode 100644
index 0000000000..600ad51b94
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessagePreview_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45422a841a79f4236a56a72773cfe8485e267f345abb03c2b376b3307e430fab
+size 18537
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessagePreview_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessagePreview_Night_0_en.png
new file mode 100644
index 0000000000..4b14520d95
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessagePreview_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dedaa24fb05db78c0b9d4c2357c5c76ac181365c09f6e6b666387112f7962a4a
+size 17424
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Day_0_en.png
index 88a6f78312..035e81f958 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:645db1dd9d9fe86d6b4f6434cb86011b24805618777400250a29f526e126ad62
+oid sha256:5a1d961ff9854bc804ae3df561ae33f562523fa2ff9ca7ce3758c31c1d8a5c4e
 size 5772
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Night_0_en.png
index 47c26da1d9..be3faaae13 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessageRecorderButton_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f2bf486a0b09a305e3daff178336d3596ea92251ad22b23490505d8c9363bc8
-size 5729
+oid sha256:f6a26ec7ab06c952049830c19f4074680ffce224d33890fbf3925662dd804204
+size 5733
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessage_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessage_Day_0_en.png
deleted file mode 100644
index 6d97ded92a..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessage_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:382d1dfc4f8b0c31ac8c0f2b8b506517d9441a97cc8e86211aab091dff99eda5
-size 20697
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessage_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessage_Night_0_en.png
deleted file mode 100644
index 3a201b4e60..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components_VoiceMessage_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:800038fd3abe4eec862e8a76050b939357b3cddf3591aab9a401f52870cfb219
-size 19505
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 bfe5178d57..2bbe3e0435 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:6434eccd77ea3b9caa1368499c08d4f7f796132c217c90df335004547d42103d
-size 35663
+oid sha256:194e43d76e485ce80195018876ff9f1baeb1770c13c88388cc8adaeb192b9367
+size 35904
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 a0a19059c8..25f1737a6d 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:bc6ae5ce0f90c7bfaa76aa0d10e23fabade20a2a23c112f5bceeb66aff585dd1
-size 34552
+oid sha256:4e40c4eba4117cfbc37f2a7dbebfa2cb3f6a81b12507fd3c2deb9df2d40b4754
+size 34349
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 fa55a464bb..a684be36f4 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:e956a7bd54ffee6dea722ff5c8e5a602f797ed82f0f4010cbd721cfed015f002
-size 51477
+oid sha256:94672cc5b4e0a4fbce2fe3053636605a7984b6cab3bef41cdc1f6b174a35252e
+size 51851
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 6400d5d479..9efb85ed8f 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:65d838a4214cb8f5f05bdf8d45b3641c283c9abf9ba4490df2ac08812ccfa0af
-size 49793
+oid sha256:ca6f44470098e77a72f5b171d36d793b63234dfade5cb6e688832e6ca3308275
+size 49451
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 f903a38854..4a1552a032 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:f6d78caceab1c70c552a369d1d537946eac4a6602c96c6277874563005a4196a
-size 18627
+oid sha256:6cb6da323e287973da01a036c010ec13837acfcdc7d81e1670901f619b5bd531
+size 18639
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 c84e30b9ec..edf9b3d30f 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:ce04f1c392063ad1b87dbb28de39ec3a9bd8417257ac0bb577c3bfae3561a3b5
-size 17597
+oid sha256:2f4652e4b20b0b0309b3f24dcea644fda7adf4b8cb2fe86b499856ddfe33b60e
+size 17592
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_0_en.png
index c518296978..234d037b0e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acc94c8fd42f7dbbdfecbb94ed878b8c6f12f82f51c4077d0e183797b4473924
-size 5380
+oid sha256:319751fbb6bc6ca328dcafc4a3e7575fe7100b378d76f6ebe3986ff7ebe1f007
+size 5348
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 d1b4b1ef6e..7fec46b2dc 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:6793bc6d6434feb41d31bf093953def9882f19795129efdaed70ac497454e5c1
-size 11352
+oid sha256:5ee5f5f6c2db1ae8be3cb6377530954ec31d832eee7e7c4deb4eb09a79bf44c0
+size 11348
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 6f0fa13cac..910184e79c 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:b25f9f8aa96320e45f645c047a6023defe10cb753001707595cc61e0659959d8
-size 18850
+oid sha256:4ba3f2b46b05a821a812d65612d59cea07cc0dc5ca8311d47945f57b198c1a14
+size 18844
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 fcb62b5382..479af0b53f 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:b7d12a487bf5c903ce086d677f032d16884eadfdbcd7991de88615d6bab99742
-size 7987
+oid sha256:4025738cd4c6b753e70a26e363437d266a8c1c4efac469332b4c60ccbc7ba8c4
+size 7979
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_0_en.png
index be8916239f..ee062a0f32 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01b95a4926989d8b8fe26a6d40e1b937724d52d1783896fcdb0c66e7cdddf57c
-size 5337
+oid sha256:9953d03587e87aff878fbf028616e358fa086311fa1cc5e718a5e6ca6aff3fe3
+size 5327
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 75d1d47421..e515bc3fba 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:186b8e43c773847bc13f5b73605a5f20411f896620d8ec71356a70857592c8ee
-size 10947
+oid sha256:8cca8a1d1c35c00415bfa17829865eb7233480b4babcc19e34fa01a7162bc29f
+size 10960
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 c24fade757..c3edf54f69 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:7522104a5f31e5ca71a142fa1ddfcb51021226ac2cb362ea2d081f71b3e5f562
-size 18165
+oid sha256:7cf4877cefaa904586f06c0456d496e2c6456b2280ffd95754b30bc1f4aa98e5
+size 18175
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 fe9ffeee77..83b7fe83f7 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:62ffcf73f8e26e5cb654fd0f4576a25b09325058eb0e03dff45ed04964067761
-size 7703
+oid sha256:79dd86685f07b79e320a1dff15d19b3c676ee30d3adccee30d7069c961ae852a
+size 7722
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 1bb749d44e..10f49a3193 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:f4564821b574977214a2e05bc58deefb3d2842c12501cadc781e1cabf6a3d4f7
-size 52521
+oid sha256:a8fbc3f86e7157b670cce57e5c1015e03ffa9ebffcdf6f2694f57fe730f4de1f
+size 52515
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 e49944c187..1d27b38bdf 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:43f3d101b9884b42f385bd19766db8fd6f75ab31dc835053726673cf66d68601
-size 50830
+oid sha256:cabcd18071e73d3de04c33753a5c75bef51dfd493e560bdbe469ab512583da10
+size 50811
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 619f22f360..959b796a83 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:4d33345e7d8cb2a55e6d291ae9dcabe66c8ec1ea4124ebc32b679566e585ca0e
-size 54020
+oid sha256:49aef4c903d8174b0801423c5ff70193e2f74f191f8ba2464e1f4894f128b915
+size 54016
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 e2ef3acc25..125662980d 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:a6af3cf20ad9b57abbe61107f758c143a676dec960fdf583b517d18e404411a3
-size 51953
+oid sha256:66c8ec0b582a2927b1e862986044a5eb8ace743aa0397cf3aa23d0fc3f08b2e1
+size 51988
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 5a1a036cf9..24fcc7dae6 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:936a9e86eddcb00e20de8af1fe60ae2153c3dfa384f8070466026969a34eb057
-size 45074
+oid sha256:43a6161ba149e16f0b182a30e4b03fcf8416bb36341c9af600f912b19f462874
+size 45078
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 718abc20fd..6150e1beb6 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:dee196ccc9872a15897426f2581c178ff92a393136aefc5f7342ba1984d8e418
-size 43492
+oid sha256:41627ce0ab8279c45431d3d7b399c3d40c64c36c42c8449b4b91dbbddae70a23
+size 43470
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 dae95c00b8..b32e529a58 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:dea3e3f516afb98543f458e0db6472a7157428e25d8170bee6abbc505ece7bd7
-size 52677
+oid sha256:abc2558e6361dcda68b6d8a62d82e1c2b9f1e163690d97d31d6e4ec11c801f60
+size 52675
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 cc6c7917b2..a383231b97 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:8ff7e86b3aefc4092514c0312a91747ac0a8a3f90234ca9774cd52ab90eeab17
-size 51072
+oid sha256:b3af2c68f5b9e991f2fa64963159d1b01baead34e5e6920602c56bc8aa32ff47
+size 51105
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 4b15f90a41..7e5c3f7c9f 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:54a3988c2a4878886f23a95e04c4e37ad41704ed4fdf0089d083e9ae52e7871d
-size 63496
+oid sha256:49f2eddd77c7a5e7a9307c79068962432a06542c327ad984e931c3de9dbf93f8
+size 63577
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 6ef64444ae..05e2660879 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:17791f3897067019f9ac60e91d3d5d993799712195a1018726d9a15e4fa6db82
-size 60888
+oid sha256:6507cecb7cb8234523c458ede4aa86d6efe818ce59917d9880e13e899118d343
+size 60992
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 1bb749d44e..10f49a3193 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:f4564821b574977214a2e05bc58deefb3d2842c12501cadc781e1cabf6a3d4f7
-size 52521
+oid sha256:a8fbc3f86e7157b670cce57e5c1015e03ffa9ebffcdf6f2694f57fe730f4de1f
+size 52515
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 e49944c187..1d27b38bdf 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:43f3d101b9884b42f385bd19766db8fd6f75ab31dc835053726673cf66d68601
-size 50830
+oid sha256:cabcd18071e73d3de04c33753a5c75bef51dfd493e560bdbe469ab512583da10
+size 50811
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 121b4c02e6..4698ec2b86 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:cc201bf11b46fee8396563323c1f35ee5589ffc9d38d95fd5d77f108c0b46fb1
-size 64472
+oid sha256:fd0cc87122d0a95938e3a345d256897dcd4a6f76d0fc3f025b5dff62799e9aec
+size 64538
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 0700d3d848..374c8d58d8 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:8b22de94fe5fa19684e4af6d9252cd0d2e96eee5b3b37f3ea8f6bf03be9d6b4e
-size 61531
+oid sha256:feb109a35370f31716f4209dba88ae2b10c31cb612cd5045fcf8fe61a519d258
+size 61541
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 74af5caa60..29ef21226b 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:dbc269040694bba49595447836c01e080326327d09dbd8437b8729be04b59e7f
-size 53972
+oid sha256:ad59b9a21632aa23cfee173cfc2d5f7bc1d653079a95bde38fa9c53b7f445ed7
+size 53936
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 569608384a..5d8e0500fb 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:7ab0b4801ae7caa9c88f6e3f64f1b1319a53d945a2fa4da09f0050bf3e8639e6
-size 50961
+oid sha256:ed14923d8757611535dcf5ce9d62b38a49f83d38d5c021e9be2d4b3619ee5b0c
+size 50938
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 10545dddfe..a9768e6f92 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:c4edf0d1a98c8ac8d7117ab522ff00cf658acb3110594e598e00a8f9be18c1d5
-size 74021
+oid sha256:184eec76d1b81bbcb0da05f190df652e0acc99b511f39b6efd64848ac0265333
+size 74011
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 328d7efdbb..4d9e3852b7 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:6ef01300b2a4aae214bfe91efcbcb4f840af3783f51e38aecd8a8f27f92b8e93
+oid sha256:8b58254ab6455b9cb669f585e55d63b3ea2d0d1863dc9cc33cfcf7efeb9c9aeb
 size 60569
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 2cc68110da..e1f56a9a7b 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:146b086f1f30c5a2280764864492fb7ed168df496c362372a289e7725f8f734b
-size 73429
+oid sha256:de0965032145efc6dd7a2eeb62cf61a38f7c178a8b8da9aa3ff38f8408698241
+size 73436
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 7718d0588b..1f689785c4 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:d06b49c3dd6a84ed96053aea69176a98b4259850101af4c5a120d96a07575915
-size 82162
+oid sha256:096674378b59fff410c6788ba29914bc4711d0f78f6bd82caf63b1e4494c97bd
+size 82156
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 6b0505032f..a63e418a77 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:588284eddf497c79ec0e26b5d58ecb9f47ff13e310eff653364b7064a34e4dbe
+oid sha256:4d35305c3c04c597092b1d7cd35718cc6e8b3ccf262f36a5e309321d2575a1c8
 size 63135
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 b7b9626b77..79e9391ba7 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:d23654026a0dc0f1c4b74c34c5963cca5dbf1c4f58ae11c5bd3cb9fbb2ec6ecb
-size 62038
+oid sha256:1dec29ccf1d615eeea8527a9faac5547b4f41bf7bd0e43708f549f0ef9e3f128
+size 62034
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 6ff1234a80..f547f8a6b2 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:14a336e4ac0698ba22784b22095edddcabd9cce56c4660b575eddeb572004761
-size 69037
+oid sha256:a55fd94dff2318b2dde74c7db1df8dbdbcfead6d897ff60fbdcbc1e016588bf7
+size 69042
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 c0117d7572..d9c304aef6 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:8e0043281ab47036d89e0211078939491cfa6f4b1448778e35fff62e05e28132
-size 90924
+oid sha256:30919bba4348eedd2491874053ae23d9ac27a9aefdea56611564b4a4df8aac8a
+size 90920
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 6fb549ca91..eb8c2523d5 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:965c8fa72a824ec3d15b03c00b2d5619e67b63f48803160d3a4452899b6786d5
-size 61469
+oid sha256:30b2ec608ba0da25348d72ed3e5cb8bf939b4b17969e1bc8d0afe2a36a107b83
+size 61464
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 462f7c2ce7..ef397e5d6b 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:f9974ba40b60d7fe315ce069d30cdd5f8e835f6fa875466a7a5e1ea69d9262f8
-size 62587
+oid sha256:407dc99e70a309c124964570a1b5f0c272c6b44f6f099d06a87d4e5aafc3d925
+size 62615
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 d02c87bbd7..7926c0c712 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:037812eede94b7aae325d174ab9e97f86361c6f48d6d70146026ac04a123d6e5
-size 68797
+oid sha256:523ccef98d598f6c92b95fe1682eecfc7e68e76d34a34c64f6be92ce94bf650c
+size 68802
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 6fdcce9bab..8f22c38553 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:105eae03dab255dbd0d110fc64cf95d4f5db3d459174a2cb6a779478801f5b02
-size 60981
+oid sha256:140983f21a45088f5ae2c9616f4b66533c79b26029dd7f589683106e6aa0931b
+size 60980
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 fae7cde2a2..6db788f931 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:bf03864fabf9e2f35e39db52d04ff2a85bd49fc310f92afa0ef50ae9932cc6c6
-size 71815
+oid sha256:8acf2059f390b026e192c4e30ac2e374197b88011c7d0c0886270f7d41285e18
+size 71843
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 bbf5f7f228..4b599055d9 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:b8911d1f308383387f7745d4b9bd6b38d73a8a43850692a4fecb405c30926064
-size 58692
+oid sha256:9edaf14c0b0db2d9e809ee49e1a3735ade58a72e662e04feb39204b7fcf5b382
+size 58693
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 64b8b56dd9..f6c1f38e3f 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:82c1a50099522a17ca152e30d6d342841d193cfa8fab32f305f9b6dd197e6d1d
-size 71244
+oid sha256:95895c181425f9569e6c18414667130a2c272e6fdffa45486b2e56f68d8a2bed
+size 71289
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 e91eb18e33..d3cb1edec3 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:ce6a863ecf0624e1d5b0454be049ccae70a3bb0f5d630f64f47f3b982a1b3e2d
-size 79707
+oid sha256:9405692b572aca986d5bdf4c70182789776a6a99eb6c72bdbb32446ad03f3cfd
+size 79714
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 3e1498d992..3eb9e16d55 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:a1cb71f2569eaca01145357514391b38b6ffc6c728356e8a36fe3aec4824ab48
-size 61203
+oid sha256:024388bfae5dcd6ff96b8bbcf37037f9c339d4d7a514ad3d096a89330fcade6b
+size 61206
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 af569a040a..38c13a155e 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:5d8aae51431f4b3468d8b0d1aa09147260e11d89ac7c2a11e7a822b81dcbee7c
-size 60165
+oid sha256:d6c45be7f090c67756caad58816d22a44182407b9b6fd22d594711d61d194baf
+size 60166
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 d63cb12ff4..86c24fe574 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:b4564918536390a6e690591593ad1d6c5e852b9db5730c567496afdef1ce9c1c
-size 66879
+oid sha256:8d96404fceabc8945bef767daf670470f073b3bd214003990a38baa29ff5fd5b
+size 66897
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 e9bf61bc64..ab5e7d6ce0 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:67a410e36136cf9f80aebc16d896b250c63b7c8049e9f418a6440f257e79ffe5
-size 87882
+oid sha256:34512dd365f1e270c269a6e1ed85394ad34a07de124d770896b752ab993276bd
+size 87890
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 dacd1fe7f2..52209b5ca6 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:59fa72e87148fdf5caa311fcf0e5076a22dea083da97b66cda3e023346ebe8b2
-size 59566
+oid sha256:c0270681b59abdb38682a9ac5aad7919392c5444fdda6fc86d75c8115ba1c4dd
+size 59573
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 b358936171..619c713d14 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:c5934239776646bb310e64f3c0a490f3795dd903a2f7dda08e2a477fbb86d35f
-size 60648
+oid sha256:b43b7277eeaee8243ba47ccd9e88b89e1e1f8500cd2399b9f8e61bdb20e04033
+size 60695
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 1164dcb827..326b358f51 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:c886a4dc307747f4c5606c716d490f8386f2f42c9283cc98ee3565d7fdc6ffb7
-size 66553
+oid sha256:e9ed04cda8b0a500d4d8d2bfe4d34edcb8ffd9e70ef0d0b4f381ef4af0432d55
+size 66563
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 ec78e7fc37..63f4a611c9 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:2c3a6806571151ac5dcecbac9f9087e14cf000ac04578d6ce796a5fb3bf5b3f6
-size 59166
+oid sha256:db0017e0d9005c8c419461dcbd8821f4559b6ff1a5e3c8fe5cf6701cc0821da8
+size 59178
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 cf3f8697e1..f6d18cd7bf 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:660df845d14679da73743f645d265c5b896f15be2712f68d7977d99456a3d1c2
-size 76155
+oid sha256:2ba108d5a6b47d399849a37468fa3e0814e0469b2d8d01b626fda26edd4936e5
+size 76184
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 d6f016ae8a..17e7f17865 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:3b4c9135d552c45c3f86c850e4580257f4908d7fa74f5267fd1d6bf6e4aa5f5e
-size 59696
+oid sha256:e5586fcace98fec1a9f022eca4469c975d8f7f07b86fbfeb3f797496592c8c1d
+size 59697
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 a865be4e28..5a45b8b26d 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:bb979724a6de90c6f6e06183de923b80bad51ce9225e1bc795e38ee514eab43e
-size 74337
+oid sha256:6748b4bf4ca59bd5f3a38f5f9f5aa5e630e88b88aa6efff93f3db2812f00bb9f
+size 74353
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 63d9e2f1b7..fea62b9f00 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:27a0d82911078b1a5a55382d296ceb1773c5096a962b1610f4203a1a1521e9c5
-size 85593
+oid sha256:6cdb6014269158e45b8fd0a559f43410f032592415731f5918f47b78cd8ae940
+size 85614
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 a58c69e329..eedafd662e 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:27b7a275237985c9837b7e137112002d900ac95eacda7e65c7779a31d79f36c3
+oid sha256:e56130ab0a81addc71a7199a8226e1f15a6adc4f4223caca635f4d2178831288
 size 62757
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 fc7c0f29ec..f59e4c9b32 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:75eb7d13033ae3a87e2b118141c8560ca701c1b97612f70568969b8d5f5d8dc4
-size 61811
+oid sha256:fced91f54b172f7b70ab9339767744872b432db944ccb88430dce3fdbc404759
+size 61815
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 dccbdd2ed6..8b8d282f73 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:f7fbb5d02a97d4b9a92e3411852b2f61febdd03501e057216ea12faf50f18ce4
-size 69777
+oid sha256:eaa5ec8204f8490a32e25ab478eaea49694b0d72e825cfcd72e52492e19a4cf9
+size 69788
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 40f59ebb9e..3b7884e81f 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:4cd67f76c8a984141b6ad091815c291fccc19a1ba617406a85f3a81c787316e0
-size 104380
+oid sha256:3cdbaee3a7f9568eb6976b1e24ca185522277925aecda287ef2d3a2b3c18b304
+size 104384
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 405e629e48..d1612612e4 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:f3291af958feb1636b0ec02543a217e1938a1597408608ea803ed9153a7e8cfb
-size 60982
+oid sha256:43251d74f11ebb90490a36c3e79245083c8e11d0e32f33d93be07f913b5fbcb1
+size 60990
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 caf4bd666e..13a98d930c 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:be8653a4ac6644f61b3e6606627f884a4ff0690ddf5c9abdc9f106c7422ae64a
-size 62932
+oid sha256:8175a640357de5e3b3d44e1246d960150480b11d5b3fb17be8a95e7215c22910
+size 62918
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 f159857937..489cec3d9d 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:9d6613f2f19be66667a6a348377b6e5c7a46642ef8aa49d60ea6f6a3ba40b356
-size 70251
+oid sha256:c70e04e7f94fa45d72bdcfa680846e456965c51c5be33011f10eebbeb0755ecd
+size 70247
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 7f43a6fba0..2cd4281638 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:93d2392588a01a78b46231d6d34d1dd72036bf92410bfd35abfa53f7688567bf
-size 60355
+oid sha256:b4c91b0ad4f1dcaabd8eeb7a9158c8c5b3b88696db34e254b01d60ca31e0ac30
+size 60361
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 e12f0a0e80..99dcf6d289 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:154362f2087618beb344f8f08ce2dad4e4778f29e90dcb55a09906c81506d405
-size 73487
+oid sha256:d8d8e2b07c6a43ed264a0f632347ebc7c251f732cd1c4e44dd72b21c4f3060c8
+size 73458
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 4f92888f59..ba04e9b9ce 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:e4e0cee61deaf7488a04605919ef5997563668f6d53313d1a1c557fbd1071702
-size 57610
+oid sha256:e088b8f7f4fc15ddf3e1862a5c3a6d5208fec52036e2492a265cddaf9bef9876
+size 57612
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 b9cfb47748..d170192ee3 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:3585a00f29dfa40a0b24a1f4b5c021fbd19987bd10eeeb7fc930800c5b4062fa
-size 71877
+oid sha256:3eebfc2ecb5be3025cd9080fe959b6ad5468c8f7faa67b73f01efe1ccec68a70
+size 71855
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 7980cb3f6f..8f595d1cd0 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:b08e93ceff370fdbde7b71d9939f5ebf687d2181fdcc2a9ac2611ee0b6ac29f6
-size 82841
+oid sha256:6052570659a9a682a8084a4e2226347a9603388672ed7db52cc9734dfb0b25c0
+size 82810
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 0de4868216..09d655c7d6 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:7f8c4ed55357fc1b1f7fb24e33a6babf364b85750f822a8bfa76cb3f0667c280
-size 60724
+oid sha256:e09bb1059cc35adefedc01cff963b0dd31bcd6e4743fa83a74b29cbce4d04f6d
+size 60718
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 7bee87ec5b..4fbbbd8ebb 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:d3a797c5e02f47ea35696cbc1114565ed1dbbff688b7fd878adfec114a06e6a2
-size 59814
+oid sha256:bf45d7b5f3183ff55a26d07a5a31c2bb34fc3a3592f10a0c6666557fe12cf7bd
+size 59821
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 b1ab0eb623..094db82643 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:5106ac2212034c28faaef131632aeef28fa4946cb634e1a058c4f6e374f04f05
-size 67695
+oid sha256:f651e19b3b7a1ff44fca6c1cb158d76aa2e1363945b1de906a8234958625bd58
+size 67707
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 c64faff6af..56d751b3ab 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:a205eb6342275a5c23ceb6e1947ff9f6591a6c596ca6f95542aac84417acfa99
+oid sha256:88468b89ecb5295a115d1a6ab021f4b443590c4ab89481c08529d328633f9901
 size 101403
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 f35f6d1a2c..97004b60ac 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:814308b7dd22558ce6e46d3a26f991768b5da555c416fe0a125dfb0fa5829ef0
-size 58902
+oid sha256:ca49c6ac12f6b4348dd10d69e1a6bcc79e52423980456d587ad0332aaa555bba
+size 58905
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 6ee853bb64..958a247983 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:953099ce0958e53caf6d005bf85b643f1fa4b0283a2d111c0d78e45306c8d6b2
-size 60792
+oid sha256:30a48506282935e77fdde11de47645ace0d952d9f576ea502e82d5a0beaedc3e
+size 60796
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 e48fcd6317..2e052d25c1 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:7bdf053e4015341f5d31900d46615ab93e63b8b4bde4a9a64a0b02f0b3684e03
-size 68032
+oid sha256:fa467616893506c39c02b46c8215fbdb490330719d19b7108f9d17b50ea444f3
+size 68039
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 b83be13812..56c9a485f5 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:a6c16525bc6947b841b0328c1b2c5c4773738480c10417acc3b8eee716a686da
-size 58386
+oid sha256:adb1b69843b2c31d172ce95a1bf24209bd43a6d981e2284f3d6e535845a097c4
+size 58397
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 6533365a7e..dd72a06454 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:6ce2282233e994df1f2604b880402d7debc0fb45cb7f7e2cd407d4399ba0261e
-size 56736
+oid sha256:3467181fd666dd8200c25366392f43a4d80ea051a18d3b525bb7e78dee6757bd
+size 56785
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 2bb2f5813c..e637616fa7 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:7b363fffe53224132aba3202078866748d60229a2ce92423a70c7705f7ac97a6
-size 54174
+oid sha256:bb37d793986aabf523d90cbf90d3873d51deda4117d340d3a931cc6a5b5aca80
+size 54246
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 13aeddb3cc..5d5f6dab49 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:fc2e33854bfd9f07a543bb46a4494163d0d952d087399dc36950cbe3186ed673
-size 46540
+oid sha256:7fd1354fd2c575377e54786f31fb85ca911a45c8a61c2ddb512750f237c04aad
+size 46546
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 fd6f6c2e7a..bd239b5b52 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:ab4f82108e8fdaf891b2dd7c9b153a5469505d458ff32473c9af1816c0f4cf65
-size 44573
+oid sha256:952dc4ee93a9e29221bb2307474e6de721b1a54543f2c43d9c9c30eda2585fff
+size 44559
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 97942d6bce..8301d09a79 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:c68d71e57f09c6c5e43599d85283d3e98bb118456020f734813b32126e7f55be
-size 37713
+oid sha256:09faeef5f5864f93d81f271a67826acf417b228987c6f918b95b31f91a468cb1
+size 36097
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 2eb4359074..943d0abc8e 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:f281d814c40ac7b7931cf1a99665cd29c47221f9cff7a6dc4837a9136d894230
-size 35749
+oid sha256:246d4bf81c16bbbcfc82dd23b23bb1471e3d5e078bc7ecaba3c68d2ab3bb75c2
+size 34307
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 682e50ebae..24be8a7dbc 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:7125fe68ccc21f947e0f8fce564145466095c1723aeb40e02f2619d55dcb0a8e
-size 26514
+oid sha256:274f54991bbd79c4220d945964caf7fc523ce99a70b748ef992cc15ee030fdf5
+size 25124
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 c7ef114f60..433550b84b 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:f2fe785e4e13ecadc8f36bbe350d6bcdcf4f6a06d40895d9e5ed330a45419b2a
-size 25522
+oid sha256:258643d514aeb7a53788ba2addc53fe46f888193ced2970c73887f9eb1584753
+size 24039
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en.png
index f3ae2c5aa9..c6732cd91c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eee43b97d23203a19a60257c011ef864535f70e0d2560a257351c46fd44b82ed
-size 12620
+oid sha256:542afa9710e2bc3ab3275bb95241c2cc67f2c9d962da6f521233373bbeae4b33
+size 12625
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 04fd821a29..0550e99778 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:5827a89cad43271d71cd0682a851a73eeaee5b9530014e4901bb7997838c9e25
-size 44718
+oid sha256:6ef584a17e342214ec554371f3834308a69aac7ed8a3d21faeba473131c13efe
+size 44734
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en.png
index 8dd9fb9d61..4d7c971297 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a06a9dba353465e896be6ad051e8ed19e951992acb5bac3ef624e1012b367f0
-size 21047
+oid sha256:f75c3239db28826e121358bbba02e7a93389c7facb987e3f7f18c82df6a9fbce
+size 21013
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en.png
index c77ea23f32..8c8b84c866 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:692bf4dd932e39d3b3d7c2b234524b9e31a288808b1a5c4574e3a0ca19d6a725
-size 23296
+oid sha256:a18d32095d18270de167ba4af90c554343d25e44bd70f6950b15e6b5ae855d7d
+size 23261
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en.png
index 0284ec265f..b44569cdd7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16d18af991406a9593533035293b131a9ae1be2c833e36cd3c8040b5c2fd4587
-size 12255
+oid sha256:d42baa6d0bcd2a0592c5baff4aeba57bff2e15be804925e3552e6fb4197dd622
+size 12247
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 2cfa7c27f6..ecd1a139e6 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:22d1b4f8ae6ecad4d2e9c7a4f204a7d0b6fc425437bee5e589e6c9e70a1179fd
-size 43283
+oid sha256:ce0a512f0e2fd0a14c90e0755511d1d440f82c05c5ee2511b7a7ce4ef9bb4e8f
+size 43273
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en.png
index b5288e7305..fdadd6e62d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75d98e98cbaddec5615c30f88912e47cb91fb006bd6489e4d75370a5845e710a
-size 19351
+oid sha256:0517660d49b45f4b9d1a620b9bab52178bc9904fe166eb2874e2a8d3ae0f5d2e
+size 19366
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en.png
index 616133a868..d76d27ef4e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:303c3a69b1ed1bcb8bf2253b8a70f2a8c06171e583f43dbc10023d66880c9e6d
-size 21309
+oid sha256:4fad770fbfb78fd80d8ddf8ebfba10b7e57c3e1fcc972e7aba90e2df83929d0e
+size 21325
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 1f6cd2b1d3..e872dcb55e 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:8c41d94a5e334bfbb60bac99bf1f830a74c3994734975a1c40cece8500403a9b
-size 30281
+oid sha256:6d2e5604b679bb3fb3b7aead79b9667390ee94eb81accd849c6c26df4142de64
+size 30288
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 fe0b50f07f..bf812f52de 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:cd217b306a36286e354df8e04643562e38949ce132eb8094ef44db713b358c3c
-size 19637
+oid sha256:167da347e6d04d92b05acbc53b25e13ba0ad0eea9526eedb1255c36c5297626e
+size 19645
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 2442a17143..461d7d5cfe 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:9051334b3879fe2a6fb56a3c573ecb49eca7700a94184d828e2c0329cbb82b4b
-size 25070
+oid sha256:adbb46497ad160ba60e8776ce3593dfce0f2ab0c1f83310c8da100c64c88f979
+size 25080
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 b349c7018d..96f22e4238 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:9d060bf7e4f14055aaf7680c2d0e6c26c68800a89bbedabbd10190e8ea760e1f
-size 30378
+oid sha256:0b9777ae12f4e8ab73972128015d7dd1592ed05b71b06c7f840aec66c76482ed
+size 30385
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 b39b390640..94ddd5803f 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:9835c25b5fa9efd2acbf5e0e5983cccd802993581c1feafea8f97eb93c0250dc
-size 24317
+oid sha256:42957a2ae0191d32091c4967d17c96fc1f11be3573b3d6898493ac91c741535a
+size 24327
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 4a4ad6f05c..0ac1aabc91 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:d5f26b1cdb6985a9887d94eb6d146f99cd0982dee3eb7e78099d7bd0bfab9071
-size 36128
+oid sha256:ca2b297b6026286403ca8164b799cfd017e099b8a6b4d833c6e5b8e03d53630e
+size 36148
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en.png
index 6b70a61340..d8b764bb07 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dea003977083a0d5036b7a45508d48d7165810c2ecf4eb2a03c9f458b3b5c3c
-size 25334
+oid sha256:aed6d50b3cd62c99497b355da815cd59cc01a112c9ca7846d0567055bd3ae8b5
+size 25325
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 155dbfa255..e7f025c72c 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:0563ee2ec774c41d51af5e2b99e9d1c25256dde6f522ae636c5bb70d8da6a61e
-size 24205
+oid sha256:0d5b409d51a29a72dfe541663faa4e43a99b2ae9fd8ede370b47e6f3b27d50c8
+size 24199
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 222c5f970e..7e633ac64b 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:9d1f44c9ac7b57f889890d5b6af10600565c79ab3596c34acd7f32816ff162ed
-size 29320
+oid sha256:ee444a132cb66adc19416dd73b9925d3db5a7fc7708324f19bfdaa4d210ef931
+size 29296
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 a44c05cf8b..bcb33a1a13 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:10f6c887b04447dd7b6fc24412b289894dad68cf5a6930e078499d4adacf47b5
-size 19187
+oid sha256:b370b20bf09f8691f882326eff8ec477870d067cd7fb9c333f2712659575c0aa
+size 19153
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 40126799db..aca7215e3c 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:50fb2b753bdad6a9df4ce2f55a552464e229c7b81be16e0d4f5c8e4e4b3d129b
-size 24312
+oid sha256:9b86306a131970f7f1eadecf0a2291ce1dcd27b1d087e515e1118412976811c8
+size 24285
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 7ad44759d3..8686ebbb56 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:54f11f0973a271b011bb62a0b614743ab9f99e7b3390f40a3b0404ffc639c424
-size 29462
+oid sha256:f418e764b15b6b5a88c886f3f526966dd57cfe297d0bf46099ab01872598fc0b
+size 29424
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 b3d11988e0..4b5ba51bd1 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:f1f151cfc61850755e2d775cf51403ad6a9ecfeddf32bcb88d070e96b7aed220
-size 23687
+oid sha256:ca102c7be8c52f3d0e605a1c5379dc62ef9e486918a4c8c8f0598e39a50dd003
+size 23662
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 1df30bd8f9..54561d8eaa 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:c438220907bd20f450a11a0a6efdcd333767c1fcfb78694980cec6ebe48da461
-size 34887
+oid sha256:b2d96886653f9ad35d50a3e45e6e579367dd92a99cae621f43f40334b2dbdcc1
+size 34854
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en.png
index e7ec4beb77..77411d24e8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d30a402a904abbdb3ab0a1aec1d637219bef4491bd2541e30010aba0b7e6351
-size 24556
+oid sha256:f6f3d5f6ad7e08a807731fa468b6e4b2fc0cf1aa97e6360698bade55a92a9f04
+size 24529
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 29bd1a834a..4cbc4e68ae 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:4a7d6984fc2fe26c2a02a3d9054698a3a7fcd611bd4a04914344f26a5da773fb
-size 23604
+oid sha256:574f069c4eb05c08c815870929132ddec98cf3e96201d6dc4167e9b7dbe2b1bc
+size 23572
diff --git a/tools/adb/callLinkCustomScheme.sh b/tools/adb/callLinkCustomScheme.sh
index 66d3203786..7e6c9f02d3 100755
--- a/tools/adb/callLinkCustomScheme.sh
+++ b/tools/adb/callLinkCustomScheme.sh
@@ -1,8 +1,9 @@
 #! /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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
diff --git a/tools/adb/callLinkCustomScheme2.sh b/tools/adb/callLinkCustomScheme2.sh
index 1716c494a2..43f427f22f 100755
--- a/tools/adb/callLinkCustomScheme2.sh
+++ b/tools/adb/callLinkCustomScheme2.sh
@@ -1,8 +1,9 @@
 #! /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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
diff --git a/tools/adb/callLinkHttps.sh b/tools/adb/callLinkHttps.sh
index 8d293038ab..4bbde8aeb4 100755
--- a/tools/adb/callLinkHttps.sh
+++ b/tools/adb/callLinkHttps.sh
@@ -1,8 +1,9 @@
 #! /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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
diff --git a/tools/adb/deeplink.sh b/tools/adb/deeplink.sh
index ef13e94a0b..d9ee729972 100755
--- a/tools/adb/deeplink.sh
+++ b/tools/adb/deeplink.sh
@@ -1,8 +1,9 @@
 #! /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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
diff --git a/tools/adb/deeplink_external.sh b/tools/adb/deeplink_external.sh
index 73accaccc7..3c3f299c4b 100755
--- a/tools/adb/deeplink_external.sh
+++ b/tools/adb/deeplink_external.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE \
diff --git a/tools/adb/deeplink_matrix.sh b/tools/adb/deeplink_matrix.sh
index f11d810ec9..d1c31b4bb5 100755
--- a/tools/adb/deeplink_matrix.sh
+++ b/tools/adb/deeplink_matrix.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 adb shell am start -a android.intent.action.VIEW \
diff --git a/tools/adb/deeplink_matrixto.sh b/tools/adb/deeplink_matrixto.sh
index 0e618c2662..9c289cc72d 100755
--- a/tools/adb/deeplink_matrixto.sh
+++ b/tools/adb/deeplink_matrixto.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 adb shell am start -a android.intent.action.VIEW \
diff --git a/tools/adb/deeplink_mobile.sh b/tools/adb/deeplink_mobile.sh
index aefb63f5be..43c4690f48 100755
--- a/tools/adb/deeplink_mobile.sh
+++ b/tools/adb/deeplink_mobile.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
diff --git a/tools/adb/disable_app_standby.sh b/tools/adb/disable_app_standby.sh
index 311921aa33..b6e115e184 100755
--- a/tools/adb/disable_app_standby.sh
+++ b/tools/adb/disable_app_standby.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Ref: https://developer.android.com/training/monitoring-device-state/doze-standby#testing_your_app_with_app_standby
diff --git a/tools/adb/disable_doze_mode.sh b/tools/adb/disable_doze_mode.sh
index b0f00a76eb..f9fac005ea 100755
--- a/tools/adb/disable_doze_mode.sh
+++ b/tools/adb/disable_doze_mode.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Ref: https://developer.android.com/training/monitoring-device-state/doze-standby#testing_doze
diff --git a/tools/adb/disable_talkback.sh b/tools/adb/disable_talkback.sh
index b16b693a0a..f1009e788d 100755
--- a/tools/adb/disable_talkback.sh
+++ b/tools/adb/disable_talkback.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 adb shell settings put secure enabled_accessibility_services null
diff --git a/tools/adb/enable_app_standby.sh b/tools/adb/enable_app_standby.sh
index 393bfa14b9..b6156e50ac 100755
--- a/tools/adb/enable_app_standby.sh
+++ b/tools/adb/enable_app_standby.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Ref: https://developer.android.com/training/monitoring-device-state/doze-standby#testing_your_app_with_app_standby
diff --git a/tools/adb/enable_doze_mode.sh b/tools/adb/enable_doze_mode.sh
index 5eb9d23c92..31d0ed50d1 100755
--- a/tools/adb/enable_doze_mode.sh
+++ b/tools/adb/enable_doze_mode.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Ref: https://developer.android.com/training/monitoring-device-state/doze-standby#testing_doze
diff --git a/tools/adb/enable_talkback.sh b/tools/adb/enable_talkback.sh
index 96f815f685..6dfb6e7c89 100755
--- a/tools/adb/enable_talkback.sh
+++ b/tools/adb/enable_talkback.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 adb shell settings put secure enabled_accessibility_services com.google.android.marvin.talkback/com.google.android.marvin.talkback.TalkBackService
diff --git a/tools/adb/oidc.sh b/tools/adb/oidc.sh
index 6772977e83..ff4894ef6c 100755
--- a/tools/adb/oidc.sh
+++ b/tools/adb/oidc.sh
@@ -1,8 +1,9 @@
 #! /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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
diff --git a/tools/adb/print_device_state.sh b/tools/adb/print_device_state.sh
index 4d0061fe75..113aed92ca 100755
--- a/tools/adb/print_device_state.sh
+++ b/tools/adb/print_device_state.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Ref: https://developer.android.com/training/monitoring-device-state/doze-standby#testing_doze
diff --git a/tools/check/check_code_quality.sh b/tools/check/check_code_quality.sh
index 3e2b8039a9..67f1ca614e 100755
--- a/tools/check/check_code_quality.sh
+++ b/tools/check/check_code_quality.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 #######################################################################################################################
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index c658c5c9a3..0fca8c2a4d 100755
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -1,6 +1,7 @@
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # This file list String which are not allowed in source code.
diff --git a/tools/check/forbidden_strings_in_xml.txt b/tools/check/forbidden_strings_in_xml.txt
index 19cf473d66..6ac4cb5cd0 100755
--- a/tools/check/forbidden_strings_in_xml.txt
+++ b/tools/check/forbidden_strings_in_xml.txt
@@ -1,6 +1,7 @@
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # This file list String which are not allowed in resource.
diff --git a/tools/compose/check_stability.sh b/tools/compose/check_stability.sh
new file mode 100755
index 0000000000..41132ce94e
--- /dev/null
+++ b/tools/compose/check_stability.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# 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.
+
+set -e
+
+# Build the project with compose report
+echo "Building the project with compose report..."
+./gradlew assembleGplayDebug -PcomposeCompilerReports=true -PcomposeCompilerMetrics=true --stacktrace
+
+echo "Checking stability of State classes..."
+# Using the find command, list all the files ending with -classes.txt
+find . -type f -name "*-classes.txt" | while read -r file; do
+    # echo "Processing $file"
+    # Check that there is no line containing "unstable class .*State {"
+    if grep -E 'unstable class .*State \{' "$file"; then
+        echo "❌ ERROR: Found unstable State class in $file"
+        exit 1
+    fi
+done
diff --git a/tools/compound/addAutoMirrored.py b/tools/compound/addAutoMirrored.py
index a8e22c42a5..4fd4a64aa0 100644
--- a/tools/compound/addAutoMirrored.py
+++ b/tools/compound/addAutoMirrored.py
@@ -1,10 +1,17 @@
 #!/usr/bin/env python3
 
+# 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.
+
 files = [
     "ic_compound_arrow_left.xml",
     "ic_compound_arrow_right.xml",
     "ic_compound_arrow_up_right.xml",
     "ic_compound_attachment.xml",
+    "ic_compound_backspace.xml",
+    "ic_compound_backspace_solid.xml",
     "ic_compound_block.xml",
     "ic_compound_chart.xml",
     "ic_compound_chat.xml",
diff --git a/tools/compound/import_tokens.sh b/tools/compound/import_tokens.sh
index 700decf81e..1f91ce42fc 100755
--- a/tools/compound/import_tokens.sh
+++ b/tools/compound/import_tokens.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# 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.
+
 set -e
 
 BRANCH='main'
@@ -22,12 +27,13 @@ if [ -d tmpCompound ]; then
 fi
 mkdir tmpCompound
 pushd tmpCompound
-git clone --branch "${BRANCH}" https://github.com/vector-im/compound-design-tokens
+git clone --branch "${BRANCH}" https://github.com/element-hq/compound-design-tokens
 
 echo "Copying files from tokens repository..."
 rm -R ../libraries/compound/src/main/res/drawable
 cp -R compound-design-tokens/assets/android/res/drawable ../libraries/compound/src/main/res/
 cp -R compound-design-tokens/assets/android/src/* ../libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/
+cp -R compound-design-tokens/assets/android/res/theme.iife.js ../libraries/compound/src/main/assets/theme.iife.js
 popd
 
 echo "Adding autoMirrored attribute..."
diff --git a/tools/danger/dangerfile-lint.js b/tools/danger/dangerfile-lint.js
index 8d704ef5a8..3023918656 100644
--- a/tools/danger/dangerfile-lint.js
+++ b/tools/danger/dangerfile-lint.js
@@ -1,3 +1,10 @@
+/**
+ * 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.
+ */
+
 import { schedule } from 'danger'
 
 /**
diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
index 1d5945ec15..634696d432 100644
--- a/tools/danger/dangerfile.js
+++ b/tools/danger/dangerfile.js
@@ -1,3 +1,10 @@
+/**
+ * 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.
+ */
+
 const {danger, warn} = require('danger')
 const fs = require('fs')
 const path = require('path')
diff --git a/tools/dependencies/checkDependencies.py b/tools/dependencies/checkDependencies.py
index 29ef7ea7fc..64ae6341e6 100755
--- a/tools/dependencies/checkDependencies.py
+++ b/tools/dependencies/checkDependencies.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import os
diff --git a/tools/detekt/detekt.yml b/tools/detekt/detekt.yml
index aab640d906..552b46755e 100644
--- a/tools/detekt/detekt.yml
+++ b/tools/detekt/detekt.yml
@@ -1,3 +1,8 @@
+# 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.
+
 # Default rules: https://github.com/detekt/detekt/blob/main/detekt-core/src/main/resources/default-detekt-config.yml
 
 style:
@@ -145,7 +150,7 @@ exceptions:
   TooGenericExceptionCaught:
     active: false
   SwallowedException:
-    active: false
+    active: true
   ThrowingExceptionsWithoutMessageOrCause:
     active: true
   TooGenericExceptionThrown:
@@ -219,27 +224,12 @@ comments:
 Compose:
   CompositionLocalAllowlist:
     active: true
-    # You can optionally define a list of CompositionLocals that are allowed here
-    allowedCompositionLocals:
-      - LocalCompoundColors
-      - 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:
@@ -262,8 +252,6 @@ 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/docs/generateModuleGraph.sh b/tools/docs/generateModuleGraph.sh
index 06b280853d..5b37a5160e 100755
--- a/tools/docs/generateModuleGraph.sh
+++ b/tools/docs/generateModuleGraph.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2022-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 ## Dependency graph https://github.com/savvasdalkitsis/module-dependency-graph
diff --git a/tools/git/validate_lfs.sh b/tools/git/validate_lfs.sh
index 3438112b8f..7dd1bc7750 100755
--- a/tools/git/validate_lfs.sh
+++ b/tools/git/validate_lfs.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2022-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Based on https://cashapp.github.io/paparazzi/#git-lfs
diff --git a/tools/gitflow/gitflow-init.sh b/tools/gitflow/gitflow-init.sh
index 2c3fbde4ce..83ee9db2bf 100755
--- a/tools/gitflow/gitflow-init.sh
+++ b/tools/gitflow/gitflow-init.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 git flow init -d
diff --git a/tools/github/download_all_github_artifacts.py b/tools/github/download_all_github_artifacts.py
index 2a50200cb0..03d6630f97 100755
--- a/tools/github/download_all_github_artifacts.py
+++ b/tools/github/download_all_github_artifacts.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 #
-# Copyright 2022-2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2022-2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 #
 
diff --git a/tools/github/download_github_artifacts.py b/tools/github/download_github_artifacts.py
index d354160dc8..9a8f07bccc 100755
--- a/tools/github/download_github_artifacts.py
+++ b/tools/github/download_github_artifacts.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 #
-# Copyright 2022-2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2022-2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 #
 
diff --git a/tools/lint/lint.xml b/tools/lint/lint.xml
index a6aa9e6e65..c4f045272c 100644
--- a/tools/lint/lint.xml
+++ b/tools/lint/lint.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
   ~ Copyright 2022 New Vector Ltd.
   ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <lint>
diff --git a/tools/localazy/checkForbiddenTerms.py b/tools/localazy/checkForbiddenTerms.py
index dc522ebf33..e190fcea68 100755
--- a/tools/localazy/checkForbiddenTerms.py
+++ b/tools/localazy/checkForbiddenTerms.py
@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
+import re
 import sys
 from xml.dom import minidom
 
@@ -13,7 +15,7 @@ file = sys.argv[1]
 # Dict of forbidden terms, with exceptions for some String name
 # Keys are the terms, values are the exceptions.
 forbiddenTerms = {
-    "Element": [
+    r"\bElement\b": [
         # Those 2 strings are only used in debug version
         "screen_advanced_settings_element_call_base_url",
         "screen_advanced_settings_element_call_base_url_description",
@@ -47,7 +49,8 @@ for elem in content.getElementsByTagName('string'):
     value = child.nodeValue
     # If value contains a forbidden term, add the error to errors
     for (term, exceptions) in forbiddenTerms.items():
-        if term in value and name not in exceptions:
+        matches = re.search(term, value)
+        if matches and name not in exceptions:
             errors.append('Forbidden term "' + term + '" in string: "' + name + '": ' + value)
 
 ### Plurals
@@ -64,7 +67,8 @@ for elem in content.getElementsByTagName('plurals'):
         value = child.nodeValue
         # If value contains a forbidden term, add the error to errors
         for (term, exceptions) in forbiddenTerms.items():
-            if term in value and name not in exceptions:
+            matches = re.search(term, value)
+            if matches and name not in exceptions:
                 errors.append('Forbidden term "' + term + '" in plural: "' + name + '": ' + value)
 
 # If errors is not empty print the report
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 82c273db2e..a8572fb660 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -129,6 +129,7 @@
       "includeRegex" : [
         "push_.*",
         "notification_.*",
+        "notification\\..*",
         "troubleshoot_notifications\\.test_blocked_users\\..*",
         "troubleshoot_notifications_test_current_push_provider.*",
         "troubleshoot_notifications_test_detect_push_provider.*",
@@ -154,6 +155,17 @@
         "troubleshoot_notifications_test_unified_push_.*"
       ]
     },
+    {
+      "name" : ":features:linknewdevice:impl",
+      "includeRegex" : [
+        "screen\\.link_new_device\\..*",
+        "screen_qr_code_login_error_.*",
+        "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_.*"
+      ]
+    },
     {
       "name" : ":features:login:impl",
       "includeRegex" : [
@@ -197,6 +209,7 @@
         "screen_room_details_.*",
         "screen\\.room_details\\..*",
         "screen_room_member_list_.*",
+        "screen\\.room_member_list\\..*",
         "screen_room_notification_settings_.*",
         "screen_notification_settings_edit_failed_updating_default_mode",
         "screen_polls_history_title",
@@ -207,10 +220,20 @@
         "screen\\.security_and_privacy\\..*"
       ]
     },
+    {
+      "name" : ":features:roomdetailsedit:impl",
+      "includeRegex" : [
+        "screen_room_details_edit_room_title",
+        "screen_room_details_edition_error",
+        "screen_room_details_edition_error_title",
+        "screen_room_details_updating_room"
+      ]
+    },
     {
       "name" : ":features:space:impl",
       "includeRegex" : [
-        "screen\\.leave_space\\..*"
+        "screen\\.leave_space\\..*",
+        "screen\\.space_settings\\..*"
       ]
     },
     {
@@ -366,11 +389,21 @@
       ]
     },
     {
-      "name" : ":features:changeroommemberroles:impl",
+      "name" : ":features:rolesandpermissions:impl",
       "includeRegex" : [
         "screen_room_change_.*",
+        "screen\\.room_change_permissions\\..*",
         "screen_room_roles_.*",
-        "screen_room_member_list.*"
+        "screen\\.room_roles_and_permissions\\..*",
+        "screen_room_member_list.*",
+        "screen\\.room_member_list\\..*"
+      ]
+    },
+    {
+      "name" : ":features:securityandprivacy:impl",
+      "includeRegex" : [
+        "screen\\.edit_room_address\\..*",
+        "screen\\.security_and_privacy\\..*"
       ]
     }
   ]
diff --git a/tools/localazy/downloadStrings.sh b/tools/localazy/downloadStrings.sh
index 9d855115c3..5a60656f35 100755
--- a/tools/localazy/downloadStrings.sh
+++ b/tools/localazy/downloadStrings.sh
@@ -1,8 +1,9 @@
 #! /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
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 set -e
diff --git a/tools/localazy/formatXmlResourcesFile.py b/tools/localazy/formatXmlResourcesFile.py
index fed34f1674..c1775c939b 100755
--- a/tools/localazy/formatXmlResourcesFile.py
+++ b/tools/localazy/formatXmlResourcesFile.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import re
diff --git a/tools/localazy/generateLocalazyConfig.py b/tools/localazy/generateLocalazyConfig.py
index cab23b17ee..c241a60cee 100755
--- a/tools/localazy/generateLocalazyConfig.py
+++ b/tools/localazy/generateLocalazyConfig.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import json
diff --git a/tools/localazy/importSupportedLocalesFromLocalazy.py b/tools/localazy/importSupportedLocalesFromLocalazy.py
index 526dc23b4f..e060d3c715 100755
--- a/tools/localazy/importSupportedLocalesFromLocalazy.py
+++ b/tools/localazy/importSupportedLocalesFromLocalazy.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import os
diff --git a/tools/quality/check.sh b/tools/quality/check.sh
index ce4544cd04..c4c8779dd3 100755
--- a/tools/quality/check.sh
+++ b/tools/quality/check.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # List of tasks to run before creating a PR, to limit the risk of getting rejected by the CI.
diff --git a/tools/release/fix-pg-map-id.py b/tools/release/fix-pg-map-id.py
index d074316034..c37fec2528 100644
--- a/tools/release/fix-pg-map-id.py
+++ b/tools/release/fix-pg-map-id.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # encoding: utf-8
 # SPDX-FileCopyrightText: 2024 FC (Fay) Stegerman <flx@obfusk.net>
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later.
 
 import hashlib
 import os
diff --git a/tools/release/inplace-fix.py b/tools/release/inplace-fix.py
index 5a57f97d10..a791e69140 100644
--- a/tools/release/inplace-fix.py
+++ b/tools/release/inplace-fix.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # encoding: utf-8
 # SPDX-FileCopyrightText: 2024 FC (Fay) Stegerman <flx@obfusk.net>
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later.
 
 import argparse
 import os
diff --git a/tools/release/release.sh b/tools/release/release.sh
index 59a29dc13c..d89cc1ca0f 100755
--- a/tools/release/release.sh
+++ b/tools/release/release.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # do not exit when any command fails (issue with git flow)
diff --git a/tools/rte/build_rte.sh b/tools/rte/build_rte.sh
index 9ad52fce56..bd1aa43791 100755
--- a/tools/rte/build_rte.sh
+++ b/tools/rte/build_rte.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+# 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.
+
 # Exit on error
 set -e
 
diff --git a/tools/sas/import_sas_emojis.py b/tools/sas/import_sas_emojis.py
index c399eec85e..6009ce2956 100755
--- a/tools/sas/import_sas_emojis.py
+++ b/tools/sas/import_sas_emojis.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2020-2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2020-2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import argparse
diff --git a/tools/sas/import_sas_strings.py b/tools/sas/import_sas_strings.py
index 78e4109221..3cf88b3a05 100755
--- a/tools/sas/import_sas_strings.py
+++ b/tools/sas/import_sas_strings.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2020-2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2020-2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import argparse
diff --git a/tools/sdk/build_rust_sdk.sh b/tools/sdk/build_rust_sdk.sh
index 91d6472426..0b74b0c4cb 100755
--- a/tools/sdk/build_rust_sdk.sh
+++ b/tools/sdk/build_rust_sdk.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 # Exit on error
diff --git a/tools/templates/files/fileTemplates/Template Module Feature Entry Point API.kt b/tools/templates/files/fileTemplates/Template Module Feature Entry Point API.kt
index 37f0500444..c4357b2d3c 100644
--- a/tools/templates/files/fileTemplates/Template Module Feature Entry Point API.kt	
+++ b/tools/templates/files/fileTemplates/Template Module Feature Entry Point API.kt	
@@ -6,12 +6,11 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface ${FEATURE_NAME}EntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node
 
     interface Callback : Plugin {
         // Add your callbacks
diff --git a/tools/templates/files/fileTemplates/Template Module Feature Entry Point Flow Impl.kt b/tools/templates/files/fileTemplates/Template Module Feature Entry Point Flow Impl.kt
index e3089e8d5e..3642f8e821 100644
--- a/tools/templates/files/fileTemplates/Template Module Feature Entry Point Flow Impl.kt	
+++ b/tools/templates/files/fileTemplates/Template Module Feature Entry Point Flow Impl.kt	
@@ -7,25 +7,15 @@ import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.${MODULE_NAME}.api.${FEATURE_NAME}EntryPoint
 import io.element.android.libraries.architecture.createNode
 import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.Inject
 
 @ContributesBinding(AppScope::class)
-@Inject
 class Default${FEATURE_NAME}EntryPoint() : ${FEATURE_NAME}EntryPoint {
 
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ${FEATURE_NAME}EntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : ${FEATURE_NAME}EntryPoint.NodeBuilder {
-
-            override fun callback(callback: ${FEATURE_NAME}EntryPoint.Callback): ${FEATURE_NAME}EntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<${FEATURE_NAME}FlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: ${FEATURE_NAME}EntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<${FEATURE_NAME}FlowNode>(buildContext, listOf(callback))
     }
 }
diff --git a/tools/templates/files/fileTemplates/Template Presentation Classes.kt b/tools/templates/files/fileTemplates/Template Presentation Classes.kt
index 91ec2165f7..a527a37b57 100644
--- a/tools/templates/files/fileTemplates/Template Presentation Classes.kt	
+++ b/tools/templates/files/fileTemplates/Template Presentation Classes.kt	
@@ -10,14 +10,14 @@ class ${NAME}Presenter() : Presenter<${NAME}State> {
     @Composable
     override fun present(): ${NAME}State {
 
-        fun handleEvents(event: ${NAME}Events) {
+        fun handleEvent(event: ${NAME}Event) {
             when (event) {
-                ${NAME}Events.MyEvent -> Unit
+                ${NAME}Event.MyEvent -> Unit
             }
         }
 
         return ${NAME}State(
-            eventSink = ::handleEvents
+            eventSink = ::handleEvent,
         )
     }
 }
diff --git a/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.3.kt b/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.3.kt
index 3fcdd7f219..f182b62d96 100644
--- a/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.3.kt	
+++ b/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.3.kt	
@@ -1,7 +1,6 @@
 #if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}#end
 
 // TODO add your ui models. Remove the eventSink if you don't have events.
-// Do not use default value, so no member get forgotten in the presenters.
 data class ${NAME}State(
-    val eventSink: (${NAME}Events) -> Unit
+    val eventSink: (${NAME}Event) -> Unit
 )
diff --git a/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.4.kt b/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.4.kt
index 4b47069304..8ef5400fd9 100644
--- a/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.4.kt	
+++ b/tools/templates/files/fileTemplates/Template Presentation Classes.kt.child.4.kt	
@@ -1,6 +1,6 @@
 #if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}#end
 
 // TODO Add your events or remove the file completely if no events
-sealed interface ${NAME}Events {
-    data object MyEvent: ${NAME}Events
+sealed interface ${NAME}Event {
+    data object MyEvent: ${NAME}Event
 }
diff --git a/tools/templates/files/options/file.template.settings.xml b/tools/templates/files/options/file.template.settings.xml
index c7d26d1fb7..a284c63140 100644
--- a/tools/templates/files/options/file.template.settings.xml
+++ b/tools/templates/files/options/file.template.settings.xml
@@ -6,13 +6,13 @@
         <template name="Template Presentation Classes.kt.child.1.kt" file-name="${NAME}Node" reformat="true" live-template-enabled="false" />
         <template name="Template Presentation Classes.kt.child.2.kt" file-name="${NAME}View" reformat="true" live-template-enabled="false" />
         <template name="Template Presentation Classes.kt.child.3.kt" file-name="${NAME}State" reformat="true" live-template-enabled="false" />
-        <template name="Template Presentation Classes.kt.child.4.kt" file-name="${NAME}Events" reformat="true" live-template-enabled="false" />
+        <template name="Template Presentation Classes.kt.child.4.kt" file-name="${NAME}Event" reformat="true" live-template-enabled="false" />
       </template>
       <template name="Template Presentation Classes.kt.child.0.kt" file-name="${NAME}StateProvider" reformat="true" live-template-enabled="false" />
       <template name="Template Presentation Classes.kt.child.1.kt" file-name="${NAME}Node" reformat="true" live-template-enabled="false" />
       <template name="Template Presentation Classes.kt.child.2.kt" file-name="${NAME}View" reformat="true" live-template-enabled="false" />
       <template name="Template Presentation Classes.kt.child.3.kt" file-name="${NAME}State" reformat="true" live-template-enabled="false" />
-      <template name="Template Presentation Classes.kt.child.4.kt" file-name="${NAME}Events" reformat="true" live-template-enabled="false" />
+      <template name="Template Presentation Classes.kt.child.4.kt" file-name="${NAME}Event" reformat="true" live-template-enabled="false" />
     </default_templates>
   </component>
 </application>
diff --git a/tools/templates/generate_templates.sh b/tools/templates/generate_templates.sh
index 1b4fc3459d..04d79bb582 100755
--- a/tools/templates/generate_templates.sh
+++ b/tools/templates/generate_templates.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+# Copyright (c) 2025 Element Creations Ltd.
 # Copyright 2023-2024 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 echo "Zipping the contents of the 'files' directory..."
diff --git a/tools/test/checkInvalidScreenshots.py b/tools/test/checkInvalidScreenshots.py
index 28740c52e8..3f872d1bc4 100755
--- a/tools/test/checkInvalidScreenshots.py
+++ b/tools/test/checkInvalidScreenshots.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import os
diff --git a/tools/test/generateAllScreenshots.py b/tools/test/generateAllScreenshots.py
index ef3b1ec939..e10a7abb74 100755
--- a/tools/test/generateAllScreenshots.py
+++ b/tools/test/generateAllScreenshots.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 #
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 #
 
diff --git a/tools/test/generateWorldScreenshots.py b/tools/test/generateWorldScreenshots.py
index c13ba58f23..adad69bba2 100755
--- a/tools/test/generateWorldScreenshots.py
+++ b/tools/test/generateWorldScreenshots.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 #
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 #
 
diff --git a/tools/test/util.py b/tools/test/util.py
index 97bb2759a5..1accdd2e56 100644
--- a/tools/test/util.py
+++ b/tools/test/util.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 New Vector Ltd.
+# Copyright (c) 2025 Element Creations Ltd.
+# Copyright 2024, 2025 New Vector Ltd.
 #
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 # Please see LICENSE files in the repository root for full details.
 
 import os